X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic16%2Fapi.c;h=bee0ea4ad95f30a755fcc00463b7d587f34c0b60;hb=1079324f9e76c4775395e5baaf916f37d4785278;hp=9d5231440bf806f6d05b930d0bec23257e5f7701;hpb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;p=libsigrok.git

diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 9d523144..bee0ea4a 100644
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -34,7 +34,7 @@
 
 #define USB_INTERFACE		0
 #define USB_CONFIGURATION	1
-#define FX2_FIRMWARE		FIRMWARE_DIR "/saleae-logic16-fx2.fw"
+#define FX2_FIRMWARE		"saleae-logic16-fx2.fw"
 
 #define MAX_RENUM_DELAY_MS	3000
 #define NUM_SIMUL_TRANSFERS	32
@@ -218,8 +218,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 				libusb_get_bus_number(devlist[i]),
 				libusb_get_device_address(devlist[i]), NULL);
 		} else {
-			if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
-						  FX2_FIRMWARE) == SR_OK)
+			if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
+					USB_CONFIGURATION, FX2_FIRMWARE) == SR_OK)
 				/* Store when this device's FW was updated. */
 				devc->fw_updated = g_get_monotonic_time();
 			else
@@ -502,11 +502,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;
 	case SR_CONF_VOLTAGE_THRESHOLD:
 		g_variant_get(data, "(dd)", &low, &high);