drivers: rename and reorganize config get/set

[libsigrok.git] / hardware / colead-slm / api.c

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 2330ad66f805a29543d95e1ec53c6634039b4379..5d350ec5fcf98d9067da2a03903372c5001cc456 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -27,25 +27,23 @@
 #include <errno.h>
 #include <string.h>
 
+/* The Colead SL-5868P uses this. */
+#define SERIALCOMM "2400/8n1"
+
 static const int hwopts[] = {
-       SR_HWOPT_CONN,
-       SR_HWOPT_SERIALCOMM,
+       SR_CONF_CONN,
+       SR_CONF_SERIALCOMM,
        0,
 };
 
 static const int hwcaps[] = {
-       SR_HWCAP_SOUNDLEVELMETER,
-       SR_HWCAP_LIMIT_SAMPLES,
-       SR_HWCAP_LIMIT_MSEC,
-       SR_HWCAP_CONTINUOUS,
+       SR_CONF_SOUNDLEVELMETER,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_LIMIT_MSEC,
+       SR_CONF_CONTINUOUS,
        0,
 };
 
-static const char *probe_names[] = {
-       "P1",
-       NULL,
-};
-
 SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 static struct sr_dev_driver *di = &colead_slm_driver_info;
 
@@ -57,7 +55,9 @@ static int clear_instances(void)
        struct dev_context *devc;
        GSList *l;
 
-       drvc = di->priv;
+       if (!(drvc = di->priv))
+               return SR_OK;
+
        for (l = drvc->instances; l; l = l->next) {
                if (!(sdi = l->data))
                        continue;
@@ -72,7 +72,7 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 
@@ -81,6 +81,7 @@ static int hw_init(void)
                return SR_ERR;
        }
 
+       drvc->sr_ctx = sr_ctx;
        di->priv = drvc;
 
        return SR_OK;
@@ -91,7 +92,7 @@ static GSList *hw_scan(GSList *options)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
-       struct sr_hwopt *opt;
+       struct sr_config *src;
        struct sr_probe *probe;
        GSList *devices, *l;
        const char *conn, *serialcomm;
@@ -102,18 +103,20 @@ static GSList *hw_scan(GSList *options)
 
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
-               opt = l->data;
-               switch (opt->hwopt) {
-               case SR_HWOPT_CONN:
-                       conn = opt->value;
+               src = l->data;
+               switch (src->key) {
+               case SR_CONF_CONN:
+                       conn = src->value;
                        break;
-               case SR_HWOPT_SERIALCOMM:
-                       serialcomm = opt->value;
+               case SR_CONF_SERIALCOMM:
+                       serialcomm = src->value;
                        break;
                }
        }
        if (!conn)
                return NULL;
+       if (!serialcomm)
+               serialcomm = SERIALCOMM;
 
        if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Colead",
                        "SL-5868P", NULL)))
@@ -124,12 +127,9 @@ static GSList *hw_scan(GSList *options)
                return NULL;
        }
 
-       if (!serialcomm)
-               /* The Colead SL-5868P uses this. */
-               serialcomm = "2400/8n1";
+       if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm)))
+               return NULL;
 
-       devc->serial = sr_serial_dev_inst_new(conn, -1);
-       devc->serialcomm = g_strdup(serialcomm);
        sdi->priv = devc;
        sdi->driver = di;
        if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
@@ -159,17 +159,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                return SR_ERR_BUG;
        }
 
-       sr_dbg("opening %s with %s", devc->serial->port, devc->serialcomm);
-       devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
-       if (devc->serial->fd == -1) {
-               sr_err("Couldn't open serial port '%s'.",
-                      devc->serial->port);
+       if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK)
                return SR_ERR;
-       }
-       if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) {
-               sr_err("Unable to set serial parameters.");
-               return SR_ERR;
-       }
+
        sdi->status = SR_ST_ACTIVE;
 
        return SR_OK;
@@ -185,8 +177,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
        }
 
        if (devc->serial && devc->serial->fd != -1) {
-               serial_close(devc->serial->fd);
-               devc->serial->fd = -1;
+               serial_close(devc->serial);
                sdi->status = SR_ST_INACTIVE;
        }
 
@@ -200,25 +191,17 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-                      const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
-       
        (void)sdi;
 
-       switch (info_id) {
+       switch (id) {
        case SR_DI_HWOPTS:
                *data = hwopts;
                break;
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(1);
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
        default:
                return SR_ERR_ARG;
        }
@@ -226,8 +209,7 @@ static int hw_info_get(int info_id, const void **data,
        return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-                            const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
@@ -239,8 +221,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                return SR_ERR_BUG;
        }
 
-       switch (hwcap) {
-       case SR_HWCAP_LIMIT_MSEC:
+       switch (id) {
+       case SR_CONF_LIMIT_MSEC:
                /* TODO: not yet implemented */
                if (*(const uint64_t *)value == 0) {
                        sr_err("LIMIT_MSEC can't be 0.");
@@ -250,13 +232,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                sr_dbg("Setting time limit to %" PRIu64 "ms.",
                       devc->limit_msec);
                break;
-       case SR_HWCAP_LIMIT_SAMPLES:
+       case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = *(const uint64_t *)value;
                sr_dbg("Setting sample limit to %" PRIu64 ".",
                       devc->limit_samples);
                break;
        default:
-               sr_err("Unknown capability: %d.", hwcap);
+               sr_err("Unknown capability: %d.", id);
                return SR_ERR;
                break;
        }
@@ -269,7 +251,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
-       struct sr_datafeed_meta_analog meta;
        struct dev_context *devc;
 
        if (!(devc = sdi->priv)) {
@@ -289,13 +270,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        gettimeofday(&header.starttime, NULL);
        sr_session_send(devc->cb_data, &packet);
 
-       /* Send metadata about the SR_DF_ANALOG packets to come. */
-       sr_dbg("Sending SR_DF_META_ANALOG.");
-       packet.type = SR_DF_META_ANALOG;
-       packet.payload = &meta;
-       meta.num_probes = 1;
-       sr_session_send(devc->cb_data, &packet);
-
        /* Poll every 150ms, or whenever some data comes in. */
        sr_source_add(devc->serial->fd, G_IO_IN, 150, colead_slm_receive_data,
                        (void *)sdi);
@@ -303,8 +277,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-                                  void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct sr_datafeed_packet packet;
        struct dev_context *devc;
@@ -339,10 +312,10 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
+       .config_get = config_get,
+       .config_set = config_set,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
-       .info_get = hw_info_get,
-       .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
        .priv = NULL,