sr_driver_scan(): Improve checks.

[libsigrok.git] / hardware / hantek-dso / api.c

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index f797b709f95d4bb2c975512ac5f8b388651b20b6..acb6d815b786446d629f0fb90825cbf3a6169537 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -285,11 +285,12 @@ static GSList *hw_scan(GSList *options)
 
        (void)options;
 
-       devcnt = 0;
-       devices = 0;
        drvc = di->priv;
        drvc->instances = NULL;
 
+       devcnt = 0;
+       devices = 0;
+
        clear_instances();
 
        /* Find all Hantek DSO devices and upload firmware to all of them. */
@@ -422,36 +423,6 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-       uint64_t tmp;
-
-       (void)sdi;
-
-       switch (id) {
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
-       case SR_DI_TIMEBASES:
-               *data = timebases;
-               break;
-       case SR_DI_TRIGGER_SOURCES:
-               *data = trigger_sources;
-               break;
-       case SR_DI_FILTERS:
-               *data = filter_targets;
-               break;
-       /* TODO remove this */
-       case SR_CONF_SAMPLERATE:
-               *data = &tmp;
-               break;
-       default:
-               return SR_ERR_ARG;
-       }
-
-       return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -577,6 +548,9 @@ 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_BUFFERSIZE:
                *data = buffersizes;
                break;
@@ -586,6 +560,15 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        case SR_CONF_VDIV:
                *data = vdivs;
                break;
+       case SR_CONF_FILTER:
+               *data = filter_targets;
+               break;
+       case SR_CONF_TIMEBASE:
+               *data = timebases;
+               break;
+       case SR_CONF_TRIGGER_SOURCE:
+               *data = trigger_sources;
+               break;
        default:
                return SR_ERR_ARG;
        }
@@ -925,7 +908,6 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .dev_clear = clear_instances,
-       .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
        .dev_open = hw_dev_open,