jlink: Added hardware version number for JLink firmware on LPC-Link2

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

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 40d91cc43264c442c6ccbcc96194f54e0575a4ca..63580f7f6eca2d92b6352b47b22b61c720a867a1 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -195,17 +195,9 @@ static const char * const jlink_cap_str[] = {
 #define JLINK_HW_TYPE_FLASHER                  2
 #define JLINK_HW_TYPE_JLINK_PRO                        3
 #define JLINK_HW_TYPE_JLINK_LITE_ADI   5
-#define JLINK_HW_TYPE_MAX                              6
-
-static const char * const jlink_hw_type_str[] = {
-       "J-Link",
-       "J-Trace",
-       "Flasher",
-       "J-Link Pro",
-       "Unknown",
-       "J-Link Lite-ADI",
-};
+#define JLINK_HW_TYPE_LPCLINK2                 18
 
+/* Interface selection */
 #define JLINK_TIF_JTAG         0
 #define JLINK_TIF_SWD          1
 #define JLINK_SWD_DIR_IN       0
@@ -590,12 +582,6 @@ static int jlink_init(void)
                jlink_tap_execute();
        }
 
-       if (swd_mode)
-               jlink_swd_switch_seq(NULL, JTAG_TO_SWD);
-       else
-               jlink_swd_switch_seq(NULL, SWD_TO_JTAG);
-       jlink_swd_run_queue(NULL);
-
        return ERROR_OK;
 }
 
@@ -970,10 +956,29 @@ static int jlink_get_version_info(void)
 
                LOG_INFO("J-Link hw version %i", (int)jlink_hw_version);
 
-               if (jlink_hw_type >= JLINK_HW_TYPE_MAX)
-                       LOG_INFO("J-Link hw type unknown 0x%" PRIx32, jlink_hw_type);
-               else
-                       LOG_INFO("J-Link hw type %s", jlink_hw_type_str[jlink_hw_type]);
+               switch (jlink_hw_type) {
+                       case JLINK_HW_TYPE_JLINK:
+                               LOG_INFO("J-Link hw type J-Link");
+                               break;
+                       case JLINK_HW_TYPE_JTRACE:
+                               LOG_INFO("J-Link hw type J-Trace");
+                               break;
+                       case JLINK_HW_TYPE_FLASHER:
+                               LOG_INFO("J-Link hw type Flasher");
+                               break;
+                       case JLINK_HW_TYPE_JLINK_PRO:
+                               LOG_INFO("J-Link hw type J-Link Pro");
+                               break;
+                       case JLINK_HW_TYPE_JLINK_LITE_ADI:
+                               LOG_INFO("J-Link hw type J-Link Lite-ADI");
+                               break;
+                       case JLINK_HW_TYPE_LPCLINK2:
+                               LOG_INFO("J-Link hw type J-Link on LPC-Link2");
+                               break;
+                       default:
+                               LOG_INFO("J-Link hw type unknown 0x%" PRIx32, jlink_hw_type);
+                               break;
+               }
        }
 
        if (jlink_caps & (1 << EMU_CAP_GET_MAX_BLOCK_SIZE)) {
@@ -1664,9 +1669,9 @@ static int jlink_swd_run_queue(struct adiv5_dap *dap)
                int ack = buf_get_u32(usb_in_buffer, pending_scan_results_buffer[i].first, 3);
 
                if (ack != SWD_ACK_OK) {
-                       LOG_ERROR("SWD ack not OK: %d %s", ack,
+                       LOG_DEBUG("SWD ack not OK: %d %s", ack,
                                  ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? "FAULT" : "JUNK");
-                       queued_retval = ack;
+                       queued_retval = ack == SWD_ACK_WAIT ? ERROR_WAIT : ERROR_FAIL;
                        goto skip;
                } else if (pending_scan_results_buffer[i].length) {
                        uint32_t data = buf_get_u32(usb_in_buffer, 3 + pending_scan_results_buffer[i].first, 32);