projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to not reset board on connect
[fw/stlink]
/
src
/
stlink-usb.h
diff --git
a/src/stlink-usb.h
b/src/stlink-usb.h
index c632a8c4163da3257a61014cf1b614b30e7cc884..f433193c81eae6ce95c20dbaa189f8f281c81c98 100644
(file)
--- a/
src/stlink-usb.h
+++ b/
src/stlink-usb.h
@@
-12,13
+12,12
@@
extern "C" {
#endif
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
#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;
struct stlink_libusb {
libusb_context* libusb_ctx;
libusb_device_handle* usb_handle;
@@
-30,13
+29,8
@@
extern "C" {
unsigned int sg_transfer_idx;
unsigned int cmd_len;
};
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);
+ stlink_t* stlink_open_usb(const int verbose
, int reset
);
#ifdef __cplusplus
#ifdef __cplusplus