windows: Fix various compiler warnings.

[libsigrok.git] / src / hardware / ikalogic-scanalogic2 / api.c

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index abdbfd7228c562f8570f134c35fc4a54fb1626b3..a18557cf5f0cd94986a4843b1e0f50a256d69077 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -49,7 +49,6 @@ SR_PRIV const uint64_t sl2_samplerates[NUM_SAMPLERATES] = {
 
 static const char *channel_names[] = {
        "0", "1", "2", "3",
-       NULL,
 };
 
 SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
@@ -78,7 +77,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, USB_VID_PID);
 
-       if (usb_devices == NULL)
+       if (!usb_devices)
                return NULL;
 
        for (l = usb_devices; l; l = l->next) {
@@ -118,9 +117,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
 
-               for (i = 0; channel_names[i]; i++)
-                       devc->channels[i] = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC,
-                               TRUE, channel_names[i]);
+               for (i = 0; i < ARRAY_SIZE(channel_names); i++)
+                       devc->channels[i] = sr_channel_new(sdi, i,
+                               SR_CHANNEL_LOGIC, TRUE, channel_names[i]);
 
                devc->state = STATE_IDLE;
                devc->next_state = STATE_IDLE;
@@ -226,11 +225,11 @@ static int dev_open(struct sr_dev_inst *sdi)
 
        libusb_fill_control_transfer(devc->xfer_in, usb->devhdl,
                devc->xfer_buf_in, sl2_receive_transfer_in,
-               sdi, USB_TIMEOUT);
+               sdi, USB_TIMEOUT_MS);
 
        libusb_fill_control_transfer(devc->xfer_out, usb->devhdl,
                devc->xfer_buf_out, sl2_receive_transfer_out,
-               sdi, USB_TIMEOUT);
+               sdi, USB_TIMEOUT_MS);
 
        memset(buffer, 0, sizeof(buffer));