- remove target specific variant and use target->variant member
[fw/openocd] / src / jtag / gw16012.c
index 819cb5131813b8d91591aacf871ceef958d66a05..e03cea93ac4deea46cd33c8131cb37b088aa0134 100644 (file)
@@ -50,9 +50,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 #if PARPORT_USE_PPDEV == 1
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
@@ -75,7 +72,6 @@
 #if IS_CYGWIN == 1
 #include <windows.h>
 #include <errno.h>
-#undef ERROR
 #endif
 #endif
 
@@ -101,13 +97,13 @@ int gw16012_quit(void);
 
 int gw16012_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
-jtag_interface_t gw16012_interface = 
+jtag_interface_t gw16012_interface =
 {
        .name = "gw16012",
-       
+
        .execute_queue = gw16012_execute_queue,
 
-       .speed = gw16012_speed, 
+       .speed = gw16012_speed,
        .register_commands = gw16012_register_commands,
        .init = gw16012_init,
        .quit = gw16012_quit,
@@ -117,7 +113,7 @@ 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;
 }
 
@@ -127,9 +123,9 @@ void gw16012_data(u8 value)
        gw16012_msb ^= 0x80; /* toggle MSB */
 
 #ifdef _DEBUG_GW16012_IO_
-       DEBUG("%2.2x", value);
+       LOG_DEBUG("%2.2x", value);
 #endif
-       
+
        #if PARPORT_USE_PPDEV == 1
                ioctl(device_handle, PPWDATA, &value);
        #else
@@ -138,7 +134,7 @@ void gw16012_data(u8 value)
                #else
                        outb(value, gw16012_port);
                #endif
-       #endif  
+       #endif
 }
 
 void gw16012_control(u8 value)
@@ -148,7 +144,7 @@ void gw16012_control(u8 value)
                gw16012_control_value = value;
 
 #ifdef _DEBUG_GW16012_IO_
-               DEBUG("%2.2x", gw16012_control_value);
+               LOG_DEBUG("%2.2x", gw16012_control_value);
 #endif
 
                #if PARPORT_USE_PPDEV == 1
@@ -172,14 +168,14 @@ void gw16012_input(u8 *value)
        #endif
 
 #ifdef _DEBUG_GW16012_IO_
-       DEBUG("%2.2x", *value);
+       LOG_DEBUG("%2.2x", *value);
 #endif
 }
 
 /* (1) assert or (0) deassert reset lines */
 void gw16012_reset(int trst, int srst)
 {
-       DEBUG("trst: %i, srst: %i", trst, srst);
+       LOG_DEBUG("trst: %i, srst: %i", trst, srst);
 
        if (trst == 0)
                gw16012_control(0x0d);
@@ -198,13 +194,13 @@ int gw16012_speed(int speed)
        return ERROR_OK;
 }
 
-void gw16012_end_state(state)
+void gw16012_end_state(int state)
 {
        if (tap_move_map[state] != -1)
                end_state = state;
        else
        {
-               ERROR("BUG: %i is not a valid end state", state);
+               LOG_ERROR("BUG: %i is not a valid end state", state);
                exit(-1);
        }
 }
@@ -213,15 +209,15 @@ void gw16012_state_move(void)
 {
        int i=0, tms=0;
        u8 tms_scan = TAP_MOVE(cur_state, end_state);
-       
+
        gw16012_control(0x0); /* single-bit mode */
-       
+
        for (i = 0; i < 7; i++)
        {
                tms = (tms_scan >> i) & 1;
                gw16012_data(tms << 1); /* output next TMS bit */
        }
-       
+
        cur_state = end_state;
 }
 
@@ -244,15 +240,15 @@ void gw16012_path_move(pathmove_command_t *cmd)
                }
                else
                {
-                       ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]);
+                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]);
                        exit(-1);
                }
-               
+
                cur_state = cmd->path[state_count];
                state_count++;
                num_states--;
        }
-       
+
        end_state = cur_state;
 }
 
