X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-logicstudio%2Fapi.c;h=c3007e4210da344695493dd71a17408bb4819663;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=ae73738a6f0b3d7cdca1cffb7d0b230a05cd2974;hpb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;p=libsigrok.git

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index ae73738a..c3007e42 100644
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -71,9 +71,8 @@ static const uint64_t samplerates[] = {
 	SR_MHZ(500),
 };
 
-static struct sr_dev_inst *create_device(struct sr_dev_driver *di,
-		struct sr_usb_dev_inst *usb, enum sr_dev_inst_status status,
-		int64_t fw_updated)
+static struct sr_dev_inst *create_device(struct sr_usb_dev_inst *usb,
+		enum sr_dev_inst_status status, int64_t fw_updated)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -84,7 +83,6 @@ static struct sr_dev_inst *create_device(struct sr_dev_driver *di,
 	sdi->status = status;
 	sdi->vendor = g_strdup("LeCroy");
 	sdi->model = g_strdup("LogicStudio16");
-	sdi->driver = di;
 	sdi->inst_type = SR_INST_USB;
 	sdi->conn = usb;
 
@@ -120,7 +118,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	(void)options;
 
 	drvc = di->context;
-	drvc->instances = NULL;
 
 	devices = NULL;
 
@@ -141,7 +138,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
 				libusb_get_device_address(devlist[i]), NULL);
 
-			sdi = create_device(di, usb, SR_ST_INACTIVE, 0);
+			sdi = create_device(usb, SR_ST_INACTIVE, 0);
 			break;
 		case LOGICSTUDIO16_PID_LACK_FIRMWARE:
 			r = ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
@@ -162,7 +159,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
 				UNKNOWN_ADDRESS, NULL);
 
-			sdi = create_device(di, usb, SR_ST_INITIALIZING,
+			sdi = create_device(usb, SR_ST_INITIALIZING,
 				g_get_monotonic_time());
 			break;
 		default:
@@ -175,13 +172,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 		sdi->connection_id = g_strdup(connection_id);
 
-		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 	}
 
 	libusb_free_device_list(devlist, 1);
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static int open_device(struct sr_dev_inst *sdi)
@@ -195,9 +191,6 @@ static int open_device(struct sr_dev_inst *sdi)
 	size_t i;
 	int r;
 
-	if (sdi->status == SR_ST_ACTIVE)
-		return SR_ERR;
-
 	drvc = sdi->driver->context;
 	usb = sdi->conn;
 
@@ -344,15 +337,13 @@ static int dev_close(struct sr_dev_inst *sdi)
 	}
 
 	if (!usb->devhdl)
-		return SR_ERR;
+		return SR_ERR_BUG;
 
 	libusb_release_interface(usb->devhdl, 0);
 
 	libusb_close(usb->devhdl);
 	usb->devhdl = NULL;
 
-	sdi->status = SR_ST_INACTIVE;
-
 	return SR_OK;
 }
 
@@ -394,9 +385,6 @@ static int config_set(uint32_t key, GVariant *data,
 
 	devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		return lls_set_samplerate(sdi, g_variant_get_uint64(data));
@@ -476,15 +464,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct drv_context *drvc;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	drvc = sdi->driver->context;
 
 	if ((ret = lls_start_acquisition(sdi)) < 0)
 		return ret;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	return usb_source_add(sdi->session, drvc->sr_ctx, 100,
 		receive_usb_data, drvc);
@@ -492,13 +477,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	return lls_stop_acquisition(sdi);
 }
 
-SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = {
+static struct sr_dev_driver lecroy_logicstudio_driver_info = {
 	.name = "lecroy-logicstudio",
 	.longname = "LeCroy LogicStudio",
 	.api_version = 1,
@@ -516,3 +498,4 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(lecroy_logicstudio_driver_info);