Browse Source

target: declare local symbols as static

Functions and variables that are not used outside the file should
be declared as static.

Change-Id: I9f97571a528f0cb3c3c26f873577ab16fdec3cdc
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5895
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
jim
Antonio Borneo 3 years ago
parent
commit
5ca2301743
19 changed files with 48 additions and 51 deletions
  1. +1
    -1
      src/target/arm926ejs.c
  2. +10
    -10
      src/target/arm946e.c
  3. +1
    -1
      src/target/armv7a.c
  4. +2
    -2
      src/target/armv7a_cache.c
  5. +1
    -1
      src/target/armv8.c
  6. +4
    -4
      src/target/avr32_ap7k.c
  7. +6
    -6
      src/target/avr32_jtag.c
  8. +2
    -1
      src/target/cortex_a.c
  9. +5
    -10
      src/target/dsp5680xx.c
  10. +2
    -2
      src/target/mips32_pracc.c
  11. +3
    -2
      src/target/mips_ejtag.c
  12. +1
    -1
      src/target/nds32_tlb.c
  13. +1
    -1
      src/target/nds32_v3.c
  14. +1
    -1
      src/target/nds32_v3m.c
  15. +1
    -1
      src/target/openrisc/jsp_server.c
  16. +1
    -1
      src/target/openrisc/or1k.c
  17. +2
    -2
      src/target/quark_d20xx.c
  18. +1
    -1
      src/target/stm8.c
  19. +3
    -3
      src/target/target.c

+ 1
- 1
src/target/arm926ejs.c View File

@@ -723,7 +723,7 @@ static int arm926ejs_target_create(struct target *target, Jim_Interp *interp)
return arm926ejs_init_arch_info(target, arm926ejs, target->tap);
}

void arm926ejs_deinit_target(struct target *target)
static void arm926ejs_deinit_target(struct target *target)
{
struct arm *arm = target_to_arm(target);
struct arm926ejs_common *arm926ejs = target_to_arm926(target);


+ 10
- 10
src/target/arm946e.c View File

@@ -51,8 +51,8 @@
*/
static uint8_t arm946e_preserve_cache;

int arm946e_post_debug_entry(struct target *target);
void arm946e_pre_restore_context(struct target *target);
static int arm946e_post_debug_entry(struct target *target);
static void arm946e_pre_restore_context(struct target *target);
static int arm946e_read_cp15(struct target *target, int reg_addr, uint32_t *value);

int arm946e_init_arch_info(struct target *target,
@@ -250,7 +250,7 @@ static uint32_t arm946e_cp15_get_csize(struct target *target, int idsel)
return csize ? 1 << (12 + (csize-3)) : 0;
}

uint32_t arm946e_invalidate_whole_dcache(struct target *target)
static uint32_t arm946e_invalidate_whole_dcache(struct target *target)
{
uint32_t csize = arm946e_cp15_get_csize(target, GET_DCACHE_SIZE);
if (csize == 0)
@@ -306,7 +306,7 @@ uint32_t arm946e_invalidate_whole_dcache(struct target *target)
return ERROR_OK;
}

uint32_t arm946e_invalidate_whole_icache(struct target *target)
static uint32_t arm946e_invalidate_whole_icache(struct target *target)
{
/* Check cache presence before flushing - avoid undefined behavior */
uint32_t csize = arm946e_cp15_get_csize(target, GET_ICACHE_SIZE);
@@ -327,7 +327,7 @@ uint32_t arm946e_invalidate_whole_icache(struct target *target)
return ERROR_OK;
}

int arm946e_post_debug_entry(struct target *target)
static int arm946e_post_debug_entry(struct target *target)
{
uint32_t ctr_reg = 0x0;
uint32_t retval = ERROR_OK;
@@ -368,7 +368,7 @@ int arm946e_post_debug_entry(struct target *target)
return ERROR_OK;
}

void arm946e_pre_restore_context(struct target *target)
static void arm946e_pre_restore_context(struct target *target)
{
uint32_t ctr_reg = 0x0;
uint32_t retval;
@@ -393,7 +393,7 @@ void arm946e_pre_restore_context(struct target *target)
} /* if preserve_cache */
}

