X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fapi.c;h=53a6bb49d33483ca104b7134d22b4e48a5e8265a;hb=852c7d1483a02e0937b7a7ce0936df17692bac34;hp=4d501450e9a3fa40a412dbeaea2efb8a592e7d01;hpb=b0d0131eff8bacbf69aa0da818efaa4439f19a64;p=libsigrok.git

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 4d501450..53a6bb49 100644
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -198,7 +198,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 		fw_uploaded = 0;
 		dev_addr = libusb_get_device_address(devlist[i]);
-		if (des.iProduct != 2) {
+		if (des.iProduct != LA2016_IPRODUCT_INDEX) {
 			sr_info("Device at '%s' has no firmware loaded.", connection_id);
 
 			if (la2016_upload_firmware(drvc->sr_ctx, devlist[i], des.idProduct) != SR_OK) {
@@ -263,7 +263,9 @@ static int la2016_dev_open(struct sr_dev_inst *sdi)
 	for (i = 0; i < device_count; i++) {
 		libusb_get_device_descriptor(devlist[i], &des);
 
-		if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID || des.iProduct != 2)
+		if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID)
+			continue;
+		if (des.iProduct != LA2016_IPRODUCT_INDEX)
 			continue;
 
 		if ((sdi->status == SR_ST_INITIALIZING) || (sdi->status == SR_ST_INACTIVE)) {
@@ -580,7 +582,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	devc->convbuffer_size = 4 * 1024 * 1024;
+	devc->convbuffer_size = LA2016_CONVBUFFER_SIZE;
 	if (!(devc->convbuffer = g_try_malloc(devc->convbuffer_size))) {
 		sr_err("Cannot allocate conversion buffer.");
 		return SR_ERR_MALLOC;