X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnand%2Ftcl.c;h=5480e0d61ea2d5ed693cd40e5d3fde4485880af2;hb=9b29cb58acbd14ed831d68fce4d6e6a1728f8caf;hp=c6ea3f3b68af914013dca748a6fd550b3233280c;hpb=ae7ab8b09d1c69559284ad9d9e3c17345d2496dd;p=openocd.git
diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index c6ea3f3b68..5480e0d61e 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -16,10 +16,9 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -29,7 +28,7 @@
#include "fileio.h"
#include
-// to be removed
+/* to be removed */
extern struct nand_device *nand_devices;
COMMAND_HANDLER(handle_nand_list_command)
@@ -37,23 +36,21 @@ COMMAND_HANDLER(handle_nand_list_command)
struct nand_device *p;
int i;
- if (!nand_devices)
- {
- command_print(CMD_CTX, "no NAND flash devices configured");
+ if (!nand_devices) {
+ command_print(CMD, "no NAND flash devices configured");
return ERROR_OK;
}
- for (p = nand_devices, i = 0; p; p = p->next, i++)
- {
+ for (p = nand_devices, i = 0; p; p = p->next, i++) {
if (p->device)
- command_print(CMD_CTX, "#%i: %s (%s) "
+ command_print(CMD, "#%i: %s (%s) "
"pagesize: %i, buswidth: %i,\n\t"
"blocksize: %i, blocks: %i",
i, p->device->name, p->manufacturer->name,
p->page_size, p->bus_width,
p->erase_size, p->num_blocks);
else
- command_print(CMD_CTX, "#%i: not probed", i);
+ command_print(CMD, "#%i: not probed", i);
}
return ERROR_OK;
@@ -67,21 +64,21 @@ COMMAND_HANDLER(handle_nand_info_command)
int last = -1;
switch (CMD_ARGC) {
- default:
- return ERROR_COMMAND_SYNTAX_ERROR;
- case 1:
- first = 0;
- last = INT32_MAX;
- break;
- case 2:
- COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
- first = last = i;
- i = 0;
- break;
- case 3:
- COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
- COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
- break;
+ default:
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ case 1:
+ first = 0;
+ last = INT32_MAX;
+ break;
+ case 2:
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
+ first = last = i;
+ i = 0;
+ break;
+ case 3:
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
+ break;
}
struct nand_device *p;
@@ -89,9 +86,8 @@ COMMAND_HANDLER(handle_nand_info_command)
if (ERROR_OK != retval)
return retval;
- if (NULL == p->device)
- {
- command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+ if (NULL == p->device) {
+ command_print(CMD, "#%s: not probed", CMD_ARGV[0]);
return ERROR_OK;
}
@@ -101,11 +97,16 @@ COMMAND_HANDLER(handle_nand_info_command)
if (last >= p->num_blocks)
last = p->num_blocks - 1;
- command_print(CMD_CTX, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
- i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
+ command_print(CMD,
+ "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
+ i++,
+ p->device->name,
+ p->manufacturer->name,
+ p->page_size,
+ p->bus_width,
+ p->erase_size);
- for (j = first; j <= last; j++)
- {
+ for (j = first; j <= last; j++) {
char *erase_state, *bad_state;
if (p->blocks[j].is_erased == 0)
@@ -122,13 +123,13 @@ COMMAND_HANDLER(handle_nand_info_command)
else
bad_state = " (block condition unknown)";
- command_print(CMD_CTX,
- "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
- j,
- p->blocks[j].offset,
- p->blocks[j].size / 1024,
- erase_state,
- bad_state);
+ command_print(CMD,
+ "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
+ j,
+ p->blocks[j].offset,
+ p->blocks[j].size / 1024,
+ erase_state,
+ bad_state);
}
return ERROR_OK;
@@ -137,19 +138,17 @@ COMMAND_HANDLER(handle_nand_info_command)
COMMAND_HANDLER(handle_nand_probe_command)
{
if (CMD_ARGC != 1)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
struct nand_device *p;
int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
- if ((retval = nand_probe(p)) == ERROR_OK)
- {
- command_print(CMD_CTX, "NAND flash device '%s (%s)' found",
- p->device->name, p->manufacturer->name);
+ retval = nand_probe(p);
+ if (retval == ERROR_OK) {
+ command_print(CMD, "NAND flash device '%s (%s)' found",
+ p->device->name, p->manufacturer->name);
}
return retval;
@@ -158,11 +157,8 @@ COMMAND_HANDLER(handle_nand_probe_command)
COMMAND_HANDLER(handle_nand_erase_command)
{
if (CMD_ARGC != 1 && CMD_ARGC != 3)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
struct nand_device *p;
int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
@@ -181,7 +177,7 @@ COMMAND_HANDLER(handle_nand_erase_command)
COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
if ((length == 0) || (length % p->erase_size) != 0
- || (length + offset) > size)
+ || (length + offset) > size)
return ERROR_COMMAND_SYNTAX_ERROR;
offset /= p->erase_size;
@@ -192,12 +188,11 @@ COMMAND_HANDLER(handle_nand_erase_command)
}
retval = nand_erase(p, offset, offset + length - 1);
- if (retval == ERROR_OK)
- {
- command_print(CMD_CTX, "erased blocks %lu to %lu "
- "on NAND flash device #%s '%s'",
- offset, offset + length,
- CMD_ARGV[0], p->device->name);
+ if (retval == ERROR_OK) {
+ command_print(CMD, "erased blocks %lu to %lu "
+ "on NAND flash device #%s '%s'",
+ offset, offset + length - 1,
+ CMD_ARGV[0], p->device->name);
}
return retval;
@@ -209,18 +204,14 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
int last = -1;
if ((CMD_ARGC < 1) || (CMD_ARGC > 3) || (CMD_ARGC == 2))
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
struct nand_device *p;
int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
- if (CMD_ARGC == 3)
- {
+ if (CMD_ARGC == 3) {
unsigned long offset;
unsigned long length;
@@ -241,10 +232,9 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
}
retval = nand_build_bbt(p, first, last);
- if (retval == ERROR_OK)
- {
- command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
- "use \"nand info\" command to list blocks");
+ if (retval == ERROR_OK) {
+ command_print(CMD, "checked NAND flash device for bad blocks, "
+ "use \"nand info\" command to list blocks");
}
return retval;
@@ -260,34 +250,32 @@ COMMAND_HANDLER(handle_nand_write_command)
return retval;
uint32_t total_bytes = s.size;
- while (s.size > 0)
- {
+ while (s.size > 0) {
int bytes_read = nand_fileio_read(nand, &s);
- if (bytes_read <= 0)
- {
- command_print(CMD_CTX, "error while reading file");
- return nand_fileio_cleanup(&s);
+ if (bytes_read <= 0) {
+ command_print(CMD, "error while reading file");
+ nand_fileio_cleanup(&s);
+ return ERROR_FAIL;
}
s.size -= bytes_read;
retval = nand_write_page(nand, s.address / nand->page_size,
s.page, s.page_size, s.oob, s.oob_size);
- if (ERROR_OK != retval)
- {
- command_print(CMD_CTX, "failed writing file %s "
+ if (ERROR_OK != retval) {
+ command_print(CMD, "failed writing file %s "
"to NAND flash %s at offset 0x%8.8" PRIx32,
CMD_ARGV[1], CMD_ARGV[0], s.address);
- return nand_fileio_cleanup(&s);
+ nand_fileio_cleanup(&s);
+ return retval;
}
s.address += s.page_size;
}
- if (nand_fileio_finish(&s))
- {
- command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
- "offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
- CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
- duration_kbps(&s.bench, total_bytes));
+ if (nand_fileio_finish(&s) == ERROR_OK) {
+ command_print(CMD, "wrote file %s to NAND flash %s up to "
+ "offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
+ CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
+ duration_kbps(&s.bench, total_bytes));
}
return ERROR_OK;
}
@@ -306,36 +294,32 @@ COMMAND_HANDLER(handle_nand_verify_command)
dev.address = file.address;
dev.size = file.size;
dev.oob_format = file.oob_format;
- retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev);
+ retval = nand_fileio_start(CMD, nand, NULL, FILEIO_NONE, &dev);
if (ERROR_OK != retval)
return retval;
- while (file.size > 0)
- {
+ while (file.size > 0) {
retval = nand_read_page(nand, dev.address / dev.page_size,
dev.page, dev.page_size, dev.oob, dev.oob_size);
- if (ERROR_OK != retval)
- {
- command_print(CMD_CTX, "reading NAND flash page failed");
+ if (ERROR_OK != retval) {
+ command_print(CMD, "reading NAND flash page failed");
nand_fileio_cleanup(&dev);
nand_fileio_cleanup(&file);
return retval;
}
int bytes_read = nand_fileio_read(nand, &file);
- if (bytes_read <= 0)
- {
- command_print(CMD_CTX, "error while reading file");
+ if (bytes_read <= 0) {
+ command_print(CMD, "error while reading file");
nand_fileio_cleanup(&dev);
nand_fileio_cleanup(&file);
return ERROR_FAIL;
}
if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
- (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size)) )
- {
- command_print(CMD_CTX, "NAND flash contents differ "
- "at 0x%8.8" PRIx32, dev.address);
+ (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size))) {
+ command_print(CMD, "NAND flash contents differ "
+ "at 0x%8.8" PRIx32, dev.address);
nand_fileio_cleanup(&dev);
nand_fileio_cleanup(&file);
return ERROR_FAIL;
@@ -345,12 +329,11 @@ COMMAND_HANDLER(handle_nand_verify_command)
dev.address += nand->page_size;
}
- if (nand_fileio_finish(&file) == ERROR_OK)
- {
- command_print(CMD_CTX, "verified file %s in NAND flash %s "
- "up to offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
- CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
- duration_kbps(&file.bench, dev.size));
+ if (nand_fileio_finish(&file) == ERROR_OK) {
+ command_print(CMD, "verified file %s in NAND flash %s "
+ "up to offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
+ CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
+ duration_kbps(&file.bench, dev.size));
}
return nand_fileio_cleanup(&dev);
@@ -358,7 +341,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
COMMAND_HANDLER(handle_nand_dump_command)
{
- int filesize;
+ size_t filesize;
struct nand_device *nand = NULL;
struct nand_fileio_state s;
int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
@@ -366,37 +349,34 @@ COMMAND_HANDLER(handle_nand_dump_command)
if (ERROR_OK != retval)
return retval;
- while (s.size > 0)
- {
+ while (s.size > 0) {
size_t size_written;
retval = nand_read_page(nand, s.address / nand->page_size,
s.page, s.page_size, s.oob, s.oob_size);
- if (ERROR_OK != retval)
- {
- command_print(CMD_CTX, "reading NAND flash page failed");
+ if (ERROR_OK != retval) {
+ command_print(CMD, "reading NAND flash page failed");
nand_fileio_cleanup(&s);
return retval;
}
if (NULL != s.page)
- fileio_write(&s.fileio, s.page_size, s.page, &size_written);
+ fileio_write(s.fileio, s.page_size, s.page, &size_written);
if (NULL != s.oob)
- fileio_write(&s.fileio, s.oob_size, s.oob, &size_written);
+ fileio_write(s.fileio, s.oob_size, s.oob, &size_written);
s.size -= nand->page_size;
s.address += nand->page_size;
}
- retval = fileio_size(&s.fileio, &filesize);
+ retval = fileio_size(s.fileio, &filesize);
if (retval != ERROR_OK)
return retval;
- if (nand_fileio_finish(&s) == ERROR_OK)
- {
- command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f KiB/s)",
- (long)filesize, duration_elapsed(&s.bench),
- duration_kbps(&s.bench, filesize));
+ if (nand_fileio_finish(&s) == ERROR_OK) {
+ command_print(CMD, "dumped %zu bytes in %fs (%0.3f KiB/s)",
+ filesize, duration_elapsed(&s.bench),
+ duration_kbps(&s.bench, filesize));
}
return ERROR_OK;
}
@@ -404,18 +384,15 @@ COMMAND_HANDLER(handle_nand_dump_command)
COMMAND_HANDLER(handle_nand_raw_access_command)
{
if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
struct nand_device *p;
int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
- if (NULL == p->device)
- {
- command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+ if (NULL == p->device) {
+ command_print(CMD, "#%s: not probed", CMD_ARGV[0]);
return ERROR_OK;
}
@@ -423,7 +400,7 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
COMMAND_PARSE_ENABLE(CMD_ARGV[1], p->use_raw);
const char *msg = p->use_raw ? "enabled" : "disabled";
- command_print(CMD_CTX, "raw access is %s", msg);
+ command_print(CMD, "raw access is %s", msg);
return ERROR_OK;
}
@@ -434,6 +411,7 @@ static const struct command_registration nand_exec_command_handlers[] = {
.handler = handle_nand_list_command,
.mode = COMMAND_EXEC,
.help = "list configured NAND flash devices",
+ .usage = "",
},
{
.name = "info",
@@ -510,9 +488,8 @@ COMMAND_HANDLER(handle_nand_init_command)
if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
- static bool nand_initialized = false;
- if (nand_initialized)
- {
+ static bool nand_initialized;
+ if (nand_initialized) {
LOG_INFO("'nand init' has already been called");
return ERROR_OK;
}
@@ -524,44 +501,40 @@ COMMAND_HANDLER(handle_nand_init_command)
static int nand_list_walker(struct nand_flash_controller *c, void *x)
{
- struct command_context *cmd_ctx = (struct command_context *)x;
- command_print(cmd_ctx, " %s", c->name);
+ struct command_invocation *cmd = x;
+ command_print(cmd, " %s", c->name);
return ERROR_OK;
}
COMMAND_HANDLER(handle_nand_list_drivers)
{
- command_print(CMD_CTX, "Available NAND flash controller drivers:");
- return nand_driver_walk(&nand_list_walker, CMD_CTX);
+ command_print(CMD, "Available NAND flash controller drivers:");
+ return nand_driver_walk(&nand_list_walker, CMD);
}
static COMMAND_HELPER(create_nand_device, const char *bank_name,
- struct nand_flash_controller *controller)
+ struct nand_flash_controller *controller)
{
struct nand_device *c;
struct target *target;
int retval;
if (CMD_ARGC < 2)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
target = get_target(CMD_ARGV[1]);
if (!target) {
LOG_ERROR("invalid target %s", CMD_ARGV[1]);
return ERROR_COMMAND_ARGUMENT_INVALID;
}
- if (NULL != controller->commands)
- {
+ if (NULL != controller->commands) {
retval = register_commands(CMD_CTX, NULL,
controller->commands);
if (ERROR_OK != retval)
return retval;
}
c = malloc(sizeof(struct nand_device));
- if (c == NULL)
- {
+ if (c == NULL) {
LOG_ERROR("End of memory");
return ERROR_FAIL;
}
@@ -575,13 +548,11 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
c->bus_width = 0;
c->address_cycles = 0;
c->page_size = 0;
- c->use_raw = 0;
+ c->use_raw = false;
c->next = NULL;
retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
- if (ERROR_OK != retval)
- {
- assert(controller->usage != NULL);
+ if (ERROR_OK != retval) {
LOG_ERROR("'%s' driver rejected nand flash. Usage: %s",
controller->name,
controller->usage);
@@ -589,6 +560,9 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
return retval;
}
+ if (controller->usage == NULL)
+ LOG_DEBUG("'%s' driver usage field missing", controller->name);
+
nand_device_add(c);
return ERROR_OK;
@@ -597,19 +571,16 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
COMMAND_HANDLER(handle_nand_device_command)
{
if (CMD_ARGC < 2)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
- // save name and increment (for compatibility) with drivers
+ /* save name and increment (for compatibility) with drivers */
const char *bank_name = *CMD_ARGV++;
CMD_ARGC--;
const char *driver_name = CMD_ARGV[0];
struct nand_flash_controller *controller;
controller = nand_driver_find_by_name(CMD_ARGV[0]);
- if (NULL == controller)
- {
+ if (NULL == controller) {
LOG_ERROR("No valid NAND flash driver found (%s)", driver_name);
return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
}
@@ -629,20 +600,24 @@ static const struct command_registration nand_config_command_handlers[] = {
.handler = &handle_nand_list_drivers,
.mode = COMMAND_ANY,
.help = "lists available NAND drivers",
+ .usage = ""
},
{
.name = "init",
.mode = COMMAND_CONFIG,
.handler = &handle_nand_init_command,
.help = "initialize NAND devices",
+ .usage = ""
},
COMMAND_REGISTRATION_DONE
};
+
static const struct command_registration nand_command_handlers[] = {
{
.name = "nand",
.mode = COMMAND_ANY,
.help = "NAND flash command group",
+ .usage = "",
.chain = nand_config_command_handlers,
},
COMMAND_REGISTRATION_DONE
@@ -652,5 +627,3 @@ int nand_register_commands(struct command_context *cmd_ctx)
{
return register_commands(cmd_ctx, NULL, nand_command_handlers);
}
-
-