@@ -260,20 +256,20 @@ void gw16012_runtest(int num_cycles)
 {
        enum tap_state saved_end_state = end_state;
        int i;
-       
-       /* only do a state_move when we're not already in RTI */
-       if (cur_state != TAP_RTI)
+
+       /* only do a state_move when we're not already in IDLE */
+       if (cur_state != TAP_IDLE)
        {
-               gw16012_end_state(TAP_RTI);
+               gw16012_end_state(TAP_IDLE);
                gw16012_state_move();
        }
-       
+
        for (i = 0; i < num_cycles; i++)
        {
                gw16012_control(0x0); /* single-bit mode */
                gw16012_data(0x0); /* TMS cycle with TMS low */
        }
-       
+
        gw16012_end_state(saved_end_state);
        if (cur_state != end_state)
                gw16012_state_move();
@@ -287,12 +283,12 @@ void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
        u8 scan_out, scan_in;
 
        /* only if we're not already in the correct Shift state */
-       if (!((!ir_scan && (cur_state == TAP_SD)) || (ir_scan && (cur_state == TAP_SI))))
+       if (!((!ir_scan && (cur_state == TAP_DRSHIFT)) || (ir_scan && (cur_state == TAP_IRSHIFT))))
        {
                if (ir_scan)
-                       gw16012_end_state(TAP_SI);
+                       gw16012_end_state(TAP_IRSHIFT);
                else
-                       gw16012_end_state(TAP_SD);
+                       gw16012_end_state(TAP_DRSHIFT);
 
                gw16012_state_move();
                gw16012_end_state(saved_end_state);
@@ -306,20 +302,20 @@ void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
                bit_count += 7;
                bits_left -= 7;
        }
-       
+
        gw16012_control(0x0); /* single-bit mode */
        while (bits_left-- > 0)
        {
                u8 tms = 0;
-               
+
                scan_out = buf_get_u32(buffer, bit_count, 1);
-               
+
                if (bits_left == 0) /* last bit */
                {
-                       if ((ir_scan && (end_state == TAP_SI))
-                               || (!ir_scan && (end_state == TAP_SD)))
+                       if ((ir_scan && (end_state == TAP_IRSHIFT))
+                               || (!ir_scan && (end_state == TAP_DRSHIFT)))
                        {
-                               tms = 0; 
+                               tms = 0;
                        }
                        else
                        {
@@ -333,20 +329,20 @@ void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
                {
                        gw16012_input(&scan_in);
                        buf_set_u32(buffer, bit_count, 1, ((scan_in & 0x08) >> 3));
-               }               
+               }
 
                bit_count++;
        }
 
-       if (!((ir_scan && (end_state == TAP_SI)) ||
-               (!ir_scan && (end_state == TAP_SD))))
+       if (!((ir_scan && (end_state == TAP_IRSHIFT)) ||
+               (!ir_scan && (end_state == TAP_DRSHIFT))))
        {
                gw16012_data(0x0);
                if (ir_scan)
-                       cur_state = TAP_PI;
+                       cur_state = TAP_IRPAUSE;
                else
-                       cur_state = TAP_PD;
-                       
+                       cur_state = TAP_DRPAUSE;
+
                if (cur_state != end_state)
                        gw16012_state_move();
        }
@@ -359,36 +355,36 @@ int gw16012_execute_queue(void)
        enum scan_type type;
        u8 *buffer;
        int retval;
-       
+
        /* return ERROR_OK, unless a jtag_read_buffer returns a failed check
         * that wasn't handled by a caller-provided error handler
-        */ 
+        */
        retval = ERROR_OK;
-               
+
        while (cmd)
        {
                switch (cmd->type)
                {
                        case JTAG_END_STATE:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("end_state: %i", cmd->cmd.end_state->end_state);
+                               LOG_DEBUG("end_state: %i", cmd->cmd.end_state->end_state);
 #endif
                                if (cmd->cmd.end_state->end_state != -1)
                                        gw16012_end_state(cmd->cmd.end_state->end_state);
                                break;
                        case JTAG_RESET:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+                               LOG_DEBUG("reset trst: %i srst %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
 #endif
                                if (cmd->cmd.reset->trst == 1)
                                {
-                                       cur_state = TAP_TLR;
+                                       cur_state = TAP_RESET;
                                }
                                gw16012_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
                                break;
                        case JTAG_RUNTEST:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->end_state);
+                               LOG_DEBUG("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, cmd->cmd.runtest->end_state);
 #endif
                                if (cmd->cmd.runtest->end_state != -1)
                                        gw16012_end_state(cmd->cmd.runtest->end_state);
@@ -396,7 +392,7 @@ int gw16012_execute_queue(void)
                                break;
                        case JTAG_STATEMOVE:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
+                               LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
 #endif
                                if (cmd->cmd.statemove->end_state != -1)
                                        gw16012_end_state(cmd->cmd.statemove->end_state);
@@ -404,7 +400,7 @@ int gw16012_execute_queue(void)
                                break;
                        case JTAG_PATHMOVE:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("pathmove: %i states, end in %i", cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
+                               LOG_DEBUG("pathmove: %i states, end in %i", cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
 #endif
                                gw16012_path_move(cmd->cmd.pathmove);
                                break;
@@ -414,7 +410,7 @@ int gw16012_execute_queue(void)
                                scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
                                type = jtag_scan_type(cmd->cmd.scan);
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("%s scan (%i) %i bit end in %i", (cmd->cmd.scan->ir_scan) ? "ir" : "dr", 
+                               LOG_DEBUG("%s scan (%i) %i bit end in %i", (cmd->cmd.scan->ir_scan) ? "ir" : "dr",
                                        type, scan_size, cmd->cmd.scan->end_state);
 #endif
                                gw16012_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
@@ -425,43 +421,43 @@ int gw16012_execute_queue(void)
                                break;
                        case JTAG_SLEEP:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("sleep %i", cmd->cmd.sleep->us);
+                               LOG_DEBUG("sleep %i", cmd->cmd.sleep->us);
 #endif
                                jtag_sleep(cmd->cmd.sleep->us);
                                break;
                        default:
-                               ERROR("BUG: unknown JTAG command type encountered");
+                               LOG_ERROR("BUG: unknown JTAG command type encountered");
                                exit(-1);
                }
                cmd = cmd->next;
        }
-       
+
        return retval;
 }
 
 #if PARPORT_USE_GIVEIO == 1
 int gw16012_get_giveio_access()
 {
-    HANDLE h;
-    OSVERSIONINFO version;
-
-    version.dwOSVersionInfoSize = sizeof 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 );
-    if (h == INVALID_HANDLE_VALUE) {
-        errno = ENODEV;
-        return -1;
-    }
-
-    CloseHandle( h );
-
-    return 0;
+       HANDLE h;
+       OSVERSIONINFO version;
+
+       version.dwOSVersionInfoSize = sizeof 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 );
+       if (h == INVALID_HANDLE_VALUE) {
+               errno = ENODEV;
+               return -1;
+       }
+
+       CloseHandle( h );
+
+       return 0;
 }
 #endif
 
@@ -472,38 +468,38 @@ int gw16012_init(void)
        int i = 0;
 #endif
        u8 status_port;
-       
+
 #if PARPORT_USE_PPDEV == 1
        if (device_handle>0)
        {
-               ERROR("device is already opened");
+               LOG_ERROR("device is already opened");
                return ERROR_JTAG_INIT_FAILED;
        }
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-       DEBUG("opening /dev/ppi%d...", gw16012_port);
+       LOG_DEBUG("opening /dev/ppi%d...", gw16012_port);
 
        snprintf(buffer, 256, "/dev/ppi%d", gw16012_port);
        device_handle = open(buffer, O_WRONLY);
 #else
-       DEBUG("opening /dev/parport%d...", gw16012_port);
+       LOG_DEBUG("opening /dev/parport%d...", gw16012_port);
 
        snprintf(buffer, 256, "/dev/parport%d", gw16012_port);
        device_handle = open(buffer, O_WRONLY);
-#endif 
+#endif
        if (device_handle<0)
        {
-               ERROR("cannot open device. check it exists and that user read and write rights are set");
+               LOG_ERROR("cannot open device. check it exists and that user read and write rights are set");
                return ERROR_JTAG_INIT_FAILED;
        }
 
-       DEBUG("...open");
+       LOG_DEBUG("...open");
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
        i=ioctl(device_handle, PPCLAIM);
        if (i<0)
        {
-               ERROR("cannot claim device");
+               LOG_ERROR("cannot claim device");
                return ERROR_JTAG_INIT_FAILED;
        }
 
@@ -511,7 +507,7 @@ int gw16012_init(void)
        i= ioctl(device_handle, PPSETMODE, & i);
        if (i<0)
        {
-               ERROR(" cannot set compatible mode to device");
+               LOG_ERROR(" cannot set compatible mode to device");
                return ERROR_JTAG_INIT_FAILED;
        }
 
@@ -519,7 +515,7 @@ int gw16012_init(void)
        i = ioctl(device_handle, PPNEGOT, & i);
        if (i<0)
        {
-               ERROR("cannot set compatible 1284 mode to device");
+               LOG_ERROR("cannot set compatible 1284 mode to device");
                return ERROR_JTAG_INIT_FAILED;
        }
 #endif
@@ -527,20 +523,20 @@ int gw16012_init(void)
        if (gw16012_port == 0)
        {
                gw16012_port = 0x378;
-               WARNING("No gw16012 port specified, using default '0x378' (LPT1)");
+               LOG_WARNING("No gw16012 port specified, using default '0x378' (LPT1)");
        }
-       
-       DEBUG("requesting privileges for parallel port 0x%lx...", 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 */
        if (ioperm(gw16012_port, 3, 1) != 0)
 #endif /* PARPORT_USE_GIVEIO */
        {
-               ERROR("missing privileges for direct i/o");
+               LOG_ERROR("missing privileges for direct i/o");
                return ERROR_JTAG_INIT_FAILED;
        }
-       DEBUG("...privileges granted");
+       LOG_DEBUG("...privileges granted");
 
        /* make sure parallel port is in right mode (clear tristate and interrupt */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -549,19 +545,19 @@ int gw16012_init(void)
        outb(0x0, gw16012_port + 2);
 #endif
 #endif /* PARPORT_USE_PPDEV */
-       
+
        gw16012_input(&status_port);
        gw16012_msb = (status_port & 0x80) ^ 0x80;
-       
+
        gw16012_speed(jtag_speed);
        gw16012_reset(0, 0);
-       
+
        return ERROR_OK;
 }
 
 int gw16012_quit(void)
 {
-       
+
        return ERROR_OK;
 }