X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=4a80b57494d5adb2ba72d7505b56ddd3ac6b822a;hb=c04ca4da177bbd718be4de11e40a4ef5cbf3df7a;hp=fc6081b45fb697d1dd83792c8f03137da4040511;hpb=8e2d6c9db788785466d61fdac4d8fdc1535bc20c;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index fc6081b4..4a80b574 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -99,7 +99,21 @@ static const struct fx2lafw_profile supported_fx2[] = {
 		"fx2lafw-braintechnology-usb-lps.fw",
 		DEV_CAPS_16BIT, NULL, NULL },
 
-	{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+	/*
+	 * sigrok FX2 based 8-channel logic analyzer
+	 */
+	{ 0x1d50, 0x608c, "sigrok", "FX2 LA (8ch)", NULL,
+		"fx2lafw-sigrok-fx2-8ch.fw",
+		0, NULL, NULL},
+
+	/*
+	 * sigrok FX2 based 16-channel logic analyzer
+	 */
+	{ 0x1d50, 0x608d, "sigrok", "FX2 LA (16ch)", NULL,
+		"fx2lafw-sigrok-fx2-16ch.fw",
+		DEV_CAPS_16BIT, NULL, NULL },
+
+	ALL_ZERO
 };
 
 static const uint32_t drvopts[] = {
@@ -360,7 +374,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 	struct sr_dev_driver *di = sdi->driver;
 	struct sr_usb_dev_inst *usb;
 	struct dev_context *devc;
-	char *fpga_firmware = NULL;
+	const char *fpga_firmware = NULL;
 	int ret;
 	int64_t timediff_us, timediff_ms;
 
@@ -553,11 +567,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = g_variant_get_uint64(data);
-		if (devc->capture_ratio > 100) {
-			devc->capture_ratio = 0;
-			ret = SR_ERR;
-		} else
-			ret = SR_OK;
+		ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
 		break;
 	default:
 		ret = SR_ERR_NA;