projects
/
fw
/
stlink
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
276be4f
)
jtag reset
author
Rene Hopf
<renehopf@mac.com>
Wed, 13 Aug 2014 14:00:40 +0000
(16:00 +0200)
committer
Rene Hopf
<renehopf@mac.com>
Wed, 13 Aug 2014 14:00:40 +0000
(16:00 +0200)
flash/main.c
patch
|
blob
|
history
src/stlink-usb.c
patch
|
blob
|
history
diff --git
a/flash/main.c
b/flash/main.c
index 8f5b351de3df57710eff7b05080dbe3a51689cdb..3e7c8143d1983d4de0659b4364f1ec266d9d6522 100644
(file)
--- a/
flash/main.c
+++ b/
flash/main.c
@@
-137,8
+137,10
@@
int main(int ac, char** av)
if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
stlink_enter_swd_mode(sl);
if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
stlink_enter_swd_mode(sl);
- if (o.reset)
+ if (o.reset){
+ stlink_jtag_reset(sl,2);
stlink_reset(sl);
stlink_reset(sl);
+ }
// Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
if (sl->chip_id == STM32_CHIPID_F4)
// Disable DMA - Set All DMA CCR Registers to zero. - AKS 1/7/2013
if (sl->chip_id == STM32_CHIPID_F4)
@@
-196,8
+198,10
@@
int main(int ac, char** av)
}
}
}
}
- if (o.reset)
- stlink_reset(sl);
+ if (o.reset){
+ stlink_jtag_reset(sl,2);
+ stlink_reset(sl);
+ }
/* success */
err = 0;
/* success */
err = 0;
diff --git
a/src/stlink-usb.c
b/src/stlink-usb.c
index 4a62d9dd5ff12d4f27e0b63df13c4f685d2ef0b4..f6004d68c51fe7eb6d447c7112d4f21fdddafc8d 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) {