Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- Fixes '<<' whitespace
[openocd.git] / src / jtag / ft2232.c
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index a288b4a21372a1c15bc4d925d314c49be4ce7851..d4e0fbcbf3261852b1772e3d90b121047930aeff 100644 (file)
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -52,7 +52,7 @@
 
 #if (BUILD_FT2232_FTD2XX==1 && BUILD_FT2232_LIBFTDI==1)
 #error "BUILD_FT2232_FTD2XX && BUILD_FT2232_LIBFTDI are mutually exclusive"
-#elif (BUILD_FT2232_FTD2XX!=1 && BUILD_FT2232_LIBFTDI!=1)
+#elif (BUILD_FT2232_FTD2XX != 1 && BUILD_FT2232_LIBFTDI != 1)
 #error "BUILD_FT2232_FTD2XX || BUILD_FT2232_LIBFTDI must be chosen"
 #endif
 
@@ -264,7 +264,7 @@ static void clock_tms(uint8_t mpsse_cmd, int tms_bits, int tms_count, bool tdi_b
                bool bit = tms_bits & 1;
 
                if (bit)
-                       tms_byte |= (1<<tms_ndx);
+                       tms_byte |= (1 << tms_ndx);
 
                /* always do state transitions in public view */
                tap_set_state(tap_state_transition(tap_get_state(), bit));
@@ -338,7 +338,7 @@ jtag_interface_t ft2232_interface =
        .quit                   = ft2232_quit,
 };
 
-static int ft2232_write(uint8_t* buf, int size, u32* bytes_written)
+static int ft2232_write(uint8_t* buf, int size, uint32_t* bytes_written)
 {
 #if BUILD_FT2232_FTD2XX == 1
        FT_STATUS status;
@@ -371,7 +371,7 @@ static int ft2232_write(uint8_t* buf, int size, u32* bytes_written)
 }
 
 
-static int ft2232_read(uint8_t* buf, u32 size, u32* bytes_read)
+static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
 {
 #if BUILD_FT2232_FTD2XX == 1
        DWORD     dw_bytes_read;
@@ -411,7 +411,9 @@ static int ft2232_read(uint8_t* buf, u32 size, u32* bytes_read)
 
        if (*bytes_read < size)
        {
-               LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)", *bytes_read, size);
+               LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)", 
+                         (unsigned int)(*bytes_read), 
+                         (unsigned int)size);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -441,7 +443,7 @@ static int ft2232_adaptive_clocking(int speed)
        uint8_t  buf = use_adaptive_clocking ? 0x96 : 0x97;
        LOG_DEBUG("%2.2x", buf);
 
-       u32 bytes_written;
+       uint32_t bytes_written;
        int retval = ft2232_write(&buf, 1, &bytes_written);
        if (ERROR_OK != retval || bytes_written != 1)
        {
@@ -463,7 +465,7 @@ static int ft2232_speed(int speed)
 {
        uint8_t  buf[3];
        int retval;
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        ft2232_adaptive_clocking(speed);
 
@@ -621,8 +623,8 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
        int             scan_size;
        enum scan_type  type;
        int             retval;
-       u32             bytes_written=0;
-       u32             bytes_read=0;
+       uint32_t             bytes_written=0;
+       uint32_t             bytes_read=0;
 
 #ifdef _DEBUG_USB_IO_
        struct timeval  start, inter, inter2, end;
@@ -758,7 +760,7 @@ static void ft2232_add_pathmove(tap_state_t* path, int num_states)
                if (tap_state_transition(walker, false) == desired_next_state)
                        ;       /* bit within tms_bits at index state_ndx is already zero */
                else if (tap_state_transition(walker, true) == desired_next_state)
-                       tms_bits |= (1<<state_ndx);
+                       tms_bits |= (1 << state_ndx);
                else
                {
                        LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
@@ -942,8 +944,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
        int last_bit;
        uint8_t* receive_buffer  = malloc(CEIL(scan_size, 8));
        uint8_t* receive_pointer = receive_buffer;
-       u32 bytes_written;
-       u32 bytes_read;
+       uint32_t bytes_written;
+       uint32_t bytes_read;
        int retval;
        int thisrun_read = 0;
 
@@ -963,7 +965,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                LOG_ERROR("couldn't write MPSSE commands to FT2232");
                exit(-1);
        }
-       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", ft2232_buffer_size, bytes_written);
+       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
+                 ft2232_buffer_size, (int)bytes_written);
        ft2232_buffer_size = 0;
 
        /* add command for complete bytes */
@@ -1016,7 +1019,9 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        LOG_ERROR("couldn't write MPSSE commands to FT2232");
                        exit(-1);
                }
