X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcem-dt-885x%2Fapi.c;h=a30b5b778d9e9be015fe17d1b7955cb30041063b;hb=f3c60fb6affce2ebd81250db1d60bee733e5f479;hp=d91c5509b1f55fa908adb1377aad0637313b4e01;hpb=91219afc75c9aa1d0c5e2da5c03343c1e43eb6df;p=libsigrok.git

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index d91c5509..a30b5b77 100644
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -21,8 +21,9 @@
 #include "protocol.h"
 
 #define SERIALCOMM "9600/8n1"
+
 /* 23ms is the longest interval between tokens. */
-#define MAX_SCAN_TIME 25 * 1000
+#define MAX_SCAN_TIME_US (25 * 1000)
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -66,23 +67,21 @@ static const char *data_sources[] = {
 	"Live",
 	"Memory",
 };
-SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
-static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
 
+SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
 	struct sr_serial_dev_inst *serial;
 	struct sr_dev_inst *sdi;
-	struct sr_channel *ch;
 	GSList *l, *devices;
 	gint64 start;
 	const char *conn;
@@ -105,7 +104,7 @@ static GSList *scan(GSList *options)
 	devices = NULL;
 	drvc = di->priv;
 	start = g_get_monotonic_time();
-	while (g_get_monotonic_time() - start < MAX_SCAN_TIME) {
+	while (g_get_monotonic_time() - start < MAX_SCAN_TIME_US) {
 		if (serial_read_nonblocking(serial, &c, 1) == 1 && c == 0xa5) {
 			/* Found one. */
 			sdi = g_malloc0(sizeof(struct sr_dev_inst));
@@ -122,8 +121,7 @@ static GSList *scan(GSList *options)
 			sdi->inst_type = SR_INST_SERIAL;
 			sdi->priv = devc;
 			sdi->driver = di;
-			ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL");
-			sdi->channels = g_slist_append(sdi->channels, ch);
+			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "SPL");
 			drvc->instances = g_slist_append(drvc->instances, sdi);
 			devices = g_slist_append(devices, sdi);
 			break;
@@ -137,7 +135,7 @@ static GSList *scan(GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
@@ -155,7 +153,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, NULL);
 }
@@ -351,6 +349,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		case SR_CONF_DEVICE_OPTIONS:
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
 					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+			break;
 		case SR_CONF_SPL_WEIGHT_FREQ:
 			*data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
 			break;