projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #367 from meisteg/fix_every_other
[fw/stlink]
/
src
/
stlink-usb.h
diff --git
a/src/stlink-usb.h
b/src/stlink-usb.h
index 4ed655b7e29c1b9e6a634f1f74b0e78bbd774b37..d7e745f514bc0af57e325a46244c8ac337b10f85 100644
(file)
--- a/
src/stlink-usb.h
+++ b/
src/stlink-usb.h
@@
-1,4
+1,4
@@
-/*
+/*
* File: stlink-usb.h
* Author: karl
*
* File: stlink-usb.h
* Author: karl
*
@@
-12,12
+12,12
@@
extern "C" {
#endif
extern "C" {
#endif
-#include <libusb
-1.0/libusb
.h>
+#include <libusb.h>
#include "stlink-common.h"
#include "stlink-common.h"
-
+
+#define STLINK_SG_SIZE 31
#define STLINK_CMD_SIZE 16
#define STLINK_CMD_SIZE 16
-#if defined(CONFIG_USE_LIBUSB)
struct stlink_libusb {
libusb_context* libusb_ctx;
libusb_device_handle* usb_handle;
struct stlink_libusb {
libusb_context* libusb_ctx;
libusb_device_handle* usb_handle;
@@
-25,14
+25,12
@@
extern "C" {
struct libusb_transfer* rep_trans;
unsigned int ep_req;
unsigned int ep_rep;
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, int reset, char *p_usb_iserial);
#ifdef __cplusplus
#ifdef __cplusplus