X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fparport.c;h=b80626f57d5dcd518f85830303ab83a95a368052;hb=c46c2d77e63264a9f0187a477b77032d0ce6fcfa;hp=399c00ad04d74978fc05c32dfc61776add37be17;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;p=openocd.git

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 399c00ad04..b80626f57d 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -103,7 +103,7 @@ static struct cable cables[] =
 /* configuration */
 static char* parport_cable = NULL;
 static uint16_t parport_port;
-static int parport_exit = 0;
+static bool parport_exit = 0;
 static uint32_t parport_toggling_time_ns = 1000;
 static int wait_states;
 
@@ -411,12 +411,12 @@ static int parport_quit(void)
 
 COMMAND_HANDLER(parport_handle_parport_port_command)
 {
-	if (argc == 1)
+	if (CMD_ARGC == 1)
 	{
 		/* only if the port wasn't overwritten by cmdline */
 		if (parport_port == 0)
 		{
-			COMMAND_PARSE_NUMBER(u16, args[0], parport_port);
+			COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], parport_port);
 		}
 		else
 		{
@@ -425,21 +425,21 @@ COMMAND_HANDLER(parport_handle_parport_port_command)
 		}
 	}
 
-	command_print(cmd_ctx, "parport port = %u", parport_port);
+	command_print(CMD_CTX, "parport port = %u", parport_port);
 
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(parport_handle_parport_cable_command)
 {
-	if (argc == 0)
+	if (CMD_ARGC == 0)
 		return ERROR_OK;
 
 	/* only if the cable name wasn't overwritten by cmdline */
 	if (parport_cable == 0)
 	{
-		parport_cable = malloc(strlen(args[0]) + sizeof(char));
-		strcpy(parport_cable, args[0]);
+		parport_cable = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
+		strcpy(parport_cable, CMD_ARGV[0]);
 	}
 
 	return ERROR_OK;
@@ -447,25 +447,22 @@ COMMAND_HANDLER(parport_handle_parport_cable_command)
 
 COMMAND_HANDLER(parport_handle_write_on_exit_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
-		command_print(cmd_ctx, "usage: parport_write_on_exit <on | off>");
+		command_print(CMD_CTX, "usage: parport_write_on_exit <on | off>");
 		return ERROR_OK;
 	}
 
-	if (strcmp(args[0], "on") == 0)
-		parport_exit = 1;
-	else if (strcmp(args[0], "off") == 0)
-		parport_exit = 0;
+	COMMAND_PARSE_ON_OFF(CMD_ARGV[0], parport_exit);
 
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
 {
-	if (argc == 1) {
+	if (CMD_ARGC == 1) {
 		uint32_t ns;
-		int retval = parse_u32(args[0], &ns);
+		int retval = parse_u32(CMD_ARGV[0], &ns);
 
 		if (ERROR_OK != retval)
 			return retval;
@@ -479,7 +476,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
 		wait_states = jtag_get_speed();
 	}
 
-	command_print(cmd_ctx, "parport toggling time = %" PRIu32 " ns",
+	command_print(CMD_CTX, "parport toggling time = %" PRIu32 " ns",
 			parport_toggling_time_ns);
 
 	return ERROR_OK;