David Brownell david-b at pacbell.net fix warnings
[fw/openocd] / src / jtag / presto.c
index c031d94b1dac8f30b8d7f9811e7019f6c28ab7a1..ea57a36ec8b925a6ebb9ba23d891f8d9f79f0e62 100644 (file)
 #error "BUG: either FTD2XX and LIBFTDI has to be used"
 #endif
 
-
-int presto_jtag_speed(int speed);
-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 =
 {
        .name = "presto",
        .execute_queue = bitq_execute_queue,
        .speed = presto_jtag_speed,
+       .khz = presto_jtag_khz,
+       .speed_div = presto_jtag_speed_div,
        .register_commands = presto_jtag_register_commands,
        .init = presto_jtag_init,
        .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,
@@ -83,10 +85,8 @@ bitq_interface_t presto_bitq =
        .in = presto_bitq_in,
 };
 
-
 /* -------------------------------------------------------------------------- */
 
-
 #define FT_DEVICE_NAME_LEN 64
 #define FT_DEVICE_SERNUM_LEN 64
 
@@ -121,21 +121,24 @@ typedef struct presto_s
 
        int jtag_tms; /* last tms state */
        int jtag_tck; /* last tck state */
+       int jtag_rst; /* last trst state */
 
        int jtag_tdi_data;
        int jtag_tdi_count;
 
+       int jtag_speed;
+       
 } 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;
@@ -157,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;
@@ -199,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;
        }
 
@@ -207,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];
@@ -235,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)
@@ -254,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);
@@ -337,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;
 
@@ -410,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;
@@ -422,9 +425,12 @@ int presto_open(char *req_serial)
 
        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;
+       
 #if BUILD_PRESTO_FTD2XX == 1
        return presto_open_ftd2xx(req_serial);
 #elif BUILD_PRESTO_LIBFTDI == 1
@@ -432,7 +438,7 @@ int presto_open(char *req_serial)
 #endif
 }
 
-int presto_close(void)
+static int presto_close(void)
 {
 
        int result = ERROR_OK;
@@ -476,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;
@@ -520,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();
 
@@ -545,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++];
@@ -562,96 +566,106 @@ int presto_getbyte(void)
 
        return -1;
 }
-
+#endif
 
 /* -------------------------------------------------------------------------- */
 
-
-int presto_bitq_out(int tms, int tdi, int tdo_req)
+static int presto_tdi_flush(void)
 {
-       unsigned char cmdparam;
+       if (presto->jtag_tdi_count == 0)
+               return 0;
 
        if (presto->jtag_tck == 0)
        {
-               presto_sendbyte(0xA4);
-               presto->jtag_tck = 1;
+               LOG_ERROR("BUG: unexpected TAP condition, TCK low");
+               return -1;
        }
 
-       else if (!tdo_req && tms == presto->jtag_tms)
-       {
-               if (presto->jtag_tdi_count == 0)
-                       presto->jtag_tdi_data = (tdi != 0);
-               else
-                       presto->jtag_tdi_data |= (tdi != 0) << presto->jtag_tdi_count;
+       presto->jtag_tdi_data |= (presto->jtag_tdi_count - 1) << 4;
+       presto_sendbyte(presto->jtag_tdi_data);
+       presto->jtag_tdi_count = 0;
+       presto->jtag_tdi_data = 0;
+       
+       return 0;
+}
 
-               if (++presto->jtag_tdi_count == 4)
-               {
-                       presto->jtag_tdi_data |= (presto->jtag_tdi_count - 1) << 4;
-                       presto_sendbyte(presto->jtag_tdi_data);
-                       presto->jtag_tdi_count = 0;
-               }
-               return 0;
+static int presto_tck_idle(void)
+{
+       if (presto->jtag_tck == 1)
+       {
+               presto_sendbyte(0xCA);
+               presto->jtag_tck = 0;
        }
+       
+       return 0;
+}
 
-       if (presto->jtag_tdi_count)
+/* -------------------------------------------------------------------------- */
+
+static int presto_bitq_out(int tms, int tdi, int tdo_req)
+{
+       int i;
+       unsigned char cmd;
+
+       if (presto->jtag_tck == 0)
        {
-               presto->jtag_tdi_data |= (presto->jtag_tdi_count - 1) << 4;
-               presto_sendbyte(presto->jtag_tdi_data);
-               presto->jtag_tdi_count = 0;
+               presto_sendbyte(0xA4); /* LED idicator - JTAG active */
        }
+       else if (presto->jtag_speed == 0 && !tdo_req && tms == presto->jtag_tms)
+       {
+               presto->jtag_tdi_data |= (tdi != 0) << presto->jtag_tdi_count;
 
-       if (tdi)
-               cmdparam = 0x0B;
-       else
-               cmdparam = 0x0A;
+               if (++presto->jtag_tdi_count == 4)
+                       presto_tdi_flush();
 
-       presto_sendbyte( 0xC0 | cmdparam);
+               return 0;
+       }
+
+       presto_tdi_flush();
+
+       cmd = tdi ? 0xCB : 0xCA;
+       presto_sendbyte(cmd);
 
        if (tms != presto->jtag_tms)
        {
-               if (tms)
-                       presto_sendbyte(0xEC);
-               else
-                       presto_sendbyte(0xE8);
+               presto_sendbyte((tms ? 0xEC : 0xE8) | (presto->jtag_rst ? 0x02 : 0));
                presto->jtag_tms = tms;
        }
 
-       if (tdo_req)
-               presto_sendbyte(0xD4 | cmdparam);
-       else
-               presto_sendbyte(0xC4|cmdparam);
+       /* delay with TCK low */
+       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--)
+               presto_sendbyte(cmd);
+
+       presto->jtag_tck = 1;
 
        return 0;
 }
 
