Put driver pointers into special section

[libsigrok.git] / src / hardware / link-mso19 / api.c

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index ff511730cc0db9e0215aacfdbb7e0f1cc69b3cbe..d95aaff6f29e76d0f2f831f9dae5da3d841ab04a 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -50,8 +50,6 @@ static const uint64_t samplerates[] = {
        SR_HZ(100),
 };
 
-SR_PRIV struct sr_dev_driver link_mso19_driver_info;
-
 /* TODO: Use sr_dev_inst to store connection handle & use std_dev_clear(). */
 static int dev_clear(const struct sr_dev_driver *di)
 {
@@ -85,11 +83,6 @@ static int dev_clear(const struct sr_dev_driver *di)
        return ret;
 }
 
-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)
 {
        int i;
@@ -263,13 +256,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 
        (void)cg;
 
+       if (!sdi)
+               return SR_ERR_ARG;
+
+       devc = sdi->priv;
+
        switch (key) {
        case SR_CONF_SAMPLERATE:
-               if (sdi) {
-                       devc = sdi->priv;
-                       *data = g_variant_new_uint64(devc->cur_rate);
-               } else
-                       return SR_ERR;
+               *data = g_variant_new_uint64(devc->cur_rate);
                break;
        default:
                return SR_ERR_NA;
@@ -289,6 +283,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
        double pos;
 
        (void)cg;
+
        devc = sdi->priv;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -452,11 +447,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
+static struct sr_dev_driver link_mso19_driver_info = {
        .name = "link-mso19",
        .longname = "Link Instruments MSO-19",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
@@ -470,3 +465,4 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(link_mso19_driver_info);