Backport recent changes from mainline.

[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 d755bea7e8d6e104afac3f8728f87a3d4edcf02f..9e33f0ad83f2e2cd35aa89d6e131691d4d4104c3 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -116,61 +116,41 @@ static GSList *scan(GSList *options, int idx)
        if (!conn)
                return NULL;
 
-       if (serialcomm) {
-               /* Use the provided comm specs. */
+       if (serialcomm)
                devices = mic_scan(conn, serialcomm, idx);
-       } else {
-               /* Try the default. */
+       else
                devices = mic_scan(conn, mic_devs[idx].conn, idx);
-       }
 
        return devices;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg, int idx)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg, int idx)
 {
-       (void)cg;
-
-       switch (key) {
-       case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-               break;
-       case SR_CONF_DEVICE_OPTIONS:
-               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;
-       }
-
-       return SR_OK;
+       /*
+        * We can't use the ternary operator here! The result would contain
+        * sizeof((cond) ? A : B) where A/B are arrays of different type/size.
+        * The ternary operator always returns the "common" type of A and B,
+        * which would be a pointer instead of either the A or B arrays.
+        * Thus, sizeof() would yield the size of a pointer, not the size
+        * of either the A or B array, which is not what we want.
+        */
+       if (mic_devs[idx].has_humidity)
+               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts_temp_hum, devopts);
+       else
+               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts_temp, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
@@ -178,15 +158,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
-       /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
        serial_source_add(sdi->session, serial, G_IO_IN, 100,
                      mic_devs[idx].receive_data, (void *)sdi);
@@ -219,6 +195,7 @@ static struct sr_dev_driver ID##_driver_info = { \
        .cleanup = std_cleanup, \
        .scan = scan_##ID_UPPER, \
        .dev_list = std_dev_list, \
+       .dev_clear = std_dev_clear, \
        .config_get = NULL, \
        .config_set = config_set, \
        .config_list = config_list_##ID_UPPER, \