fixed warnings + added zy1000 jtag_add_clocks support.

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

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index 9c24dba447323f9e19c1844f68b50c9c885ede94..03a391a0c054aea62db55effec9c5dfec9f25f59 100644 (file)
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -17,7 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "log.h"
 #include "jtag.h"
 #include "bitbang.h"
@@ -31,10 +34,10 @@
 #define VCC_BIT                64
 
 /* system includes */
-#include <sys/io.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <time.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -61,10 +64,8 @@ struct timespec ep93xx_zzzz;
 jtag_interface_t ep93xx_interface = 
 {
        .name = "ep93xx",
-       
-       .execute_queue = bitbang_execute_queue,
 
-       .support_statemove = 0,
+       .execute_queue = bitbang_execute_queue,
 
        .speed = ep93xx_speed,  
        .register_commands = ep93xx_register_commands,
@@ -76,7 +77,8 @@ bitbang_interface_t ep93xx_bitbang =
 {
        .read = ep93xx_read,
        .write = ep93xx_write,
-       .reset = ep93xx_reset
+       .reset = ep93xx_reset,
+       .blink = 0,
 };
 
 int ep93xx_read(void)
@@ -89,20 +91,20 @@ void ep93xx_write(int tck, int tms, int tdi)
        if (tck)
                output_value |= TCK_BIT;
        else
-               output_value &= TCK_BIT;
+               output_value &= ~TCK_BIT;
        
        if (tms)
                output_value |= TMS_BIT;
        else
-               output_value &= TMS_BIT;
+               output_value &= ~TMS_BIT;
        
        if (tdi)
                output_value |= TDI_BIT;
        else
-               output_value &= TDI_BIT;
+               output_value &= ~TDI_BIT;
 
        *gpio_data_register = output_value;
-       nanosleep(ep93xx_zzzz);
+       nanosleep(&ep93xx_zzzz, NULL);
 }
 
 /* (1) assert or (0) deassert reset lines */
@@ -111,20 +113,20 @@ void ep93xx_reset(int trst, int srst)
        if (trst == 0)
                output_value |= TRST_BIT;
        else if (trst == 1)
-               output_value &= TRST_BIT;
+               output_value &= ~TRST_BIT;
 
        if (srst == 0)
                output_value |= SRST_BIT;
        else if (srst == 1)
-               output_value &= SRST_BIT;
+               output_value &= ~SRST_BIT;
        
        *gpio_data_register = output_value;
-       nanosleep(ep93xx_zzzz);
+       nanosleep(&ep93xx_zzzz, NULL);
 }
 
 int ep93xx_speed(int speed)
 {
-       
+
        return ERROR_OK;
 }
 
@@ -208,8 +210,8 @@ int ep93xx_init(void)
        gpio_data_register = gpio_controller + 0x08;
        gpio_data_direction_register = gpio_controller + 0x18;
 
-       printf("gpio_data_register      = %08x\n", gpio_data_register);
-        printf("gpio_data_direction_reg = %08x\n", gpio_data_direction_register); 
+       LOG_INFO("gpio_data_register      = %p\n", gpio_data_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
@@ -217,7 +219,7 @@ int ep93xx_init(void)
         */
        output_value = TMS_BIT | TRST_BIT | SRST_BIT | VCC_BIT;
        *gpio_data_register = output_value;
-       nanosleep(ep93xx_zzzz);
+       nanosleep(&ep93xx_zzzz, NULL);
 
        /*
         * Configure the direction register.  1 = output, 0 = input.
@@ -225,7 +227,7 @@ int ep93xx_init(void)
        *gpio_data_direction_register =
                TDI_BIT | TCK_BIT | TMS_BIT | TRST_BIT | SRST_BIT | VCC_BIT;
 
-       nanosleep(ep93xx_zzzz);
+       nanosleep(&ep93xx_zzzz, NULL);
        return ERROR_OK;
 }