X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fep93xx.c;h=6ae823e82652bf00dce016be0e5f10784e818e3f;hb=e1c26950c03b09efe42b8a25dd83f1e50e22a507;hp=55d1eeeaed8b4f0f055fb3a767b2b25c14e9929d;hpb=67caf323f74937e11c0f5f95c2ee57d2786ac02b;p=openocd.git

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index 55d1eeeaed..6ae823e826 100644
--- 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"
 
@@ -35,11 +34,11 @@
 
 #include <sys/mman.h>
 
-static u8 output_value = 0x0;
+static uint8_t output_value = 0x0;
 static int dev_mem_fd;
 static void *gpio_controller;
-static volatile u8 *gpio_data_register;
-static volatile u8 *gpio_data_direction_register;
+static volatile uint8_t *gpio_data_register;
+static volatile uint8_t *gpio_data_direction_register;
 
 /* low level command set
  */
@@ -54,19 +53,19 @@ static int ep93xx_quit(void);
 
 struct timespec ep93xx_zzzz;
 
-jtag_interface_t ep93xx_interface = 
+struct jtag_interface 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,
 };
 
-static bitbang_interface_t ep93xx_bitbang =
+static struct bitbang_interface ep93xx_bitbang =
 {
 	.read = ep93xx_read,
 	.write = ep93xx_write,
@@ -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);
 }
@@ -132,7 +131,7 @@ static int ep93xx_register_commands(struct command_context_s *cmd_ctx)
 static int set_gonk_mode(void)
 {
 	void *syscon;
-	u32 devicecfg;
+	uint32_t devicecfg;
 
 	syscon = mmap(NULL, 4096, PROT_READ | PROT_WRITE,
 			MAP_SHARED, dev_mem_fd, 0x80930000);
@@ -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