- Fixes '!=' whitespace

[openocd.git] / src / jtag / presto.c

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 56543e6ab8033459bf091899a9000279f5f55fdf..bd1cc5d441c80c3c61740436a7f53b29ac7d7c4f 100644 (file)
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -25,8 +25,7 @@
 #include "windows.h"
 #endif
 
-#define INCLUDE_JTAG_INTERFACE_H
-#include "jtag.h"
+#include "interface.h"
 #include "time_support.h"
 #include "bitq.h"
 
@@ -99,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;
@@ -118,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;
@@ -140,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));
@@ -151,14 +150,15 @@ 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)", 
+                         (unsigned)ftbytes, (unsigned)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;
@@ -169,7 +169,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);
@@ -193,7 +193,8 @@ 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)", 
+                           (unsigned)ftbytes, (unsigned)size);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -203,7 +204,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];
@@ -278,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");
 
@@ -312,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;
@@ -333,7 +334,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");
 
@@ -421,7 +422,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
@@ -522,7 +523,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++;
        }
@@ -576,7 +577,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;
 }
 
@@ -587,7 +588,7 @@ static int presto_tck_idle(void)
                presto_sendbyte(0xCA);
                presto->jtag_tck = 0;
        }
-       
+
        return 0;
 }
 
@@ -712,7 +713,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;
 }
 
@@ -726,26 +727,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;
 }
 
@@ -788,7 +789,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;