[Openocd-svn] r2209 - trunk/src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-12 03:40:03 +0200 (Fri, 12 Jun 2009)
New Revision: 2209

Modified:
   trunk/src/jtag/parport.c
Log:
Simplify and improve parport_handle_parport_port_command:
- Show the port number to the user when asking for it or setting it.
- Print an error if the parport_port has already been set.
- Use parse_u16 helper to ensure the parport_port string parses correctly.


Modified: trunk/src/jtag/parport.c
===================================================================
--- trunk/src/jtag/parport.c	2009-06-12 01:39:57 UTC (rev 2208)
+++ trunk/src/jtag/parport.c	2009-06-12 01:40:03 UTC (rev 2209)
@@ -429,12 +429,23 @@
 
 static int parport_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	if (argc == 0)
-		return ERROR_OK;
+	if (argc == 1)
+	{
+		/* only if the port wasn't overwritten by cmdline */
+		if (parport_port == 0)
+		{
+			int retval = parse_u16(args[0], &parport_port);
+			if (ERROR_OK != retval)
+				return retval;
+		}
+		else
+		{
+			LOG_ERROR("The parport port was already configured!");
+			return ERROR_FAIL;
+		}
+	}
 
-	/* only if the port wasn't overwritten by cmdline */
-	if (parport_port == 0)
-		parport_port = strtoul(args[0], NULL, 0);
+	command_print(cmd_ctx, "parport port = %u", parport_port);
 
 	return ERROR_OK;
 }