X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fftdi-la%2Fapi.c;h=22715a1f43dc20480bb0724e624d439550b5b523;hb=bee2b0168c087676c1b365861d8c2d4714afa9b9;hp=c3c3891fc500f16d662f30292ba5929c029316cc;hpb=07a917521ae98260d5c913a300f34c659cc91994;p=libsigrok.git

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index c3c3891f..22715a1f 100644
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -82,7 +82,7 @@ static const struct ftdi_chip_desc *chip_descs[] = {
 	&ft232r_desc,
 };
 
-static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
+static void scan_device(struct ftdi_context *ftdic,
 	struct libusb_device *dev, GSList **devices)
 {
 	struct libusb_device_descriptor usb_desc;
@@ -90,10 +90,8 @@ static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
 	struct dev_context *devc;
 	char *vendor, *model, *serial_num;
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	int rv;
 
-	drvc = di->context;
 	libusb_get_device_descriptor(dev, &usb_desc);
 
 	desc = NULL;
@@ -116,9 +114,6 @@ static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
 	/* Allocate memory for the incoming data. */
 	devc->data_buf = g_malloc0(DATA_BUF_SIZE);
 
-	snprintf(devc->address, sizeof(devc->address), "d:%u/%u",
-		libusb_get_bus_number(dev), libusb_get_device_address(dev));
-
 	devc->desc = desc;
 
 	vendor = g_malloc(32);
@@ -146,15 +141,15 @@ static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
 	sdi->vendor = vendor;
 	sdi->model = model;
 	sdi->serial_num = serial_num;
-	sdi->driver = di;
 	sdi->priv = devc;
+	sdi->connection_id = g_strdup_printf("d:%u/%u",
+		libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
 	for (char *const *chan = &(desc->channel_names[0]); *chan; chan++)
 		sr_channel_new(sdi, chan - &(desc->channel_names[0]),
 				SR_CHANNEL_LOGIC, TRUE, *chan);
 
 	*devices = g_slist_append(*devices, sdi);
-	drvc->instances = g_slist_append(drvc->instances, sdi);
 	return;
 
 err_free_strings:
@@ -165,8 +160,7 @@ err_free_strings:
 	g_free(devc);
 }
 
-static GSList *scan_all(struct ftdi_context *ftdic, struct sr_dev_driver *di,
-	GSList *options)
+static GSList *scan_all(struct ftdi_context *ftdic, GSList *options)
 {
 	GSList *devices;
 	struct ftdi_device_list *devlist = 0;
@@ -188,7 +182,7 @@ static GSList *scan_all(struct ftdi_context *ftdic, struct sr_dev_driver *di,
 
 	curdev = devlist;
 	while (curdev) {
-		scan_device(di, ftdic, curdev->dev, &devices);
+		scan_device(ftdic, curdev->dev, &devices);
 		curdev = curdev->next;
 	}
 
@@ -210,7 +204,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	int i;
 
 	drvc = di->context;
-	drvc->instances = NULL;
 	conn = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -236,17 +229,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 				usb = l->data;
 				if (usb->bus == libusb_get_bus_number(devlist[i])
 					&& usb->address == libusb_get_device_address(devlist[i])) {
-					scan_device(di, ftdic, devlist[i], &devices);
+					scan_device(ftdic, devlist[i], &devices);
 				}
 			}
 		}
 		libusb_free_device_list(devlist, 1);
 	} else
-		devices = scan_all(ftdic, di, options);
+		devices = scan_all(ftdic, options);
 
 	ftdi_free(ftdic);
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static void clear_helper(void *priv)
@@ -274,7 +267,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (!devc->ftdic)
 		return SR_ERR;
 
-	ret = ftdi_usb_open_string(devc->ftdic, devc->address);
+	ret = ftdi_usb_open_string(devc->ftdic, sdi->connection_id);
 	if (ret < 0) {
 		/* Log errors, except for -3 ("device not found"). */
 		if (ret != -3)
@@ -458,7 +451,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	devc->samples_sent = 0;
 	devc->bytes_received = 0;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Hook up a dummy handler to receive data from the device. */
 	sr_session_source_add(sdi->session, -1, G_IO_IN, 0,
@@ -475,7 +468,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	sr_dbg("Stopping acquisition.");
 	sr_session_source_remove(sdi->session, -1);
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	return SR_OK;
 }