]> git.sur5r.net Git - openocd/blobdiff - src/jtag/bitq.c
- removed obsolete cmd JLINK_TAP_SEQUENCE_COMMAND, use EMU_CMD_HW_JTAG instead
[openocd] / src / jtag / bitq.c
index dd9acdf3ac23be735f84c5a7081bb87f6f3eabcc..93bb30638beee9fe248526ae9729cf227b432d8a 100644 (file)
@@ -34,9 +34,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 
 bitq_interface_t *bitq_interface; /* low level bit queue interface */
 
@@ -50,7 +47,7 @@ unsigned long bitq_in_bufsize=32; /* min. buffer size */
  * input queue processing does not use jtag_read_buffer() to avoid unnecessary overhead
  * also the buffer for incomming data is reallocated only if necessary
  * no parameters, makes use of stored state information
- */ 
+ */
 void bitq_in_proc(void)
 {
        /* static information preserved between calls to increase performance */
@@ -60,7 +57,7 @@ void bitq_in_proc(void)
 
        scan_field_t *field;
        int tdo;
-       
+
        /* loop through the queue */
        while (bitq_in_state.cmd) {
                /* only JTAG_SCAN command may return data */
@@ -88,10 +85,10 @@ void bitq_in_proc(void)
                                                                /* double the buffer size until it fits */
                                                                while (field->num_bits>bitq_in_bufsize*8) bitq_in_bufsize*=2;
                                                        }
-                                                       /* if necessary, allocate buffer and check for malloc error */ 
+                                                       /* if necessary, allocate buffer and check for malloc error */
                                                        if (bitq_in_buffer==NULL && (bitq_in_buffer=malloc(bitq_in_bufsize))==NULL) {
-                                                               ERROR("malloc error");
-                                                               exit(-1);                
+                                                               LOG_ERROR("malloc error");
+                                                               exit(-1);
                                                        }
                                                        in_buff=(void *)bitq_in_buffer;
                                                }
@@ -101,7 +98,7 @@ void bitq_in_proc(void)
                                        while (bitq_in_state.bit_pos<field->num_bits) {
                                                if ((tdo=bitq_interface->in())<0) {
 #ifdef _DEBUG_JTAG_IO_
-                                                       DEBUG("bitq in EOF");
+                                                       LOG_DEBUG("bitq in EOF");
 #endif
                                                        return;
                                                }
@@ -114,14 +111,14 @@ void bitq_in_proc(void)
                                                else in_mask<<=1;
                                                bitq_in_state.bit_pos++;
                                        }
-                                       
+
 
                                        if (field->in_handler && bitq_in_state.status==ERROR_OK) {
                                                bitq_in_state.status=(*field->in_handler)(in_buff, field->in_handler_priv, field);
                                        }
 
                                }
-                               
+
                                bitq_in_state.field_idx++; /* advance to next field */
                                bitq_in_state.bit_pos=0; /* start next field from the first bit */
                        }
@@ -137,7 +134,7 @@ void bitq_in_proc(void)
 void bitq_io(int tms, int tdi, int tdo_req)
 {
        bitq_interface->out(tms, tdi, tdo_req);
-       /* check and process the input queue */ 
+       /* check and process the input queue */
        if (bitq_interface->in_rdy()) bitq_in_proc();
 }
 
@@ -146,7 +143,7 @@ void bitq_end_state(enum tap_state state)
 {
        if (state==-1) return;
        if (tap_move_map[state]==-1) {
-               ERROR("BUG: %i is not a valid end state", state);
+               LOG_ERROR("BUG: %i is not a valid end state", state);
                exit(-1);
        }
        end_state = state;
@@ -159,10 +156,10 @@ void bitq_state_move(enum tap_state new_state)
        u8 tms_scan;
 
        if (tap_move_map[cur_state]==-1 || tap_move_map[new_state]==-1) {
-               ERROR("TAP move from or to unstable state");
+               LOG_ERROR("TAP move from or to unstable state");
                exit(-1);
        }
-       
+
        tms_scan=TAP_MOVE(cur_state, new_state);
 
        for (i=0; i<7; i++) {
@@ -182,7 +179,7 @@ void bitq_path_move(pathmove_command_t *cmd)
                if (tap_transitions[cur_state].low == cmd->path[i]) bitq_io(0, 0, 0);
                else if (tap_transitions[cur_state].high == cmd->path[i]) bitq_io(1, 0, 0);
                else {
-                       ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[i]]);
+                       LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[i]]);
                        exit(-1);
                }
 
