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

ETB: cleanup needless symbol exports and forward decls. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@2772 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
dbrownell 2009-09-29 18:06:26 +00:00
parent f4fce92f28
commit afc3a5cc6f
2 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/target/etb.c
View File

@ -96,6 +96,33 @@ static int etb_scann(etb_t *etb, uint32_t new_scan_chain)
return ERROR_OK; return ERROR_OK;
} }
static int etb_read_reg_w_check(reg_t *, uint8_t *, uint8_t *);
static int etb_set_reg_w_exec(reg_t *, uint8_t *);
static int etb_read_reg(reg_t *reg)
{
return etb_read_reg_w_check(reg, NULL, NULL);
}
static int etb_get_reg(reg_t *reg)
{
int retval;
if ((retval = etb_read_reg(reg)) != ERROR_OK)
{
LOG_ERROR("BUG: error scheduling etm register read");
return retval;
}
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("register read failed");
return retval;
}
return ERROR_OK;
}
reg_cache_t* etb_build_reg_cache(etb_t *etb) reg_cache_t* etb_build_reg_cache(etb_t *etb)
{ {
reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t)); reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t));
@ -138,29 +165,10 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb)
return reg_cache; return reg_cache;
} }
static int etb_get_reg(reg_t *reg)
{
int retval;
if ((retval = etb_read_reg(reg)) != ERROR_OK)
{
LOG_ERROR("BUG: error scheduling etm register read");
return retval;
}
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("register read failed");
return retval;
}
return ERROR_OK;
}
static void etb_getbuf(jtag_callback_data_t arg) static void etb_getbuf(jtag_callback_data_t arg)
{ {
uint8_t *in = (uint8_t *)arg; uint8_t *in = (uint8_t *)arg;
*((uint32_t *)in) = buf_get_u32(in, 0, 32); *((uint32_t *)in) = buf_get_u32(in, 0, 32);
} }
@ -218,7 +226,8 @@ static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames)
return ERROR_OK; return ERROR_OK;
} }
int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* check_mask) static int etb_read_reg_w_check(reg_t *reg,
uint8_t* check_value, uint8_t* check_mask)
{ {
etb_reg_t *etb_reg = reg->arch_info; etb_reg_t *etb_reg = reg->arch_info;
uint8_t reg_addr = etb_reg->addr & 0x7f; uint8_t reg_addr = etb_reg->addr & 0x7f;
@ -271,12 +280,9 @@ int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* check_mask)
return ERROR_OK; return ERROR_OK;
} }
int etb_read_reg(reg_t *reg) static int etb_write_reg(reg_t *, uint32_t);
{
return etb_read_reg_w_check(reg, NULL, NULL);
}
int etb_set_reg(reg_t *reg, uint32_t value) static int etb_set_reg(reg_t *reg, uint32_t value)
{ {
int retval; int retval;
@ -293,7 +299,7 @@ int etb_set_reg(reg_t *reg, uint32_t value)
return ERROR_OK; return ERROR_OK;
} }
int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf) static int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf)
{ {
int retval; int retval;
@ -307,7 +313,7 @@ int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf)
return ERROR_OK; return ERROR_OK;
} }
int etb_write_reg(reg_t *reg, uint32_t value) static int etb_write_reg(reg_t *reg, uint32_t value)
{ {
etb_reg_t *etb_reg = reg->arch_info; etb_reg_t *etb_reg = reg->arch_info;
uint8_t reg_addr = etb_reg->addr & 0x7f; uint8_t reg_addr = etb_reg->addr & 0x7f;
@ -345,11 +351,6 @@ int etb_write_reg(reg_t *reg, uint32_t value)
return ERROR_OK; return ERROR_OK;
} }
int etb_store_reg(reg_t *reg)
{
return etb_write_reg(reg, buf_get_u32(reg->value, 0, reg->size));
}
static int etb_register_commands(struct command_context_s *cmd_ctx) static int etb_register_commands(struct command_context_s *cmd_ctx)
{ {
command_t *etb_cmd; command_t *etb_cmd;

6
src/target/etb.h
View File

@ -57,11 +57,5 @@ typedef struct etb_reg_s
extern etm_capture_driver_t etb_capture_driver; extern etm_capture_driver_t etb_capture_driver;
extern reg_cache_t* etb_build_reg_cache(etb_t *etb); extern reg_cache_t* etb_build_reg_cache(etb_t *etb);
extern int etb_read_reg(reg_t *reg);
extern int etb_write_reg(reg_t *reg, uint32_t value);
extern int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* check_mask);
extern int etb_store_reg(reg_t *reg);
extern int etb_set_reg(reg_t *reg, uint32_t value);
extern int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf);
#endif /* ETB_H */ #endif /* ETB_H */