X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fep93xx.c;h=55550b36814de244aceddf4382d6b79c0d4d84eb;hp=e68e3d15893e400aa84f84632d42227fdc6d6366;hb=23aa223ec417646e4389e990c3168e113e90f3d0;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index e68e3d1589..55550b3681 100644
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -34,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>
@@ -67,8 +67,6 @@ jtag_interface_t ep93xx_interface =
 	
 	.execute_queue = bitbang_execute_queue,
 
-	.support_statemove = 0,
-
 	.speed = ep93xx_speed,	
 	.register_commands = ep93xx_register_commands,
 	.init = ep93xx_init,
@@ -79,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)
@@ -92,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 */
@@ -114,15 +113,15 @@ 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)
@@ -211,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
@@ -220,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.
@@ -228,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;
 }