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

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 0972223387..b4ba3f44aa 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -42,11 +42,11 @@
 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_register_commands(struct command_context *cmd_ctx);
 static int presto_jtag_init(void);
 static int presto_jtag_quit(void);
 
-jtag_interface_t presto_interface =
+struct jtag_interface presto_interface =
 {
 	.name = "presto",
 	.execute_queue = bitq_execute_queue,
@@ -65,7 +65,7 @@ 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 =
+static struct bitq_interface presto_bitq =
 {
 	.out = presto_bitq_out,
 	.flush = presto_bitq_flush,
@@ -86,8 +86,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 +116,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[] =
 {
@@ -752,7 +750,7 @@ 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)
 	{
@@ -768,7 +766,7 @@ 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)
+static int presto_jtag_register_commands(struct command_context *cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
 		COMMAND_CONFIG, NULL);