X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fapi.c;h=d0a63dc95cb2a9f8455ef56946e386807c27aa96;hb=660e398fe9f5fc608787f8fd75a9df8aac61026f;hp=dfcbe047f8ea3674794d977367d27a0f66bab0a0;hpb=0c30b35fce5777592ff781ec9660b7e46f0af9c6;p=libsigrok.git

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index dfcbe047..d0a63dc9 100644
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -240,11 +240,6 @@ static GSList *dev_list(void)
 	return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_clear(void)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int logic16_dev_open(struct sr_dev_inst *sdi)
 {
 	libusb_device **devlist;
@@ -424,14 +419,16 @@ static int cleanup(void)
 		/* Can get called on an unused driver, doesn't matter. */
 		return SR_OK;
 
-	ret = dev_clear();
+
+	ret = std_dev_clear(di, NULL);
 	g_free(drvc);
 	di->priv = NULL;
 
 	return ret;
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *channel_group)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -440,6 +437,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	int ret;
 	unsigned int i;
 
+	(void)channel_group;
+
 	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_CONN:
@@ -482,13 +481,16 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *channel_group)
 {
 	struct dev_context *devc;
 	gdouble low, high;
 	int ret;
 	unsigned int i;
 
+	(void)channel_group;
+
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
@@ -522,7 +524,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *channel_group)
 {
 	GVariant *gvar, *range[2];
 	GVariantBuilder gvb;
@@ -530,6 +533,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	unsigned int i;
 
 	(void)sdi;
+	(void)channel_group;
 
 	ret = SR_OK;
 	switch (key) {
@@ -683,7 +687,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
 	struct libusb_transfer *transfer;
-	const struct libusb_pollfd **lupfd;
 	unsigned int i, timeout, num_transfers;
 	int ret;
 	unsigned char *buf;
@@ -713,7 +716,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	size = get_buffer_size(devc);
 	convsize = (size / devc->num_channels + 2) * 16;
 	devc->submitted_transfers = 0;
-	devc->usbfd = NULL;
 
 	devc->convbuffer_size = convsize;
 	if (!(devc->convbuffer = g_try_malloc(convsize))) {
@@ -763,21 +765,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		devc->submitted_transfers++;
 	}
 
-	lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-	for (i = 0; lupfd[i]; i++);
-	devc->usbfd = g_try_malloc(sizeof(struct libusb_pollfd) * (i + 1));
-	if (!devc->usbfd) {
-		abort_acquisition(devc);
-		free(lupfd);
-		return SR_ERR;
-	}
-	for (i = 0; lupfd[i]; i++) {
-		sr_source_add(lupfd[i]->fd, lupfd[i]->events,
-			      timeout, receive_data, (void *)sdi);
-		devc->usbfd[i] = lupfd[i]->fd;
-	}
-	devc->usbfd[i] = -1;
-	free(lupfd);
+	devc->ctx = drvc->sr_ctx;
+
+	usb_source_add(devc->ctx, timeout, receive_data, (void *)sdi);
 
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
@@ -814,7 +804,7 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,