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

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index fceae34a35..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[] =
 {
@@ -150,7 +148,7 @@ static int presto_write(uint8_t *buf, uint32_t size)
 
 	if (ftbytes != size)
 	{
-		LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", 
+		LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)",
 			  (unsigned)ftbytes, (unsigned)size);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -193,7 +191,7 @@ static int presto_read(uint8_t* buf, uint32_t size)
 	if (ftbytes != size)
 	{
 		/* this is just a warning, there might have been timeout when detecting PRESTO, which is not fatal */
-		LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", 
+		LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)",
 			    (unsigned)ftbytes, (unsigned)size);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -239,7 +237,7 @@ static int presto_open_ftd2xx(char *req_serial)
 			LOG_DEBUG("FT_Open failed: %i", (int)presto->status);
 			continue;
 		}
-		LOG_DEBUG("FTDI device %i open", i);
+		LOG_DEBUG("FTDI device %i open", (int)i);
 
 		if ((presto->status = FT_GetDeviceInfo(presto->handle, &device, &vidpid,
 				presto->serial, devname, NULL)) == FT_OK)
@@ -251,7 +249,7 @@ static int presto_open_ftd2xx(char *req_serial)
 		else
 			LOG_DEBUG("FT_GetDeviceInfo failed: %lu", presto->status);
 
-		LOG_DEBUG("FTDI device %i does not match, closing", i);
+		LOG_DEBUG("FTDI device %i does not match, closing", (int)i);
 		FT_Close(presto->handle);
 		presto->handle = (FT_HANDLE)INVALID_HANDLE_VALUE;
 	}
@@ -553,7 +551,7 @@ static int presto_getbyte(void)
 	if (presto_flush() != ERROR_OK)
 		return -1;
 
-	if (presto->buff_in_pos<presto->buff_in_len)
+	if (presto->buff_in_pos < presto->buff_in_len)
 		return presto->buff_in[presto->buff_in_pos++];
 
 	return -1;
@@ -625,14 +623,14 @@ static int presto_bitq_out(int tms, int tdi, int tdo_req)
 	}
 
 	/* delay with TCK low */
-	for (i = presto->jtag_speed; i>1; i--)
+	for (i = presto->jtag_speed; i > 1; i--)
 		presto_sendbyte(cmd);
 
 	cmd |= 0x04;
 	presto_sendbyte(cmd | (tdo_req ? 0x10 : 0));
 
 	/* delay with TCK high */
-	for (i = presto->jtag_speed; i>1; i--)
+	for (i = presto->jtag_speed; i > 1; i--)
 		presto_sendbyte(cmd);
 
 	presto->jtag_tck = 1;
@@ -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);