X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=ab3345f32cc81db6758261e48e1cd5423867b554;hb=94b138a3c3d07cf5581c07536c53a97cebf885d9;hp=6fd89795624f3a79a1f1e95e74c810cdebf2cb8a;hpb=93b118da4fec6976df924eb77121f07b361b8330;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 6fd89795..ab3345f3 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -106,9 +106,8 @@ static const uint32_t devopts[] = {
 };
 
 static const char *channel_names[] = {
-	"0",  "1",  "2",  "3",  "4",  "5",  "6",  "7",
-	"8",  "9", "10", "11", "12", "13", "14", "15",
-	NULL,
+	"0", "1", "2", "3", "4", "5", "6", "7",
+	"8", "9", "10", "11", "12", "13", "14", "15",
 };
 
 static const int32_t soft_trigger_matches[] = {
@@ -427,7 +426,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 	struct sr_usb_dev_inst *usb;
 
 	usb = sdi->conn;
-	if (usb->devhdl == NULL)
+	if (!usb->devhdl)
 		return SR_ERR;
 
 	sr_info("fx2lafw: Closing device on %d.%d (logical) / %s (physical) interface %d.",
@@ -630,7 +629,7 @@ static int start_transfers(const struct sr_dev_inst *sdi)
 		if (devc->limit_samples > 0)
 			pre_trigger_samples = devc->capture_ratio * devc->limit_samples/100;
 		devc->stl = soft_trigger_logic_new(sdi, trigger, pre_trigger_samples);
-		if (devc->stl == NULL)
+		if (!devc->stl)
 			return SR_ERR_MALLOC;
 		devc->trigger_fired = FALSE;
 	} else
@@ -678,7 +677,7 @@ static int start_transfers(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static void dslogic_trigger_receive(struct libusb_transfer *transfer)
+static void LIBUSB_CALL dslogic_trigger_receive(struct libusb_transfer *transfer)
 {
 	const struct sr_dev_inst *sdi;
 	struct dslogic_trigger_pos *tpos;