uni-t-ut32x: Shorten dev_list().

[libsigrok.git] / hardware / cem-dt-885x / api.c

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index fb309fe2592c55029c10cdfddbc683591a9f8627..62001a5b8f98e8d9edd4636bab2193d2c822e869 100644 (file)
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -32,12 +32,14 @@ static const int32_t hwcaps[] = {
        SR_CONF_SOUNDLEVELMETER,
        SR_CONF_LIMIT_SAMPLES,
        SR_CONF_CONTINUOUS,
-       SR_CONF_DATALOG,
        SR_CONF_SPL_WEIGHT_FREQ,
        SR_CONF_SPL_WEIGHT_TIME,
+       SR_CONF_SPL_MEASUREMENT_RANGE,
+       SR_CONF_DATALOG,
        SR_CONF_HOLD_MAX,
        SR_CONF_HOLD_MIN,
-       SR_CONF_SPL_MEASUREMENT_RANGE,
+       SR_CONF_POWER_OFF,
+       SR_CONF_DATA_SOURCE,
 };
 
 static const char *weight_freq[] = {
@@ -57,6 +59,10 @@ static const uint64_t meas_ranges[][2] = {
        { 80, 130 },
 };
 
+static const char *data_sources[] = {
+       "Live",
+       "Memory",
+};
 SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
 
@@ -111,6 +117,8 @@ static GSList *scan(GSList *options)
                        devc->cur_mqflags = 0;
                        devc->recording = -1;
                        devc->cur_meas_range = 0;
+                       devc->cur_data_source = DATA_SOURCE_LIVE;
+                       devc->enable_data_source_memory = FALSE;
 
                        if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
                                return NULL;
@@ -136,11 +144,7 @@ static GSList *scan(GSList *options)
 
 static GSList *dev_list(void)
 {
-       struct drv_context *drvc;
-
-       drvc = di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int dev_clear(void)
@@ -232,6 +236,15 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
                        *data = g_variant_new_tuple(range, 2);
                }
                break;
+       case SR_CONF_POWER_OFF:
+               *data = g_variant_new_boolean(FALSE);
+               break;
+       case SR_CONF_DATA_SOURCE:
+               if (devc->cur_data_source == DATA_SOURCE_LIVE)
+                       *data = g_variant_new_string("Live");
+               else
+                       *data = g_variant_new_string("Memory");
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -305,6 +318,20 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
                        }
                }
                break;
+       case SR_CONF_POWER_OFF:
+               if (g_variant_get_boolean(data))
+                       ret = cem_dt_885x_power_off(sdi);
+               break;
+       case SR_CONF_DATA_SOURCE:
+               tmp_str = g_variant_get_string(data, NULL);
+               if (!strcmp(tmp_str, "Live"))
+                       devc->cur_data_source = DATA_SOURCE_LIVE;
+               else if (!strcmp(tmp_str, "Memory"))
+                       devc->cur_data_source = DATA_SOURCE_MEMORY;
+               else
+                       return SR_ERR;
+               devc->enable_data_source_memory = devc->cur_data_source == DATA_SOURCE_MEMORY;
+               break;
        default:
                ret = SR_ERR_NA;
        }
@@ -347,6 +374,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
                }
                *data = g_variant_builder_end(&gvb);
                break;
+       case SR_CONF_DATA_SOURCE:
+               *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
+               break;
        default:
                return SR_ERR_NA;
        }