Put driver pointers into special section

[libsigrok.git] / src / hardware / ikalogic-scanalogic2 / api.c

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 7f03a59a7d9c63ebf848ea702c9d7515fe81fdeb..c30c605c88444a71da4bbad89083c4fe9092419f 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -52,13 +52,6 @@ static const char *channel_names[] = {
        "0", "1", "2", "3",
 };
 
-SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(di, sr_ctx);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        GSList *usb_devices, *devices, *l;
@@ -84,7 +77,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        for (l = usb_devices; l; l = l->next) {
                usb = l->data;
 
-               if ((ret = sl2_get_device_info(*usb, &dev_info)) < 0) {
+               if ((ret = sl2_get_device_info(di, *usb, &dev_info)) < 0) {
                        sr_warn("Failed to get device information: %d.", ret);
                        sr_usb_dev_inst_free(usb);
                        continue;
@@ -463,11 +456,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info = {
+static struct sr_dev_driver ikalogic_scanalogic2_driver_info = {
        .name = "ikalogic-scanalogic2",
        .longname = "IKALOGIC Scanalogic-2",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
@@ -481,3 +474,4 @@ SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(ikalogic_scanalogic2_driver_info);