X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fipdbg-la%2Fapi.c;h=407344d2907956017ca7f494f26753846230fd00;hb=6ee37801751a6e76e6b5865d1b3c88b9d342fe53;hp=e89c3a2886a2dd68c3b03d5541040b1088f25d81;hpb=ac3625bef92fd9a9f7aad15d4515a5cfafe32f20;p=libsigrok.git

diff --git a/src/hardware/ipdbg-la/api.c b/src/hardware/ipdbg-la/api.c
index e89c3a28..407344d2 100644
--- a/src/hardware/ipdbg-la/api.c
+++ b/src/hardware/ipdbg-la/api.c
@@ -42,8 +42,6 @@ static const int32_t trigger_matches[] = {
 	SR_TRIGGER_EDGE,
 };
 
-SR_PRIV struct sr_dev_driver ipdbg_la_driver_info;
-
 static void ipdbg_la_split_addr_port(const char *conn, char **addr,
 	char **port)
 {
@@ -113,10 +111,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sr_dbg("limit samples = %" PRIu64 "\n", devc->limit_samples_max);
 
 	for (uint32_t i = 0; i < devc->data_width; i++) {
-		const uint8_t buf_size = 16;
-		char buf[buf_size];
-		snprintf(buf, buf_size, "ch%d", i);
-		sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, buf);
+		char *name = g_strdup_printf("CH%d", i);
+		sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
+		g_free(name);
 	}
 
 	sdi->inst_type = SR_INST_USER;
@@ -210,7 +207,11 @@ static int config_set(uint32_t key, GVariant *data,
 		devc->capture_ratio = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
-		devc->limit_samples = g_variant_get_uint64(data);
+		{
+			uint64_t limit_samples = g_variant_get_uint64(data);
+			if (limit_samples <= devc->limit_samples_max)
+				devc->limit_samples = limit_samples;
+		}
 		break;
 	default:
 		return SR_ERR_NA;
@@ -261,13 +262,15 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	struct ipdbg_la_tcp *tcp = sdi->conn;
 	struct dev_context *devc = sdi->priv;
 
-	uint8_t byte;
+	const size_t bufsize = 1024;
+	uint8_t buffer[bufsize];
 
 	if (devc->num_transfers > 0) {
 		while (devc->num_transfers <
 			(devc->limit_samples_max * devc->data_width_bytes)) {
-			ipdbg_la_tcp_receive(tcp, &byte);
-			devc->num_transfers++;
+			int recd = ipdbg_la_tcp_receive(tcp, buffer, bufsize);
+			if (recd > 0)
+				devc->num_transfers += recd;
 		}
 	}
 
@@ -277,7 +280,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = {
+static struct sr_dev_driver ipdbg_la_driver_info = {
 	.name = "ipdbg-la",
 	.longname = "IPDBG LA",
 	.api_version = 1,
@@ -295,5 +298,4 @@ SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(ipdbg_la_driver_info);