X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips_ejtag.c;h=794f92f819881acb6f82d73468177d8c86af26e9;hp=c2bee941d94f4f994322539190cb849b8cbbd2ae;hb=refs%2Fchanges%2F93%2F1193%2F8;hpb=47d5f44fe0401746b3239ea43994889c41c0ca5e

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index c2bee941d9..794f92f819 100644
--- 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,30 +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);
 
-int mips_ejtag_read_debug(struct mips_ejtag *ejtag_info, uint32_t* debug_reg)
-{
-	/* read ejtag ECR */
-	static const uint32_t code[] = {
-			MIPS32_MTC0(15, 31, 0),							/* move $15 to COP0 DeSave */
-			MIPS32_LUI(15, UPPER16(MIPS32_PRACC_STACK)),	/* $15 = MIPS32_PRACC_STACK */
-			MIPS32_ORI(15, 15, LOWER16(MIPS32_PRACC_STACK)),
-			MIPS32_SW(1, 0, 15),							/* sw $1,($15) */
-			MIPS32_SW(2, 0, 15),							/* sw $2,($15) */
-			MIPS32_LUI(1, UPPER16(MIPS32_PRACC_PARAM_OUT)),	/* $1 = MIPS32_PRACC_PARAM_OUT */
-			MIPS32_ORI(1, 1, LOWER16(MIPS32_PRACC_PARAM_OUT)),
-			MIPS32_MFC0(2, 23, 0),							/* move COP0 Debug to $2 */
-			MIPS32_SW(2, 0, 1),
-			MIPS32_LW(2, 0, 15),
-			MIPS32_LW(1, 0, 15),
-			MIPS32_B(NEG16(12)),
-			MIPS32_MFC0(15, 31, 0),							/* move COP0 DeSave to $15 */
-	};
-
-	return mips32_pracc_exec(ejtag_info, ARRAY_SIZE(code), code,
-		0, NULL, 1, debug_reg, 1);
+	/* pic32mx workaround, false pending at low core clock */
+	jtag_add_sleep(1000);
+
+	return retval;
 }
 
 int mips_ejtag_init(struct mips_ejtag *ejtag_info)
@@ -297,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;