X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=4a3f8fe21fade48d580813959235ac2ac3c07d40;hp=03a56e29d2de32ef9c6e237da0adfafc8d6422ad;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hpb=1bf7462edb89a79835e8bd42905d69282ba4ba17 diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 03a56e29d2..4a3f8fe21f 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); @@ -141,7 +141,7 @@ static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio) gpio_con = S3C2440_GPJCON; } else { LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } ret = target_read_u32(target, gpio_con, &data); @@ -173,7 +173,7 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val gpio_dat = S3C2440_GPJDAT; } else { LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } ret = target_read_u32(target, gpio_dat, &data); @@ -209,7 +209,7 @@ static int mg_init_gpio (void) return ret; } -static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) +static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var) { uint8_t status, error; struct target *target = mflash_bank->target; @@ -220,7 +220,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) struct duration bench; duration_start(&bench); - while (time) { + while (time_var) { ret = target_read_u8(target, mg_task_reg + MG_REG_STATUS, &status); if (ret != ERROR_OK) @@ -228,10 +228,10 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) if (status & mg_io_rbit_status_busy) { - if (wait == mg_io_wait_bsy) + if (wait_local == mg_io_wait_bsy) return ERROR_OK; } else { - switch (wait) + switch (wait_local) { case mg_io_wait_not_bsy: return ERROR_OK; @@ -259,7 +259,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) return ERROR_MG_IO; } - switch (wait) + switch (wait_local) { case mg_io_wait_rdy: if (status & mg_io_rbit_status_ready) @@ -280,7 +280,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time) else LOG_ERROR("mflash: duration measurement failed: %d", ret); - if (t > time) + if (t > time_var) break; } @@ -342,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"); @@ -350,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; @@ -718,14 +720,20 @@ COMMAND_HANDLER(mg_write_cmd) if (ret != ERROR_OK) return ret; + int filesize; buffer = malloc(MG_FILEIO_CHUNK); if (!buffer) { fileio_close(&fileio); return ERROR_FAIL; } + int retval = fileio_size(&fileio, &filesize); + if (retval != ERROR_OK) { + fileio_close(&fileio); + return retval; + } - cnt = fileio.size / MG_FILEIO_CHUNK; - res = fileio.size % MG_FILEIO_CHUNK; + cnt = filesize / MG_FILEIO_CHUNK; + res = filesize % MG_FILEIO_CHUNK; struct duration bench; duration_start(&bench); @@ -749,9 +757,9 @@ 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], - duration_elapsed(&bench), duration_kbps(&bench, fileio.size)); + command_print(CMD_CTX, "wrote %ld bytes from file %s " + "in %fs (%0.3f kB/s)", (long)filesize, CMD_ARGV[1], + duration_elapsed(&bench), duration_kbps(&bench, filesize)); } free(buffer); @@ -760,7 +768,7 @@ COMMAND_HANDLER(mg_write_cmd) return ERROR_OK; mg_write_cmd_err: - free(buffer); + free(buffer); fileio_close(&fileio); return ret; @@ -827,7 +835,7 @@ COMMAND_HANDLER(mg_dump_cmd) return ERROR_OK; mg_dump_cmd_err: - free(buffer); + free(buffer); fileio_close(&fileio); return ret; @@ -1119,7 +1127,7 @@ static int mg_storage_config(void) != ERROR_OK) return ret; - mg_gen_ataid((mg_io_type_drv_info *)buff); + mg_gen_ataid((mg_io_type_drv_info *)(void *)buff); if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo)) != ERROR_OK) @@ -1147,7 +1155,7 @@ static int mg_boot_config(void) buff[0] = mg_op_mode_snd; /* operation mode */ buff[1] = MG_UNLOCK_OTP_AREA; buff[2] = 4; /* boot size */ - *((uint32_t *)(buff + 4)) = 0; /* XIP size */ + *((uint32_t *)(void *)(buff + 4)) = 0; /* XIP size */ if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo)) != ERROR_OK) @@ -1269,41 +1277,61 @@ COMMAND_HANDLER(mg_config_cmd) static const struct command_registration mflash_exec_command_handlers[] = { { .name = "probe", - .handler = &mg_probe_cmd, + .handler = mg_probe_cmd, .mode = COMMAND_EXEC, .help = "Detect bank configuration information", }, { .name = "write", - .handler = &mg_write_cmd, + .handler = mg_write_cmd, .mode = COMMAND_EXEC, - .usage = "
", - .help = "Write a file at the specified address", + /* FIXME bank_num is unused */ + .usage = "bank_num filename address", + .help = "Write binary file at the specified address.", }, { .name = "dump", - .handler = &mg_dump_cmd, + .handler = mg_dump_cmd, .mode = COMMAND_EXEC, - .usage = "
", - .help = "Dump to a file from the specified address", + /* 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, + .handler = mg_config_cmd, .mode = COMMAND_EXEC, - .usage = " ", - .help = "Dump to a file from the specified address", + .help = "Configure MFLASH options.", + .usage = "('boot'|'storage'|'pll' frequency)", }, COMMAND_REGISTRATION_DONE }; -int mflash_init_drivers(struct command_context *cmd_ctx) +static int mflash_init_drivers(struct command_context *cmd_ctx) { 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; + + LOG_DEBUG("Initializing mflash devices..."); + return mflash_init_drivers(CMD_CTX); +} + COMMAND_HANDLER(mg_bank_cmd) { struct target *target; @@ -1326,7 +1354,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; @@ -1347,10 +1376,17 @@ COMMAND_HANDLER(mg_bank_cmd) static const struct command_registration mflash_config_command_handlers[] = { { .name = "bank", - .handler = &mg_bank_cmd, + .handler = mg_bank_cmd, .mode = COMMAND_CONFIG, .help = "configure a mflash device bank", - .usage = " ", + .usage = "soc_type base_addr pin_id target", + }, + { + .name = "init", + .mode = COMMAND_CONFIG, + .handler = handle_mflash_init_command, + .help = "initialize mflash devices", + .usage = "" }, COMMAND_REGISTRATION_DONE }; @@ -1359,6 +1395,7 @@ static const struct command_registration mflash_command_handler[] = { .name = "mflash", .mode = COMMAND_ANY, .help = "mflash command group", + .usage = "", .chain = mflash_config_command_handlers, }, COMMAND_REGISTRATION_DONE