Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add header file for JTAG minidriver:
[openocd.git] / src / jtag / zy1000.c
diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c
index b17780684f02cc3e483859286c6249021f0fa648..73a40f2ed8c5910b1ec3efd0f11cb1d6e7230100 100644 (file)
--- a/src/jtag/zy1000.c
+++ b/src/jtag/zy1000.c
@@ -20,19 +20,16 @@
 #include "config.h"
 #endif
 
-
-#include "log.h"
-#include "jtag.h"
+#define INCLUDE_JTAG_INTERFACE_H
+#include "embeddedice.h"
+#include "minidriver.h"
 #include "bitbang.h"
-#include "../target/embeddedice.h"
-
 
 #include <cyg/hal/hal_io.h>             // low level i/o
 #include <cyg/hal/hal_diag.h>
 
-#include <stdlib.h>
 
-#define ZYLIN_VERSION "1.51"
+#define ZYLIN_VERSION "1.52"
 #define ZYLIN_DATE __DATE__
 #define ZYLIN_TIME __TIME__
 #define ZYLIN_OPENOCD "$Revision$"
@@ -384,7 +381,6 @@ int zy1000_quit(void)
 
 
 
-
 int interface_jtag_execute_queue(void)
 {
        cyg_uint32 empty;
@@ -448,7 +444,7 @@ static void gotoEndState(void)
        setCurrentState(cmd_queue_end_state);
 }
 
-static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, int pause)
+static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
 {
        int i;
        int j;
@@ -468,24 +464,6 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
                if (fields[i].in_value!=NULL)
                {
                        inBuffer=fields[i].in_value;
-               } else if (fields[i].in_handler!=NULL)
-               {
-                       if (in_buff_size*8<num_bits)
-                       {
-                               // we need more space
-                               if (in_buff!=NULL)
-                                       free(in_buff);
-                               in_buff=NULL;
-                               in_buff_size=(num_bits+7)/8;
-                               in_buff=malloc(in_buff_size);
-                               if (in_buff==NULL)
-                               {
-                                       LOG_ERROR("Out of memory");
-                                       jtag_error=ERROR_JTAG_QUEUE_FAILED;
-                                       return;
-                               }
-                       }
-                       inBuffer=in_buff;
                }
 
                // here we shuffle N bits out/in
@@ -500,10 +478,10 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
                        {
                                k=32;
                                /* we have more to shift out */
-                       } else if (pause&&(i == num_fields-1))
+                       } else if (i == num_fields-1)
                        {
                                /* this was the last to shift out this time */
-                               pause_state=(shiftState==TAP_DRSHIFT)?TAP_DRPAUSE:TAP_IRPAUSE;
+                               pause_state=end_state;
                        }
 
                        // we have (num_bits+7)/8 bytes of bits to toggle out.
@@ -535,17 +513,6 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
                        }
                        j+=k;
                }
-
-               if (fields[i].in_handler!=NULL)
-               {
-                       // invoke callback
-                       int r=fields[i].in_handler(inBuffer, fields[i].in_handler_priv, fields+i);
-                       if (r!=ERROR_OK)
-                       {
-                               /* this will cause jtag_execute_queue() to return an error */
-                               jtag_error=r;
-                       }
-               }
        }
 }
 
@@ -555,7 +522,7 @@ int interface_jtag_add_end_state(tap_state_t state)
 }
 
 
-int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 
        int j;
