X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=385c93c019390b21eee0304cb5bd65b5cdb5367c;hp=3bac4a9553b7b2b57f19b3a71a8d19fe534459a2;hb=86e4324f1bd4cd8135cb857e4b940b1f2e872dc3;hpb=a3e84343e202eb70ebce0ec1e8b15d7f9ce57f00

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 3bac4a9553..385c93c019 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -98,10 +98,10 @@ typedef struct presto_s
 
 	char serial[FT_DEVICE_SERNUM_LEN];
 
-	u8 buff_out[BUFFER_SIZE];
+	uint8_t buff_out[BUFFER_SIZE];
 	int buff_out_pos;
 
-	u8 buff_in[BUFFER_SIZE];
+	uint8_t buff_in[BUFFER_SIZE];
 	int buff_in_exp; /* expected in buffer length */
 	int buff_in_len; /* length of data received */
 	int buff_in_pos;
@@ -117,18 +117,18 @@ 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 u8 presto_init_seq[] =
+static uint8_t presto_init_seq[] =
 {
 	0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0
 };
 
-static int presto_write(u8 *buf, u32 size)
+static int presto_write(uint8_t *buf, uint32_t size)
 {
 #if BUILD_PRESTO_FTD2XX == 1
 	DWORD ftbytes;
@@ -139,7 +139,7 @@ static int presto_write(u8 *buf, u32 size)
 	}
 
 #elif BUILD_PRESTO_LIBFTDI == 1
-	u32 ftbytes;
+	uint32_t ftbytes;
 	if ((presto->retval = ftdi_write_data(&presto->ftdic, buf, size)) < 0)
 	{
 		LOG_ERROR("ftdi_write_data: %s", ftdi_get_error_string(&presto->ftdic));
@@ -150,14 +150,14 @@ static int presto_write(u8 *buf, u32 size)
 
 	if (ftbytes != size)
 	{
-		LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (u32)ftbytes, size);
+		LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (uint32_t)ftbytes, size);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
 	return ERROR_OK;
 }
 
-static int presto_read(u8* buf, u32 size)
+static int presto_read(uint8_t* buf, uint32_t size)
 {
 #if BUILD_PRESTO_FTD2XX == 1
 	DWORD ftbytes;
@@ -168,7 +168,7 @@ static int presto_read(u8* buf, u32 size)
 	}
 
 #elif BUILD_PRESTO_LIBFTDI == 1
-	u32 ftbytes = 0;
+	uint32_t ftbytes = 0;
 
 	struct timeval timeout, now;
 	gettimeofday(&timeout, NULL);
@@ -192,7 +192,7 @@ static int presto_read(u8* buf, u32 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)", (u32)ftbytes, size);
+		LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", (uint32_t)ftbytes, size);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
@@ -202,7 +202,7 @@ static int presto_read(u8* buf, u32 size)
 #if BUILD_PRESTO_FTD2XX == 1
 static int presto_open_ftd2xx(char *req_serial)
 {
-	u32 i;
+	uint32_t i;
 	DWORD numdevs;
 	DWORD vidpid;
 	char devname[FT_DEVICE_NAME_LEN];
@@ -332,7 +332,7 @@ static int presto_open_ftd2xx(char *req_serial)
 #elif BUILD_PRESTO_LIBFTDI == 1
 static int presto_open_libftdi(char *req_serial)
 {
-	u8 presto_data;
+	uint8_t presto_data;
 
 	LOG_DEBUG("searching for PRESTO using libftdi");
 
@@ -420,7 +420,7 @@ static int presto_open(char *req_serial)
 	presto->jtag_tdi_count=0;
 
 	presto->jtag_speed=0;
-	
+
 #if BUILD_PRESTO_FTD2XX == 1
 	return presto_open_ftd2xx(req_serial);
 #elif BUILD_PRESTO_LIBFTDI == 1
@@ -521,7 +521,7 @@ static int presto_sendbyte(int data)
 
 	if (presto->buff_out_pos < BUFFER_SIZE)
 	{
-		presto->buff_out[presto->buff_out_pos++] = (u8)data;
+		presto->buff_out[presto->buff_out_pos++] = (uint8_t)data;
 		if (((data & 0xC0) == 0x40) || ((data & 0xD0)== 0xD0))
 			presto->buff_in_exp++;
 	}
@@ -575,7 +575,7 @@ static int presto_tdi_flush(void)
 	presto_sendbyte(presto->jtag_tdi_data);
 	presto->jtag_tdi_count = 0;
 	presto->jtag_tdi_data = 0;
-	
+
 	return 0;
 }
 
@@ -586,7 +586,7 @@ static int presto_tck_idle(void)
 		presto_sendbyte(0xCA);
 		presto->jtag_tck = 0;
 	}
-	
+
 	return 0;
 }
 
@@ -711,7 +711,7 @@ static int presto_jtag_khz(int khz, int *jtag_speed)
 
 	if (khz >= 3000) *jtag_speed = 0;
 	else *jtag_speed = (1000+khz-1)/khz;
-	
+
 	return 0;
 }
 
@@ -725,26 +725,26 @@ static int presto_jtag_speed_div(int speed, int *khz)
 
 	if (speed == 0) *khz = 3000;
 	else *khz = 1000/speed;
-	
+
 	return 0;
 }
 
 static int presto_jtag_speed(int speed)
 {
 	int khz;
-	
+
 	if (presto_jtag_speed_div(speed, &khz))
 	{
 		return ERROR_INVALID_ARGUMENTS;
 	}
 
 	presto->jtag_speed = speed;
-	
+
 	if (khz%1000 == 0)
 		LOG_INFO("setting speed to %d, max. TCK freq. is %d MHz", speed, khz/1000);
 	else
 		LOG_INFO("setting speed to %d, max. TCK freq. is %d kHz", speed, khz);
-	
+
 	return 0;
 }
 
@@ -787,7 +787,7 @@ static int presto_jtag_init(void)
 	LOG_INFO("PRESTO open, serial number '%s'", presto->serial);
 
 	/* use JTAG speed setting from configuration file */
-	presto_jtag_speed(jtag_speed);
+	presto_jtag_speed(jtag_get_speed());
 
 	bitq_interface = &presto_bitq;
 	return ERROR_OK;