X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fasix-sigma.c;h=dac6e011dabaddc7d2c516ebb44de4fc791eb368;hb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;hp=c577ca74686ca58268829c7c457efa35c339b08e;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c
index c577ca74..dac6e011 100644
--- a/src/hardware/asix-sigma/asix-sigma.c
+++ b/src/hardware/asix-sigma/asix-sigma.c
@@ -39,7 +39,6 @@
 #define USB_MODEL_NAME			"SIGMA"
 
 SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
-static struct sr_dev_driver *di = &asix_sigma_driver_info;
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 /*
@@ -312,20 +311,19 @@ static void clear_helper(void *priv)
 	ftdi_deinit(&devc->ftdic);
 }
 
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, clear_helper);
 }
 
-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 sr_dev_inst *sdi;
-	struct sr_channel *ch;
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	GSList *devices;
@@ -383,11 +381,9 @@ static GSList *scan(GSList *options)
 	sdi->model = g_strdup(USB_MODEL_NAME);
 	sdi->driver = di;
 
-	for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
-		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+	for (i = 0; i < ARRAY_SIZE(channel_names); i++)
+		sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
 				    channel_names[i]);
-		sdi->channels = g_slist_append(sdi->channels, ch);
-	}
 
 	devices = g_slist_append(devices, sdi);
 	drvc->instances = g_slist_append(drvc->instances, sdi);
@@ -404,7 +400,7 @@ free:
 	return NULL;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
@@ -446,7 +442,7 @@ static int sigma_fpga_init_bitbang(struct dev_context *devc)
 		if (data & (1 << 5))
 			return 0;
 		/* The D6 was not asserted yet, wait a bit. */
-		usleep(10000);
+		g_usleep(10000);
 	}
 
 	return SR_ERR_TIMEOUT;
@@ -806,9 +802,9 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-	return dev_clear();
+	return dev_clear(di);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,