new-driver: keep driver_info local to the api.c source file

[sigrok-util.git] / source / drv-api.c

diff --git a/source/drv-api.c b/source/drv-api.c
index 7b90c197e8536028b33158341ace6814130911ec..6a1c20c70b8328a7fa2fcb7e6a1cdc237dc78562 100644 (file)
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "protocol.h"
 
-SR_PRIV struct sr_dev_driver {lib}_driver_info;
+static struct sr_dev_driver {lib}_driver_info;
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {{
@@ -39,11 +39,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }}
 
-static int dev_clear(const struct sr_dev_driver *di)
-{{
-       return std_dev_clear(di, NULL);
-}}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {{
        (void)sdi;
@@ -86,6 +81,7 @@ static int config_set(uint32_t key, GVariant *data,
 {{
        int ret;
 
+       (void)sdi;
        (void)data;
        (void)cg;
 
@@ -123,6 +119,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        /* TODO: configure hardware, reset acquisition state, set up
         * callbacks and send header packet. */
 
+       (void)sdi;
+
        return SR_OK;
 }}
 
@@ -130,10 +128,12 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {{
        /* TODO: stop acquisition. */
 
+       (void)sdi;
+
        return SR_OK;
 }}
 
-SR_PRIV struct sr_dev_driver {lib}_driver_info = {{
+static struct sr_dev_driver {lib}_driver_info = {{
        .name = "{short}",
        .longname = "{name}",
        .api_version = 1,
@@ -141,7 +141,7 @@ SR_PRIV struct sr_dev_driver {lib}_driver_info = {{
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = std_dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
@@ -151,5 +151,4 @@ SR_PRIV struct sr_dev_driver {lib}_driver_info = {{
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 }};
-
 SR_REGISTER_DEV_DRIVER({lib}_driver_info);