move nor drivers to src/flash/nor
[fw/openocd] / src / jtag / gw16012.c
index 0ea66340c465941d0cd802216a1f5725c0960c34..b827fd53a12e543acf3f48c32a77c8e708674cb2 100644 (file)
 
 
 /* configuration */
-u16 gw16012_port;
+uint16_t gw16012_port;
 
 /* interface variables
  */
-static u8 gw16012_msb = 0x0;
-static u8 gw16012_control_value = 0x0;
+static uint8_t gw16012_msb = 0x0;
+static uint8_t gw16012_control_value = 0x0;
 
 #if PARPORT_USE_PPDEV == 1
 static int device_handle;
 #endif
 
-static int gw16012_execute_queue(void);
-static int gw16012_register_commands(struct command_context_s *cmd_ctx);
-static int gw16012_speed(int speed);
-static int gw16012_init(void);
-static int gw16012_quit(void);
-
-static int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-jtag_interface_t gw16012_interface =
-{
-       .name = "gw16012",
-
-       .execute_queue = gw16012_execute_queue,
-
-       .speed = gw16012_speed,
-       .register_commands = gw16012_register_commands,
-       .init = gw16012_init,
-       .quit = gw16012_quit,
-};
-
-static int gw16012_register_commands(struct command_context_s *cmd_ctx)
-{
-       register_command(cmd_ctx, NULL, "parport_port", gw16012_handle_parport_port_command,
-                                        COMMAND_CONFIG, NULL);
-
-       return ERROR_OK;
-}
-
-static void gw16012_data(u8 value)
+static void gw16012_data(uint8_t value)
 {
        value = (value & 0x7f) | gw16012_msb;
        gw16012_msb ^= 0x80; /* toggle MSB */
@@ -126,7 +98,7 @@ static void gw16012_data(u8 value)
        #endif
 }
 
-static void gw16012_control(u8 value)
+static void gw16012_control(uint8_t value)
 {
        if (value != gw16012_control_value)
        {
@@ -148,7 +120,7 @@ static void gw16012_control(u8 value)
        }
 }
 
-static void gw16012_input(u8 *value)
+static void gw16012_input(uint8_t *value)
 {
        #if PARPORT_USE_PPDEV == 1
                ioctl(device_handle, PPRSTATUS, value);
@@ -196,8 +168,8 @@ static void gw16012_end_state(tap_state_t state)
 
 static void gw16012_state_move(void)
 {
-       int i=0, tms=0;
-       u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
+       int i = 0, tms = 0;
+       uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
        int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
        gw16012_control(0x0); /* single-bit mode */
@@ -211,7 +183,7 @@ static void gw16012_state_move(void)
        tap_set_state(tap_get_end_state());
 }
 
-static void gw16012_path_move(pathmove_command_t *cmd)
+static void gw16012_path_move(struct pathmove_command *cmd)
 {
        int num_states = cmd->num_states;
        int state_count;
@@ -265,12 +237,12 @@ static void gw16012_runtest(int num_cycles)
                gw16012_state_move();
 }
 
-static void gw16012_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size)
+static void gw16012_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size)
 {
        int bits_left = scan_size;
        int bit_count = 0;
        tap_state_t saved_end_state = tap_get_end_state();
-       u8 scan_out, scan_in;
+       uint8_t scan_out, scan_in;
 
        /* only if we're not already in the correct Shift state */
        if (!((!ir_scan && (tap_get_state() == TAP_DRSHIFT)) || (ir_scan && (tap_get_state() == TAP_IRSHIFT))))
@@ -296,7 +268,7 @@ static void gw16012_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan
        gw16012_control(0x0); /* single-bit mode */
        while (bits_left-- > 0)
        {
-               u8 tms = 0;
+               uint8_t tms = 0;
 
                scan_out = buf_get_u32(buffer, bit_count, 1);
 
@@ -340,10 +312,10 @@ static void gw16012_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan
 
 static int gw16012_execute_queue(void)
 {
-       jtag_command_t *cmd = jtag_command_queue; /* currently processed command */
+       struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
        int scan_size;
        enum scan_type type;
-       u8 *buffer;
+       uint8_t *buffer;
        int retval;
 
        /* return ERROR_OK, unless a jtag_read_buffer returns a failed check
@@ -422,20 +394,20 @@ static int gw16012_get_giveio_access(void)
        OSVERSIONINFO version;
 
        version.dwOSVersionInfoSize = sizeof version;
-       if (!GetVersionEx( &version )) {
+       if (!GetVersionEx(&version)) {
                errno = EINVAL;
                return -1;
        }
        if (version.dwPlatformId != VER_PLATFORM_WIN32_NT)
                return 0;
 
-       h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+       h = CreateFile("\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
        if (h == INVALID_HANDLE_VALUE) {
                errno = ENODEV;
                return -1;
        }
 
-       CloseHandle( h );
+       CloseHandle(h);
 
        return 0;
 }
@@ -500,7 +472,7 @@ static int gw16012_init_device(void)
        LOG_DEBUG("opening %s...", buffer);
 
        device_handle = open(buffer, O_WRONLY);
-       if (device_handle<0)
+       if (device_handle < 0)
        {
                LOG_ERROR("cannot open device. check it exists and that user read and write rights are set");
                return ERROR_JTAG_INIT_FAILED;
@@ -524,7 +496,7 @@ static int gw16012_init_device(void)
                LOG_WARNING("No gw16012 port specified, using default '0x378' (LPT1)");
        }
 
-       LOG_DEBUG("requesting privileges for parallel port 0x%lx...", (long unsigned)(gw16012_port) );
+       LOG_DEBUG("requesting privileges for parallel port 0x%lx...", (long unsigned)(gw16012_port));
 #if PARPORT_USE_GIVEIO == 1
        if (gw16012_get_giveio_access() != 0)
 #else /* PARPORT_USE_GIVEIO */
@@ -549,7 +521,7 @@ static int gw16012_init_device(void)
 
 static int gw16012_init(void)
 {
-       u8 status_port;
+       uint8_t status_port;
 
        if (gw16012_init_device() != ERROR_OK)
                return ERROR_JTAG_INIT_FAILED;
@@ -569,14 +541,43 @@ static int gw16012_quit(void)
        return ERROR_OK;
 }
 
-static int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(gw16012_handle_parport_port_command)
 {
-       if (argc == 0)
-               return ERROR_OK;
+       if (CMD_ARGC == 1)
+       {
+               /* only if the port wasn't overwritten by cmdline */
+               if (gw16012_port == 0)
+               {
+                       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], gw16012_port);
+               }
+               else
+               {
+                       LOG_ERROR("The parport port was already configured!");
+                       return ERROR_FAIL;
+               }
+       }
 
-       /* only if the port wasn't overwritten by cmdline */
-       if (gw16012_port == 0)
-               gw16012_port = strtoul(args[0], NULL, 0);
+       command_print(CMD_CTX, "parport port = %u", gw16012_port);
 
        return ERROR_OK;
 }
+
+static const struct command_registration gw16012_command_handlers[] = {
+       {
+               .name = "parport_port",
+               .handler = &gw16012_handle_parport_port_command,
+               .mode = COMMAND_CONFIG,
+               .help = "configure the parallel port to use",
+               .usage = "<port_num>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+struct jtag_interface gw16012_interface = {
+               .name = "gw16012",
+               .commands = gw16012_command_handlers,
+               .init = &gw16012_init,
+               .quit = &gw16012_quit,
+               .speed = &gw16012_speed,
+               .execute_queue = &gw16012_execute_queue,
+       };