X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic-pro%2Fapi.c;h=0a2a2728633e3cf42c9e463153c65d060aa5eb6c;hb=4e5ff004d827af1e0bb5b569749e3653e2550f1a;hp=a7cd83d73b43a41f696d529c84a580c74a708c70;hpb=f2b8a31be5d9cdbd6c50257de78c125f2bb25c74;p=libsigrok.git

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index a7cd83d7..0a2a2728 100644
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -26,16 +26,14 @@
 #define BUF_SIZE (16 * 1024)
 #define BUF_TIMEOUT 1000
 
-SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
+static const uint32_t scanopts[] = {
+	SR_CONF_CONN,
+};
 
 static const uint32_t drvopts[] = {
 	SR_CONF_LOGIC_ANALYZER,
 };
 
-static const uint32_t scanopts[] = {
-	SR_CONF_CONN,
-};
-
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_CONN | SR_CONF_GET,
@@ -200,10 +198,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 +240,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 +301,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 +329,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,34 +349,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)
 {
-	GVariant *gvar;
-	GVariantBuilder gvb;
-
-	(void)sdi;
-	(void)cg;
-
 	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:
-		if (!sdi) {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		} else {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-		}
-		break;
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_SAMPLERATE:
-		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
-			samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
-		g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-		*data = g_variant_builder_end(&gvb);
+		*data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
 		break;
 	default:
 		return SR_ERR_NA;
@@ -395,8 +376,6 @@ static void dev_acquisition_abort(const struct sr_dev_inst *sdi)
 	}
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi);
-
 static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi = cb_data;
@@ -409,7 +388,7 @@ static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 
 	/* Handle timeout */
 	if (!revents)
-		dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 
 	return TRUE;
 }
@@ -478,7 +457,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
+static struct sr_dev_driver saleae_logic_pro_driver_info = {
 	.name = "saleae-logic-pro",
 	.longname = "Saleae Logic Pro",
 	.api_version = 1,
@@ -496,5 +475,4 @@ SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(saleae_logic_pro_driver_info);