Audit and eliminate redundant #include directives in other target files.

[fw/openocd] / src / target / xscale.c

diff --git a/src/target/xscale.c b/src/target/xscale.c
index e3112cebcb8c97270c5fffec10e05f0bae1b9c44..0497a47853cf36270ac1e33e3bbf5162dcebb585 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -24,30 +24,12 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "xscale.h"
-
 #include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
 #include "arm_simulator.h"
 #include "arm_disassembler.h"
-#include "log.h"
-#include "jtag.h"
-#include "binarybuffer.h"
 #include "time_support.h"
-#include "breakpoints.h"
-#include "fileio.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-
+#include "image.h"
 
 /* cli handling */
 int xscale_register_commands(struct command_context_s *cmd_ctx);
@@ -226,11 +208,13 @@ int xscale_jtag_set_instr(jtag_tap_t *tap, u32 new_instr)
                field.out_value = calloc(CEIL(field.num_bits, 8), 1);
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 
-               field.in_value = NULL;
-               jtag_set_check_value(&field, tap->expected, tap->expected_mask, NULL);
+               u8 tmp[4];
+               field.in_value = tmp;
 
                jtag_add_ir_scan(1, &field, TAP_INVALID);
 
+               jtag_check_value_mask(&field, tap->expected, tap->expected_mask);
+
                free(field.out_value);
        }
 
@@ -261,29 +245,26 @@ int xscale_read_dcsr(target_t *target)
        fields[0].tap = xscale->jtag_info.tap;
        fields[0].num_bits = 3;
        fields[0].out_value = &field0;
-
-       fields[0].in_value = NULL;
-       jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
+       u8 tmp;
+       fields[0].in_value = &tmp;
 
        fields[1].tap = xscale->jtag_info.tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
-
        fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
-       fields[1].in_handler = NULL;
-
-
-
+       
 
        fields[2].tap = xscale->jtag_info.tap;
        fields[2].num_bits = 1;
        fields[2].out_value = &field2;
-
-       fields[2].in_value = NULL;
-       jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
+       u8 tmp2;
+       fields[2].in_value = &tmp2;
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
+       jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
+       jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                LOG_ERROR("JTAG error while reading DCSR");
@@ -339,21 +320,21 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
        fields[0].tap = xscale->jtag_info.tap;
        fields[0].num_bits = 3;
        fields[0].out_value = NULL;
-       fields[0].in_value = NULL;
-       jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
+       u8 tmp2;
+       fields[0].in_value = &tmp2;
 
        fields[1].tap = xscale->jtag_info.tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
        u8 tmp[4];
        fields[1].in_value = tmp;
-       fields[1].in_handler = NULL;
+       
 
        fields[2].tap = xscale->jtag_info.tap;
        fields[2].num_bits = 1;
        fields[2].out_value = NULL;
-       fields[2].in_value = NULL;
-       jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
+       u8 tmp3;
+       fields[2].in_value = &tmp3;
 
        jtag_add_end_state(TAP_IDLE);
        xscale_jtag_set_instr(xscale->jtag_info.tap, xscale->jtag_info.dbgtx);
@@ -372,6 +353,9 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
                        jtag_add_pathmove(3, path);
                        jtag_add_dr_scan_now(3, fields, TAP_IDLE);
 
+                       jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
+                       jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+
                        field1[i]=buf_get_u32(tmp, 0, 32);
 
                        words_scheduled++;
@@ -454,26 +438,19 @@ int xscale_read_tx(target_t *target, int consume)
        fields[0].tap = xscale->jtag_info.tap;
        fields[0].num_bits = 3;
        fields[0].out_value = NULL;
-
        fields[0].in_value = &field0_in;
-       jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
        fields[1].tap = xscale->jtag_info.tap;
        fields[1].num_bits = 32;
        fields[1].out_value = NULL;
-
        fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_TX].value;
-       fields[1].in_handler = NULL;
-
-
-
+       
 
        fields[2].tap = xscale->jtag_info.tap;
        fields[2].num_bits = 1;
        fields[2].out_value = NULL;
