X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fikalogic-scanalogic2%2Fapi.c;h=93a9ca87ce692bb384dfe98c8a01d005c9e96875;hb=e22aa87808624c86ec52ea8d57d0a6f35c9e018e;hp=501a58fed47ad8199864df81fb649c15020e8e1a;hpb=79914b3a62adb1b0b054d23c2721ce80eb7ba9ea;p=libsigrok.git

diff --git a/hardware/ikalogic-scanalogic2/api.c b/hardware/ikalogic-scanalogic2/api.c
index 501a58fe..93a9ca87 100644
--- a/hardware/ikalogic-scanalogic2/api.c
+++ b/hardware/ikalogic-scanalogic2/api.c
@@ -25,6 +25,7 @@ static const int hwcaps[] = {
 	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_TRIGGER_TYPE,
 	SR_CONF_CAPTURE_RATIO,
+	SR_CONF_MAX_UNCOMPRESSED_SAMPLES,
 };
 
 SR_PRIV const uint64_t sl2_samplerates[NUM_SAMPLERATES] = {
@@ -161,7 +162,7 @@ static GSList *scan(GSList *options)
 			PACKET_LENGTH);
 
 		libusb_fill_control_setup(devc->xfer_buf_in,
-			USB_REQUEST_TYPE_IN, USB_HID_SET_REPORT,
+			USB_REQUEST_TYPE_IN, USB_HID_GET_REPORT,
 			USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
 			PACKET_LENGTH);
 		libusb_fill_control_setup(devc->xfer_buf_out,
@@ -234,7 +235,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (libusb_kernel_driver_active(usb->devhdl, USB_INTERFACE) == 1) {
 		ret = libusb_detach_kernel_driver(usb->devhdl, USB_INTERFACE);
 		if (ret < 0) {
-			sr_err("Failed to detach kernel driver: %i.",
+			sr_err("Failed to detach kernel driver: %s.",
 				libusb_error_name(ret));
 			return SR_ERR;
 		}
@@ -307,11 +308,14 @@ static int cleanup(void)
 	return dev_clear();
 }
 
-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_probe_group *probe_group)
 {
 	struct dev_context *devc;
 	int ret;
 
+	(void)probe_group;
+
 	ret = SR_OK;
 	devc = sdi->priv;
 
@@ -322,6 +326,9 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	case SR_CONF_CAPTURE_RATIO:
 		*data = g_variant_new_uint64(devc->capture_ratio);
 		break;
+	case SR_CONF_MAX_UNCOMPRESSED_SAMPLES:
+		*data = g_variant_new_uint64(MAX_SAMPLES);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -329,11 +336,14 @@ 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_probe_group *probe_group)
 {
 	uint64_t samplerate, limit_samples, capture_ratio;
 	int ret;
 
+	(void)probe_group;
+
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
@@ -359,13 +369,15 @@ 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_probe_group *probe_group)
 {
 	GVariant *gvar;
 	GVariantBuilder gvb;
 	int ret;
 
 	(void)sdi;
+	(void)probe_group;
 
 	ret = SR_OK;
 
@@ -394,7 +406,6 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
-	const struct libusb_pollfd **pfd;
 	struct drv_context *drvc;
 	struct dev_context *devc;
 	uint16_t trigger_bytes, tmp;
@@ -465,34 +476,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	tmp = GUINT16_TO_LE(devc->after_trigger_delay);
 	memcpy(devc->xfer_data_out + 10, &tmp, sizeof(tmp));
 
-	if (!(pfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx))) {
-		sr_err("libusb_get_pollfds failed.");
-		return SR_ERR;
-	}
-
-	/* Count the number of file descriptors. */
-	for (devc->num_usbfd = 0; pfd[devc->num_usbfd]; devc->num_usbfd++);
-
-	if (!(devc->usbfd = g_try_malloc(devc->num_usbfd * sizeof(int)))) {
-		sr_err("File descriptor array malloc failed.");
-		free(pfd);
-		return SR_ERR_MALLOC;
-	}
-
 	if ((ret = libusb_submit_transfer(devc->xfer_out)) != 0) {
 		sr_err("Submit transfer failed: %s.", libusb_error_name(ret));
-		g_free(devc->usbfd);
 		return SR_ERR;
 	}
 
-	for (i = 0; i < devc->num_usbfd; i++) {
-		sr_source_add(pfd[i]->fd, pfd[i]->events, 100,
-			ikalogic_scanalogic2_receive_data, (void *)sdi);
-
-		devc->usbfd[i] = pfd[i]->fd;
-	}
-
-	free(pfd);
+	usb_source_add(drvc->sr_ctx, 100, ikalogic_scanalogic2_receive_data, (void *)sdi);
 
 	sr_dbg("Acquisition started successfully.");