X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=d3078583488eaaa2c2fb82cd60152cf9bf9af74e;hb=a1cf1b52444c67b6c56ad58fe29be5a285b244cb;hp=64f332e9af6a3350255dc8443feaa5a5fd08bb2f;hpb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;p=openocd.git diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 64f332e9af..d307858348 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -22,10 +22,10 @@ #endif #include "mflash.h" -#include "target.h" -#include "time_support.h" -#include "fileio.h" -#include "log.h" +#include +#include +#include +#include static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio); @@ -33,8 +33,6 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio); static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val); -static struct command *mflash_cmd; - static struct mflash_bank *mflash_bank; static struct mflash_gpio_drv pxa270_gpio = { @@ -344,7 +342,8 @@ static int mg_dsk_drv_info(void) if ((ret = mg_dsk_io_cmd(0, 1, mg_io_cmd_identify)) != ERROR_OK) return ret; - if ((ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL)) != ERROR_OK) + ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL); + if (ret != ERROR_OK) return ret; LOG_INFO("mflash: read drive info"); @@ -352,7 +351,8 @@ static int mg_dsk_drv_info(void) if (! mflash_bank->drv_info) mflash_bank->drv_info = malloc(sizeof(struct mg_drv_info)); - target_read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1, + ret = target_read_memory(target, mg_buff, 2, + sizeof(mg_io_type_drv_info) >> 1, (uint8_t *)&mflash_bank->drv_info->drv_id); if (ret != ERROR_OK) return ret; @@ -416,7 +416,7 @@ COMMAND_HANDLER(mg_probe_cmd) ret = mg_mflash_probe(); if (ret == ERROR_OK) { - command_print(cmd_ctx, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "", + command_print(CMD_CTX, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "", mflash_bank->drv_info->tot_sects, mflash_bank->base); } @@ -751,8 +751,8 @@ COMMAND_HANDLER(mg_write_cmd) if (duration_measure(&bench) == ERROR_OK) { - command_print(cmd_ctx, "wrote %zu byte from file %s " - "in %fs (%0.3f kB/s)", fileio.size, CMD_ARGV[1], + command_print(CMD_CTX, "wrote %ld bytes from file %s " + "in %fs (%0.3f kB/s)", (long)fileio.size, CMD_ARGV[1], duration_elapsed(&bench), duration_kbps(&bench, fileio.size)); } @@ -762,7 +762,7 @@ COMMAND_HANDLER(mg_write_cmd) return ERROR_OK; mg_write_cmd_err: - free(buffer); + free(buffer); fileio_close(&fileio); return ret; @@ -817,7 +817,7 @@ COMMAND_HANDLER(mg_dump_cmd) if (duration_measure(&bench) == ERROR_OK) { - command_print(cmd_ctx, "dump image (address 0x%8.8" PRIx32 " " + command_print(CMD_CTX, "dump image (address 0x%8.8" PRIx32 " " "size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)", address, size, CMD_ARGV[1], duration_elapsed(&bench), duration_kbps(&bench, size)); @@ -829,7 +829,7 @@ COMMAND_HANDLER(mg_dump_cmd) return ERROR_OK; mg_dump_cmd_err: - free(buffer); + free(buffer); fileio_close(&fileio); return ret; @@ -1268,19 +1268,62 @@ COMMAND_HANDLER(mg_config_cmd) } } -int mflash_init_drivers(struct command_context *cmd_ctx) +static const struct command_registration mflash_exec_command_handlers[] = { + { + .name = "probe", + .handler = mg_probe_cmd, + .mode = COMMAND_EXEC, + .help = "Detect bank configuration information", + }, + { + .name = "write", + .handler = mg_write_cmd, + .mode = COMMAND_EXEC, + /* FIXME bank_num is unused */ + .usage = "bank_num filename address", + .help = "Write binary file at the specified address.", + }, + { + .name = "dump", + .handler = mg_dump_cmd, + .mode = COMMAND_EXEC, + /* FIXME bank_num is unused */ + .usage = "bank_num filename address size", + .help = "Write specified number of bytes from a binary file " + "to the specified, address.", + }, + { + .name = "config", + .handler = mg_config_cmd, + .mode = COMMAND_EXEC, + .help = "Configure MFLASH options.", + .usage = "('boot'|'storage'|'pll' frequency)", + }, + COMMAND_REGISTRATION_DONE +}; + +static int mflash_init_drivers(struct command_context *cmd_ctx) { - if (mflash_bank) { - register_command(cmd_ctx, mflash_cmd, "probe", mg_probe_cmd, COMMAND_EXEC, NULL); - register_command(cmd_ctx, mflash_cmd, "write", mg_write_cmd, COMMAND_EXEC, - "mflash write
"); - register_command(cmd_ctx, mflash_cmd, "dump", mg_dump_cmd, COMMAND_EXEC, - "mflash dump
"); - register_command(cmd_ctx, mflash_cmd, "config", mg_config_cmd, - COMMAND_EXEC, "mflash config "); + if (!mflash_bank) + return ERROR_OK; + return register_commands(cmd_ctx, NULL, mflash_exec_command_handlers); +} + +COMMAND_HANDLER(handle_mflash_init_command) +{ + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + + static bool mflash_initialized = false; + if (mflash_initialized) + { + LOG_INFO("'mflash init' has already been called"); + return ERROR_OK; } + mflash_initialized = true; - return ERROR_OK; + LOG_DEBUG("Initializing mflash devices..."); + return mflash_init_drivers(CMD_CTX); } COMMAND_HANDLER(mg_bank_cmd) @@ -1305,7 +1348,8 @@ COMMAND_HANDLER(mg_bank_cmd) char *str; mflash_bank->rst_pin.num = strtoul(CMD_ARGV[2], &str, 0); if (*str) - mflash_bank->rst_pin.port[0] = (uint16_t)tolower(str[0]); + mflash_bank->rst_pin.port[0] = (uint16_t) + tolower((unsigned)str[0]); mflash_bank->target = target; @@ -1323,10 +1367,32 @@ COMMAND_HANDLER(mg_bank_cmd) return ERROR_OK; } +static const struct command_registration mflash_config_command_handlers[] = { + { + .name = "bank", + .handler = mg_bank_cmd, + .mode = COMMAND_CONFIG, + .help = "configure a mflash device bank", + .usage = "soc_type base_addr pin_id target", + }, + { + .name = "init", + .mode = COMMAND_CONFIG, + .handler = handle_mflash_init_command, + .help = "initialize mflash devices", + }, + COMMAND_REGISTRATION_DONE +}; +static const struct command_registration mflash_command_handler[] = { + { + .name = "mflash", + .mode = COMMAND_ANY, + .help = "mflash command group", + .chain = mflash_config_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; int mflash_register_commands(struct command_context *cmd_ctx) { - mflash_cmd = register_command(cmd_ctx, NULL, "mflash", NULL, COMMAND_ANY, NULL); - register_command(cmd_ctx, mflash_cmd, "bank", mg_bank_cmd, COMMAND_CONFIG, - "mflash bank "); - return ERROR_OK; + return register_commands(cmd_ctx, NULL, mflash_command_handler); }