Menu
▾
▴
[Openocd-svn] r1560 - in trunk/src: flash helper jtag server target
|
From: <zw...@ma...> - 2009-04-29 03:43:39
|
Author: zwelch
Date: 2009-04-29 03:43:01 +0200 (Wed, 29 Apr 2009)
New Revision: 1560
Modified:
trunk/src/flash/stellaris.c
trunk/src/helper/fileio.c
trunk/src/helper/jim.c
trunk/src/helper/replacements.c
trunk/src/helper/replacements.h
trunk/src/helper/time_support.c
trunk/src/jtag/jtag.h
trunk/src/server/tcl_server.c
trunk/src/target/arm7_9_common.h
trunk/src/target/arm7tdmi.c
trunk/src/target/arm926ejs.c
trunk/src/target/arm9tdmi.c
trunk/src/target/armv4_5.h
trunk/src/target/armv4_5_mmu.c
trunk/src/target/armv7m.h
trunk/src/target/embeddedice.c
trunk/src/target/etb.c
trunk/src/target/etm.c
Log:
Remove redundant declarations to allow building with -Wredundant-decls.
Modified: trunk/src/flash/stellaris.c
===================================================================
--- trunk/src/flash/stellaris.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/flash/stellaris.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -59,7 +59,6 @@
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);
Modified: trunk/src/helper/fileio.c
===================================================================
--- trunk/src/helper/fileio.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/helper/fileio.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -43,7 +43,6 @@
#include <errno.h>
#include <ctype.h>
-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)
Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/helper/jim.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -11979,7 +11979,7 @@
if (argc == 1) {
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__USE_GNU)
extern char **environ;
#endif
Modified: trunk/src/helper/replacements.c
===================================================================
--- trunk/src/helper/replacements.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/helper/replacements.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -64,6 +64,7 @@
return t;
}
+#define IN_REPLACEMENTS_C
#include "replacements.h"
#include <stdio.h>
Modified: trunk/src/helper/replacements.h
===================================================================
--- trunk/src/helper/replacements.h 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/helper/replacements.h 2009-04-29 01:43:01 UTC (rev 1560)
@@ -103,9 +103,11 @@
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:
Modified: trunk/src/helper/time_support.c
===================================================================
--- trunk/src/helper/time_support.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/helper/time_support.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -33,9 +33,6 @@
#include <stdlib.h>
-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)
Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/jtag/jtag.h 2009-04-29 01:43:01 UTC (rev 1560)
@@ -395,7 +395,6 @@
};
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);
Modified: trunk/src/server/tcl_server.c
===================================================================
--- trunk/src/server/tcl_server.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/server/tcl_server.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -43,7 +43,6 @@
int tc_outerror; /* flag an output error */
} tcl_connection_t;
-extern Jim_Interp *interp;
static unsigned short tcl_port = 0;
/* commands */
Modified: trunk/src/target/arm7_9_common.h
===================================================================
--- trunk/src/target/arm7_9_common.h 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/arm7_9_common.h 2009-04-29 01:43:01 UTC (rev 1560)
@@ -127,7 +127,6 @@
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);
Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/arm7tdmi.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -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 */
Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/arm926ejs.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -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_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);
Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/arm9tdmi.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -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 =
Modified: trunk/src/target/armv4_5.h
===================================================================
--- trunk/src/target/armv4_5.h 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/armv4_5.h 2009-04-29 01:43:01 UTC (rev 1560)
@@ -139,7 +139,6 @@
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);
Modified: trunk/src/target/armv4_5_mmu.c
===================================================================
--- trunk/src/target/armv4_5_mmu.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/armv4_5_mmu.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -30,8 +30,6 @@
#include <stdlib.h>
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[] =
{
Modified: trunk/src/target/armv7m.h
===================================================================
--- trunk/src/target/armv7m.h 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/armv7m.h 2009-04-29 01:43:01 UTC (rev 1560)
@@ -121,7 +121,6 @@
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);
Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/embeddedice.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -86,12 +86,7 @@
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)
{
int retval;
Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/etb.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -52,12 +52,7 @@
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);
int etb_set_instr(etb_t *etb, u32 new_instr)
Modified: trunk/src/target/etm.c
===================================================================
--- trunk/src/target/etm.c 2009-04-29 00:33:35 UTC (rev 1559)
+++ trunk/src/target/etm.c 2009-04-29 01:43:01 UTC (rev 1560)
@@ -208,12 +208,7 @@
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;
reg_cache_t* etm_build_reg_cache(target_t *target, arm_jtag_t *jtag_info, etm_context_t *etm_ctx)
@@ -480,7 +475,6 @@
/* 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;
|
