Zach Welch <zw@superlucidity.net> fix jlink reset

[openocd.git] / src / jtag / jlink.c

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 022afe5fd4ee37d6f51d7fd5aea2c92d08cf71ec..44a1ad6d723e402fbb15cbd6fd27b7c40cd18f15 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -42,8 +42,9 @@
 
 #define JLINK_USB_TIMEOUT              1000
 
-#define JLINK_IN_BUFFER_SIZE                   8192
-#define JLINK_OUT_BUFFER_SIZE                  8192
+// See Section 1.3.2 of the Segger JLink USB protocol manual
+#define JLINK_IN_BUFFER_SIZE                   2048
+#define JLINK_OUT_BUFFER_SIZE                  2048
 #define JLINK_EMU_RESULT_BUFFER_SIZE   64
 
 /* Global USB buffers */
@@ -462,6 +463,8 @@ static void jlink_reset(int trst, int srst)
        if (srst == 0)
        {
                jlink_simple_command(EMU_CMD_HW_RESET1);
+               jlink_end_state(TAP_RESET);
+               jlink_state_move();
        }
        else if (srst == 1)
        {
@@ -471,6 +474,8 @@ static void jlink_reset(int trst, int srst)
        if (trst == 0)
        {
                jlink_simple_command(EMU_CMD_HW_TRST1);
+               jlink_end_state(TAP_RESET);
+               jlink_state_move();
        }
        else if (trst == 1)
        {