move nor drivers to src/flash/nor

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

diff --git a/src/jtag/ep93xx.c b/src/jtag/ep93xx.c
index 1f422314827b59d526b5f1c2c72df147eaaf31da..c679b2164344f7c9ce5334a9049c6e01a3add4be 100644 (file)
--- a/src/jtag/ep93xx.c
+++ b/src/jtag/ep93xx.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "jtag.h"
+#include "interface.h"
 #include "bitbang.h"
 
 #define TDO_BIT                1
@@ -34,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
  */
@@ -47,25 +47,25 @@ static void ep93xx_write(int tck, int tms, int tdi);
 static void ep93xx_reset(int trst, int srst);
 
 static int ep93xx_speed(int speed);
-static int ep93xx_register_commands(struct command_context_s *cmd_ctx);
+static int ep93xx_register_commands(struct command_context *cmd_ctx);
 static int ep93xx_init(void);
 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,
@@ -84,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
@@ -111,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);
 }
@@ -122,7 +122,7 @@ static int ep93xx_speed(int speed)
        return ERROR_OK;
 }
 
-static int ep93xx_register_commands(struct command_context_s *cmd_ctx)
+static int ep93xx_register_commands(struct command_context *cmd_ctx)
 {
 
        return ERROR_OK;
@@ -131,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);
@@ -153,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;
@@ -203,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