main: invoke jtag_interface_quit() explicitly

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

diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index ce28bb533762f51095cd778394f97278fa93354a..ff9f7a4126046863c2747b391a9321b2db6431e9 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,34 +82,34 @@ 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 */
 };
 
-struct device_t devices[] =
+static struct device_t devices[] =
 {
        { "rea_ecr", PIOD, P27, PIOA, NC, PIOD, P23, PIOD, P24, PIOD, P26, PIOC, P5 },
        { .name = NULL },
 };
 
 /* configuration */
-char* at91rm9200_device;
+static char* at91rm9200_device;
 
 /* interface variables
  */
 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
  */
@@ -124,11 +118,11 @@ static void at91rm9200_write(int tck, int tms, int tdi);
 static void at91rm9200_reset(int trst, int srst);
 
 static int at91rm9200_speed(int speed);
-static int at91rm9200_register_commands(struct command_context_s *cmd_ctx);
+static int at91rm9200_register_commands(struct command_context *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,
@@ -191,26 +185,33 @@ static int at91rm9200_speed(int speed)
        return ERROR_OK;
 }
 
-static int at91rm9200_handle_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, char *cmd, char **CMD_ARGV, int argc)
 {
-       if (argc == 0)
+       if (CMD_ARGC == 0)
                return ERROR_OK;
 
        /* only if the device name wasn't overwritten by cmdline */
        if (at91rm9200_device == 0)
        {
-               at91rm9200_device = malloc(strlen(args[0]) + sizeof(char));
-               strcpy(at91rm9200_device, args[0]);
+               at91rm9200_device = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
+               strcpy(at91rm9200_device, CMD_ARGV[0]);
        }
 
        return ERROR_OK;
 }
 
-static int at91rm9200_register_commands(struct command_context_s *cmd_ctx)
+static const struct command_registration at91rm9200_command_handlers[] = {
+       {
+               .name = "at91rm9200_device",
+               .handler = &at91rm9200_handle_device_command,
+               .mode = COMMAND_CONFIG,
+               .help = "query armjtagew info",
+       },
+};
+
+static int at91rm9200_register_commands(struct command_context *cmd_ctx)
 {
-       register_command(cmd_ctx, NULL, "at91rm9200_device", at91rm9200_handle_device_command,
-               COMMAND_CONFIG, NULL);
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, at91rm9200_command_handlers);
 }
 
 static int at91rm9200_init(void)
@@ -256,7 +257,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