-
-       fields[2].in_value = NULL;
-       jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
+       u8 tmp;
+       fields[2].in_value = &tmp;
 
        gettimeofday(&timeout, NULL);
        timeval_add_time(&timeout, 1, 0);
@@ -493,6 +470,9 @@ int xscale_read_tx(target_t *target, int consume)
 
                jtag_add_dr_scan(3, fields, TAP_IDLE);
 
+               jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
+               jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+
                if ((retval = jtag_execute_queue()) != ERROR_OK)
                {
                        LOG_ERROR("JTAG error while reading TX");
@@ -550,26 +530,19 @@ int xscale_write_rx(target_t *target)
        fields[0].tap = xscale->jtag_info.tap;
        fields[0].num_bits = 3;
        fields[0].out_value = &field0_out;
-
        fields[0].in_value = &field0_in;
-       jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
        fields[1].tap = xscale->jtag_info.tap;
        fields[1].num_bits = 32;
        fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_RX].value;
-
        fields[1].in_value = NULL;
-       fields[1].in_handler = NULL;
-
-
-
+       
 
        fields[2].tap = xscale->jtag_info.tap;
        fields[2].num_bits = 1;
        fields[2].out_value = &field2;
-
-       fields[2].in_value = NULL;
-       jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
+       u8 tmp;
+       fields[2].in_value = &tmp;
 
        gettimeofday(&timeout, NULL);
        timeval_add_time(&timeout, 1, 0);
@@ -580,6 +553,9 @@ int xscale_write_rx(target_t *target)
        {
                jtag_add_dr_scan(3, fields, TAP_IDLE);
 
+               jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
+               jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+
                if ((retval = jtag_execute_queue()) != ERROR_OK)
                {
                        LOG_ERROR("JTAG error while writing RX");
@@ -725,29 +701,26 @@ int xscale_write_dcsr(target_t *target, int hold_rst, int ext_dbg_brk)
        fields[0].tap = xscale->jtag_info.tap;
        fields[0].num_bits = 3;
        fields[0].out_value = &field0;
-
-       fields[0].in_value = NULL;
-       jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
+       u8 tmp;
+       fields[0].in_value = &tmp;
 
        fields[1].tap = xscale->jtag_info.tap;
        fields[1].num_bits = 32;
        fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
-
        fields[1].in_value = NULL;
-       fields[1].in_handler = NULL;
-
-
-
+       
 
        fields[2].tap = xscale->jtag_info.tap;
        fields[2].num_bits = 1;
        fields[2].out_value = &field2;
-
-       fields[2].in_value = NULL;
-       jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
+       u8 tmp2;
+       fields[2].in_value = &tmp2;
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
+       jtag_check_value_mask(fields+0, &field0_check_value, &field0_check_mask);
+       jtag_check_value_mask(fields+2, &field2_check_value, &field2_check_mask);
+
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                LOG_ERROR("JTAG error while writing DCSR");
@@ -805,7 +778,7 @@ int xscale_load_ic(target_t *target, int mini, u32 va, u32 buffer[8])
        fields[0].in_value = NULL;
 
 
-       fields[0].in_handler = NULL;
+       
 
 
        fields[1].tap = xscale->jtag_info.tap;
@@ -815,7 +788,7 @@ int xscale_load_ic(target_t *target, int mini, u32 va, u32 buffer[8])
        fields[1].in_value = NULL;
 
 
-       fields[1].in_handler = NULL;
+       
 
 
        jtag_add_dr_scan(2, fields, TAP_INVALID);
@@ -867,7 +840,7 @@ int xscale_invalidate_ic_line(target_t *target, u32 va)
        fields[0].in_value = NULL;
 
 
-       fields[0].in_handler = NULL;
+       
 
 
        fields[1].tap = xscale->jtag_info.tap;
@@ -877,7 +850,7 @@ int xscale_invalidate_ic_line(target_t *target, u32 va)
        fields[1].in_value = NULL;
 
 
-       fields[1].in_handler = NULL;
+       
 
 
        jtag_add_dr_scan(2, fields, TAP_INVALID);