Store the masked chip_id in the stlink structure. Should fix unexpected

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

diff --git a/src/stlink-usb.h b/src/stlink-usb.h
index fe9645ab02ff0f76319ca3acfdadf9d08fa259a9..2f3b8cc3ed7f84c17994debaaa68da442aaf86bd 100644 (file)
--- a/src/stlink-usb.h
+++ b/src/stlink-usb.h
@@ -13,8 +13,11 @@ extern "C" {
 #endif
 
 #include <libusb-1.0/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;
@@ -22,14 +25,12 @@ extern "C" {
         struct libusb_transfer* rep_trans;
         unsigned int ep_req;
         unsigned int ep_rep;
+        int protocoll;
+        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 char *dev_name, const int verbose);
+    stlink_t* stlink_open_usb(const int verbose);
 
 
 #ifdef __cplusplus