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

TARGET: review scope of functions 

Add "static" qualifier to private functions.
Remove unused "extern" in src/ecosboard.c

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
__archive__
Antonio Borneo 2010-04-10 00:22:46 +08:00
parent 81fab96c0d
commit 321aa6aa8f
3 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ecosboard.c
View File

@ -101,7 +101,6 @@ char hwaddr[512];
extern struct flash_driver *flash_drivers[]; extern struct flash_driver *flash_drivers[];
extern struct target_type *target_types[];
#ifdef CYGPKG_PROFILE_GPROF #ifdef CYGPKG_PROFILE_GPROF
#include <cyg/profile/profile.h> #include <cyg/profile/profile.h>

29
src/target/target.c
View File

@ -50,6 +50,7 @@ static int target_array2mem(Jim_Interp *interp, struct target *target,
int argc, Jim_Obj *const *argv); int argc, Jim_Obj *const *argv);
static int target_mem2array(Jim_Interp *interp, struct target *target, static int target_mem2array(Jim_Interp *interp, struct target *target,
int argc, Jim_Obj *const *argv); int argc, Jim_Obj *const *argv);
static int target_register_user_commands(struct command_context *cmd_ctx);
/* targets */ /* targets */
extern struct target_type arm7tdmi_target; extern struct target_type arm7tdmi_target;
@ -70,7 +71,7 @@ extern struct target_type avr_target;
extern struct target_type dsp563xx_target; extern struct target_type dsp563xx_target;
extern struct target_type testee_target; extern struct target_type testee_target;
struct target_type *target_types[] = static struct target_type *target_types[] =
{ {
&arm7tdmi_target, &arm7tdmi_target,
&arm9tdmi_target, &arm9tdmi_target,
@ -93,8 +94,8 @@ struct target_type *target_types[] =
}; };
struct target *all_targets = NULL; struct target *all_targets = NULL;
struct target_event_callback *target_event_callbacks = NULL; static struct target_event_callback *target_event_callbacks = NULL;
struct target_timer_callback *target_timer_callbacks = NULL; static struct target_timer_callback *target_timer_callbacks = NULL;
static const Jim_Nvp nvp_assert[] = { static const Jim_Nvp nvp_assert[] = {
{ .name = "assert", NVP_ASSERT }, { .name = "assert", NVP_ASSERT },
@ -121,7 +122,7 @@ static const Jim_Nvp nvp_error_target[] = {
{ .value = -1, .name = NULL } { .value = -1, .name = NULL }
}; };
const char *target_strerror_safe(int err) static const char *target_strerror_safe(int err)
{ {
const Jim_Nvp *n; const Jim_Nvp *n;
@ -282,7 +283,7 @@ uint16_t target_buffer_get_u16(struct target *target, const uint8_t *buffer)
} }
/* read a uint8_t from a buffer in target memory endianness */ /* read a uint8_t from a buffer in target memory endianness */
uint8_t target_buffer_get_u8(struct target *target, const uint8_t *buffer) static uint8_t target_buffer_get_u8(struct target *target, const uint8_t *buffer)
{ {
return *buffer & 0x0ff; return *buffer & 0x0ff;
} }
@ -306,7 +307,7 @@ void target_buffer_set_u16(struct target *target, uint8_t *buffer, uint16_t valu
} }
/* write a uint8_t to a buffer in target memory endianness */ /* write a uint8_t to a buffer in target memory endianness */
void target_buffer_set_u8(struct target *target, uint8_t *buffer, uint8_t value) static void target_buffer_set_u8(struct target *target, uint8_t *buffer, uint8_t value)
{ {
*buffer = value; *buffer = value;
} }
@ -489,7 +490,7 @@ int target_resume(struct target *target, int current, uint32_t address, int hand
return retval; return retval;
} }
int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode reset_mode) static int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode reset_mode)
{ {
char buf[100]; char buf[100];
int retval; int retval;
@ -682,7 +683,7 @@ int target_read_memory(struct target *target,
return target->type->read_memory(target, address, size, count, buffer); return target->type->read_memory(target, address, size, count, buffer);
} }
int target_read_phys_memory(struct target *target, static int target_read_phys_memory(struct target *target,
uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
{ {
return target->type->read_phys_memory(target, address, size, count, buffer); return target->type->read_phys_memory(target, address, size, count, buffer);
@ -694,7 +695,7 @@ int target_write_memory(struct target *target,
return target->type->write_memory(target, address, size, count, buffer); return target->type->write_memory(target, address, size, count, buffer);
} }
int target_write_phys_memory(struct target *target, static int target_write_phys_memory(struct target *target,
uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
{ {
return target->type->write_phys_memory(target, address, size, count, buffer); return target->type->write_phys_memory(target, address, size, count, buffer);
@ -854,7 +855,7 @@ static int target_init_one(struct command_context *cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
int target_init(struct command_context *cmd_ctx) static int target_init(struct command_context *cmd_ctx)
{ {
struct target *target; struct target *target;
int retval; int retval;
@ -987,7 +988,7 @@ int target_unregister_event_callback(int (*callback)(struct target *target, enum
return ERROR_OK; return ERROR_OK;
} }
int target_unregister_timer_callback(int (*callback)(void *priv), void *priv) static int target_unregister_timer_callback(int (*callback)(void *priv), void *priv)
{ {
struct target_timer_callback **p = &target_timer_callbacks; struct target_timer_callback **p = &target_timer_callbacks;
struct target_timer_callback *c = target_timer_callbacks; struct target_timer_callback *c = target_timer_callbacks;
@ -1230,7 +1231,7 @@ int target_alloc_working_area(struct target *target, uint32_t size, struct worki
return ERROR_OK; return ERROR_OK;
} }
int target_free_working_area_restore(struct target *target, struct working_area *area, int restore) static int target_free_working_area_restore(struct target *target, struct working_area *area, int restore)
{ {
if (area->free) if (area->free)
return ERROR_OK; return ERROR_OK;
@ -1259,7 +1260,7 @@ int target_free_working_area(struct target *target, struct working_area *area)
/* free resources and restore memory, if restoring memory fails, /* free resources and restore memory, if restoring memory fails,
* free up resources anyway * free up resources anyway
*/ */
void target_free_all_working_areas_restore(struct target *target, int restore) static void target_free_all_working_areas_restore(struct target *target, int restore)
{ {
struct working_area *c = target->working_areas; struct working_area *c = target->working_areas;
@ -5262,7 +5263,7 @@ static const struct command_registration target_exec_command_handlers[] = {
}, },
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
int target_register_user_commands(struct command_context *cmd_ctx) static int target_register_user_commands(struct command_context *cmd_ctx)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK) if ((retval = target_request_register_commands(cmd_ctx)) != ERROR_OK)

15
src/target/target.h
View File

@ -247,11 +247,7 @@ struct target_timer_callback
}; };
int target_register_commands(struct command_context *cmd_ctx); int target_register_commands(struct command_context *cmd_ctx);
int target_register_user_commands(struct command_context *cmd_ctx);
int target_init(struct command_context *cmd_ctx);
int target_examine(void); int target_examine(void);
int target_process_reset(struct command_context *cmd_ctx,
enum target_reset_mode reset_mode);
int target_register_event_callback( int target_register_event_callback(
int (*callback)(struct target *target, int (*callback)(struct target *target,
@ -273,7 +269,6 @@ int target_call_event_callbacks(struct target *target, enum target_event event);
*/ */
int target_register_timer_callback(int (*callback)(void *priv), int target_register_timer_callback(int (*callback)(void *priv),
int time_ms, int periodic, void *priv); int time_ms, int periodic, void *priv);
int target_unregister_timer_callback(int (*callback)(void *priv), void *priv);
int target_call_timer_callbacks(void); int target_call_timer_callbacks(void);
/** /**
@ -458,22 +453,14 @@ const char *target_state_name( struct target *target );
int target_alloc_working_area(struct target *target, int target_alloc_working_area(struct target *target,
uint32_t size, struct working_area **area); uint32_t size, struct working_area **area);
int target_free_working_area(struct target *target, struct working_area *area); int target_free_working_area(struct target *target, struct working_area *area);
int target_free_working_area_restore(struct target *target,
struct working_area *area, int restore);
void target_free_all_working_areas(struct target *target); void target_free_all_working_areas(struct target *target);
void target_free_all_working_areas_restore(struct target *target, int restore);
extern struct target *all_targets; extern struct target *all_targets;
extern struct target_event_callback *target_event_callbacks;
extern struct target_timer_callback *target_timer_callbacks;
uint32_t target_buffer_get_u32(struct target *target, const uint8_t *buffer); uint32_t target_buffer_get_u32(struct target *target, const uint8_t *buffer);
uint16_t target_buffer_get_u16(struct target *target, const uint8_t *buffer); uint16_t target_buffer_get_u16(struct target *target, const uint8_t *buffer);
uint8_t target_buffer_get_u8 (struct target *target, const uint8_t *buffer);
void target_buffer_set_u32(struct target *target, uint8_t *buffer, uint32_t value); void target_buffer_set_u32(struct target *target, uint8_t *buffer, uint32_t value);
void target_buffer_set_u16(struct target *target, uint8_t *buffer, uint16_t value); void target_buffer_set_u16(struct target *target, uint8_t *buffer, uint16_t value);
void target_buffer_set_u8 (struct target *target, uint8_t *buffer, uint8_t value);
int target_read_u32(struct target *target, uint32_t address, uint32_t *value); int target_read_u32(struct target *target, uint32_t address, uint32_t *value);
int target_read_u16(struct target *target, uint32_t address, uint16_t *value); int target_read_u16(struct target *target, uint32_t address, uint16_t *value);
@ -500,8 +487,6 @@ void target_all_handle_event(enum target_event e);
#define ERROR_TARGET_NOT_RUNNING (-310) #define ERROR_TARGET_NOT_RUNNING (-310)
#define ERROR_TARGET_NOT_EXAMINED (-311) #define ERROR_TARGET_NOT_EXAMINED (-311)
const char *target_strerror_safe(int err);
extern bool get_target_reset_nag(void); extern bool get_target_reset_nag(void);
#endif /* TARGET_H */ #endif /* TARGET_H */