Nicolas Pitre nico at cam.org don't ignore bad options passed to the "nand write" command

git-svn-id: svn://svn.berlios.de/openocd/trunk@1386 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-03-01 20:56:18 +00:00
parent 857e9cb076
commit 2e8f1911d6
1 changed files with 4 additions and 2 deletions

View File

@ -287,7 +287,7 @@ int nand_init(struct command_context_s *cmd_ctx)
register_command(cmd_ctx, nand_cmd, "dump", handle_nand_dump_command, COMMAND_EXEC, register_command(cmd_ctx, nand_cmd, "dump", handle_nand_dump_command, COMMAND_EXEC,
"dump from NAND flash device <num> <filename> <offset> <size> [options]"); "dump from NAND flash device <num> <filename> <offset> <size> [options]");
register_command(cmd_ctx, nand_cmd, "write", handle_nand_write_command, COMMAND_EXEC, register_command(cmd_ctx, nand_cmd, "write", handle_nand_write_command, COMMAND_EXEC,
"write to NAND flash device <num> <filename> <offset> [options]"); "write to NAND flash device <num> <filename> <offset> [oob_raw|oob_only]");
register_command(cmd_ctx, nand_cmd, "raw_access", handle_nand_raw_access_command, COMMAND_EXEC, register_command(cmd_ctx, nand_cmd, "raw_access", handle_nand_raw_access_command, COMMAND_EXEC,
"raw access to NAND flash device <num> ['enable'|'disable']"); "raw access to NAND flash device <num> ['enable'|'disable']");
} }
@ -1254,7 +1254,6 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
u8 *oob = NULL; u8 *oob = NULL;
u32 oob_size = 0; u32 oob_size = 0;
duration_start_measure(&duration);
offset = strtoul(args[2], NULL, 0); offset = strtoul(args[2], NULL, 0);
if (argc > 3) if (argc > 3)
@ -1269,10 +1268,13 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
else else
{ {
command_print(cmd_ctx, "unknown option: %s", args[i]); command_print(cmd_ctx, "unknown option: %s", args[i]);
return ERROR_COMMAND_SYNTAX_ERROR;
} }
} }
} }
duration_start_measure(&duration);
if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{ {
return ERROR_OK; return ERROR_OK;