X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=f4e689c2a527f7eb229ab517c184c362e518b88e;hb=0377e5b54d6db196cfeeaaa70824c581317e2290;hp=0972223387a9238926901ec44252e63bfe3caead;hpb=5627e841e39f04ea09001b99a4ff78d33de217da;p=openocd.git

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 0972223387..f4e689c2a5 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -39,42 +39,6 @@
 #error "BUG: either FTD2XX and LIBFTDI has to be used"
 #endif
 
-static int presto_jtag_speed(int speed);
-static int presto_jtag_khz(int khz, int *jtag_speed);
-static int presto_jtag_speed_div(int speed, int *khz);
-static int presto_jtag_register_commands(struct command_context_s *cmd_ctx);
-static int presto_jtag_init(void);
-static int presto_jtag_quit(void);
-
-jtag_interface_t presto_interface =
-{
-	.name = "presto",
-	.execute_queue = bitq_execute_queue,
-	.speed = presto_jtag_speed,
-	.khz = presto_jtag_khz,
-	.speed_div = presto_jtag_speed_div,
-	.register_commands = presto_jtag_register_commands,
-	.init = presto_jtag_init,
-	.quit = presto_jtag_quit,
-};
-
-static int presto_bitq_out(int tms, int tdi, int tdo_req);
-static int presto_bitq_flush(void);
-static int presto_bitq_sleep(unsigned long us);
-static int presto_bitq_reset(int trst, int srst);
-static int presto_bitq_in_rdy(void);
-static int presto_bitq_in(void);
-
-static bitq_interface_t presto_bitq =
-{
-	.out = presto_bitq_out,
-	.flush = presto_bitq_flush,
-	.sleep = presto_bitq_sleep,
-	.reset = presto_bitq_reset,
-	.in_rdy = presto_bitq_in_rdy,
-	.in = presto_bitq_in,
-};
-
 /* -------------------------------------------------------------------------- */
 
 #define FT_DEVICE_NAME_LEN 64
@@ -86,8 +50,7 @@ static bitq_interface_t presto_bitq =
 
 #define BUFFER_SIZE (64*62)
 
-typedef struct presto_s
-{
+struct presto {
 #if BUILD_PRESTO_FTD2XX == 1
 	FT_HANDLE handle;
 	FT_STATUS status;
@@ -117,11 +80,10 @@ typedef struct presto_s
 	int jtag_tdi_count;
 
 	int jtag_speed;
+};
 
-} presto_t;
-
-static presto_t presto_state;
-static presto_t *presto = &presto_state;
+static struct presto presto_state;
+static struct presto *presto = &presto_state;
 
 static uint8_t presto_init_seq[] =
 {
@@ -701,6 +663,15 @@ static int presto_bitq_reset(int trst, int srst)
 	return 0;
 }
 
+static struct bitq_interface presto_bitq = {
+		.out = &presto_bitq_out,
+		.flush = &presto_bitq_flush,
+		.sleep = &presto_bitq_sleep,
+		.reset = &presto_bitq_reset,
+		.in_rdy = &presto_bitq_in_rdy,
+		.in = &presto_bitq_in,
+	};
+
 /* -------------------------------------------------------------------------- */
 
 static int presto_jtag_khz(int khz, int *jtag_speed)
@@ -752,13 +723,13 @@ static int presto_jtag_speed(int speed)
 
 static char *presto_serial;
 
-static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(presto_handle_serial_command)
 {
-	if (argc == 1)
+	if (CMD_ARGC == 1)
 	{
 		if (presto_serial)
 			free(presto_serial);
-		presto_serial = strdup(args[0]);
+		presto_serial = strdup(CMD_ARGV[0]);
 	}
 	else
 	{
@@ -768,12 +739,16 @@ static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char
 	return ERROR_OK;
 }
 
-static int presto_jtag_register_commands(struct command_context_s *cmd_ctx)
-{
-	register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
-		COMMAND_CONFIG, NULL);
-	return ERROR_OK;
-}
+static const struct command_registration presto_command_handlers[] = {
+	{
+		.name = "presto_serial",
+		.handler = &presto_handle_serial_command,
+		.mode = COMMAND_CONFIG,
+		.help = "configure serial port",
+		.usage = "<devname>",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 static int presto_jtag_init(void)
 {
@@ -809,3 +784,17 @@ static int presto_jtag_quit(void)
 
 	return ERROR_OK;
 }
+
+struct jtag_interface presto_interface = {
+		.name = "presto",
+
+		.commands = presto_command_handlers,
+
+		.execute_queue = &bitq_execute_queue,
+		.speed = &presto_jtag_speed,
+		.khz = &presto_jtag_khz,
+		.speed_div = &presto_jtag_speed_div,
+
+		.init = &presto_jtag_init,
+		.quit = &presto_jtag_quit,
+	};