Eliminate sr_dev_inst_new().

[libsigrok.git] / src / hardware / mic-985xx / api.c

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index eb5d25d4f2cbec74735604c239c79f3d834490af..ae48fb6e1122c4fbace3b5cfe44b0e36ae640980 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -25,10 +25,17 @@ static const uint32_t scanopts[] = {
        SR_CONF_SERIALCOMM,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts_temp[] = {
+       SR_CONF_THERMOMETER,
+};
+
+static const uint32_t drvopts_temp_hum[] = {
        SR_CONF_THERMOMETER,
        SR_CONF_HYGROMETER,
-       SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t devopts[] = {
+       SR_CONF_CONTINUOUS | SR_CONF_SET,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
@@ -84,9 +91,10 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
        sr_info("Found device on port %s.", conn);
 
        /* TODO: Fill in version from protocol response. */
-       if (!(sdi = sr_dev_inst_new(SR_ST_INACTIVE, mic_devs[idx].vendor,
-                                   mic_devs[idx].device, NULL)))
-               goto scan_cleanup;
+       sdi = g_malloc0(sizeof(struct sr_dev_inst));
+       sdi->status = SR_ST_INACTIVE;
+       sdi->vendor = g_strdup(mic_devs[idx].vendor);
+       sdi->model = g_strdup(mic_devs[idx].device);
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
                sr_err("Device context malloc failed.");
@@ -191,9 +199,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+               const struct sr_channel_group *cg, int idx)
 {
-       (void)sdi;
        (void)cg;
 
        switch (key) {
@@ -202,8 +209,18 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
                break;
        case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+               if (!sdi && !mic_devs[idx].has_humidity) {
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               drvopts_temp, ARRAY_SIZE(drvopts_temp),
+                               sizeof(uint32_t));
+               } else if (!sdi && mic_devs[idx].has_humidity) {
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               drvopts_temp_hum, ARRAY_SIZE(drvopts_temp_hum),
+                               sizeof(uint32_t));
+               } else {
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+               }
                break;
        default:
                return SR_ERR_NA;
@@ -254,6 +271,10 @@ static GSList *scan_##X(GSList *options) { return scan(options, X); }
 static GSList *dev_list_##X(void) { return dev_list(X); }
 #define HW_DEV_CLEAR(X) \
 static int dev_clear_##X(void) { return dev_clear(X); }
+#define HW_CONFIG_LIST(X) \
+static int config_list_##X(uint32_t key, GVariant **data, \
+const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { \
+return config_list(key, data, sdi, cg, X); }
 #define HW_DEV_ACQUISITION_START(X) \
 static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
 void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
@@ -265,6 +286,7 @@ HW_CLEANUP(ID_UPPER) \
 HW_SCAN(ID_UPPER) \
 HW_DEV_LIST(ID_UPPER) \
 HW_DEV_CLEAR(ID_UPPER) \
+HW_CONFIG_LIST(ID_UPPER) \
 HW_DEV_ACQUISITION_START(ID_UPPER) \
 SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .name = NAME, \
@@ -277,7 +299,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .dev_clear = dev_clear_##ID_UPPER, \
        .config_get = NULL, \
        .config_set = config_set, \
-       .config_list = config_list, \
+       .config_list = config_list_##ID_UPPER, \
        .dev_open = std_serial_dev_open, \
        .dev_close = std_serial_dev_close, \
        .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \