mips: m4k alternate pracc code. Patch 1

[openocd.git] / src / target / mips_ejtag.c

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index bd7ae14dd70eec587023c277aa607ff7a5c4368c..794f92f819881acb6f82d73468177d8c86af26e9 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -99,6 +99,29 @@ static int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impco
        return ERROR_OK;
 }
 
+void mips_ejtag_add_scan_96(struct mips_ejtag *ejtag_info, uint32_t ctrl, uint32_t data, uint8_t *in_scan_buf)
+{
+       assert(ejtag_info->tap != NULL);
+       struct jtag_tap *tap = ejtag_info->tap;
+
+       struct scan_field field;
+       uint8_t out_scan[12];
+
+       /* processor access "all" register 96 bit */
+       field.num_bits = 96;
+
+       field.out_value = out_scan;
+       buf_set_u32(out_scan, 0, 32, ctrl);
+       buf_set_u32(out_scan + 4, 0, 32, data);
+       buf_set_u32(out_scan + 8, 0, 32, 0);
+
+       field.in_value = in_scan_buf;
+
+       jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
+
+       keep_alive();
+}
+
 int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data)
 {
        struct jtag_tap *tap;
@@ -245,7 +268,12 @@ int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info)
        inst = MIPS32_DRET;
 
        /* execute our dret instruction */
-       return mips32_pracc_exec(ejtag_info, 1, &inst, 0, NULL, 0, NULL, 0);
+       int retval = mips32_pracc_exec(ejtag_info, 1, &inst, 0, NULL, 0, NULL, 0);
+
+       /* pic32mx workaround, false pending at low core clock */
+       jtag_add_sleep(1000);
+
+       return retval;
 }
 
 int mips_ejtag_init(struct mips_ejtag *ejtag_info)
@@ -274,6 +302,12 @@ int mips_ejtag_init(struct mips_ejtag *ejtag_info)
                case 3:
                        LOG_DEBUG("EJTAG: Version 3.1 Detected");
                        break;
+               case 4:
+                       LOG_DEBUG("EJTAG: Version 4.1 Detected");
+                       break;
+               case 5:
+                       LOG_DEBUG("EJTAG: Version 5.1 Detected");
+                       break;
                default:
                        LOG_DEBUG("EJTAG: Unknown Version Detected");
                        break;