jtag_interface_t -> struct jtag_interface

[openocd.git] / src / jtag / at91rm9200.c

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index 45fb089bc92a752b6c4ca7a9678c496811f35927..706257533e3a02132a3e447e8126c2f9d44fb235 100644 (file)
--- a/src/jtag/at91rm9200.c
+++ b/src/jtag/at91rm9200.c
@@ -21,17 +21,11 @@
 #include "config.h"
 #endif
 
-#include "log.h"
-#include "jtag.h"
+#include "interface.h"
 #include "bitbang.h"
 
-/* system includes */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
+
 
 /* AT91RM9200 */
 #define AT91C_BASE_SYS (0xfffff000)
@@ -88,17 +82,17 @@ struct device_t
 {
        char* name;
        int TDO_PIO;    /* PIO holding TDO */
-       u32 TDO_MASK;   /* TDO bitmask */
+       uint32_t TDO_MASK;      /* TDO bitmask */
        int TRST_PIO;   /* PIO holding TRST */
-       u32 TRST_MASK;  /* TRST bitmask */
+       uint32_t TRST_MASK;     /* TRST bitmask */
        int TMS_PIO;    /* PIO holding TMS */
-       u32 TMS_MASK;   /* TMS bitmask */
+       uint32_t TMS_MASK;      /* TMS bitmask */
        int TCK_PIO;    /* PIO holding TCK */
-       u32 TCK_MASK;   /* TCK bitmask */
+       uint32_t TCK_MASK;      /* TCK bitmask */
        int TDI_PIO;    /* PIO holding TDI */
-       u32 TDI_MASK;   /* TDI bitmask */
+       uint32_t TDI_MASK;      /* TDI bitmask */
        int SRST_PIO;   /* PIO holding SRST */
-       u32 SRST_MASK;  /* SRST bitmask */
+       uint32_t SRST_MASK;     /* SRST bitmask */
 };
 
 static struct device_t devices[] =
@@ -115,7 +109,7 @@ static char* at91rm9200_device;
 static struct device_t* device;
 static int dev_mem_fd;
 static void *sys_controller;
-static u32* pio_base;
+static uint32_t* pio_base;
 
 /* low level command set
  */
@@ -128,7 +122,7 @@ static int at91rm9200_register_commands(struct command_context_s *cmd_ctx);
 static int at91rm9200_init(void);
 static int at91rm9200_quit(void);
 
-jtag_interface_t at91rm9200_interface =
+struct jtag_interface at91rm9200_interface =
 {
        .name = "at91rm9200",
 
@@ -140,7 +134,7 @@ jtag_interface_t at91rm9200_interface =
        .quit = at91rm9200_quit,
 };
 
-static bitbang_interface_t at91rm9200_bitbang =
+static struct bitbang_interface at91rm9200_bitbang =
 {
        .read = at91rm9200_read,
        .write = at91rm9200_write,
@@ -256,7 +250,7 @@ static int at91rm9200_init(void)
                close(dev_mem_fd);
                return ERROR_JTAG_INIT_FAILED;
        }
-       pio_base = (u32*)sys_controller + 0x100;
+       pio_base = (uint32_t*)sys_controller + 0x100;
 
        /*
         * Configure TDO as an input, and TDI, TCK, TMS, TRST, SRST