uint32_t arm946e_invalidate_dcache(struct target *target, uint32_t address,
static uint32_t arm946e_invalidate_dcache(struct target *target, uint32_t address,
uint32_t size, uint32_t count)
{
uint32_t cur_addr = 0x0;
@@ -458,7 +458,7 @@ uint32_t arm946e_invalidate_dcache(struct target *target, uint32_t address,
return ERROR_OK;
}

uint32_t arm946e_invalidate_icache(struct target *target, uint32_t address,
static uint32_t arm946e_invalidate_icache(struct target *target, uint32_t address,
uint32_t size, uint32_t count)
{
uint32_t cur_addr = 0x0;
@@ -509,7 +509,7 @@ uint32_t arm946e_invalidate_icache(struct target *target, uint32_t address,
}

/** Writes a buffer, in the specified word size, with current MMU settings. */
int arm946e_write_memory(struct target *target, target_addr_t address,
static int arm946e_write_memory(struct target *target, target_addr_t address,
uint32_t size, uint32_t count, const uint8_t *buffer)
{
int retval;
@@ -557,7 +557,7 @@ int arm946e_write_memory(struct target *target, target_addr_t address,

}

int arm946e_read_memory(struct target *target, target_addr_t address,
static int arm946e_read_memory(struct target *target, target_addr_t address,
uint32_t size, uint32_t count, uint8_t *buffer)
{
int retval;


+ 1
- 1
src/target/armv7a.c View File

@@ -589,7 +589,7 @@ static const struct command_registration l2_cache_commands[] = {

};

const struct command_registration l2x_cache_command_handlers[] = {
static const struct command_registration l2x_cache_command_handlers[] = {
{
.name = "cache_config",
.mode = COMMAND_EXEC,


+ 2
- 2
src/target/armv7a_cache.c View File

@@ -572,7 +572,7 @@ static const struct command_registration arm7a_l1_i_cache_commands[] = {
COMMAND_REGISTRATION_DONE
};

const struct command_registration arm7a_l1_di_cache_group_handlers[] = {
static const struct command_registration arm7a_l1_di_cache_group_handlers[] = {
{
.name = "info",
.handler = arm7a_l1_cache_info_cmd,
@@ -597,7 +597,7 @@ const struct command_registration arm7a_l1_di_cache_group_handlers[] = {
COMMAND_REGISTRATION_DONE
};

const struct command_registration arm7a_cache_group_handlers[] = {
static const struct command_registration arm7a_cache_group_handlers[] = {
{
.name = "auto",
.handler = arm7a_cache_disable_auto_cmd,


+ 1
- 1
src/target/armv8.c View File

@@ -1126,7 +1126,7 @@ int armv8_init_arch_info(struct target *target, struct armv8_common *armv8)
return ERROR_OK;
}

int armv8_aarch64_state(struct target *target)
static int armv8_aarch64_state(struct target *target)
{
struct arm *arm = target_to_arm(target);



+ 4
- 4
src/target/avr32_ap7k.c View File

@@ -63,7 +63,7 @@ static const struct avr32_core_reg
static int avr32_read_core_reg(struct target *target, int num);
static int avr32_write_core_reg(struct target *target, int num);

int avr32_ap7k_save_context(struct target *target)
static int avr32_ap7k_save_context(struct target *target)
{
int retval, i;
struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
@@ -80,7 +80,7 @@ int avr32_ap7k_save_context(struct target *target)
return ERROR_OK;
}

int avr32_ap7k_restore_context(struct target *target)
static int avr32_ap7k_restore_context(struct target *target)
{
int i;

@@ -555,7 +555,7 @@ static int avr32_ap7k_examine(struct target *target)
return ERROR_OK;
}

int avr32_ap7k_arch_state(struct target *target)
static int avr32_ap7k_arch_state(struct target *target)
{
struct avr32_ap7k_common *ap7k = target_to_ap7k(target);

@@ -565,7 +565,7 @@ int avr32_ap7k_arch_state(struct target *target)
return ERROR_OK;
}

int avr32_ap7k_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
static int avr32_ap7k_get_gdb_reg_list(struct target *target, struct reg **reg_list[],
int *reg_list_size, enum target_register_class reg_class)
{
#if 0


+ 6
- 6
src/target/avr32_jtag.c View File

@@ -55,7 +55,7 @@ static int avr32_jtag_set_instr(struct avr32_jtag *jtag_info, int new_instr)
return ERROR_OK;
}

int avr32_jtag_nexus_set_address(struct avr32_jtag *jtag_info,
static int avr32_jtag_nexus_set_address(struct avr32_jtag *jtag_info,
uint32_t addr, int mode)
{
struct scan_field fields[2];
@@ -92,7 +92,7 @@ int avr32_jtag_nexus_set_address(struct avr32_jtag *jtag_info,
}


int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info,
static int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info,
uint32_t *pdata)
{

@@ -129,7 +129,7 @@ int avr32_jtag_nexus_read_data(struct avr32_jtag *jtag_info,
return ERROR_OK;
}

int avr32_jtag_nexus_write_data(struct avr32_jtag *jtag_info,
static int avr32_jtag_nexus_write_data(struct avr32_jtag *jtag_info,
uint32_t data)
{

@@ -184,7 +184,7 @@ int avr32_jtag_nexus_write(struct avr32_jtag *jtag_info,
return avr32_jtag_nexus_write_data(jtag_info, value);
}

int avr32_jtag_mwa_set_address(struct avr32_jtag *jtag_info, int slave,
static int avr32_jtag_mwa_set_address(struct avr32_jtag *jtag_info, int slave,
uint32_t addr, int mode)
{
struct scan_field fields[2];
@@ -223,7 +223,7 @@ int avr32_jtag_mwa_set_address(struct avr32_jtag *jtag_info, int slave,
return ERROR_OK;
}

int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info,
static int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info,
uint32_t *pdata)
{

@@ -260,7 +260,7 @@ int avr32_jtag_mwa_read_data(struct avr32_jtag *jtag_info,
return ERROR_OK;
}

int avr32_jtag_mwa_write_data(struct avr32_jtag *jtag_info,
static int avr32_jtag_mwa_write_data(struct avr32_jtag *jtag_info,
uint32_t data)
{



+ 2
- 1
src/target/cortex_a.c View File

@@ -1115,7 +1115,8 @@ static int cortex_a_post_debug_entry(struct target *target)
return ERROR_OK;
}

int cortex_a_set_dscr_bits(struct target *target, unsigned long bit_mask, unsigned long value)
static int cortex_a_set_dscr_bits(struct target *target,
unsigned long bit_mask, unsigned long value)
{
struct armv7a_common *armv7a = target_to_armv7a(target);
uint32_t dscr;


+ 5
- 10
src/target/dsp5680xx.c View File

@@ -40,7 +40,7 @@ struct dsp5680xx_common dsp5680xx_context;
#define CHECK_HALT(target) if (target->state != TARGET_HALTED) HALT_FAIL
#define check_halt_and_debug(target) { CHECK_HALT(target); CHECK_DBG; }

int dsp5680xx_execute_queue(void)
static int dsp5680xx_execute_queue(void)
{
int retval;

@@ -892,12 +892,6 @@ static int dsp5680xx_arch_state(struct target *target)
return ERROR_OK;
}

int dsp5680xx_target_status(struct target *target, uint8_t *jtag_st,
uint16_t *eonce_st)
{
return target->state;
}

static int dsp5680xx_assert_reset(struct target *target)
{
target->state = TARGET_RESET;
@@ -1555,7 +1549,7 @@ static int perl_crc(const uint8_t *buff8, uint32_t word_count)
*
* @return
*/
int dsp5680xx_f_SIM_reset(struct target *target)
static int dsp5680xx_f_SIM_reset(struct target *target)
{
int retval = ERROR_OK;

@@ -1978,7 +1972,8 @@ int dsp5680xx_f_erase(struct target *target, int first, int last)
* 0x0000001E 0xA961 bra *-30
*/

const uint16_t pgm_write_pflash[] = { 0x8A46, 0x0013, 0x807D, 0xE700,
static const uint16_t pgm_write_pflash[] = {
0x8A46, 0x0013, 0x807D, 0xE700,
0xE700, 0x8A44, 0xFFFE, 0x017B,
0xE700, 0xF514, 0x8563, 0x8646,
0x0020, 0x0014, 0x8646, 0x0080,
@@ -1988,7 +1983,7 @@ const uint16_t pgm_write_pflash[] = { 0x8A46, 0x0013, 0x807D, 0xE700,
0x0013, 0x0010, 0xA961
};

const uint32_t pgm_write_pflash_length = 31;
static const uint32_t pgm_write_pflash_length = 31;

int dsp5680xx_f_wr(struct target *t, const uint8_t *b, uint32_t a, uint32_t count,
int is_flash_lock)


+ 2
- 2
src/target/mips32_pracc.c View File

@@ -120,7 +120,7 @@ static void mips32_pracc_finish(struct mips_ejtag *ejtag_info)
mips_ejtag_drscan_32_out(ejtag_info, ctrl);
}

int mips32_pracc_clean_text_jump(struct mips_ejtag *ejtag_info)
static int mips32_pracc_clean_text_jump(struct mips_ejtag *ejtag_info)
{
uint32_t jt_code = MIPS32_J(ejtag_info->isa, MIPS32_PRACC_TEXT);
pracc_swap16_array(ejtag_info, &jt_code, 1);
@@ -453,7 +453,7 @@ exit:
return retval;
}

int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
static int mips32_pracc_read_u32(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *buf)
{
struct pracc_queue_info ctx = {.ejtag_info = ejtag_info};
pracc_queue_init(&ctx);


+ 3
- 2
src/target/mips_ejtag.c View File

@@ -58,7 +58,7 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info)
return mips_ejtag_drscan_32(ejtag_info, &ejtag_info->idcode);
}

int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info)
static int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info)
{
mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE);

@@ -119,7 +119,8 @@ int mips_ejtag_drscan_64(struct mips_ejtag *ejtag_info, uint64_t *data)
return ERROR_OK;
}

void mips_ejtag_drscan_32_queued(struct mips_ejtag *ejtag_info, uint32_t data_out, uint8_t *data_in)
static void mips_ejtag_drscan_32_queued(struct mips_ejtag *ejtag_info,
uint32_t data_out, uint8_t *data_in)
{
assert(ejtag_info->tap != NULL);
struct jtag_tap *tap = ejtag_info->tap;


+ 1
- 1
src/target/nds32_tlb.c View File

@@ -31,7 +31,7 @@ int nds32_probe_tlb(struct nds32 *nds32, const target_addr_t virtual_address,
return aice_read_tlb(aice, virtual_address, physical_address);
}

struct page_table_walker_info_s page_table_info[PAGE_SIZE_NUM] = {
static struct page_table_walker_info_s page_table_info[PAGE_SIZE_NUM] = {
/* 4K page */
{0xFFC00000, 20, 0x003FF000, 10, 0x00000FFF, 0xFFFFF000, 0xFFFFF000, 0xFFFFF000},
/* 8K page */


+ 1
- 1
src/target/nds32_v3.c View File

@@ -404,7 +404,7 @@ static int nds32_v3_remove_watchpoint(struct target *target,
return ERROR_OK;
}

struct nds32_v3_common_callback nds32_v3_common_callback = {
static struct nds32_v3_common_callback nds32_v3_common_callback = {
.check_interrupt_stack = nds32_v3_check_interrupt_stack,
.restore_interrupt_stack = nds32_v3_restore_interrupt_stack,
.activate_hardware_breakpoint = nds32_v3_activate_hardware_breakpoint,


+ 1
- 1
src/target/nds32_v3m.c View File

@@ -379,7 +379,7 @@ static int nds32_v3m_remove_watchpoint(struct target *target,
return ERROR_OK;
}

struct nds32_v3_common_callback nds32_v3m_common_callback = {
static struct nds32_v3_common_callback nds32_v3m_common_callback = {
.check_interrupt_stack = nds32_v3m_check_interrupt_stack,
.restore_interrupt_stack = nds32_v3m_restore_interrupt_stack,
.activate_hardware_breakpoint = nds32_v3m_activate_hardware_breakpoint,


+ 1
- 1
src/target/openrisc/jsp_server.c View File

@@ -57,7 +57,7 @@ static int telnet_write(struct connection *connection, const void *data, int len
return ERROR_SERVER_REMOTE_CLOSED;
}

int jsp_poll_read(void *priv)
static int jsp_poll_read(void *priv)
{
struct jsp_service *jsp_service = (struct jsp_service *)priv;
unsigned char out_buffer[10];


+ 1
- 1
src/target/openrisc/or1k.c View File

@@ -1200,7 +1200,7 @@ static int or1k_get_gdb_reg_list(struct target *target, struct reg **reg_list[],

}

int or1k_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fileio_info)
static int or1k_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fileio_info)
{
return ERROR_FAIL;
}


+ 2
- 2
src/target/quark_d20xx.c View File

@@ -43,7 +43,7 @@
#include "lakemont.h"
#include "x86_32_common.h"

int quark_d20xx_target_create(struct target *t, Jim_Interp *interp)
static int quark_d20xx_target_create(struct target *t, Jim_Interp *interp)
{
struct x86_32_common *x86_32 = calloc(1, sizeof(struct x86_32_common));
if (x86_32 == NULL) {
@@ -56,7 +56,7 @@ int quark_d20xx_target_create(struct target *t, Jim_Interp *interp)
return ERROR_OK;
}

int quark_d20xx_init_target(struct command_context *cmd_ctx, struct target *t)
static int quark_d20xx_init_target(struct command_context *cmd_ctx, struct target *t)
{
return lakemont_init_target(cmd_ctx, t);
}


+ 1
- 1
src/target/stm8.c View File

@@ -1945,7 +1945,7 @@ static int stm8_run_algorithm(struct target *target, int num_mem_params,
return ERROR_OK;
}

int stm8_jim_configure(struct target *target, Jim_GetOptInfo *goi)
static int stm8_jim_configure(struct target *target, Jim_GetOptInfo *goi)
{
struct stm8_common *stm8 = target_to_stm8(target);
jim_wide w;


+ 3
- 3
src/target/target.c View File

@@ -154,8 +154,8 @@ static struct target_type *target_types[] = {
struct target *all_targets;
static struct target_event_callback *target_event_callbacks;
static struct target_timer_callback *target_timer_callbacks;
LIST_HEAD(target_reset_callback_list);
LIST_HEAD(target_trace_callback_list);
static LIST_HEAD(target_reset_callback_list);
static LIST_HEAD(target_trace_callback_list);
static const int polling_interval = 100;

static const Jim_Nvp nvp_assert[] = {
@@ -1319,7 +1319,7 @@ unsigned target_address_bits(struct target *target)
return 32;
}

int target_profiling(struct target *target, uint32_t *samples,
static int target_profiling(struct target *target, uint32_t *samples,
uint32_t max_num_samples, uint32_t *num_samples, uint32_t seconds)
{
return target->type->profiling(target, samples, max_num_samples,


Loading…
Cancel
Save