serial-dmm: bm86x: increase packet request frequency

[libsigrok.git] / src / hardware / brymen-bm86x / api.c

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 3b4da51611a489f6a8d1668e66fe842276dfef5e..a6c45e3a02a0b6edc9f7c8446f10c73ba070cc70 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -59,10 +59,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        }
 
        devices = NULL;
-       if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
-               g_slist_free_full(usb_devices, g_free);
+       if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn)))
                return NULL;
-       }
 
        for (l = usb_devices; l; l = l->next) {
                usb = l->data;
@@ -74,7 +72,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                devc = g_malloc0(sizeof(struct dev_context));
                sdi->priv = devc;
                sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P2");
+               sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "P2");
 
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
@@ -129,6 +127,9 @@ static int dev_close(struct sr_dev_inst *sdi)
        usb = sdi->conn;
        devc = sdi->priv;
 
+       if (!usb->devhdl)
+               return SR_OK;
+
        if ((ret = libusb_release_interface(usb->devhdl, 0)))
                sr_err("Failed to release interface 0: %s.\n", libusb_error_name(ret));
 
@@ -145,8 +146,8 @@ static int dev_close(struct sr_dev_inst *sdi)
        return (ret == 0) ? SR_OK : SR_ERR;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc = sdi->priv;
 
@@ -155,8 +156,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return sr_sw_limits_config_get(&devc->sw_limits, key, data);
 }
 
-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;
 
@@ -167,8 +168,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return sr_sw_limits_config_set(&devc->sw_limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
@@ -199,7 +200,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 }
 
 static struct sr_dev_driver brymen_bm86x_driver_info = {
-       .name = "brymen-bm86x",
+       .name = "brymen-bm86x-usb",
        .longname = "Brymen BM86X",
        .api_version = 1,
        .init = std_init,