X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-logicstudio%2Fapi.c;h=95c044f1f3de52ebfe33f4948cf81027600ca6ff;hb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;hp=9cf7018eb810e93f7a72a76a499da046675c04d2;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index 9cf7018e..95c044f1 100644
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -71,16 +71,8 @@ static const uint64_t samplerates[] = {
 	SR_MHZ(500),
 };
 
-SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-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;
@@ -91,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;
 
@@ -127,7 +118,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	(void)options;
 
 	drvc = di->context;
-	drvc->instances = NULL;
 
 	devices = NULL;
 
@@ -148,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],
@@ -169,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:
@@ -182,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)
@@ -263,19 +252,12 @@ static int open_device(struct sr_dev_inst *sdi)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	int64_t timediff_us, timediff_ms;
 	int ret;
 
-	drvc = sdi->driver->context;
 	devc = sdi->priv;
 
-	if (!drvc) {
-		sr_err("Driver was not initialized.");
-		return SR_ERR;
-	}
-
 	/*
 	 * If we didn't need to upload FX2 firmware in scan(), open the device
 	 * right away. Otherwise, wait up to MAX_RENUM_DELAY_MS ms for the
@@ -498,7 +480,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	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);
@@ -506,17 +488,14 @@ 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,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
@@ -530,3 +509,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);