X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=8789bed254f1f8c611ceb9bb2f56e07c99062d46;hp=1331f2af84a881531f34d045a85cc5ec922b06ff;hb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;hpb=40d7e81c45d112522f021205f7f1b46f025b8984

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 1331f2af84..8789bed254 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -150,7 +150,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 +193,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 +239,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 +251,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;
 	}
@@ -279,7 +279,7 @@ static int presto_open_ftd2xx(char *req_serial)
 	if ((presto->status = FT_Read(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK)
 		return ERROR_JTAG_DEVICE_ERROR;
 
-	if (ftbytes!=1)
+	if (ftbytes != 1)
 	{
 		LOG_DEBUG("PRESTO reset");
 
@@ -292,7 +292,7 @@ static int presto_open_ftd2xx(char *req_serial)
 
 		presto_data = 0;
 		for (i = 0; i < 4 * 62; i++)
-			if ((presto->status=FT_Write(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK)
+			if ((presto->status = FT_Write(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK)
 				return ERROR_JTAG_DEVICE_ERROR;
 
 		usleep(100000);
@@ -313,7 +313,7 @@ static int presto_open_ftd2xx(char *req_serial)
 		if ((presto->status = FT_Read(presto->handle, &presto_data, 1, &ftbytes)) != FT_OK)
 			return ERROR_JTAG_DEVICE_ERROR;
 
-		if (ftbytes!=1)
+		if (ftbytes != 1)
 		{
 			LOG_DEBUG("PRESTO not responding");
 			return ERROR_JTAG_DEVICE_ERROR;
@@ -407,21 +407,21 @@ static int presto_open_libftdi(char *req_serial)
 
 static int presto_open(char *req_serial)
 {
-	presto->buff_out_pos=0;
-	presto->buff_in_pos=0;
-	presto->buff_in_len=0;
-	presto->buff_in_exp=0;
+	presto->buff_out_pos = 0;
+	presto->buff_in_pos = 0;
+	presto->buff_in_len = 0;
+	presto->buff_in_exp = 0;
 
-	presto->total_out=0;
-	presto->total_in=0;
+	presto->total_out = 0;
+	presto->total_in = 0;
 
-	presto->jtag_tms=0;
-	presto->jtag_tck=0;
-	presto->jtag_rst=0;
-	presto->jtag_tdi_data=0;
-	presto->jtag_tdi_count=0;
+	presto->jtag_tms = 0;
+	presto->jtag_tck = 0;
+	presto->jtag_rst = 0;
+	presto->jtag_tdi_data = 0;
+	presto->jtag_tdi_count = 0;
 
-	presto->jtag_speed=0;
+	presto->jtag_speed = 0;
 
 #if BUILD_PRESTO_FTD2XX == 1
 	return presto_open_ftd2xx(req_serial);
@@ -534,7 +534,7 @@ static int presto_sendbyte(int data)
 	if (presto->buff_out_pos >= BUFFER_SIZE)
 #elif BUILD_PRESTO_LIBFTDI == 1
 	/* libftdi does not do background read, be sure that USB IN buffer does not overflow (128 bytes only!) */
-	if (presto->buff_out_pos >= BUFFER_SIZE || presto->buff_in_exp==128)
+	if (presto->buff_out_pos >= BUFFER_SIZE || presto->buff_in_exp == 128)
 #endif
 		return presto_flush();
 
@@ -553,7 +553,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 +625,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;
@@ -652,14 +652,14 @@ static int presto_bitq_flush(void)
 
 static int presto_bitq_in_rdy(void)
 {
-	if (presto->buff_in_pos>=presto->buff_in_len)
+	if (presto->buff_in_pos >= presto->buff_in_len)
 		return 0;
 	return presto->buff_in_len-presto->buff_in_pos;
 }
 
 static int presto_bitq_in(void)
 {
-	if (presto->buff_in_pos>=presto->buff_in_len)
+	if (presto->buff_in_pos >= presto->buff_in_len)
 		return -1;
 	if (presto->buff_in[presto->buff_in_pos++]&0x08) return 1;
 	return 0;
@@ -707,12 +707,12 @@ static int presto_jtag_khz(int khz, int *jtag_speed)
 {
 	if (khz < 0)
 	{
-		*jtag_speed=0;
+		*jtag_speed = 0;
 		return ERROR_INVALID_ARGUMENTS;
 	}
 
 	if (khz >= 3000) *jtag_speed = 0;
-	else *jtag_speed = (1000+khz-1)/khz;
+	else *jtag_speed = (1000 + khz-1)/khz;
 
 	return 0;
 }
@@ -721,7 +721,7 @@ static int presto_jtag_speed_div(int speed, int *khz)
 {
 	if ((speed < 0) || (speed > 1000))
 	{
-		*khz=0;
+		*khz = 0;
 		return ERROR_INVALID_ARGUMENTS;
 	}
 
@@ -752,7 +752,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)
 	{