-
-int presto_bitq_flush(void)
+static int presto_bitq_flush(void)
 {
-       if (presto->jtag_tdi_count)
-       {
-               presto->jtag_tdi_data |= (presto->jtag_tdi_count - 1) << 4;
-               presto_sendbyte(presto->jtag_tdi_data);
-               presto->jtag_tdi_count = 0;
-       }
-
-       presto_sendbyte(0xCA);
-       presto->jtag_tck = 0;
+       presto_tdi_flush();
+       presto_tck_idle();
 
-       presto_sendbyte(0xA0);
+       presto_sendbyte(0xA0); /* LED idicator - JTAG idle */
 
        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;
@@ -659,11 +673,13 @@ int presto_bitq_in(void)
        return 0;
 }
 
-
-int presto_bitq_sleep(unsigned long us)
+static int presto_bitq_sleep(unsigned long us)
 {
        long waits;
 
+       presto_tdi_flush();
+       presto_tck_idle();
+
        if (us > 100000)
        {
                presto_bitq_flush();
@@ -678,50 +694,73 @@ 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)
 {
-       unsigned char cmd;
+       presto_tdi_flush();
+       presto_tck_idle();
 
-       cmd = 0xE8;
-       if (presto->jtag_tms)
-               cmd |= 0x04;
+       /* add a delay after possible TCK transition */
+       presto_sendbyte(0x80);
+       presto_sendbyte(0x80);
 
-       if (trst || srst)
-               cmd |= 0x02;
+       presto->jtag_rst = trst || srst;
+       presto_sendbyte((presto->jtag_rst ? 0xEA : 0xE8) | (presto->jtag_tms ? 0x04 : 0));
 
-       presto_sendbyte(cmd);
        return 0;
 }
 
-
 /* -------------------------------------------------------------------------- */
 
-char *presto_speed_text[4] =
+static int presto_jtag_khz(int khz, int *jtag_speed)
 {
-       "3 MHz",
-       "1.5 MHz",
-       "750 kHz",
-       "93.75 kHz"
-};
+       if (khz < 0)
+       {
+               *jtag_speed=0;
+               return ERROR_INVALID_ARGUMENTS;
+       }
 
-int presto_jtag_speed(int speed)
-{
+       if (khz >= 3000) *jtag_speed = 0;
+       else *jtag_speed = (1000+khz-1)/khz;
+       
+       return 0;
+}
 
-       if ((speed < 0) || (speed > 3))
+static int presto_jtag_speed_div(int speed, int *khz)
+{
+       if ((speed < 0) || (speed > 1000))
        {
-               LOG_INFO("valid speed values: 0 (3 MHz), 1 (1.5 MHz), 2 (750 kHz) and 3 (93.75 kHz)");
+               *khz=0;
                return ERROR_INVALID_ARGUMENTS;
        }
 
-       LOG_INFO("setting speed to %d, max. TCK freq. is %s", speed, presto_speed_text[speed]);
-       return presto_sendbyte(0xA8 | speed);
+       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;
+       }
 
-char *presto_serial;
+       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;
+}
 
-int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static char *presto_serial;
+
+static int presto_handle_serial_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        if (argc == 1)
        {
@@ -737,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)
        {
@@ -766,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();