- Fixes '>>' whitespace

[fw/openocd] / src / jtag / dummy.c

diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c
index 158a8d5f5a2a347b9852fb008ebeb80a6c4e480d..6d738ee0dafe8088472e22e4af3069b9efe0e69a 100644 (file)
--- a/src/jtag/dummy.c
+++ b/src/jtag/dummy.c
@@ -21,9 +21,7 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include "jtag.h"
+#include "interface.h"
 #include "bitbang.h"
 
 
@@ -34,7 +32,7 @@ static int dummy_clock;         /* edge detector */
 
 static int clock_count;         /* count clocks in any stable state, only stable states */
 
-static u32 dummy_data;
+static uint32_t dummy_data;
 
 
 static int dummy_speed(int speed);
@@ -87,16 +85,16 @@ static int dummy_read(void)
 static void dummy_write(int tck, int tms, int tdi)
 {
        /* TAP standard: "state transitions occur on rising edge of clock" */
-       if( tck != dummy_clock )
+       if ( tck != dummy_clock )
        {
-               if( tck )
+               if ( tck )
                {
                        tap_state_t old_state = dummy_state;
                        dummy_state = tap_state_transition( old_state, tms );
 
-                       if( old_state != dummy_state )
+                       if ( old_state != dummy_state )
                        {
-                               if( clock_count )
+                               if ( clock_count )
                                {
                                        LOG_DEBUG("dummy_tap: %d stable clocks", clock_count);
                                        clock_count = 0;
@@ -105,7 +103,7 @@ static void dummy_write(int tck, int tms, int tdi)
                                LOG_DEBUG("dummy_tap: %s", tap_state_name(dummy_state) );
 
 #if defined(DEBUG)
-                               if(dummy_state == TAP_DRCAPTURE)
+                               if (dummy_state == TAP_DRCAPTURE)
                                        dummy_data = 0x01255043;
 #endif
                        }
@@ -125,7 +123,7 @@ static void dummy_reset(int trst, int srst)
 {
        dummy_clock = 0;
 
-       if (trst || (srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
+       if (trst || (srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
                dummy_state = TAP_RESET;
 
        LOG_DEBUG("reset to: %s", tap_state_name(dummy_state) );