@@ -216,7 +213,7 @@ void bitq_scan_field(scan_field_t *field, int pause)
 
        u8 *out_ptr;
        u8 out_mask;
-       
+
        if ( field->in_value || field->in_handler) tdo_req=1;
        else tdo_req=0;
 
@@ -265,7 +262,7 @@ void bitq_scan(scan_command_t *cmd)
 int bitq_execute_queue(void)
 {
        jtag_command_t *cmd = jtag_command_queue; /* currently processed command */
-       
+
        bitq_in_state.cmd = jtag_command_queue;
        bitq_in_state.field_idx = 0;
        bitq_in_state.bit_pos = 0;
@@ -277,14 +274,14 @@ int bitq_execute_queue(void)
 
                        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
                                bitq_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
                                bitq_interface->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
                                if (bitq_interface->in_rdy()) bitq_in_proc();
@@ -292,7 +289,7 @@ int bitq_execute_queue(void)
 
                        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
                                bitq_end_state(cmd->cmd.runtest->end_state);
                                bitq_runtest(cmd->cmd.runtest->num_cycles);
@@ -300,7 +297,7 @@ int bitq_execute_queue(void)
 
                        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
                                bitq_end_state(cmd->cmd.statemove->end_state);
                                bitq_state_move(end_state); /* uncoditional TAP move */
@@ -308,16 +305,16 @@ int bitq_execute_queue(void)
 
                        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
                                bitq_path_move(cmd->cmd.pathmove);
                                break;
 
                        case JTAG_SCAN:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("scan end in %i", cmd->cmd.scan->end_state);
-                               if (cmd->cmd.scan->ir_scan) DEBUG("scan ir");
-                               else DEBUG("scan dr");
+                               LOG_DEBUG("scan end in %i", cmd->cmd.scan->end_state);
+                               if (cmd->cmd.scan->ir_scan) LOG_DEBUG("scan ir");
+                               else LOG_DEBUG("scan dr");
 #endif
                                bitq_end_state(cmd->cmd.scan->end_state);
                                bitq_scan(cmd->cmd.scan);
@@ -326,14 +323,14 @@ int bitq_execute_queue(void)
 
                        case JTAG_SLEEP:
 #ifdef _DEBUG_JTAG_IO_
-                               DEBUG("sleep %i", cmd->cmd.sleep->us);
+                               LOG_DEBUG("sleep %i", cmd->cmd.sleep->us);
 #endif
                                bitq_interface->sleep(cmd->cmd.sleep->us);
                                if (bitq_interface->in_rdy()) bitq_in_proc();
                                break;
 
                        default:
-                               ERROR("BUG: unknown JTAG command type encountered");
+                               LOG_ERROR("BUG: unknown JTAG command type encountered");
                                exit(-1);
                }
 
@@ -344,11 +341,11 @@ int bitq_execute_queue(void)
        bitq_in_proc();
 
        if (bitq_in_state.cmd) {
-               ERROR("missing data from bitq interface");
+               LOG_ERROR("missing data from bitq interface");
                return ERROR_JTAG_QUEUE_FAILED;
        }
        if (bitq_interface->in()>=0) {
-               ERROR("extra data from bitq interface");
+               LOG_ERROR("extra data from bitq interface");
                return ERROR_JTAG_QUEUE_FAILED;
        }