@@ -564,7 +531,14 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t
        for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
        {
                nextTap=jtag_NextEnabledTap(tap);
-               int pause=(nextTap==NULL);
+               tap_state_t end_state;
+               if (nextTap==NULL)
+               {
+                       end_state = cmd_queue_end_state;
+               } else
+               {
+                       end_state = TAP_IRSHIFT;
+               }
 
                int found = 0;
 
@@ -577,16 +551,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t
                        {
                                found = 1;
 
-                               if ((jtag_verify_capture_ir)&&(fields[j].in_handler==NULL))
-                               {
-                                       jtag_set_check_value(fields+j, tap->expected, tap->expected_mask, NULL);
-                               } else if (jtag_verify_capture_ir)
-                               {
-                                       fields[j].in_check_value = tap->expected;
-                                       fields[j].in_check_mask = tap->expected_mask;
-                               }
-
-                               scanFields(1, fields+j, TAP_IRSHIFT, pause);
+                               scanFields(1, fields+j, TAP_IRSHIFT, end_state);
                                /* update device information */
                                buf_cpy(fields[j].out_value, tap->cur_instr, scan_size);
 
@@ -604,13 +569,12 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t
                        memset(&tmp, 0, sizeof(tmp));
                        tmp.out_value = ones;
                        tmp.num_bits = scan_size;
-                       scanFields(1, &tmp, TAP_IRSHIFT, pause);
+                       scanFields(1, &tmp, TAP_IRSHIFT, end_state);
                        /* update device information */
                        buf_cpy(tmp.out_value, tap->cur_instr, scan_size);
                        tap->bypass = 1;
                }
        }
-       gotoEndState();
 
        return ERROR_OK;
 }
@@ -619,17 +583,16 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t
 
 
 
-int interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_ir_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
-       scanFields(num_fields, fields, TAP_IRSHIFT, 1);
-       gotoEndState();
+       scanFields(num_fields, fields, TAP_IRSHIFT, cmd_queue_end_state);
 
        return ERROR_OK;
 }
 
 /*extern jtag_command_t **jtag_get_last_command_p(void);*/
 
-int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
 
        int j;
@@ -638,7 +601,14 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t
        {
                nextTap=jtag_NextEnabledTap(tap);
                int found=0;
-               int pause=(nextTap==NULL);
+               tap_state_t end_state;
+               if (nextTap==NULL)
+               {
+                       end_state = cmd_queue_end_state;
+               } else
+               {
+                       end_state = TAP_DRSHIFT;
+               }
 
                for (j=0; j < num_fields; j++)
                {
@@ -646,7 +616,7 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t
                        {
                                found = 1;
 
-                               scanFields(1, fields+j, TAP_DRSHIFT, pause);
+                               scanFields(1, fields+j, TAP_DRSHIFT, end_state);
                        }
                }
                if (!found)
@@ -656,25 +626,19 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t
                        tmp.num_bits = 1;
                        tmp.out_value = NULL;
                        tmp.in_value = NULL;
-                       tmp.in_check_value = NULL;
-                       tmp.in_check_mask = NULL;
-                       tmp.in_handler = NULL;
-                       tmp.in_handler_priv = NULL;
 
-                       scanFields(1, &tmp, TAP_DRSHIFT, pause);
+                       scanFields(1, &tmp, TAP_DRSHIFT, end_state);
                }
                else
                {
                }
        }
-       gotoEndState();
        return ERROR_OK;
 }
 
-int interface_jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+int interface_jtag_add_plain_dr_scan(int num_fields, const scan_field_t *fields, tap_state_t state)
 {
-       scanFields(num_fields, fields, TAP_DRSHIFT, 1);
-       gotoEndState();
+       scanFields(num_fields, fields, TAP_DRSHIFT, cmd_queue_end_state);
        return ERROR_OK;
 }
 
@@ -723,8 +687,9 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
        /* test manual drive code on any target */
        int tms;
        u8 tms_scan = tap_get_tms_path(t, state);
+       int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
-       for (i = 0; i < 7; i++)
+       for (i = 0; i < tms_count; i++)
        {
                tms = (tms_scan >> i) & 1;
                waitIdle();
@@ -754,7 +719,7 @@ int interface_jtag_add_sleep(u32 us)
        return ERROR_OK;
 }
 
-int interface_jtag_add_pathmove(int num_states, tap_state_t *path)
+int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
 {
        int state_count;
        int tms = 0;
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)