Merge branch 'master' of github.com:UweBonnes/stlink

[fw/stlink] / src / stlink-usb.h

diff --git a/src/stlink-usb.h b/src/stlink-usb.h
index c632a8c4163da3257a61014cf1b614b30e7cc884..63b53695e270fd5ecd1e5ec28ae6c4636d630ba3 100644 (file)
--- a/src/stlink-usb.h
+++ b/src/stlink-usb.h
@@ -12,13 +12,12 @@
 extern "C" {
 #endif
 
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 #include "stlink-common.h"
     
 #define STLINK_SG_SIZE 31
 #define STLINK_CMD_SIZE 16
 
-#if defined(CONFIG_USE_LIBUSB)
     struct stlink_libusb {
         libusb_context* libusb_ctx;
         libusb_device_handle* usb_handle;
@@ -30,11 +29,6 @@ extern "C" {
         unsigned int sg_transfer_idx;
         unsigned int cmd_len;
     };
-#else
-#error "it's all bad!"
-    struct stlink_libusb {};
-#endif
-
     
     stlink_t* stlink_open_usb(const int verbose);