From 6cd97f48d032e3ead3ee94c56699e162f7032ddd Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Mon, 9 Nov 2009 09:20:34 -0800 Subject: [PATCH] str{7,9}x*.c: remove useless forward declarations Remove useless forward declarations. Moves command registrations to end of files. Moves flash structure definitions to end of files. Signed-off-by: Zachary T Welch --- src/flash/str7x.c | 63 +++++++++------------- src/flash/str9x.c | 63 +++++++++------------- src/flash/str9xpec.c | 123 ++++++++++++++++++++----------------------- 3 files changed, 108 insertions(+), 141 deletions(-) diff --git a/src/flash/str7x.c b/src/flash/str7x.c index 650c0bc3b8..ed107f313c 100644 --- a/src/flash/str7x.c +++ b/src/flash/str7x.c @@ -45,43 +45,6 @@ str7x_mem_layout_t mem_layout_str7bank1[] = { {0x00002000, 0x02000, 0x20000} }; -static int str7x_register_commands(struct command_context_s *cmd_ctx); -static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int str7x_erase(struct flash_bank_s *bank, int first, int last); -static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count); -static int str7x_probe(struct flash_bank_s *bank); -//static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str7x_protect_check(struct flash_bank_s *bank); -static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size); - -static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -flash_driver_t str7x_flash = -{ - .name = "str7x", - .register_commands = str7x_register_commands, - .flash_bank_command = str7x_flash_bank_command, - .erase = str7x_erase, - .protect = str7x_protect, - .write = str7x_write, - .probe = str7x_probe, - .auto_probe = str7x_probe, - .erase_check = default_flash_blank_check, - .protect_check = str7x_protect_check, - .info = str7x_info -}; - -static int str7x_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *str7x_cmd = register_command(cmd_ctx, NULL, "str7x", NULL, COMMAND_ANY, NULL); - - register_command(cmd_ctx, str7x_cmd, "disable_jtag", str7x_handle_disable_jtag_command, COMMAND_EXEC, - "disable jtag access"); - - return ERROR_OK; -} - static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg) { str7x_flash_bank_t *str7x_info = bank->driver_priv; @@ -707,3 +670,29 @@ static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, return ERROR_OK; } + +static int str7x_register_commands(struct command_context_s *cmd_ctx) +{ + command_t *str7x_cmd = register_command(cmd_ctx, NULL, "str7x", + NULL, COMMAND_ANY, "str7x flash specific commands"); + + register_command(cmd_ctx, str7x_cmd, "disable_jtag", + str7x_handle_disable_jtag_command, COMMAND_EXEC, + "disable jtag access"); + + return ERROR_OK; +} + +flash_driver_t str7x_flash = { + .name = "str7x", + .register_commands = &str7x_register_commands, + .flash_bank_command = &str7x_flash_bank_command, + .erase = &str7x_erase, + .protect = &str7x_protect, + .write = &str7x_write, + .probe = &str7x_probe, + .auto_probe = &str7x_probe, + .erase_check = &default_flash_blank_check, + .protect_check = &str7x_protect_check, + .info = &str7x_info, + }; diff --git a/src/flash/str9x.c b/src/flash/str9x.c index fe6c086890..893baf531d 100644 --- a/src/flash/str9x.c +++ b/src/flash/str9x.c @@ -33,43 +33,6 @@ static uint32_t bank1start = 0x00080000; -static int str9x_register_commands(struct command_context_s *cmd_ctx); -static int str9x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int str9x_erase(struct flash_bank_s *bank, int first, int last); -static int str9x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str9x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count); -static int str9x_probe(struct flash_bank_s *bank); -//static int str9x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9x_protect_check(struct flash_bank_s *bank); -static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size); - -static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -flash_driver_t str9x_flash = -{ - .name = "str9x", - .register_commands = str9x_register_commands, - .flash_bank_command = str9x_flash_bank_command, - .erase = str9x_erase, - .protect = str9x_protect, - .write = str9x_write, - .probe = str9x_probe, - .auto_probe = str9x_probe, - .erase_check = default_flash_blank_check, - .protect_check = str9x_protect_check, - .info = str9x_info -}; - -static int str9x_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *str9x_cmd = register_command(cmd_ctx, NULL, "str9x", NULL, COMMAND_ANY, NULL); - - register_command(cmd_ctx, str9x_cmd, "flash_config", str9x_handle_flash_config_command, COMMAND_EXEC, - "configure str9 flash controller"); - - return ERROR_OK; -} - static int str9x_build_block_list(struct flash_bank_s *bank) { str9x_flash_bank_t *str9x_info = bank->driver_priv; @@ -714,3 +677,29 @@ static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, target_write_u32(target, FLASH_CR, 0x18); return ERROR_OK; } + +static int str9x_register_commands(struct command_context_s *cmd_ctx) +{ + command_t *str9x_cmd = register_command(cmd_ctx, NULL, "str9x", + NULL, COMMAND_ANY, "str9x flash commands"); + + register_command(cmd_ctx, str9x_cmd, "flash_config", + str9x_handle_flash_config_command, COMMAND_EXEC, + "configure str9 flash controller"); + + return ERROR_OK; +} + +flash_driver_t str9x_flash = { + .name = "str9x", + .register_commands = &str9x_register_commands, + .flash_bank_command = &str9x_flash_bank_command, + .erase = &str9x_erase, + .protect = &str9x_protect, + .write = &str9x_write, + .probe = &str9x_probe, + .auto_probe = &str9x_probe, + .erase_check = &default_flash_blank_check, + .protect_check = &str9x_protect_check, + .info = &str9x_info, + }; diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index 711ee7ae77..73b9a1d4a5 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -28,77 +28,10 @@ #include "arm7_9_common.h" -static int str9xpec_register_commands(struct command_context_s *cmd_ctx); -static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int str9xpec_erase(struct flash_bank_s *bank, int first, int last); -static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count); -static int str9xpec_probe(struct flash_bank_s *bank); -static int str9xpec_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_protect_check(struct flash_bank_s *bank); -static int str9xpec_erase_check(struct flash_bank_s *bank); -static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size); - static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last); static int str9xpec_set_address(struct flash_bank_s *bank, uint8_t sector); static int str9xpec_write_options(struct flash_bank_s *bank); -static int str9xpec_handle_flash_options_cmap_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_options_lvdthd_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_options_lvdsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_options_lvdwarn_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_enable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -flash_driver_t str9xpec_flash = -{ - .name = "str9xpec", - .register_commands = str9xpec_register_commands, - .flash_bank_command = str9xpec_flash_bank_command, - .erase = str9xpec_erase, - .protect = str9xpec_protect, - .write = str9xpec_write, - .probe = str9xpec_probe, - .auto_probe = str9xpec_probe, - .erase_check = str9xpec_erase_check, - .protect_check = str9xpec_protect_check, - .info = str9xpec_info -}; - -static int str9xpec_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec", NULL, COMMAND_ANY, "str9xpec flash specific commands"); - - register_command(cmd_ctx, str9xpec_cmd, "enable_turbo", str9xpec_handle_flash_enable_turbo_command, COMMAND_EXEC, - "enable str9xpec turbo mode"); - register_command(cmd_ctx, str9xpec_cmd, "disable_turbo", str9xpec_handle_flash_disable_turbo_command, COMMAND_EXEC, - "disable str9xpec turbo mode"); - register_command(cmd_ctx, str9xpec_cmd, "options_cmap", str9xpec_handle_flash_options_cmap_command, COMMAND_EXEC, - "configure str9xpec boot sector"); - register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd", str9xpec_handle_flash_options_lvdthd_command, COMMAND_EXEC, - "configure str9xpec lvd threshold"); - register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel", str9xpec_handle_flash_options_lvdsel_command, COMMAND_EXEC, - "configure str9xpec lvd selection"); - register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn", str9xpec_handle_flash_options_lvdwarn_command, COMMAND_EXEC, - "configure str9xpec lvd warning"); - register_command(cmd_ctx, str9xpec_cmd, "options_read", str9xpec_handle_flash_options_read_command, COMMAND_EXEC, - "read str9xpec options"); - register_command(cmd_ctx, str9xpec_cmd, "options_write", str9xpec_handle_flash_options_write_command, COMMAND_EXEC, - "write str9xpec options"); - register_command(cmd_ctx, str9xpec_cmd, "lock", str9xpec_handle_flash_lock_command, COMMAND_EXEC, - "lock str9xpec device"); - register_command(cmd_ctx, str9xpec_cmd, "unlock", str9xpec_handle_flash_unlock_command, COMMAND_EXEC, - "unlock str9xpec device"); - register_command(cmd_ctx, str9xpec_cmd, "part_id", str9xpec_handle_part_id_command, COMMAND_EXEC, - "print part id of str9xpec flash bank "); - - return ERROR_OK; -} - int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state) { if (tap == NULL) { @@ -1229,3 +1162,59 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s return ERROR_OK; } + +static int str9xpec_register_commands(struct command_context_s *cmd_ctx) +{ + command_t *str9xpec_cmd = register_command(cmd_ctx, NULL, "str9xpec", + NULL, COMMAND_ANY, "str9xpec flash specific commands"); + + register_command(cmd_ctx, str9xpec_cmd, "enable_turbo", + str9xpec_handle_flash_enable_turbo_command, + COMMAND_EXEC, "enable str9xpec turbo mode"); + register_command(cmd_ctx, str9xpec_cmd, "disable_turbo", + str9xpec_handle_flash_disable_turbo_command, + COMMAND_EXEC, "disable str9xpec turbo mode"); + register_command(cmd_ctx, str9xpec_cmd, "options_cmap", + str9xpec_handle_flash_options_cmap_command, + COMMAND_EXEC, "configure str9xpec boot sector"); + register_command(cmd_ctx, str9xpec_cmd, "options_lvdthd", + str9xpec_handle_flash_options_lvdthd_command, + COMMAND_EXEC, "configure str9xpec lvd threshold"); + register_command(cmd_ctx, str9xpec_cmd, "options_lvdsel", + str9xpec_handle_flash_options_lvdsel_command, + COMMAND_EXEC, "configure str9xpec lvd selection"); + register_command(cmd_ctx, str9xpec_cmd, "options_lvdwarn", + str9xpec_handle_flash_options_lvdwarn_command, + COMMAND_EXEC, "configure str9xpec lvd warning"); + register_command(cmd_ctx, str9xpec_cmd, "options_read", + str9xpec_handle_flash_options_read_command, + COMMAND_EXEC, "read str9xpec options"); + register_command(cmd_ctx, str9xpec_cmd, "options_write", + str9xpec_handle_flash_options_write_command, + COMMAND_EXEC, "write str9xpec options"); + register_command(cmd_ctx, str9xpec_cmd, "lock", + str9xpec_handle_flash_lock_command, + COMMAND_EXEC, "lock str9xpec device"); + register_command(cmd_ctx, str9xpec_cmd, "unlock", + str9xpec_handle_flash_unlock_command, + COMMAND_EXEC, "unlock str9xpec device"); + register_command(cmd_ctx, str9xpec_cmd, "part_id", + str9xpec_handle_part_id_command, + COMMAND_EXEC, "print part id of str9xpec flash bank "); + + return ERROR_OK; +} + +flash_driver_t str9xpec_flash = { + .name = "str9xpec", + .register_commands = &str9xpec_register_commands, + .flash_bank_command = &str9xpec_flash_bank_command, + .erase = &str9xpec_erase, + .protect = &str9xpec_protect, + .write = &str9xpec_write, + .probe = &str9xpec_probe, + .auto_probe = &str9xpec_probe, + .erase_check = &str9xpec_erase_check, + .protect_check = &str9xpec_protect_check, + .info = &str9xpec_info, + }; -- 2.30.2