X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-logicstudio%2Fapi.c;h=20ffcf2f8735c1b664ca9577ede3269ad0aabe7b;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;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..20ffcf2f 100644
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -71,13 +71,6 @@ 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)
@@ -263,19 +256,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
@@ -512,11 +498,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	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 +516,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);