- renamed EMU_CMD_HW_JTAG to EMU_CMD_HW_JTAG3

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

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 3d2468e1471be53d6d1daea4f906f13ebec060cc..7ca53d80f4890d7deecf7f2f668f239cfc2df8f1 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -51,8 +51,8 @@
 
 #define JLINK_USB_TIMEOUT              100
 
-#define JLINK_IN_BUFFER_SIZE                                   2064
-#define JLINK_OUT_BUFFER_SIZE                                  2064
+#define JLINK_IN_BUFFER_SIZE                                   8192
+#define JLINK_OUT_BUFFER_SIZE                                  8192
 #define JLINK_EMU_RESULT_BUFFER_SIZE   64
 
 
@@ -65,7 +65,7 @@ static u8 usb_emu_result_buffer[JLINK_EMU_RESULT_BUFFER_SIZE];
 #define EMU_CMD_VERSION     0x01
 #define EMU_CMD_SET_SPEED   0x05
 #define EMU_CMD_GET_STATE   0x07
-#define EMU_CMD_HW_JTAG     0xcf
+#define EMU_CMD_HW_JTAG3    0xcf
 #define EMU_CMD_HW_RESET0   0xdc
 #define EMU_CMD_HW_RESET1   0xdd
 #define EMU_CMD_HW_TRST0    0xde
@@ -549,8 +549,8 @@ int jlink_handle_jlink_info_command(struct command_context_s *cmd_ctx, char *cmd
 /***************************************************************************/
 /* J-Link tap functions */
 
-/* We use the maximal value observed */
-#define JLINK_TAP_BUFFER_SIZE 390
+/* 2048 is the max value we can use here */
+#define JLINK_TAP_BUFFER_SIZE 2048
 
 static int tap_length;
 static u8 tms_buffer[JLINK_TAP_BUFFER_SIZE];
@@ -565,7 +565,7 @@ typedef struct
        u8 *buffer;
 } pending_scan_result_t;
 
-#define MAX_PENDING_SCAN_RESULTS 16
+#define MAX_PENDING_SCAN_RESULTS 256
 
 static int pending_scan_results_length;
 static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
@@ -664,7 +664,7 @@ int jlink_tap_execute()
        
                byte_length = tap_length / 8;
        
-               usb_out_buffer[0] = EMU_CMD_HW_JTAG;
+               usb_out_buffer[0] = EMU_CMD_HW_JTAG3;
                usb_out_buffer[1] = 0;
                usb_out_buffer[2] = (tap_length >> 0) & 0xff;
                usb_out_buffer[3] = (tap_length >> 8) & 0xff;
@@ -763,7 +763,14 @@ jlink_jtag_t* jlink_usb_open()
                                /* usb_set_configuration required under win32 */
                                usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue);
                                usb_claim_interface(result->usb_handle, 0);
+                               
+#if 0
+                               /* 
+                                * This makes problems under Mac OS X. And is not needed
+                                * under Windows. Hopefully this will not break a linux build
+                                */
                                usb_set_altinterface(result->usb_handle, 0);
+#endif                         
                                return result;
                        }
                }