From: Øyvind Harboe Date: Fri, 4 Dec 2009 07:20:38 +0000 (+0100) Subject: zy1000: FPGA revC wip X-Git-Tag: v0.4.0-rc1~133 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=24551b7b92725fb2b26d042c2e88330e3d1d4d21;p=openocd zy1000: FPGA revC wip The bug in revC register memory access is pretty much cornered now. Signed-off-by: Øyvind Harboe --- diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index afbea13a..536c6770 100644 --- a/src/jtag/zy1000/jtag_minidriver.h +++ b/src/jtag/zy1000/jtag_minidriver.h @@ -18,6 +18,7 @@ ***************************************************************************/ #include // low level i/o +#include // low level i/o //#define VERBOSE(a) a #define VERBOSE(a) @@ -31,10 +32,16 @@ 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. \ - */ \ + +#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) \ { \ @@ -42,7 +49,14 @@ int diag_printf(const char *fmt, ...); cyg_uint32 empty; ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); \ overflow_counter = 0; \ } \ - } + /* NB! interrupts must be restored *after* read */ \ + HAL_RESTORE_INTERRUPTS(_old_); \ +}\ + +#else +#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b) +#endif + #endif // FIFO empty?