|
From: <zw...@ma...> - 2009-06-12 03:40:21
|
Author: zwelch
Date: 2009-06-12 03:40:17 +0200 (Fri, 12 Jun 2009)
New Revision: 2210
Modified:
trunk/src/jtag/amt_jtagaccel.c
Log:
Simplify and improve amt_jtagaccel_handle_parport_port_command:
- Show the port number to the user when asking for it or setting it.
- Print an error if the amt_jtagaccel_port has already been set.
- Use parse_u16 helper to ensure amt_jtagaccel_port string parses correctly.
Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c 2009-06-12 01:40:03 UTC (rev 2209)
+++ trunk/src/jtag/amt_jtagaccel.c 2009-06-12 01:40:17 UTC (rev 2210)
@@ -526,14 +526,26 @@
return ERROR_OK;
}
-static int amt_jtagaccel_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int amt_jtagaccel_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 (amt_jtagaccel_port == 0)
+ {
+ int retval = parse_u16(args[0], &amt_jtagaccel_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 (amt_jtagaccel_port == 0)
- amt_jtagaccel_port = strtoul(args[0], NULL, 0);
+ command_print(cmd_ctx, "parport port = %u", amt_jtagaccel_port);
return ERROR_OK;
}
|