X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11_dbgtap.c;h=369576c5076d3cfd0c21eb811624eb7b77dcba4b;hp=c9812a1526ff6d42dbaf81d0dc1a56731491909c;hb=42ef503d37b18d907da16d26e99167566d5aabd1;hpb=20c8f64f0a69ec50911a7c0ee64d6ae34df83660

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index c9812a1526..369576c507 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "arm11.h"
+#include "arm11_dbgtap.h"
 
 #include "time_support.h"
 
@@ -41,7 +41,7 @@ behavior of the FTDI driver IIRC was to go via RTI.
 Conversely there may be other places in this code where the ARM11 code relies
 on the driver to hit through RTI when coming from Update-?R.
 */
-tap_state_t arm11_move_pi_to_si_via_ci[] =
+static const tap_state_t arm11_move_pi_to_si_via_ci[] =
 {
     TAP_IREXIT2, TAP_IRUPDATE, TAP_DRSELECT, TAP_IRSELECT, TAP_IRCAPTURE, TAP_IRSHIFT
 };
@@ -56,7 +56,7 @@ int arm11_add_ir_scan_vc(int num_fields, scan_field_t *fields, tap_state_t state
 	return ERROR_OK;
 }
 
-tap_state_t arm11_move_pd_to_sd_via_cd[] =
+static const tap_state_t arm11_move_pd_to_sd_via_cd[] =
 {
 	TAP_DREXIT2, TAP_DRUPDATE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
 };
@@ -100,7 +100,7 @@ void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, vo
  */
 void arm11_add_IR(arm11_common_t * arm11, uint8_t instr, tap_state_t state)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	tap = arm11->target->tap;
 
 	if (buf_get_u32(tap->cur_instr, 0, 5) == instr)
@@ -548,7 +548,7 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, uint32_t opcode, uint32
  *  https://lists.berlios.de/pipermail/openocd-development/2009-July/009698.html
  *  https://lists.berlios.de/pipermail/openocd-development/2009-August/009865.html
  */
-tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] =
+static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] =
 {
 	TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
 };
@@ -940,3 +940,79 @@ int arm11_read_memory_word(arm11_common_t * arm11, uint32_t address, uint32_t *
 }
 
 
+/** Write Embedded Trace Macrocell (ETM) via Scan chain 6
+ *
+ * http://infocenter.arm.com/help/topic/com.arm.doc.ddi0318e/Bcfddjeh.html#Bcfggcbe
+ *
+ * \param arm11		Target state variable.
+ * \param address	7 bit ETM register address
+ * \param value		Value to be written
+ *					
+ * \return			Error status
+ *
+ * \remarks			This is a stand-alone function that executes the JTAG command queue.
+ */
+int arm11_write_etm(arm11_common_t * arm11, uint8_t address, uint32_t value)
+{
+	CHECK_RETVAL(arm11_add_debug_SCAN_N(arm11, 0x06, ARM11_TAP_DEFAULT));
+
+	/* Uses INTEST for read and write */
+	arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
+
+	scan_field_t		chain6_fields[3];
+
+	uint8_t				nRW			= 1;
+
+	arm11_setup_field(arm11, 32, &value,		NULL,		chain6_fields + 0);
+	arm11_setup_field(arm11,  7, &address,		NULL,		chain6_fields + 1);
+	arm11_setup_field(arm11,  1, &nRW,			NULL,		chain6_fields + 2);
+
+	arm11_add_dr_scan_vc(asizeof(chain6_fields), chain6_fields, TAP_IDLE);
+
+	CHECK_RETVAL(jtag_execute_queue());
+
+	return ERROR_OK;
+}
+
+/** Read Embedded Trace Macrocell (ETM) via Scan chain 6
+ *
+ * http://infocenter.arm.com/help/topic/com.arm.doc.ddi0318e/Bcfddjeh.html#Bcfggcbe
+ *
+ * \param arm11		Target state variable.
+ * \param address	7 bit ETM register address
+ * \param value		Pointer that receives value that was read
+ *					
+ * \return			Error status
+ *
+ * \remarks			This is a stand-alone function that executes the JTAG command queue.
+ */
+int arm11_read_etm(arm11_common_t * arm11, uint8_t address, uint32_t * value)
+{
+	CHECK_RETVAL(arm11_add_debug_SCAN_N(arm11, 0x06, ARM11_TAP_DEFAULT));
+
+	/* Uses INTEST for read and write */
+	arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
+
+	scan_field_t		chain6_fields[3];
+
+	uint8_t				nRW			= 0;
+
+	arm11_setup_field(arm11, 32, NULL,			NULL,		chain6_fields + 0);
+	arm11_setup_field(arm11,  7, &address,		NULL,		chain6_fields + 1);
+	arm11_setup_field(arm11,  1, &nRW,			NULL,		chain6_fields + 2);
+
+	arm11_add_dr_scan_vc(asizeof(chain6_fields), chain6_fields, TAP_IDLE);
+
+	/* Data is made available in Capture-DR and shifted out on the next access */
+
+	arm11_setup_field(arm11, 32, NULL,			value,		chain6_fields + 0);
+	arm11_setup_field(arm11,  7, &address,		NULL,		chain6_fields + 1);
+	arm11_setup_field(arm11,  1, &nRW,			NULL,		chain6_fields + 2);
+
+	arm11_add_dr_scan_vc(asizeof(chain6_fields), chain6_fields, TAP_IDLE);
+
+	CHECK_RETVAL(jtag_execute_queue());
+
+	return ERROR_OK;
+}
+