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 daaded9154890161537951b8e301bf2b78942ff8..6a1c20c70b8328a7fa2fcb7e6a1cdc237dc78562 100644 (file)
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "protocol.h"
 
 #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)
 {{
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {{


@@ -39,19 +39,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }}
 
        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;
 
        /* TODO: get handle from sdi->conn and open it. */
 
 static int dev_open(struct sr_dev_inst *sdi)
 {{
        (void)sdi;
 
        /* TODO: get handle from sdi->conn and open it. */
 

-       sdi->status = SR_ST_ACTIVE;
-

        return SR_OK;
 }}
 
        return SR_OK;
 }}
 


@@ -61,8 +54,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 
        /* TODO: get handle from sdi->conn and close it. */
 
 
        /* TODO: get handle from sdi->conn and close it. */
 

-       sdi->status = SR_ST_INACTIVE;
-

        return SR_OK;
 }}
 
        return SR_OK;
 }}
 


@@ -90,12 +81,10 @@ static int config_set(uint32_t key, GVariant *data,
 {{
        int ret;
 
 {{
        int ret;
 

+       (void)sdi;

        (void)data;
        (void)cg;
 
        (void)data;
        (void)cg;
 

-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-

        ret = SR_OK;
        switch (key) {{
        /* TODO */
        ret = SR_OK;
        switch (key) {{
        /* TODO */


@@ -127,26 +116,24 @@ static int config_list(uint32_t key, GVariant **data,
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {{
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {{

-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-

        /* TODO: configure hardware, reset acquisition state, set up
         * callbacks and send header packet. */
 
        /* TODO: configure hardware, reset acquisition state, set up
         * callbacks and send header packet. */
 

+       (void)sdi;
+

        return SR_OK;
 }}
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {{
        return SR_OK;
 }}
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {{

-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-

        /* TODO: stop acquisition. */
 
        /* TODO: stop acquisition. */
 

+       (void)sdi;
+

        return SR_OK;
 }}
 
        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,
        .name = "{short}",
        .longname = "{name}",
        .api_version = 1,


@@ -154,7 +141,7 @@ SR_PRIV struct sr_dev_driver {lib}_driver_info = {{
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
        .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,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,


@@ -164,5 +151,4 @@ SR_PRIV struct sr_dev_driver {lib}_driver_info = {{
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 }};
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 }};

-

 SR_REGISTER_DEV_DRIVER({lib}_driver_info);
 SR_REGISTER_DEV_DRIVER({lib}_driver_info);