Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix ft2232 TX buffer overflow
[openocd.git] / src / jtag / presto.c
diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 21f80f00a1d90fe31198d872429122379f1d4b33..ea57a36ec8b925a6ebb9ba23d891f8d9f79f0e62 100644 (file)
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -49,13 +49,12 @@
 #error "BUG: either FTD2XX and LIBFTDI has to be used"
 #endif
 
-
-int presto_jtag_speed(int speed);
-int presto_jtag_khz(int khz, int *jtag_speed);
-int presto_jtag_speed_div(int speed, int *khz);
-int presto_jtag_register_commands(struct command_context_s *cmd_ctx);
-int presto_jtag_init(void);
-int presto_jtag_quit(void);
+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_init(void);
+static int presto_jtag_quit(void);
 
 jtag_interface_t presto_interface =
 {
@@ -69,15 +68,14 @@ jtag_interface_t presto_interface =
        .quit = presto_jtag_quit,
 };
 
+static int presto_bitq_out(int tms, int tdi, int tdo_req);
+static int presto_bitq_flush(void);
+static int presto_bitq_sleep(unsigned long us);
+static int presto_bitq_reset(int trst, int srst);
+static int presto_bitq_in_rdy(void);
+static int presto_bitq_in(void);
 
-int presto_bitq_out(int tms, int tdi, int tdo_req);
-int presto_bitq_flush(void);
-int presto_bitq_sleep(unsigned long us);
-int presto_bitq_reset(int trst, int srst);
-int presto_bitq_in_rdy(void);
-int presto_bitq_in(void);
-
-bitq_interface_t presto_bitq =
+static bitq_interface_t presto_bitq =
 {
        .out = presto_bitq_out,
        .flush = presto_bitq_flush,
@@ -87,10 +85,8 @@ bitq_interface_t presto_bitq =
        .in = presto_bitq_in,
 };
 
-
 /* -------------------------------------------------------------------------- */
 
-
 #define FT_DEVICE_NAME_LEN 64
 #define FT_DEVICE_SERNUM_LEN 64
 
@@ -134,15 +130,15 @@ typedef struct presto_s
        
 } presto_t;
 
-presto_t presto_state;
-presto_t *presto = &presto_state;
+static presto_t presto_state;
+static presto_t *presto = &presto_state;
 
-u8 presto_init_seq[] =
+static u8 presto_init_seq[] =
 {
        0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0
 };
 
-int presto_write(u8 *buf, int size)
+static int presto_write(u8 *buf, u32 size)
 {
 #if BUILD_PRESTO_FTD2XX == 1
        DWORD ftbytes;
@@ -164,14 +160,14 @@ int presto_write(u8 *buf, int size)
 
        if (ftbytes != size)
        {
-               LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%i < %i)", ftbytes, size);
+               LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (u32)ftbytes, size);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        return ERROR_OK;
 }
 
