jtag: remove jtag_get_end_state()'s that should be unecessary

[openocd] / src / jtag / zy1000 / jtag_minidriver.h

diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 3fd471b2f802eb26e8c3d11a53f2276bbcb9a9de..1dcf23a98af6cacb297bd8f3d6b37b7f767c2fd7 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  *
@@ -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)
@@ -26,12 +27,12 @@
 #define TEST_MANUAL() 0
 
 #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)
 #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
 
 // FIFO empty?
@@ -49,7 +50,7 @@ static __inline__ void waitQueue(void)
 //     waitIdle();
 }
 
-static void sampleShiftRegister(void)
+static __inline__ void sampleShiftRegister(void)
 {
 #if 0
        cyg_uint32 dummy;
@@ -58,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;
@@ -96,7 +96,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
        {
                int i;
                setCurrentState(state);
-               for (i = 0; i<repeat; i++)
+               for (i = 0; i < repeat; i++)
                {
                        int tms;
                        tms = 0;
@@ -124,11 +124,11 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
 #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);
@@ -148,7 +148,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,7 +156,7 @@ 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;
+       struct jtag_tap *tap, *nextTap;
        for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap = nextTap)
        {
                nextTap = jtag_tap_next_enabled(tap);
@@ -167,7 +167,7 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
                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,7 +180,7 @@ 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,