zy1000: reset bugfix

[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 afbea13a4509ebd3dddbbceffe0a9ad22a78825d..1dcf23a98af6cacb297bd8f3d6b37b7f767c2fd7 100644 (file)
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include <cyg/hal/hal_io.h>             // low level i/o
+#include <cyg/hal/hal_intr.h>             // low level i/o
 
 //#define VERBOSE(a) a
 #define VERBOSE(a)
@@ -31,18 +32,7 @@ int  diag_printf(const char *fmt, ...);
 #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)
-#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(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. \
-  */ \
- static int overflow_counter = 0; \
-   if (++overflow_counter >= 1) \
-   { \
-          /* clear FIFO */ \
-          cyg_uint32 empty; ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); \
-          overflow_counter = 0; \
-   } \
- }
+#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)
 #endif
 
 // FIFO empty?
@@ -60,7 +50,7 @@ static __inline__ void waitQueue(void)
 //     waitIdle();
 }
 
-static void sampleShiftRegister(void)
+static __inline__ void sampleShiftRegister(void)
 {
 #if 0
        cyg_uint32 dummy;
@@ -69,8 +59,7 @@ static void sampleShiftRegister(void)
 #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;