X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=5acb0016d0b8e6ab5ad204aea7e238f55e2f5fa8;hb=7f0463840ab5d6a85daaa76850558d2b71e596cf;hp=078b9c5c54a3a85f624baf32313de66924687d45;hpb=4b25cbffa17c9b8c9c30f98ffe6918a15b664b2a;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 078b9c5c..5acb0016 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -25,15 +25,22 @@
 static const struct fx2lafw_profile supported_fx2[] = {
 	/*
 	 * CWAV USBee AX
-	 * EE Electronics ESLA201A
-	 * ARMFLY AX-Pro
+	 * ARMFLY AX-Pro (clone of the CWAV USBee AX)
+	 * ARMFLY Mini-Logic (clone of the CWAV USBee AX)
+	 * EE Electronics ESLA201A (clone of the CWAV USBee AX)
+	 * HT USBee-AxPro (clone of the CWAV USBee AX)
+	 * MCU123 USBee AX Pro clone (clone of the CWAV USBee AX)
+	 * Noname LHT00SU1 (clone of the CWAV USBee AX)
+	 * XZL_Studio AX (clone of the CWAV USBee AX)
 	 */
 	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
 		"fx2lafw-cwav-usbeeax.fw",
 		DEV_CAPS_AX_ANALOG, NULL, NULL},
