David Brownell <david-b@pacbell.net>:

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

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index 55d1eeeaed8b4f0f055fb3a767b2b25c14e9929d..38b9acb05d10c6b1bdda02775f27a960ba029cf3 100644 (file)
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #endif
 
-#define INCLUDE_JTAG_INTERFACE_H
 #include "interface.h"
 #include "bitbang.h"
 
@@ -54,13 +53,13 @@ static int ep93xx_quit(void);
 
 struct timespec ep93xx_zzzz;
 
-jtag_interface_t ep93xx_interface = 
+jtag_interface_t ep93xx_interface =
 {
        .name = "ep93xx",
 
        .execute_queue = bitbang_execute_queue,
 
-       .speed = ep93xx_speed,  
+       .speed = ep93xx_speed,
        .register_commands = ep93xx_register_commands,
        .init = ep93xx_init,
        .quit = ep93xx_quit,
@@ -85,12 +84,12 @@ static void ep93xx_write(int tck, int tms, int tdi)
                output_value |= TCK_BIT;
        else
                output_value &= ~TCK_BIT;
-       
+
        if (tms)
                output_value |= TMS_BIT;
        else
                output_value &= ~TMS_BIT;
-       
+
        if (tdi)
                output_value |= TDI_BIT;
        else
@@ -112,7 +111,7 @@ static void ep93xx_reset(int trst, int srst)
                output_value |= SRST_BIT;
        else if (srst == 1)
                output_value &= ~SRST_BIT;
-       
+
        *gpio_data_register = output_value;
        nanosleep(&ep93xx_zzzz, NULL);
 }
@@ -154,7 +153,7 @@ static int ep93xx_init(void)
 {
        int ret;
 
-       bitbang_interface = &ep93xx_bitbang;    
+       bitbang_interface = &ep93xx_bitbang;
 
        ep93xx_zzzz.tv_sec = 0;
        ep93xx_zzzz.tv_nsec = 10000000;
@@ -204,7 +203,7 @@ static int ep93xx_init(void)
        gpio_data_direction_register = gpio_controller + 0x18;
 
        LOG_INFO("gpio_data_register      = %p\n", gpio_data_register);
-       LOG_INFO("gpio_data_direction_reg = %p\n", gpio_data_direction_register); 
+       LOG_INFO("gpio_data_direction_reg = %p\n", gpio_data_direction_register);
        /*
         * Configure bit 0 (TDO) as an input, and bits 1-5 (TDI, TCK
         * TMS, TRST, SRST) as outputs.  Drive TDI and TCK low, and