scpi-pps: Add a missing "break" in config_get().

[libsigrok.git] / src / hardware / saleae-logic-pro / api.c

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index bd96e3de051b54f0dba011edb97cd70fffa65b59..7b8582d2bc614588587ffd1d805d56c80b4a9532 100644 (file)
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -200,10 +200,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        continue;
 
                if (!scan_firmware(devlist[i])) {
+                       const char *fwname;
                        sr_info("Found a Logic Pro 16 device (no firmware loaded).");
+                       fwname = "saleae-logicpro16-fx3.fw";
                        if (upload_firmware(drvc->sr_ctx, devlist[i],
-                                           "saleae-logicpro16-fx3.fw") != SR_OK) {
-                               sr_err("Firmware upload failed.");
+                                           fwname) != SR_OK) {
+                               sr_err("Firmware upload failed, name %s.", fwname);
                                continue;
                        };
                        fw_loaded = TRUE;
@@ -240,7 +242,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                if (des.idVendor != 0x21a9 || des.idProduct != 0x1006)
                        continue;
 
-               usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+               if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+                       continue;
 
                sdi = g_malloc0(sizeof(struct sr_dev_inst));
                sdi->status = SR_ST_INITIALIZING;
@@ -300,7 +303,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 }
 
 static int config_get(uint32_t key, GVariant **data,
-                     const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct sr_usb_dev_inst *usb;
        struct dev_context *devc;
@@ -328,7 +331,7 @@ static int config_get(uint32_t key, GVariant **data,
 }
 
 static int config_set(uint32_t key, GVariant *data,
-                     const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -348,14 +351,14 @@ static int config_set(uint32_t key, GVariant *data,
 }
 
 static int config_list(uint32_t key, GVariant **data,
-                      const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
        case SR_CONF_DEVICE_OPTIONS:
                return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
-               *data = std_gvar_samplerates(samplerates, ARRAY_SIZE(samplerates));
+               *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
                break;
        default:
                return SR_ERR_NA;