-               LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", ft2232_buffer_size, bytes_written);
+               LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
+                         ft2232_buffer_size, 
+                         (int)bytes_written);
                ft2232_buffer_size = 0;
 
                if (type != SCAN_OUT)
@@ -1026,7 +1031,9 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                                LOG_ERROR("couldn't read from FT2232");
                                exit(-1);
                        }
-                       LOG_DEBUG("thisrun_read: %i, bytes_read: %i", thisrun_read, bytes_read);
+                       LOG_DEBUG("thisrun_read: %i, bytes_read: %i", 
+                                 thisrun_read, 
+                                 (int)bytes_read);
                        receive_pointer += bytes_read;
                }
        }
@@ -1122,7 +1129,9 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                LOG_ERROR("couldn't write MPSSE commands to FT2232");
                exit(-1);
        }
-       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", ft2232_buffer_size, bytes_written);
+       LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i", 
+                 ft2232_buffer_size, 
+                 (int)bytes_written);
        ft2232_buffer_size = 0;
 
        if (type != SCAN_OUT)
@@ -1132,7 +1141,9 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
                        LOG_ERROR("couldn't read from FT2232");
                        exit(-1);
                }
-               LOG_DEBUG("thisrun_read: %i, bytes_read: %i", thisrun_read, bytes_read);
+               LOG_DEBUG("thisrun_read: %i, bytes_read: %i", 
+                         thisrun_read, 
+                         (int)bytes_read);
                receive_pointer += bytes_read;
        }
 
@@ -1860,7 +1871,7 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
                if (status == FT_OK)
                {
                        char** desc_array = malloc(sizeof(char*) * (num_devices + 1));
-                       u32 i;
+                       uint32_t i;
 
                        for (i = 0; i < num_devices; i++)
                                desc_array[i] = malloc(64);
@@ -2034,7 +2045,7 @@ static int ft2232_init(void)
 {
        uint8_t  buf[1];
        int retval;
-       u32 bytes_written;
+       uint32_t bytes_written;
        const ft2232_layout_t* cur_layout = ft2232_layouts;
        int i;
 
@@ -2124,7 +2135,7 @@ static int ft2232_init(void)
 static int usbjtag_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x0b;
@@ -2200,7 +2211,7 @@ static int usbjtag_init(void)
 static int axm0432_jtag_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x2b;
@@ -2271,7 +2282,7 @@ static int axm0432_jtag_init(void)
 static int jtagkey_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x1b;
@@ -2354,7 +2365,7 @@ static int jtagkey_init(void)
 static int olimex_jtag_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x1b;
@@ -2422,7 +2433,7 @@ static int olimex_jtag_init(void)
 static int flyswatter_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x18;
        low_direction = 0xfb;
@@ -2469,7 +2480,7 @@ static int flyswatter_init(void)
 static int turtle_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x5b;
@@ -2510,7 +2521,7 @@ static int turtle_init(void)
 static int comstick_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x0b;
@@ -2554,7 +2565,7 @@ static int comstick_init(void)
 static int stm32stick_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x88;
        low_direction = 0x8b;
@@ -2598,7 +2609,7 @@ static int stm32stick_init(void)
 static int sheevaplug_init(void)
 {
        uint8_t buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output = 0x08;
        low_direction = 0x1b;
@@ -2649,7 +2660,7 @@ static int sheevaplug_init(void)
 static int cortino_jtag_init(void)
 {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_output    = 0x08;
        low_direction = 0x1b;
@@ -2950,7 +2961,7 @@ static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
  */
 static int icebear_jtag_init(void) {
        uint8_t  buf[3];
-       u32 bytes_written;
+       uint32_t bytes_written;
 
        low_direction   = 0x0b; /* output: TCK TDI TMS; input: TDO */
        low_output      = 0x08; /* high: TMS; low: TCK TDI */
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)