Use driver name as the log prefix in standard functions

[libsigrok.git] / src / hardware / zeroplus-logic-cube / api.c

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index dd001495828f3147ae5ca08f6ae8934b70a272ba..b2fe6079a676d19dd648e8435032a0d130a45463 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -212,7 +212,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sdi->status = SR_ST_INACTIVE;
                sdi->vendor = g_strdup(VENDOR_NAME);
                sdi->model = g_strdup(prof->model_name);
-               sdi->driver = di;
                sdi->serial_num = g_strdup(serial_num);
                sdi->connection_id = g_strdup(connection_id);
 
@@ -238,7 +237,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                                        channel_names[j]);
 
                devices = g_slist_append(devices, sdi);
-               drvc->instances = g_slist_append(drvc->instances, sdi);
                sdi->inst_type = SR_INST_USB;
                sdi->conn = sr_usb_dev_inst_new(
                        libusb_get_bus_number(devlist[i]),
@@ -246,7 +244,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        }
        libusb_free_device_list(devlist, 1);
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -524,11 +522,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        sr_info("Ramsize trigger    = 0x%x.", ramsize_trigger);
        sr_info("Memory size        = 0x%x.", memory_size);
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Check for empty capture */
        if ((status & STATUS_READY) && !stop_address) {
-               std_session_send_df_end(sdi, LOG_PREFIX);
+               std_session_send_df_end(sdi);
                return SR_OK;
        }
 
@@ -636,7 +634,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        analyzer_read_stop(usb->devhdl);
        g_free(buf);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        return SR_OK;
 }
@@ -646,7 +644,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct sr_usb_dev_inst *usb;
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        usb = sdi->conn;
        analyzer_reset(usb->devhdl);
@@ -655,7 +653,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
+static struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .name = "zeroplus-logic-cube",
        .longname = "ZEROPLUS Logic Cube LAP-C series",
        .api_version = 1,
@@ -673,3 +671,4 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(zeroplus_logic_cube_driver_info);