X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fipdbg-la%2Fapi.c;h=407344d2907956017ca7f494f26753846230fd00;hb=0ccc6f7cdf3ce1a3ac1f9116b1524f2b326dd6be;hp=62d0616e35077fdc95a31aacedbca821d2c0235b;hpb=77b6b98d1c3790b8feb55105f243cec63418ab0f;p=libsigrok.git

diff --git a/src/hardware/ipdbg-la/api.c b/src/hardware/ipdbg-la/api.c
index 62d0616e..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)
 {
@@ -97,11 +95,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		return NULL;
 
 	struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	if (!sdi) {
-		sr_err("no possible to allocate sr_dev_inst");
-		return NULL;
-	}
-
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("ipdbg.org");
 	sdi->model = g_strdup("IPDBG LA");
@@ -113,15 +106,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	ipdbg_la_get_addrwidth_and_datawidth(tcp, devc);
 
-	sr_dbg("addr_width = %d, data_width = %d\n", devc->ADDR_WIDTH,
-		devc->DATA_WIDTH);
+	sr_dbg("addr_width = %d, data_width = %d\n", devc->addr_width,
+		devc->data_width);
 	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);
+	for (uint32_t i = 0; i < devc->data_width; i++) {
+		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;
@@ -158,8 +150,6 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	sdi->status = SR_ST_INACTIVE;
-
 	struct ipdbg_la_tcp *tcp = sdi->conn;
 
 	if (!tcp)
@@ -168,21 +158,18 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (ipdbg_la_tcp_open(tcp) != SR_OK)
 		return SR_ERR;
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	// Should be called before a new call to scan()
+	/* Should be called before a new call to scan(). */
 	struct ipdbg_la_tcp *tcp = sdi->conn;
 
 	if (tcp)
 		ipdbg_la_tcp_close(tcp);
 
 	sdi->conn = NULL;
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
@@ -215,15 +202,16 @@ static int config_set(uint32_t key, GVariant *data,
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	switch (key) {
 	case SR_CONF_CAPTURE_RATIO:
 		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;
@@ -249,21 +237,8 @@ static int config_list(uint32_t key, GVariant **data,
 	return SR_OK;
 }
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(di, sr_ctx);
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	struct ipdbg_la_tcp *tcp = sdi->conn;
 	struct dev_context *devc = sdi->priv;
 
@@ -287,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++;
+			(devc->limit_samples_max * devc->data_width_bytes)) {
+			int recd = ipdbg_la_tcp_receive(tcp, buffer, bufsize);
+			if (recd > 0)
+				devc->num_transfers += recd;
 		}
 	}
 
@@ -303,14 +280,14 @@ 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,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
@@ -321,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);