+
 	/*
 	 * CWAV USBee DX
-	 * XZL-Studio DX
+	 * HT USBee-DxPro (clone of the CWAV USBee DX), not yet supported!
+	 * XZL-Studio DX (clone of the CWAV USBee DX)
 	 */
 	{ 0x08a9, 0x0015, "CWAV", "USBee DX", NULL,
 		"fx2lafw-cwav-usbeedx.fw",
@@ -55,9 +62,12 @@ static const struct fx2lafw_profile supported_fx2[] = {
 
 	/*
 	 * Saleae Logic
-	 * EE Electronics ESLA100
-	 * Robomotic MiniLogic
-	 * Robomotic BugLogic 3
+	 * EE Electronics ESLA100 (clone of the Saleae Logic)
+	 * Hantek 6022BL in LA mode (clone of the Saleae Logic)
+	 * Instrustar ISDS205X in LA mode (clone of the Saleae Logic)
+	 * Robomotic MiniLogic (clone of the Saleae Logic)
+	 * Robomotic BugLogic 3 (clone of the Saleae Logic)
+	 * MCU123 Saleae Logic clone (clone of the Saleae Logic)
 	 */
 	{ 0x0925, 0x3881, "Saleae", "Logic", NULL,
 		"fx2lafw-saleae-logic.fw",
@@ -67,6 +77,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
 	 * Default Cypress FX2 without EEPROM, e.g.:
 	 * Lcsoft Mini Board
 	 * Braintechnology USB Interface V2.x
+	 * fx2grok-tiny
 	 */
 	{ 0x04B4, 0x8613, "Cypress", "FX2", NULL,
 		"fx2lafw-cypress-fx2.fw",
@@ -81,6 +92,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
 
 	/*
 	 * sigrok FX2 based 8-channel logic analyzer
+	 * fx2grok-flat (before and after renumeration)
 	 */
 	{ 0x1d50, 0x608c, "sigrok", "FX2 LA (8ch)", NULL,
 		"fx2lafw-sigrok-fx2-8ch.fw",
@@ -93,6 +105,13 @@ static const struct fx2lafw_profile supported_fx2[] = {
 		"fx2lafw-sigrok-fx2-16ch.fw",
 		DEV_CAPS_16BIT, NULL, NULL },
 
+	/*
+	 * usb-c-grok
+	 */
+	{ 0x1d50, 0x608f, "sigrok", "usb-c-grok", NULL,
+		"fx2lafw-usb-c-grok.fw",
+		0, NULL, NULL},
+
 	ALL_ZERO
 };
 
@@ -106,6 +125,7 @@ static const uint32_t drvopts[] = {
 
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
+	SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_CONN | SR_CONF_GET,
 	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@@ -113,7 +133,7 @@ static const uint32_t devopts[] = {
 	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const int32_t soft_trigger_matches[] = {
+static const int32_t trigger_matches[] = {
 	SR_TRIGGER_ZERO,
 	SR_TRIGGER_ONE,
 	SR_TRIGGER_RISING,
@@ -138,6 +158,7 @@ static const uint64_t samplerates[] = {
 	SR_MHZ(12),
 	SR_MHZ(16),
 	SR_MHZ(24),
+	SR_MHZ(48),
 };
 
 static gboolean is_plausible(const struct libusb_device_descriptor *des)
@@ -251,10 +272,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			continue;
 		}
 
-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
-
 		libusb_close(hdl);
 
+		if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+			continue;
+
 		prof = NULL;
 		for (j = 0; supported_fx2[j].vid; j++) {
 			if (des.idVendor == supported_fx2[j].vid &&
@@ -325,14 +347,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 					libusb_get_device_address(devlist[i]), NULL);
 		} else {
 			if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
-					USB_CONFIGURATION, prof->firmware) == SR_OK)
+					USB_CONFIGURATION, prof->firmware) == SR_OK) {
 				/* Store when this device's FW was updated. */
 				devc->fw_updated = g_get_monotonic_time();
-			else
+			} else {
 				sr_err("Firmware upload failed for "
-				       "device %d.%d (logical).",
+				       "device %d.%d (logical), name %s.",
 				       libusb_get_bus_number(devlist[i]),
-				       libusb_get_device_address(devlist[i]));
+				       libusb_get_device_address(devlist[i]),
+				       prof->firmware);
+			}
 			sdi->inst_type = SR_INST_USB;
 			sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
 					0xff, NULL);
@@ -449,7 +473,6 @@ static int config_get(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	char str[128];
 
 	(void)cg;
 
@@ -467,8 +490,10 @@ static int config_get(uint32_t key, GVariant **data,
 			/* Device still needs to re-enumerate after firmware
 			 * upload, so we don't know its (future) address. */
 			return SR_ERR;
-		snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-		*data = g_variant_new_string(str);
+		*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
+		break;
+	case SR_CONF_LIMIT_FRAMES:
+		*data = g_variant_new_uint64(devc->limit_frames);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
@@ -490,8 +515,7 @@ 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;
-	uint64_t arg;
-	int i, ret;
+	int idx;
 
 	(void)cg;
 
@@ -500,58 +524,48 @@ static int config_set(uint32_t key, GVariant *data,
 
 	devc = sdi->priv;
 
-	ret = SR_OK;
-
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
-		arg = g_variant_get_uint64(data);
-		for (i = 0; i < devc->num_samplerates; i++) {
-			if (devc->samplerates[i] == arg) {
-				devc->cur_samplerate = arg;
-				break;
-			}
-		}
-		if (i == devc->num_samplerates)
-			ret = SR_ERR_ARG;
+		if ((idx = std_u64_idx(data, devc->samplerates, devc->num_samplerates)) < 0)
+			return SR_ERR_ARG;
+		devc->cur_samplerate = devc->samplerates[idx];
+		break;
+	case SR_CONF_LIMIT_FRAMES:
+		devc->limit_frames = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = g_variant_get_uint64(data);
-		ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	GVariant *gvar;
-	GVariantBuilder gvb;
 
 	devc = (sdi) ? sdi->priv : NULL;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 	case SR_CONF_DEVICE_OPTIONS:
+		if (cg)
+			return SR_ERR_NA;
 		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"), devc->samplerates,
-				devc->num_samplerates, sizeof(uint64_t));
-		g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-		*data = g_variant_builder_end(&gvb);
+		if (!devc)
+			return SR_ERR_NA;
+		*data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates);
 		break;
 	case SR_CONF_TRIGGER_MATCH:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-				soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
-				sizeof(int32_t));
+		*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
 		break;
 	default:
 		return SR_ERR_NA;