projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check stlink_load_device_params
[fw/stlink]
/
src
/
stlink-usb.c
diff --git
a/src/stlink-usb.c
b/src/stlink-usb.c
index 4a62d9dd5ff12d4f27e0b63df13c4f685d2ef0b4..d0baa0deb965b23f31d5d6f9588460287c3a8bd2 100644
(file)
--- a/
src/stlink-usb.c
+++ b/
src/stlink-usb.c
@@
-432,7
+432,7
@@
void _stlink_usb_jtag_reset(stlink_t * sl, int value) {
cmd[i++] = STLINK_DEBUG_COMMAND;
cmd[i++] = STLINK_JTAG_DRIVE_NRST;
cmd[i++] = STLINK_DEBUG_COMMAND;
cmd[i++] = STLINK_JTAG_DRIVE_NRST;
- cmd[i++] =
(value)?0:1
;
+ cmd[i++] =
value
;
size = send_recv(slu, 1, cmd, slu->cmd_len, data, rep_len);
if (size == -1) {
size = send_recv(slu, 1, cmd, slu->cmd_len, data, rep_len);
if (size == -1) {
@@
-770,8
+770,7
@@
stlink_t* stlink_open_usb(const int verbose, int reset) {
devAddr=atoi(c);
ILOG("bus %03d dev %03d\n",devBus, devAddr);
}
devAddr=atoi(c);
ILOG("bus %03d dev %03d\n",devBus, devAddr);
}
- while (cnt){
- cnt--;
+ while (cnt--){
libusb_get_device_descriptor( list[cnt], &desc );
if (desc.idVendor!=USB_ST_VID) continue;
if (devBus && devAddr)
libusb_get_device_descriptor( list[cnt], &desc );
if (desc.idVendor!=USB_ST_VID) continue;
if (devBus && devAddr)
@@
-865,10
+864,8
@@
stlink_t* stlink_open_usb(const int verbose, int reset) {
if (reset) {
stlink_reset(sl);
}
if (reset) {
stlink_reset(sl);
}
- stlink_load_device_params(sl);
stlink_version(sl);
stlink_version(sl);
-
- error = 0;
+ error = stlink_load_device_params(sl);
on_libusb_error:
if (devs != NULL) {
on_libusb_error:
if (devs != NULL) {
@@
-888,6
+885,6
@@
on_error:
libusb_exit(slu->libusb_ctx);
if (sl != NULL) free(sl);
if (slu != NULL) free(slu);
libusb_exit(slu->libusb_ctx);
if (sl != NULL) free(sl);
if (slu != NULL) free(slu);
- return
0
;
+ return
NULL
;
}
}