small warning fix

[libsigrok.git] / hardware / common / misc.c

diff --git a/hardware/common/misc.c b/hardware/common/misc.c
index 8bcd7b0907342c16c76254e951ae5de580c4fc5f..43b158ae742c32356aff8b3d80b6ecb1adb9e46d 100644 (file)
--- a/hardware/common/misc.c
+++ b/hardware/common/misc.c
@@ -17,11 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include <stdint.h>
 #include <glib.h>
+#ifdef HAVE_LIBUSB_1_0
 #include <libusb.h>
+#endif
 #include <sigrok.h>
 
+#ifdef HAVE_LIBUSB_1_0
+
 int opendev2(int device_index, struct sr_device_instance **sdi,
             libusb_device *dev, struct libusb_device_descriptor *des,
             int *skip, uint16_t vid, uint16_t pid, int interface)
@@ -48,7 +53,7 @@ int opendev2(int device_index, struct sr_device_instance **sdi,
         */
        if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
                (*sdi)->usb->address = libusb_get_device_address(dev);
-               (*sdi)->status = ST_ACTIVE;
+               (*sdi)->status = SR_ST_ACTIVE;
                g_message("opened device %d on %d.%d interface %d",
                          (*sdi)->index, (*sdi)->usb->bus,
                          (*sdi)->usb->address, interface);
@@ -78,7 +83,7 @@ int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
            && libusb_get_device_address(dev) == (*sdi)->usb->address) {
                /* Found it. */
                if (!(err = libusb_open(dev, &((*sdi)->usb->devhdl)))) {
-                       (*sdi)->status = ST_ACTIVE;
+                       (*sdi)->status = SR_ST_ACTIVE;
                        g_message("opened device %d on %d.%d interface %d",
                                  (*sdi)->index, (*sdi)->usb->bus,
                                  (*sdi)->usb->address, interface);
@@ -90,3 +95,5 @@ int opendev3(struct sr_device_instance **sdi, libusb_device *dev,
 
        return 0;
 }
+
+#endif