Merge pull request #257 from rene-dev/master

reset chip via JTAG

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 (o.reset)
+    if (o.reset){
+        stlink_jtag_reset(sl,2);
         stlink_reset(sl);
+    }
 
     // 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)
+    if (o.reset){
+        stlink_jtag_reset(sl,2);
         stlink_reset(sl);
+    }
 
     /* success */
     err = 0;

gdbserver/gdb-server.c

@@ -804,8 +804,8 @@ int serve(stlink_t *sl, st_state_t *st) {
                     } else if (!strncmp(params,"6a7461675f7265736574",20)) { //jtag_reset
                         reply = strdup("OK");
 
-                        stlink_jtag_reset(sl, 1);
                         stlink_jtag_reset(sl, 0);
+                        stlink_jtag_reset(sl, 1);
                         stlink_force_debug(sl);
 
                         DLOG("Rcmd: jtag_reset\n");

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++] = (value)?0:1;
+    cmd[i++] = value;
 
     size = send_recv(slu, 1, cmd, slu->cmd_len, data, rep_len);
     if (size == -1) {