probe_groups: API changes required to implement probe groups.

[libsigrok.git] / hardware / rigol-ds1xx2 / api.c

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index a6bdff27b9540a225a064f4ba909cbda3fa58d5b..40865950e9545f763b867684148aff055addadc0 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -133,44 +133,30 @@ static const char *coupling[] = {
 static const char *supported_models[] = {
        "DS1052E",
        "DS1102E",
+       "DS1152E",
        "DS1052D",
        "DS1102D",
+       "DS1152D",
 };
 
 SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
 static struct sr_dev_driver *di = &rigol_ds1xx2_driver_info;
 
-/* Properly close and free all devices. */
-static int clear_instances(void)
+static void clear_helper(void *priv)
 {
-       struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
-       GSList *l;
-
-       if (!(drvc = di->priv))
-               return SR_OK;
-
-       for (l = drvc->instances; l; l = l->next) {
-               if (!(sdi = l->data))
-                       continue;
 
-               if (sdi->conn)
-                       sr_serial_dev_inst_free(sdi->conn);
+       devc = priv;
 
-               if ((devc = sdi->priv)) {
-                       g_free(devc->coupling[0]);
-                       g_free(devc->coupling[1]);
-                       g_free(devc->trigger_source);
-                       g_free(devc->trigger_slope);
-               }
-               sr_dev_inst_free(sdi);
-       }
-
-       g_slist_free(drvc->instances);
-       drvc->instances = NULL;
+       g_free(devc->coupling[0]);
+       g_free(devc->coupling[1]);
+       g_free(devc->trigger_source);
+       g_free(devc->trigger_slope);
+}
 
-       return SR_OK;
+static int dev_clear(void)
+{
+       return std_dev_clear(di, clear_helper);
 }
 
 static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
@@ -194,7 +180,7 @@ static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
 
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static int probe_port(const char *port, GSList **devices)
@@ -266,6 +252,7 @@ static int probe_port(const char *port, GSList **devices)
        if (!(sdi->conn = sr_serial_dev_inst_new(port, NULL)))
                return SR_ERR_MALLOC;
        sdi->driver = di;
+       sdi->inst_type = SR_INST_SERIAL;
 
        if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
                return SR_ERR_MALLOC;
@@ -322,8 +309,9 @@ static GSList *scan(GSList *options)
                if (probe_port(port, &devices) == SR_ERR_MALLOC)
                        return NULL;
        } else {
-               if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
-                       return NULL;
+               if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL)))
+                       if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
+                               return NULL;
                while ((dev_name = g_dir_read_name(dir))) {
                        if (strncmp(dev_name, "usbtmc", 6))
                                continue;
@@ -379,15 +367,15 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(void)
 {
-       clear_instances();
-
-       return SR_OK;
+       return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
 
        (void)sdi;
+       (void)probe_group;
 
        switch (id) {
        case SR_CONF_NUM_TIMEBASE:
@@ -403,7 +391,8 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        struct dev_context *devc;
        uint64_t tmp_u64, p, q;
@@ -412,6 +401,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        int ret;
        const char *tmp_str;
 
+       (void)probe_group;
+
        devc = sdi->priv;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -511,13 +502,16 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        GVariant *tuple, *rational[2];
        GVariantBuilder gvb;
        unsigned int i;
        struct dev_context *devc;
 
+       (void)probe_group;
+
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
@@ -663,7 +657,7 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = clear_instances,
+       .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,