Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
zy1000: allow it to build on linux host for testing purposes
[openocd.git] / src / jtag / zy1000 / jtag_minidriver.h
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 28d1201f55c3f688437040cfb8ff44513000d860..43d0c9755f32ec27316abbcef16a61906055cabb 100644 (file)
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2008 by Øyvind Harboe                              *
+ *   Copyright (C) 2007-2009 by Øyvind Harboe                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -17,31 +17,42 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <cyg/hal/hal_io.h>             // low level i/o
-
-//#define VERBOSE(a) a
-#define VERBOSE(a)
-
 /* used to test manual mode */
 #define TEST_MANUAL() 0
+#define VERBOSE(a)
+
+#if BUILD_ECOSBOARD
+
+#include <cyg/hal/hal_io.h>             // low level i/o
+#include <cyg/hal/hal_intr.h>             // low level i/o
 
 #if 0
-int  diag_printf( const char *fmt, ... );
+int  diag_printf(const char *fmt, ...);
 #define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b); diag_printf("poke 0x%08x,0x%08x\n", a, b)
-#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b); diag_printf("peek 0x%08x=0x%08x\n", a, b)
+#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b); diag_printf("peek 0x%08x = 0x%08x\n", a, b)
 #else
-#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)
 #define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b)
+#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)
+#endif
+
+#else
+
+/* redirect this to TCP/IP */
+#define ZY1000_PEEK(a, b) b = 1;
+#define ZY1000_POKE(a, b)
+
 #endif
 
+
+
 // FIFO empty?
 static __inline__ void waitIdle(void)
 {
-       cyg_uint32 empty;
+       uint32_t empty;
        do
        {
-               ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);
-       } while ((empty & 0x100)==0);
+               ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
+       } while ((empty & 0x100) == 0);
 }
 
 static __inline__ void waitQueue(void)
@@ -49,98 +60,97 @@ static __inline__ void waitQueue(void)
 //     waitIdle();
 }
 
-static void sampleShiftRegister(void)
+static __inline__ void sampleShiftRegister(void)
 {
 #if 0
-       cyg_uint32 dummy;
+       uint32_t dummy;
        waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, dummy);
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, dummy);
 #endif
 }
 
-/* -O3 will inline this for us */
-static void setCurrentState(enum tap_state state)
+static __inline__ void setCurrentState(enum tap_state state)
 {
-       cyg_uint32 a;
-       a=state;
-       int repeat=0;
-       if (state==TAP_RESET)
+       uint32_t a;
+       a = state;
+       int repeat = 0;
+       if (state == TAP_RESET)
        {
                // The FPGA nor we know the current state of the CPU TAP
                // controller. This will move it to TAP for sure.
                //
                // 5 should be enough here, 7 is what OpenOCD uses
-               repeat=7;
+               repeat = 7;
        }
        waitQueue();
        sampleShiftRegister();
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|a);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | a);
 
 }
 
 /*
- * Enter state and cause repeat transitions *out* of that state. So if the endState!=state, then
+ * Enter state and cause repeat transitions *out* of that state. So if the endState != state, then
  * the transition from state to endState counts as a transition out of state.
  */
-static __inline__ void shiftValueInner(const enum tap_state state, const enum tap_state endState, int repeat, cyg_uint32 value)
+static __inline__ void shiftValueInner(const enum tap_state state, const enum tap_state endState, int repeat, uint32_t value)
 {
-       cyg_uint32 a,b;
-       a=state;
-       b=endState;
+       uint32_t a,b;
+       a = state;
+       b = endState;
        waitQueue();
        sampleShiftRegister();
-       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
 #if 1
 #if TEST_MANUAL()
-       if ((state==TAP_DRSHIFT)&&(endState!=TAP_DRSHIFT))
+       if ((state == TAP_DRSHIFT) && (endState != TAP_DRSHIFT))
        {
                int i;
                setCurrentState(state);
-               for (i=0; i<repeat; i++)
+               for (i = 0; i < repeat; i++)
                {
                        int tms;
-                       tms=0;
-                       if ((i==repeat-1)&&(state!=endState))
+                       tms = 0;
+                       if ((i == repeat-1) && (state != endState))
                        {
-                               tms=1;
+                               tms = 1;
                        }
                        /* shift out value */
                        waitIdle();
-                       ZY1000_POKE(ZY1000_JTAG_BASE+0x28, (((value>>i)&1)<<1)|tms);
+                       ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, (((value >> i)&1) << 1) | tms);
                }
                waitIdle();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x28, 0);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
                waitIdle();
-               //ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_DRSHIFT); // set this state and things break => expected
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_DRPAUSE); // set this and things will work => expected. Not setting this is not sufficient to make things break.
+               //ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT); // set this state and things break => expected
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRPAUSE); // set this and things will work => expected. Not setting this is not sufficient to make things break.
                setCurrentState(endState);
        } else
        {
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|b);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
        }
 #else
        /* fast version */
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|b);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
 #endif
 #else
        /* maximum debug version */
-       if ((repeat>0)&&((state==TAP_DRSHIFT)||(state==TAP_SI)))
+       if ((repeat > 0) && ((state == TAP_DRSHIFT)||(state == TAP_SI)))
        {
                int i;
                /* sample shift register for every bit. */
-               for (i=0; i<repeat-1; i++)
+               for (i = 0; i < repeat-1; i++)
                {
                        sampleShiftRegister();
-                       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value>>i);
-                       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<8)|(a<<4)|a);
+                       ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> i);
+                       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | a);
                }
                sampleShiftRegister();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value>>(repeat-1));
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1<<8)|(a<<4)|b);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> (repeat-1));
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | b);
        } else
        {
                sampleShiftRegister();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat<<8)|(a<<4)|b);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
        }
        sampleShiftRegister();
 #endif
@@ -148,7 +158,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
 
 
 
-static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
+static __inline__ void interface_jtag_add_dr_out_core(struct jtag_tap *target_tap,
                int num_fields,
                const int *num_bits,
                const uint32_t *value,
@@ -156,18 +166,18 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
 {
        enum tap_state pause_state = TAP_DRSHIFT;
 
-       jtag_tap_t *tap, *nextTap;
-       for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+       struct jtag_tap *tap, *nextTap;
+       for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap = nextTap)
        {
-               nextTap=jtag_tap_next_enabled(tap);
-               if (nextTap==NULL)
+               nextTap = jtag_tap_next_enabled(tap);
+               if (nextTap == NULL)
                {
                        pause_state = end_state;
                }
                if (tap == target_tap)
                {
                        int j;
-                       for (j=0; j<(num_fields-1); j++)
+                       for (j = 0; j < (num_fields-1); j++)
                        {
                                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[j], value[j]);
                        }
@@ -180,21 +190,21 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
        }
 }
 
-static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
+static __inline__ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
                int num_fields,
                const int *num_bits,
                const uint32_t *value,
                enum tap_state end_state)
 {
 
-       int singletap=(jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL);
-       if ((singletap)&&(num_fields==3))
+       int singletap = (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL)) == NULL);
+       if ((singletap) && (num_fields == 3))
        {
                /* used by embeddedice_write_reg_inner() */
                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]);
                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[1], value[1]);
                shiftValueInner(TAP_DRSHIFT, end_state, num_bits[2], value[2]);
-       } else if ((singletap)&&(num_fields==2))
+       } else if ((singletap) && (num_fields == 2))
        {
                /* used by arm7 code */
                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[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)