From 1de959ca1c9e67ef57f77ec2d7a1132b73153abb Mon Sep 17 00:00:00 2001 From: zwelch Date: Wed, 29 Apr 2009 01:43:01 +0000 Subject: [PATCH] Remove redundant declarations to allow building with -Wredundant-decls. git-svn-id: svn://svn.berlios.de/openocd/trunk@1560 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/stellaris.c | 1 - src/helper/fileio.c | 1 - src/helper/jim.c | 2 +- src/helper/replacements.c | 1 + src/helper/replacements.h | 2 ++ src/helper/time_support.c | 3 --- src/jtag/jtag.h | 1 - src/server/tcl_server.c | 1 - src/target/arm7_9_common.h | 1 - src/target/arm7tdmi.c | 4 ---- src/target/arm926ejs.c | 6 +----- src/target/arm9tdmi.c | 2 -- src/target/armv4_5.h | 1 - src/target/armv4_5_mmu.c | 2 -- src/target/armv7m.h | 1 - src/target/embeddedice.c | 5 ----- src/target/etb.c | 5 ----- src/target/etm.c | 6 ------ 18 files changed, 5 insertions(+), 40 deletions(-) diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c index b13f894a2..61e30f5dc 100644 --- a/src/flash/stellaris.c +++ b/src/flash/stellaris.c @@ -59,7 +59,6 @@ static u32 stellaris_get_flash_status(flash_bank_t *bank); static void stellaris_set_flash_mode(flash_bank_t *bank,int mode); //static u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout); -static int stellaris_read_part_info(struct flash_bank_s *bank); static int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int stellaris_mass_erase(struct flash_bank_s *bank); diff --git a/src/helper/fileio.c b/src/helper/fileio.c index 84e1f846e..d4cd75cdd 100644 --- a/src/helper/fileio.c +++ b/src/helper/fileio.c @@ -43,7 +43,6 @@ #include #include -int fileio_close(fileio_t *fileio); int fileio_dispatch_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read); int fileio_open_local(fileio_t *fileio) diff --git a/src/helper/jim.c b/src/helper/jim.c index bcea7c53f..7f21b4304 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -11979,7 +11979,7 @@ static int Jim_EnvCoreCommand(Jim_Interp *interp, int argc, if (argc == 1) { -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__USE_GNU) extern char **environ; #endif diff --git a/src/helper/replacements.c b/src/helper/replacements.c index 9f1312ca9..cc0c242ae 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -64,6 +64,7 @@ void *fill_malloc(size_t size) return t; } +#define IN_REPLACEMENTS_C #include "replacements.h" #include diff --git a/src/helper/replacements.h b/src/helper/replacements.h index 8e1e51d06..18c96701d 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -103,9 +103,11 @@ struct timezone; extern int gettimeofday(struct timeval *tv, struct timezone *tz); #endif +#ifndef IN_REPLACEMENTS_C /**** clear_malloc & fill_malloc ****/ void *clear_malloc(size_t size); void *fill_malloc(size_t size); +#endif /* * Now you have 3 ways for the malloc function: diff --git a/src/helper/time_support.c b/src/helper/time_support.c index 6968ab7d2..bc52e9ca5 100644 --- a/src/helper/time_support.c +++ b/src/helper/time_support.c @@ -33,9 +33,6 @@ #include -int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y); -int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y); -int timeval_add_time(struct timeval *result, int sec, int usec); /* calculate difference between two struct timeval values */ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 8f0f477c2..5dfbbdce4 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -395,7 +395,6 @@ struct jtag_tap_s }; extern jtag_tap_t* jtag_AllTaps(void); extern jtag_tap_t* jtag_TapByPosition(int n); -extern jtag_tap_t* jtag_TapByPosition(int n); extern jtag_tap_t* jtag_TapByString(const char* dotted_name); extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj); extern jtag_tap_t* jtag_TapByAbsPosition(int abs_position); diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c index edc209bc4..070f93361 100644 --- a/src/server/tcl_server.c +++ b/src/server/tcl_server.c @@ -43,7 +43,6 @@ typedef struct tcl_connection_s { int tc_outerror; /* flag an output error */ } tcl_connection_t; -extern Jim_Interp *interp; static unsigned short tcl_port = 0; /* commands */ diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index de2aef86e..9b497edce 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -127,7 +127,6 @@ int arm7_9_soft_reset_halt(struct target_s *target); int arm7_9_prepare_reset_halt(struct target_s *target); int arm7_9_halt(target_t *target); -int arm7_9_debug_entry(target_t *target); int arm7_9_full_context(target_t *target); int arm7_9_restore_context(target_t *target); int arm7_9_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution); diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 0c408a7a0..1a448fc33 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -43,13 +43,9 @@ #define _DEBUG_INSTRUCTION_EXECUTION_ #endif -/* cli handling */ -int arm7tdmi_register_commands(struct command_context_s *cmd_ctx); - /* forward declarations */ int arm7tdmi_target_create(struct target_s *target,Jim_Interp *interp); -int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target); int arm7tdmi_quit(void); /* target function declarations */ diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index ba156d485..a6ef5e10c 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -34,8 +34,6 @@ #endif /* cli handling */ -int arm926ejs_register_commands(struct command_context_s *cmd_ctx); - int arm926ejs_handle_cp15_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int arm926ejs_handle_cp15i_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int arm926ejs_handle_virt2phys_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -50,10 +48,8 @@ int arm926ejs_handle_read_mmu_command(struct command_context_s *cmd_ctx, char *c int arm926ejs_target_create(struct target_s *target, Jim_Interp *interp); int arm926ejs_init_target(struct command_context_s *cmd_ctx, struct target_s *target); int arm926ejs_quit(void); -int arm926ejs_arch_state(struct target_s *target); int arm926ejs_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer); -int arm926ejs_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer); -int arm926ejs_soft_reset_halt(struct target_s *target); + static int arm926ejs_virt2phys(struct target_s *target, u32 virtual, u32 *physical); static int arm926ejs_mmu(struct target_s *target, int *enabled); diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 15ce8dcb1..1aab2864f 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -48,13 +48,11 @@ #endif /* cli handling */ -int arm9tdmi_register_commands(struct command_context_s *cmd_ctx); int handle_arm9tdmi_catch_vectors_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); /* forward declarations */ int arm9tdmi_target_create( struct target_s *target, Jim_Interp *interp ); -int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target); int arm9tdmi_quit(void); target_type_t arm9tdmi_target = diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h index b007b51a2..59f4af999 100644 --- a/src/target/armv4_5.h +++ b/src/target/armv4_5.h @@ -139,7 +139,6 @@ static __inline enum armv4_5_mode armv4_5_number_to_mode(int number) extern int armv4_5_arch_state(struct target_s *target); extern int armv4_5_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size); -extern int armv4_5_invalidate_core_regs(target_t *target); extern int armv4_5_register_commands(struct command_context_s *cmd_ctx); extern int armv4_5_init_arch_info(target_t *target, armv4_5_common_t *armv4_5); diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c index 1d84847e8..869aabefb 100644 --- a/src/target/armv4_5_mmu.c +++ b/src/target/armv4_5_mmu.c @@ -30,8 +30,6 @@ #include u32 armv4mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 va, int *type, u32 *cb, int *domain, u32 *ap); -int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 address, u32 size, u32 count, u8 *buffer); -int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, u32 address, u32 size, u32 count, u8 *buffer); char* armv4_5_mmu_page_type_names[] = { diff --git a/src/target/armv7m.h b/src/target/armv7m.h index 909330bde..35afe11f7 100644 --- a/src/target/armv7m.h +++ b/src/target/armv7m.h @@ -121,7 +121,6 @@ extern int armv7m_mode_to_number(enum armv7m_mode mode); extern int armv7m_arch_state(struct target_s *target); extern int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size); -extern int armv7m_invalidate_core_regs(target_t *target); extern int armv7m_register_commands(struct command_context_s *cmd_ctx); extern int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m); diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index 6a1cf0543..15beb9f44 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -86,11 +86,6 @@ char* embeddedice_reg_list[] = int embeddedice_reg_arch_type = -1; int embeddedice_get_reg(reg_t *reg); -void embeddedice_set_reg(reg_t *reg, u32 value); -int embeddedice_set_reg_w_exec(reg_t *reg, u8 *buf); - -void embeddedice_write_reg(reg_t *reg, u32 value); -int embeddedice_read_reg(reg_t *reg); reg_cache_t* embeddedice_build_reg_cache(target_t *target, arm7_9_common_t *arm7_9) { diff --git a/src/target/etb.c b/src/target/etb.c index 709bb0080..9f5e78a1f 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -52,11 +52,6 @@ char* etb_reg_list[] = int etb_reg_arch_type = -1; int etb_get_reg(reg_t *reg); -int etb_set_reg(reg_t *reg, u32 value); -int etb_set_reg_w_exec(reg_t *reg, u8 *buf); - -int etb_write_reg(reg_t *reg, u32 value); -int etb_read_reg(reg_t *reg); int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); diff --git a/src/target/etm.c b/src/target/etm.c index 06b97fe39..f95907099 100644 --- a/src/target/etm.c +++ b/src/target/etm.c @@ -208,11 +208,6 @@ char* etm_reg_list[] = int etm_reg_arch_type = -1; int etm_get_reg(reg_t *reg); -int etm_set_reg(reg_t *reg, u32 value); -int etm_set_reg_w_exec(reg_t *reg, u8 *buf); - -int etm_write_reg(reg_t *reg, u32 value); -int etm_read_reg(reg_t *reg); command_t *etm_cmd = NULL; @@ -480,7 +475,6 @@ int etm_store_reg(reg_t *reg) /* ETM trace analysis functionality * */ -extern etm_capture_driver_t etb_capture_driver; extern etm_capture_driver_t etm_dummy_capture_driver; #if BUILD_OOCD_TRACE == 1 extern etm_capture_driver_t oocd_trace_capture_driver;