Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
SVF player courtesy of Simon Qian <simonqian@SimonQian.com>
[openocd.git] / src / jtag / presto.c
diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index c031d94b1dac8f30b8d7f9811e7019f6c28ab7a1..0e532817fc4453f7704b761ac09ae312182b9cf9 100644 (file)
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -49,8 +49,9 @@
 #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);
@@ -60,12 +61,13 @@ 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,
 };
 
-
 int presto_bitq_out(int tms, int tdi, int tdo_req);
 int presto_bitq_flush(void);
 int presto_bitq_sleep(unsigned long us);
@@ -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,10 +121,13 @@ 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;
@@ -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
@@ -476,7 +482,6 @@ int presto_close(void)
        return result;
 }
 
-
 int presto_flush(void)
 {
        if (presto->buff_out_pos == 0)
@@ -520,7 +525,6 @@ int presto_flush(void)
        return ERROR_OK;
 }
 
-
 int presto_sendbyte(int data)
 {
        if (data == EOF) return presto_flush();
@@ -545,7 +549,6 @@ int presto_sendbyte(int data)
        return ERROR_OK;
 }
 
-
 int presto_getbyte(void)
 {
        if (presto->buff_in_pos < presto->buff_in_len)
@@ -563,86 +566,96 @@ int presto_getbyte(void)
        return -1;
 }
 
-
 /* -------------------------------------------------------------------------- */
 
+int presto_tdi_flush(void)
+{
+       if (presto->jtag_tdi_count == 0)
+               return 0;
+
+       if (presto->jtag_tck == 0)
+       {
+               LOG_ERROR("BUG: unexpected TAP condition, TCK low");
+               return -1;
+       }
+
+       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;
+}
+
+int presto_tck_idle(void)
+{
+       if (presto->jtag_tck == 1)
+       {
+               presto_sendbyte(0xCA);
+               presto->jtag_tck = 0;
+       }
+       
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
 
 int presto_bitq_out(int tms, int tdi, int tdo_req)
 {
-       unsigned char cmdparam;
+       int i;
+       unsigned char cmd;
 
        if (presto->jtag_tck == 0)
        {
-               presto_sendbyte(0xA4);
-               presto->jtag_tck = 1;
+               presto_sendbyte(0xA4); /* LED idicator - JTAG active */
        }
-
-       else if (!tdo_req && tms == presto->jtag_tms)
+       else if (presto->jtag_speed == 0 && !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 |= (tdi != 0) << presto->jtag_tdi_count;
 
                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;
-       }
+                       presto_tdi_flush();
 
-       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;
+               return 0;
        }
 
-       if (tdi)
-               cmdparam = 0x0B;
-       else
-               cmdparam = 0x0A;
+       presto_tdi_flush();
 
-       presto_sendbyte( 0xC0 | cmdparam);
+       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)
 {
-       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)
 {
        if (presto->buff_in_pos>=presto->buff_in_len)
@@ -650,7 +663,6 @@ int presto_bitq_in_rdy(void)
        return presto->buff_in_len-presto->buff_in_pos;
 }
 
-
 int presto_bitq_in(void)
 {
        if (presto->buff_in_pos>=presto->buff_in_len)
@@ -659,11 +671,13 @@ int presto_bitq_in(void)
        return 0;
 }
 
-
 int presto_bitq_sleep(unsigned long us)
 {
        long waits;
 
+       presto_tdi_flush();
+       presto_tck_idle();
+
        if (us > 100000)
        {
                presto_bitq_flush();
@@ -678,46 +692,69 @@ int presto_bitq_sleep(unsigned long us)
        return 0;
 }
 
-
 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] =
+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))
+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;
 }
 
+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;
+}
 
 char *presto_serial;
 
@@ -737,7 +774,6 @@ 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)
 {
        register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
@@ -745,7 +781,6 @@ int presto_jtag_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-
 int presto_jtag_init(void)
 {
        if (presto_open(presto_serial) != ERROR_OK)
@@ -766,7 +801,6 @@ int presto_jtag_init(void)
        return ERROR_OK;
 }
 
-
 int presto_jtag_quit(void)
 {
        bitq_cleanup();
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)