Don't check sr_channel_new() return value (always succeeds).

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

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index 943377a3df67e67ee2f182eaafacba15c0e36e5e..29db2451bde727a1456df44a901f7c3f5d0b7943 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -24,22 +24,25 @@
 /* 23ms is the longest interval between tokens. */
 #define MAX_SCAN_TIME 25 * 1000
 
-static const uint32_t hwopts[] = {
+static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
-static const uint32_t hwcaps[] = {
+static const uint32_t drvopts[] = {
        SR_CONF_SOUNDLEVELMETER,
-       SR_CONF_LIMIT_SAMPLES,
-       SR_CONF_CONTINUOUS,
-       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_POWER_OFF,
-       SR_CONF_DATA_SOURCE,
+};
+
+static const uint32_t devopts[] = {
+       SR_CONF_CONTINUOUS | SR_CONF_SET,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_SPL_WEIGHT_FREQ | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SPL_WEIGHT_TIME | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SPL_MEASUREMENT_RANGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_DATALOG | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_HOLD_MAX | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_HOLD_MIN | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const char *weight_freq[] = {
@@ -97,23 +100,20 @@ static GSList *scan(GSList *options)
        if (!(serial = sr_serial_dev_inst_new(conn, SERIALCOMM)))
                return NULL;
 
-       if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
                return NULL;
 
        devices = NULL;
        drvc = di->priv;
        start = g_get_monotonic_time();
        while (g_get_monotonic_time() - start < MAX_SCAN_TIME) {
-               if (serial_read(serial, &c, 1) == 1 && c == 0xa5) {
+               if (serial_read_nonblocking(serial, &c, 1) == 1 && c == 0xa5) {
                        /* Found one. */
-                       if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "CEM",
-                                       "DT-885x", NULL)))
-                               return NULL;
-
-                       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-                               sr_dbg("Device context malloc failed.");
-                               return NULL;
-                       }
+                       sdi = g_malloc0(sizeof(struct sr_dev_inst));
+                       sdi->status = SR_ST_INACTIVE;
+                       sdi->vendor = g_strdup("CEM");
+                       sdi->model = g_strdup("DT-885x");
+                       devc = g_malloc0(sizeof(struct dev_context));
                        devc->cur_mqflags = 0;
                        devc->recording = -1;
                        devc->cur_meas_range = 0;
@@ -126,8 +126,7 @@ static GSList *scan(GSList *options)
                        sdi->inst_type = SR_INST_SERIAL;
                        sdi->priv = devc;
                        sdi->driver = di;
-                       if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL")))
-                               return NULL;
+                       ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL");
                        sdi->channels = g_slist_append(sdi->channels, ch);
                        drvc->instances = g_slist_append(drvc->instances, sdi);
                        devices = g_slist_append(devices, sdi);
@@ -335,40 +334,49 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        unsigned int i;
        int ret;
 
-       (void)sdi;
        (void)cg;
 
        ret = SR_OK;
-       switch (key) {
-       case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
-               break;
-       case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
-               break;
-       case SR_CONF_SPL_WEIGHT_FREQ:
-               *data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
-               break;
-       case SR_CONF_SPL_WEIGHT_TIME:
-               *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
-               break;
-       case SR_CONF_SPL_MEASUREMENT_RANGE:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-               for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
-                       range[0] = g_variant_new_uint64(meas_ranges[i][0]);
-                       range[1] = g_variant_new_uint64(meas_ranges[i][1]);
-                       tuple = g_variant_new_tuple(range, 2);
-                       g_variant_builder_add_value(&gvb, tuple);
+       if (!sdi) {
+               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:
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+                       break;
+               default:
+                       return SR_ERR_NA;
+               }
+       } else {
+               switch (key) {
+               case SR_CONF_DEVICE_OPTIONS:
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+               case SR_CONF_SPL_WEIGHT_FREQ:
+                       *data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
+                       break;
+               case SR_CONF_SPL_WEIGHT_TIME:
+                       *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
+                       break;
+               case SR_CONF_SPL_MEASUREMENT_RANGE:
+                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+                       for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+                               range[0] = g_variant_new_uint64(meas_ranges[i][0]);
+                               range[1] = g_variant_new_uint64(meas_ranges[i][1]);
+                               tuple = g_variant_new_tuple(range, 2);
+                               g_variant_builder_add_value(&gvb, tuple);
+                       }
+                       *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;
                }
-               *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;
        }
 
        return ret;