-int presto_read(u8* buf, int size)
+static int presto_read(u8* buf, u32 size)
 {
 #if BUILD_PRESTO_FTD2XX == 1
        DWORD ftbytes;
@@ -206,7 +202,7 @@ int presto_read(u8* buf, int 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 (%i < %i)", ftbytes, size);
+               LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", (u32)ftbytes, size);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -214,9 +210,9 @@ int presto_read(u8* buf, int size)
 }
 
 #if BUILD_PRESTO_FTD2XX == 1
-int presto_open_ftd2xx(char *req_serial)
+static int presto_open_ftd2xx(char *req_serial)
 {
-       int i;
+       u32 i;
        DWORD numdevs;
        DWORD vidpid;
        char devname[FT_DEVICE_NAME_LEN];
@@ -242,7 +238,7 @@ int presto_open_ftd2xx(char *req_serial)
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
-       LOG_DEBUG("FTDI devices available: %i", numdevs);
+       LOG_DEBUG("FTDI devices available: %lu", numdevs);
        for (i = 0; i < numdevs; i++)
        {
                if ((presto->status = FT_Open(i, &(presto->handle))) != FT_OK)
@@ -261,7 +257,7 @@ int presto_open_ftd2xx(char *req_serial)
                                break;
                }
                else
-                       LOG_DEBUG("FT_GetDeviceInfo failed: %i", presto->status);
+                       LOG_DEBUG("FT_GetDeviceInfo failed: %lu", presto->status);
 
                LOG_DEBUG("FTDI device %i does not match, closing", i);
                FT_Close(presto->handle);
@@ -344,7 +340,7 @@ int presto_open_ftd2xx(char *req_serial)
 }
 
 #elif BUILD_PRESTO_LIBFTDI == 1
-int presto_open_libftdi(char *req_serial)
+static int presto_open_libftdi(char *req_serial)
 {
        u8 presto_data;
 
@@ -417,7 +413,7 @@ int presto_open_libftdi(char *req_serial)
 }
 #endif /* BUILD_PRESTO_LIBFTDI == 1 */
 
-int presto_open(char *req_serial)
+static int presto_open(char *req_serial)
 {
        presto->buff_out_pos=0;
        presto->buff_in_pos=0;
@@ -442,7 +438,7 @@ int presto_open(char *req_serial)
 #endif
 }
 
-int presto_close(void)
+static int presto_close(void)
 {
 
        int result = ERROR_OK;
@@ -486,8 +482,7 @@ int presto_close(void)
        return result;
 }
 
-
-int presto_flush(void)
+static int presto_flush(void)
 {
        if (presto->buff_out_pos == 0)
                return ERROR_OK;
@@ -530,8 +525,7 @@ int presto_flush(void)
        return ERROR_OK;
 }
 
-
-int presto_sendbyte(int data)
+static int presto_sendbyte(int data)
 {
        if (data == EOF) return presto_flush();
 
@@ -555,8 +549,8 @@ int presto_sendbyte(int data)
        return ERROR_OK;
 }
 
-
-int presto_getbyte(void)
+#if 0
+static int presto_getbyte(void)
 {
        if (presto->buff_in_pos < presto->buff_in_len)
                return presto->buff_in[presto->buff_in_pos++];
@@ -572,12 +566,11 @@ int presto_getbyte(void)
 
        return -1;
 }
-
+#endif
 
 /* -------------------------------------------------------------------------- */
 
-
-int presto_tdi_flush(void)
+static int presto_tdi_flush(void)
 {
        if (presto->jtag_tdi_count == 0)
                return 0;
@@ -596,8 +589,7 @@ int presto_tdi_flush(void)
        return 0;
 }
 
-
-int presto_tck_idle(void)
+static int presto_tck_idle(void)
 {
        if (presto->jtag_tck == 1)
        {
@@ -608,11 +600,9 @@ int presto_tck_idle(void)
        return 0;
 }
 
-
 /* -------------------------------------------------------------------------- */
 
-
-int presto_bitq_out(int tms, int tdi, int tdo_req)
+static int presto_bitq_out(int tms, int tdi, int tdo_req)
 {
        int i;
        unsigned char cmd;
@@ -658,8 +648,7 @@ int presto_bitq_out(int tms, int tdi, int tdo_req)
        return 0;
 }
 
-
-int presto_bitq_flush(void)
+static int presto_bitq_flush(void)
 {
        presto_tdi_flush();
        presto_tck_idle();
@@ -669,16 +658,14 @@ int presto_bitq_flush(void)
        return presto_flush();
 }
 
-
-int presto_bitq_in_rdy(void)
+static int presto_bitq_in_rdy(void)
 {
        if (presto->buff_in_pos>=presto->buff_in_len)
                return 0;
        return presto->buff_in_len-presto->buff_in_pos;
 }
 
-
-int presto_bitq_in(void)
+static int presto_bitq_in(void)
 {
        if (presto->buff_in_pos>=presto->buff_in_len)
                return -1;
@@ -686,8 +673,7 @@ int presto_bitq_in(void)
        return 0;
 }
 
-
-int presto_bitq_sleep(unsigned long us)
+static int presto_bitq_sleep(unsigned long us)
 {
        long waits;
 
@@ -708,8 +694,7 @@ int presto_bitq_sleep(unsigned long us)
        return 0;
 }
 
-
-int presto_bitq_reset(int trst, int srst)
+static int presto_bitq_reset(int trst, int srst)
 {
        presto_tdi_flush();
        presto_tck_idle();
@@ -724,11 +709,9 @@ int presto_bitq_reset(int trst, int srst)
        return 0;
 }
 
-
 /* -------------------------------------------------------------------------- */
 
-
-int presto_jtag_khz(int khz, int *jtag_speed)
+static int presto_jtag_khz(int khz, int *jtag_speed)
 {
        if (khz < 0)
        {
@@ -742,8 +725,7 @@ int presto_jtag_khz(int khz, int *jtag_speed)
        return 0;
 }
 
-
-int presto_jtag_speed_div(int speed, int *khz)
+static int presto_jtag_speed_div(int speed, int *khz)
 {
        if ((speed < 0) || (speed > 1000))
        {
@@ -757,8 +739,7 @@ int presto_jtag_speed_div(int speed, int *khz)
        return 0;
 }
 
-
-int presto_jtag_speed(int speed)
+static int presto_jtag_speed(int speed)
 {
        int khz;
        
@@ -777,10 +758,9 @@ int presto_jtag_speed(int speed)
        return 0;
 }
 
+static char *presto_serial;
 
-char *presto_serial;
-
-int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        if (argc == 1)
        {
@@ -796,16 +776,14 @@ int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, c
        return ERROR_OK;
 }
 
-
-int presto_jtag_register_commands(struct command_context_s *cmd_ctx)
+static int presto_jtag_register_commands(struct command_context_s *cmd_ctx)
 {
        register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
                COMMAND_CONFIG, NULL);
        return ERROR_OK;
 }
 
-
-int presto_jtag_init(void)
+static int presto_jtag_init(void)
 {
        if (presto_open(presto_serial) != ERROR_OK)
        {
@@ -825,8 +803,7 @@ int presto_jtag_init(void)
        return ERROR_OK;
 }
 
-
-int presto_jtag_quit(void)
+static int presto_jtag_quit(void)
 {
        bitq_cleanup();
        presto_close();
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)