zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ETM: fix build issue on MinGW. 

The Win32 global namespace is rather cluttered...


git-svn-id: svn://svn.berlios.de/openocd/trunk@2773 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
dbrownell 2009-09-29 18:08:16 +00:00
parent afc3a5cc6f
commit d96e3eae23
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/target/etm.c
View File

@ -68,6 +68,7 @@ struct etm_reg_info {
/* /*
* Registers 0..0x7f are JTAG-addressable using scanchain 6. * Registers 0..0x7f are JTAG-addressable using scanchain 6.
* (Or on some processors, through coprocessor operations.)
* Newer versions of ETM make some W/O registers R/W, and * Newer versions of ETM make some W/O registers R/W, and
* provide definitions for some previously-unused bits. * provide definitions for some previously-unused bits.
*/ */
@ -154,7 +155,7 @@ static const struct etm_reg_info etm_data_comp[] = {
}; };
static const struct etm_reg_info etm_counters[] = { static const struct etm_reg_info etm_counters[] = {
#define COUNTER(i) \ #define ETM_COUNTER(i) \
{ ETM_COUNTER_RELOAD_VALUE + (i), 16, WO, 0x10, \ { ETM_COUNTER_RELOAD_VALUE + (i), 16, WO, 0x10, \
"ETM_COUNTER_RELOAD_VALUE" #i, }, \ "ETM_COUNTER_RELOAD_VALUE" #i, }, \
{ ETM_COUNTER_ENABLE + (i), 18, WO, 0x10, \ { ETM_COUNTER_ENABLE + (i), 18, WO, 0x10, \
@ -163,38 +164,38 @@ static const struct etm_reg_info etm_counters[] = {
"ETM_COUNTER_RELOAD_EVENT" #i, }, \ "ETM_COUNTER_RELOAD_EVENT" #i, }, \
{ ETM_COUNTER_VALUE + (i), 16, RO, 0x10, \ { ETM_COUNTER_VALUE + (i), 16, RO, 0x10, \
"ETM_COUNTER_VALUE" #i, } "ETM_COUNTER_VALUE" #i, }
COUNTER(0), ETM_COUNTER(0),
COUNTER(1), ETM_COUNTER(1),
COUNTER(2), ETM_COUNTER(2),
COUNTER(3), ETM_COUNTER(3),
#undef COUNTER #undef ETM_COUNTER
}; };
static const struct etm_reg_info etm_sequencer[] = { static const struct etm_reg_info etm_sequencer[] = {
#define SEQ(i) \ #define ETM_SEQ(i) \
{ ETM_SEQUENCER_EVENT + (i), 17, WO, 0x10, \ { ETM_SEQUENCER_EVENT + (i), 17, WO, 0x10, \
"ETM_SEQUENCER_EVENT" #i, } "ETM_SEQUENCER_EVENT" #i, }
SEQ(0), /* 1->2 */ ETM_SEQ(0), /* 1->2 */
SEQ(1), /* 2->1 */ ETM_SEQ(1), /* 2->1 */
SEQ(2), /* 2->3 */ ETM_SEQ(2), /* 2->3 */
SEQ(3), /* 3->1 */ ETM_SEQ(3), /* 3->1 */
SEQ(4), /* 3->2 */ ETM_SEQ(4), /* 3->2 */
SEQ(5), /* 1->3 */ ETM_SEQ(5), /* 1->3 */
#undef SEQ #undef ETM_SEQ
/* 0x66 reserved */ /* 0x66 reserved */
{ ETM_SEQUENCER_STATE, 2, RO, 0x10, "ETM_SEQUENCER_STATE", }, { ETM_SEQUENCER_STATE, 2, RO, 0x10, "ETM_SEQUENCER_STATE", },
}; };
static const struct etm_reg_info etm_outputs[] = { static const struct etm_reg_info etm_outputs[] = {
#define OUT(i) \ #define ETM_OUTPUT(i) \
{ ETM_EXTERNAL_OUTPUT + (i), 17, WO, 0x10, \ { ETM_EXTERNAL_OUTPUT + (i), 17, WO, 0x10, \
"ETM_EXTERNAL_OUTPUT" #i, } "ETM_EXTERNAL_OUTPUT" #i, }
OUT(0), ETM_OUTPUT(0),
OUT(1), ETM_OUTPUT(1),
OUT(2), ETM_OUTPUT(2),
OUT(3), ETM_OUTPUT(3),
#undef OUT #undef ETM_OUTPUT
}; };
#if 0 #if 0