X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=d107191663a820af2f7ccdb3115bb08b507f428d;hb=af930bcf7bdf82da663dca9344f37ddfe2f25f32;hp=647aeec04d35522c11ba2cf80bec6899629b0a82;hpb=6c1a76d1263403f908ac31271a4fd01792488545;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 647aeec0..d1071916 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -105,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
 };
 
@@ -338,14 +345,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);
@@ -539,6 +548,8 @@ static int config_list(uint32_t key, GVariant **data,
 	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:
 		if (!devc)