X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetm.h;h=ead45855e95805001943757d6c12314e95971644;hb=a585bdf7269ce5c861c83ee3294ba1f074e9c877;hp=2335c983e163caa98857839a422615f235667a0f;hpb=d796ce0e4d17e8a140ad0efa8c63c828ca185455;p=openocd.git

diff --git a/src/target/etm.h b/src/target/etm.h
index 2335c983e1..ead45855e9 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -25,7 +25,6 @@
 
 #include "trace.h"
 #include "arm_jtag.h"
-#include "armv4_5.h"
 
 struct image_s;
 
@@ -69,6 +68,7 @@ enum
 	/* N task contexts */
 	ETM_CONTEXTID_COMPARATOR_VALUE = 0x6c,
 	ETM_CONTEXTID_COMPARATOR_MASK = 0x6f,
+	ETM_ID = 0x79,
 };
 
 typedef struct etm_reg_s
@@ -84,7 +84,13 @@ typedef enum
 	ETM_PORT_4BIT		= 0x00,
 	ETM_PORT_8BIT		= 0x10,
 	ETM_PORT_16BIT		= 0x20,
-	ETM_PORT_WIDTH_MASK	= 0x70,
+	ETM_PORT_24BIT		= 0x30,
+	ETM_PORT_32BIT		= 0x40,
+	ETM_PORT_48BIT		= 0x50,
+	ETM_PORT_64BIT		= 0x60,
+	ETM_PORT_1BIT		= 0x00 | (1 << 21),
+	ETM_PORT_2BIT		= 0x10 | (1 << 21),
+	ETM_PORT_WIDTH_MASK	= 0x70 | (1 << 21),
 	/* Port modes */
 	ETM_PORT_NORMAL    = 0x00000,
 	ETM_PORT_MUXED     = 0x10000,
@@ -158,7 +164,7 @@ typedef struct etm
 	uint32_t trace_depth;		/* number of cycles to be analyzed, 0 if no data available */
 	etm_portmode_t portmode;	/* normal, multiplexed or demultiplexed */
 	etmv1_tracemode_t tracemode;	/* type of info trace contains */
-	armv4_5_state_t core_state;	/* current core state */
+	int /*armv4_5_state_t*/ core_state;	/* current core state */
 	struct image_s *image;		/* source for target opcodes */
 	uint32_t pipe_index;		/* current trace cycle */
 	uint32_t data_index;		/* cycle holding next data packet */
@@ -167,6 +173,7 @@ typedef struct etm
 	bool ptr_ok;			/* whether last_ptr is valid */
 	uint8_t bcd_vers;		/* e.g. 0x13 == ETMv1.3 */
 	uint32_t config;		/* cache of ETM_CONFIG value */
+	uint32_t id;			/* cache of ETM_ID value, or 0 */
 	uint32_t current_pc;		/* current program counter */
 	uint32_t last_branch;		/* last branch address output */
 	uint32_t last_branch_reason;	/* type of last branch encountered */