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.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2209 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-06-12 01:40:03 +00:00
parent 0f6a47837e
commit ae28b96ab9
1 changed files with 16 additions and 5 deletions

View File

@ -429,12 +429,23 @@ static int parport_quit(void)
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;
}