X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fnand.c;h=f01b94c29c7f15f80bdbc5e1ab5ff32fef720b00;hb=6d3bed69dc023f49b51b6504d977463e722e9e9d;hp=92c7bc7ae52f199bbb768bb26e265441334668e2;hpb=88b767e3ec35406e3297ae519fb02d7c0c07db67;p=openocd.git

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 92c7bc7ae5..f01b94c29c 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -2,10 +2,8 @@
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   partially based on                                                    *
- * 	 drivers/mtd/nand_ids.c                                            *
- *                                                                         *
- *   Copyright (C) 2002 Thomas Gleixner (tglx@linutronix.de)               *
+ *   Partially based on drivers/mtd/nand_ids.c from Linux.                 *
+ *   Copyright (C) 2002 Thomas Gleixner <tglx@linutronix.de>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -1024,8 +1022,8 @@ int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if ((argc < 1) || (argc > 3))
 	{
-		command_print(cmd_ctx, "usage: nand info <num> [<first> <last>]");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	}
 	
 	if (argc == 2)
@@ -1091,8 +1089,7 @@ int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if (argc != 1)
 	{
-		command_print(cmd_ctx, "usage: nand probe <num>");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	
 	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1126,8 +1123,8 @@ int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if (argc != 3)
 	{
-		command_print(cmd_ctx, "usage: nand erase <num> <first> <last>");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	}
 	
 	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1166,8 +1163,8 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char
 		
 	if ((argc < 1) || (argc > 3) || (argc == 2))
 	{
-		command_print(cmd_ctx, "usage: nand check_bad_blocks <num> [<first> <last>]");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	}
 	
 	if (argc == 3)
@@ -1206,8 +1203,8 @@ int handle_nand_copy_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if (argc != 4)
 	{
-		command_print(cmd_ctx, "usage: nand copy <num> <offset> <length> <ram-address>");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	}
 	
 	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1239,8 +1236,8 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 	if (argc < 3)
 	{
-		command_print(cmd_ctx, "usage: nand write <num> <file> <offset> [options]");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	}
 	
 	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1272,7 +1269,6 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char
 		
 		if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 		{
-			command_print(cmd_ctx, "file open error: %s", fileio.error_str);
 			return ERROR_OK;
 		}
 	
@@ -1353,8 +1349,7 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char
 			
 	if (argc < 4)
 	{
-		command_print(cmd_ctx, "usage: nand dump <num> <filename> <address> <size> [options]");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	
 	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1413,7 +1408,6 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char
 			
 			if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
 			{
-				command_print(cmd_ctx, "dump_image error: %s", fileio.error_str);
 				return ERROR_OK;
 			}
 	
@@ -1475,8 +1469,7 @@ int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd,
 		
 	if ((argc < 1) || (argc > 2))
 	{
-		command_print(cmd_ctx, "usage: nand raw_access <num> ['enable'|'disable']");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	
 	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
@@ -1496,7 +1489,7 @@ int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd,
 				}
 				else
 				{
-					command_print(cmd_ctx, "usage: nand raw_access ['enable'|disable']");
+					return ERROR_COMMAND_SYNTAX_ERROR;
 				}
 			}