Fix outdated ezusb_install_firmware() prototype.

[libsigrok.git] / hardware / saleae-logic / saleae-logic.c

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index a1ab755b149c2b0b6e479575e2b4ab1c468c1a0d..c8b3dfa3ec017a104b54cd3219aa39e1cbc1539f 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -24,8 +24,8 @@
 #include <inttypes.h>
 #include <glib.h>
 #include <libusb.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "saleae-logic.h"
 
 static struct fx2_profile supported_fx2[] = {
@@ -292,7 +292,7 @@ static int hw_init(const char *deviceinfo)
        int err, devcnt, i, j;
 
        /* Avoid compiler warnings. */
-       deviceinfo = deviceinfo;
+       (void)deviceinfo;
 
        if (libusb_init(&usb_context) != 0) {
                sr_warn("Failed to initialize USB.");
@@ -554,9 +554,9 @@ static int receive_data(int fd, int revents, void *user_data)
        struct timeval tv;
 
        /* Avoid compiler warnings. */
-       fd = fd;
-       revents = revents;
-       user_data = user_data;
+       (void)fd;
+       (void)revents;
+       (void)user_data;
 
        tv.tv_sec = tv.tv_usec = 0;
        libusb_handle_events_timeout(usb_context, &tv);
@@ -564,7 +564,7 @@ static int receive_data(int fd, int revents, void *user_data)
        return TRUE;
 }
 
-void receive_transfer(struct libusb_transfer *transfer)
+static void receive_transfer(struct libusb_transfer *transfer)
 {
        /* TODO: these statics have to move to fx2_device struct */
        static int num_samples = 0;
@@ -780,7 +780,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_data)
        struct sr_datafeed_packet packet;
 
        /* Avoid compiler warnings. */
-       device_index = device_index;
+       (void)device_index;
 
        packet.type = SR_DF_END;
        sr_session_bus(session_data, &packet);