Factor out common hw_init() driver code.

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

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 0ae1eb630174ef960a07b76245bbaf397d834438..9fcb9cf81f49d3a9ce32c89562b29620a3f1f81c 100644 (file)
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -22,13 +22,13 @@
 #include "protocol.h"
 
 static const int hwcaps[] = {
-       SR_HWCAP_LOGIC_ANALYZER,
-       SR_HWCAP_SAMPLERATE,
-       SR_HWCAP_TRIGGER_SLOPE,
-       SR_HWCAP_HORIZ_TRIGGERPOS,
-//      SR_HWCAP_CAPTURE_RATIO,
-       SR_HWCAP_LIMIT_SAMPLES,
-//      SR_HWCAP_RLE,
+       SR_CONF_LOGIC_ANALYZER,
+       SR_CONF_SAMPLERATE,
+       SR_CONF_TRIGGER_SLOPE,
+       SR_CONF_HORIZ_TRIGGERPOS,
+//      SR_CONF_CAPTURE_RATIO,
+       SR_CONF_LIMIT_SAMPLES,
+//      SR_CONF_RLE,
        0,
 };
 
@@ -54,17 +54,7 @@ static struct sr_dev_driver *di = &link_mso19_driver_info;
 
 static int hw_init(struct sr_context *sr_ctx)
 {
-       struct drv_context *drvc;
-
-       if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-               sr_err("Driver context malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-
-       drvc->sr_ctx = sr_ctx;
-       di->priv = drvc;
-
-       return SR_OK;
+       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static GSList *hw_scan(GSList *options)
@@ -74,19 +64,19 @@ static GSList *hw_scan(GSList *options)
        const char *conn = NULL;
        const char *serialcomm = NULL;
        GSList *l;
-       struct sr_hwopt *opt;
+       struct sr_config *src;
        struct udev *udev;
 
        (void)options;
 
        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;
                }
        }
@@ -298,28 +288,12 @@ static int hw_cleanup(void)
        return ret;
 }
 
-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)
 {
        struct dev_context *devc;
 
-       switch (info_id) {
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(1);
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = mso19_probe_names;
-               break;
-       case SR_DI_SAMPLERATES:
-               *data = &samplerates;
-               break;
-       case SR_DI_TRIGGER_TYPES:
-               *data = (char *)TRIGGER_TYPES;
-               break;
-       case SR_DI_CUR_SAMPLERATE:
+       switch (id) {
+       case SR_CONF_SAMPLERATE:
                if (sdi) {
                        devc = sdi->priv;
                        *data = &devc->cur_rate;
@@ -333,8 +307,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)
 {
        int ret;
        struct dev_context *devc;
@@ -347,13 +320,13 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR;
 
-       switch (hwcap) {
-       case SR_HWCAP_SAMPLERATE:
+       switch (id) {
+       case SR_CONF_SAMPLERATE:
                // FIXME
                return mso_configure_rate(sdi, *(const uint64_t *)value);
                ret = SR_OK;
                break;
-       case SR_HWCAP_LIMIT_SAMPLES:
+       case SR_CONF_LIMIT_SAMPLES:
                num_samples = *(uint64_t *)value;
                if (num_samples < 1024) {
                        sr_err("minimum of 1024 samples required");
@@ -365,10 +338,10 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                        ret = SR_OK;
                }
                break;
-       case SR_HWCAP_CAPTURE_RATIO:
+       case SR_CONF_CAPTURE_RATIO:
                ret = SR_OK;
                break;
-       case SR_HWCAP_TRIGGER_SLOPE:
+       case SR_CONF_TRIGGER_SLOPE:
                slope = *(uint64_t *)value;
                if (slope != SLOPE_NEGATIVE && slope != SLOPE_POSITIVE) {
                        sr_err("Invalid trigger slope");
@@ -378,7 +351,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                        ret = SR_OK;
                }
                break;
-       case SR_HWCAP_HORIZ_TRIGGERPOS:
+       case SR_CONF_HORIZ_TRIGGERPOS:
                pos = *(float *)value;
                if (pos < 0 || pos > 255) {
                        sr_err("Trigger position (%f) should be between 0 and 255.", pos);
@@ -389,7 +362,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                        ret = SR_OK;
                }
                break;
-       case SR_HWCAP_RLE:
+       case SR_CONF_RLE:
                ret = SR_OK;
                break;
        default:
@@ -400,12 +373,33 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        return ret;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+       (void)sdi;
+
+       switch (key) {
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = hwcaps;
+               break;
+       case SR_CONF_SAMPLERATE:
+               *data = &samplerates;
+               break;
+       case SR_CONF_TRIGGER_TYPE:
+               *data = (char *)TRIGGER_TYPE;
+               break;
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data)
 {
        struct sr_datafeed_packet *packet;
        struct sr_datafeed_header *header;
-       struct sr_datafeed_meta_logic meta;
        struct dev_context *devc;
        int ret = SR_ERR;
 
@@ -475,12 +469,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        gettimeofday(&header->starttime, NULL);
        sr_session_send(cb_data, packet);
 
-       packet->type = SR_DF_META_LOGIC;
-       packet->payload = &meta;
-       meta.samplerate = devc->cur_rate;
-       meta.num_probes = NUM_PROBES;
-       sr_session_send(cb_data, packet);
-
        g_free(header);
        g_free(packet);
 
@@ -506,10 +494,11 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = hw_cleanup,
+       .config_get = config_get,
+       .config_set = config_set,
+       .config_list = config_list,
        .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,