X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fzy1000%2Fjtag_minidriver.h;h=7d1ede5d48f24f49ce6383bc9cc7529abc135976;hp=536c677061d3d97c92af3d60a25aa056807a3745;hb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;hpb=24551b7b92725fb2b26d042c2e88330e3d1d4d21
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 536c677061..7d1ede5d48 100644
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007-2009 by Ãyvind Harboe *
+ * Copyright (C) 2007-2010 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 *
@@ -12,89 +12,85 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
-#include // low level i/o
-#include // low level i/o
-
-//#define VERBOSE(a) a
-#define VERBOSE(a)
-
/* used to test manual mode */
#define TEST_MANUAL() 0
+#define VERBOSE(a)
-#if 0
-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)
-#else
-#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b)
+#if BUILD_ZY1000_MASTER
-#ifdef CYGPKG_HAL_NIOS2
-#define ZY1000_POKE(a, b) \
- {/* This will flush the bridge FIFO. Overflowed bridge FIFO fails. We must \
- flush every "often". No precise system has been found, but 4 seems solid. \
- This code goes away once the FPGA has been fixed. */ \
-\
-CYG_INTERRUPT_STATE _old_; \
-HAL_DISABLE_INTERRUPTS(_old_); \
-HAL_WRITE_UINT32(a, b);\
- static int overflow_counter = 0; \
- if (++overflow_counter >= 1) \
- { \
- /* clear FIFO */ \
- cyg_uint32 empty; ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); \
- overflow_counter = 0; \
- } \
- /* NB! interrupts must be restored *after* read */ \
- HAL_RESTORE_INTERRUPTS(_old_); \
-}\
+#define ZY1000_PEEK(a, b) do {b = *((volatile uint32_t *)(a)); } while (0)
+#define ZY1000_POKE(a, b) do {*((volatile uint32_t *)(a)) = b; } while (0)
+extern volatile void *zy1000_jtag_master;
+#define ZY1000_JTAG_BASE ((unsigned long)zy1000_jtag_master)
#else
-#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)
-#endif
+
+/* redirect this to TCP/IP */
+#define ZY1000_JTAG_BASE 0
+extern void zy1000_tcpout(uint32_t address, uint32_t data);
+extern uint32_t zy1000_tcpin(uint32_t address);
+#define ZY1000_PEEK(a, b) b = zy1000_tcpin(a)
+#define ZY1000_POKE(a, b) zy1000_tcpout(a, b)
#endif
-// FIFO empty?
-static __inline__ void waitIdle(void)
+#if BUILD_ZY1000_MASTER
+/* FIFO empty? */
+static inline void waitIdle(void)
{
- cyg_uint32 empty;
- do
- {
+ uint32_t empty;
+ do {
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
} while ((empty & 0x100) == 0);
}
-static __inline__ void waitQueue(void)
+static inline void zy1000_flush_readqueue(void)
+{
+ /* Not used w/hardware fifo */
+}
+static inline void zy1000_flush_callbackqueue(void)
+{
+ /* Not used w/hardware fifo */
+}
+#else
+extern void waitIdle(void);
+void zy1000_flush_readqueue(void);
+void zy1000_flush_callbackqueue(void);
+void zy1000_jtag_add_callback4(jtag_callback_t callback,
+ jtag_callback_data_t data0,
+ jtag_callback_data_t data1,
+ jtag_callback_data_t data2,
+ jtag_callback_data_t data3);
+void zy1000_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0);
+#endif
+
+static inline void waitQueue(void)
{
-// waitIdle();
+/* 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);
#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;
+ 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
+ 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;
}
waitQueue();
@@ -107,9 +103,12 @@ static void setCurrentState(enum tap_state state)
* 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;
+ uint32_t a, b;
a = state;
b = endState;
waitQueue();
@@ -117,44 +116,42 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
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 = 1;
- }
- /* shift out value */
+ /* shift out value */
waitIdle();
ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, (((value >> i)&1) << 1) | tms);
}
waitIdle();
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);
- }
+
#else
/* fast version */
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);
@@ -162,8 +159,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
sampleShiftRegister();
ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> (repeat-1));
ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | b);
- } else
- {
+ } else {
sampleShiftRegister();
ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
}
@@ -171,65 +167,16 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
#endif
}
-
-
-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,
- enum tap_state end_state)
-{
- enum tap_state pause_state = TAP_DRSHIFT;
-
- 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)
- {
- pause_state = end_state;
- }
- if (tap == target_tap)
- {
- int j;
- for (j = 0; j < (num_fields-1); j++)
- {
- shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[j], value[j]);
- }
- shiftValueInner(TAP_DRSHIFT, pause_state, num_bits[j], value[j]);
- } else
- {
- /* program the scan field to 1 bit length, and ignore it's value */
- shiftValueInner(TAP_DRSHIFT, pause_state, 1, 0);
- }
- }
-}
-
-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))
- {
- /* 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))
- {
- /* used by arm7 code */
- shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]);
- shiftValueInner(TAP_DRSHIFT, end_state, num_bits[1], value[1]);
- } else
- {
- interface_jtag_add_dr_out_core(target_tap, num_fields, num_bits, value, end_state);
- }
-}
-
+#if BUILD_ZY1000_MASTER
#define interface_jtag_add_callback(callback, in) callback(in)
-
-#define interface_jtag_add_callback4(callback, in, data1, data2, data3) jtag_set_error(callback(in, data1, data2, data3))
+#define interface_jtag_add_callback4(callback, in, data1, data2, \
+ data3) jtag_set_error(callback(in, data1, data2, data3))
+#else
+#define interface_jtag_add_callback(callback, in) zy1000_jtag_add_callback(callback, in)
+#define interface_jtag_add_callback4(callback, in, data1, data2, data3) zy1000_jtag_add_callback4( \
+ callback, \
+ in, \
+ data1, \
+ data2, \
+ data3)
+#endif