Put driver pointers into special section

[libsigrok.git] / src / hardware / conrad-digi-35-cpu / api.c

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index a9ea575e5d9f5f82bdcc41471328e53a8d2898ba..63c0e4f18703f2614b31740ce5fbeec3cd657a1c 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -22,6 +22,7 @@
  *  @internal
  */
 
+#include <config.h>
 #include "protocol.h"
 
 #define SERIALCOMM "9600/8n1"
@@ -33,18 +34,11 @@ static const uint32_t scanopts[] = {
 
 static const uint32_t devopts[] = {
        SR_CONF_POWER_SUPPLY,
-       SR_CONF_OUTPUT_VOLTAGE | SR_CONF_SET,
-       SR_CONF_OUTPUT_CURRENT | SR_CONF_SET,
+       SR_CONF_VOLTAGE | SR_CONF_SET,
+       SR_CONF_CURRENT | SR_CONF_SET,
        SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
 };
 
-SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct sr_dev_inst *sdi;
@@ -55,7 +49,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        const char *conn, *serialcomm;
 
        devices = NULL;
-       drvc = di->priv;
+       drvc = di->context;
        drvc->instances = NULL;
        conn = serialcomm = NULL;
 
@@ -92,7 +86,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sr_spew("Conrad DIGI 35 CPU assumed at %s.", conn);
 
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
-       sdi->status = SR_ST_ACTIVE;
+       sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("Conrad");
        sdi->model = g_strdup("DIGI 35 CPU");
        sdi->conn = serial;
@@ -105,16 +99,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->priv))->instances;
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -126,9 +110,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       ret = SR_OK;
        switch (key) {
-       case SR_CONF_OUTPUT_VOLTAGE:
+       case SR_CONF_VOLTAGE:
                dblval = g_variant_get_double(data);
                if ((dblval < 0.0) || (dblval > 35.0)) {
                        sr_err("Voltage out of range (0 - 35.0)!");
@@ -136,7 +119,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                }
                ret = send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
                break;
-       case SR_CONF_OUTPUT_CURRENT:
+       case SR_CONF_CURRENT:
                dblval = g_variant_get_double(data);
                if ((dblval < 0.01) || (dblval > 2.55)) {
                        sr_err("Current out of range (0 - 2.55)!");
@@ -182,34 +165,30 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
+static struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
        .name = "conrad-digi-35-cpu",
        .longname = "Conrad DIGI 35 CPU",
        .api_version = 1,
-       .init = init,
-       .cleanup = cleanup,
+       .init = std_init,
+       .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
+       .dev_list = std_dev_list,
        .dev_clear = NULL,
        .config_get = NULL,
        .config_set = config_set,
@@ -218,5 +197,6 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(conrad_digi_35_cpu_driver_info);