rlink: remove redundant text from log messages

[openocd.git] / src / jtag / drivers / driver.c

diff --git a/src/jtag/drivers/driver.c b/src/jtag/drivers/driver.c
index 14efe965e7aad3037b12ac2a88b3809dcf0d4d06..49f40246e976f70447ee2fb4d72dadf89cdeb766 100644 (file)
--- a/src/jtag/drivers/driver.c
+++ b/src/jtag/drivers/driver.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007-2009 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2009 SoftPLC Corporation                                *
@@ -64,7 +64,6 @@ static void jtag_callback_queue_reset(void)
  */
 static void cmd_queue_scan_field_clone(struct scan_field * dst, const struct scan_field * src)
 {
-       dst->tap                = src->tap;
        dst->num_bits   = src->num_bits;
        dst->out_value  = buf_cpy(src->out_value, cmd_queue_alloc(DIV_ROUND_UP(src->num_bits, 8)), src->num_bits);
        dst->in_value   = src->in_value;
@@ -75,7 +74,7 @@ static void cmd_queue_scan_field_clone(struct scan_field * dst, const struct sca
  * see jtag_add_ir_scan()
  *
  */
-int interface_jtag_add_ir_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state)
+int interface_jtag_add_ir_scan(struct jtag_tap* active, const struct scan_field *in_fields, tap_state_t state)
 {
        size_t num_taps = jtag_tap_count_enabled();
 
@@ -102,33 +101,18 @@ int interface_jtag_add_ir_scan(int in_num_fields, const struct scan_field *in_fi
        {
                /* search the input field list for fields for the current TAP */
 
-               bool found = false;
-
-               for (int j = 0; j < in_num_fields; j++)
+               if (tap == active)
                {
-                       if (tap != in_fields[j].tap)
-                               continue;
-
                        /* if TAP is listed in input fields, copy the value */
-
-                       found = true;
-
                        tap->bypass = 0;
 
-                       assert(in_fields[j].num_bits == tap->ir_length); /* input fields must have the same length as the TAP's IR */
-
-                       cmd_queue_scan_field_clone(field, in_fields + j);
-
-                       break;
-               }
-
-               if (!found)
+                       cmd_queue_scan_field_clone(field, in_fields);
+               } else
                {
                        /* if a TAP isn't listed in input fields, set it to BYPASS */
 
                        tap->bypass = 1;
 
-                       field->tap                      = tap;
                        field->num_bits         = tap->ir_length;
                        field->out_value        = buf_set_ones(cmd_queue_alloc(DIV_ROUND_UP(tap->ir_length, 8)), tap->ir_length);
                        field->in_value         = NULL; /* do not collect input for tap's in bypass */
@@ -145,40 +129,11 @@ int interface_jtag_add_ir_scan(int in_num_fields, const struct scan_field *in_fi
        return ERROR_OK;
 }
 
-/**
- * see jtag_add_plain_ir_scan()
- *
- */
-int interface_jtag_add_plain_ir_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state)
-{
-
-       struct jtag_command * cmd               = cmd_queue_alloc(sizeof(struct jtag_command));
-       struct scan_command * scan              = cmd_queue_alloc(sizeof(struct scan_command));
-       struct scan_field * out_fields  = cmd_queue_alloc(in_num_fields * sizeof(struct scan_field));
-
-       jtag_queue_command(cmd);
-
-       cmd->type                               = JTAG_SCAN;
-       cmd->cmd.scan                   = scan;
-
-       scan->ir_scan                   = true;
-       scan->num_fields                = in_num_fields;
-       scan->fields                    = out_fields;
-       scan->end_state                 = state;
-
-       for (int i = 0; i < in_num_fields; i++)
-               cmd_queue_scan_field_clone(out_fields + i, in_fields + i);
-
-       return ERROR_OK;
-}
-
-
-
 /**
  * see jtag_add_dr_scan()
  *
  */
-int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state)
+int interface_jtag_add_dr_scan(struct jtag_tap* active, int in_num_fields, const struct scan_field *in_fields, tap_state_t state)
 {
        /* count devices in bypass */
 
@@ -215,6 +170,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fi
 
                if (!tap->bypass)
                {
+                       assert(active == tap);
 #ifndef NDEBUG
                        /* remember initial position for assert() */
                        struct scan_field *start_field = field;
@@ -222,9 +178,6 @@ int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fi
 
                        for (int j = 0; j < in_num_fields; j++)
                        {
-                               if (tap != in_fields[j].tap)
-                                       continue;
-
                                cmd_queue_scan_field_clone(field, in_fields + j);
 
                                field++;
@@ -236,7 +189,6 @@ int interface_jtag_add_dr_scan(int in_num_fields, const struct scan_field *in_fi
                /* if a TAP is bypassed, generated a dummy bit*/
                else
                {
-                       field->tap                      = tap;
                        field->num_bits         = 1;
                        field->out_value        = NULL;
                        field->in_value         = NULL;
@@ -320,7 +272,6 @@ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
                                size_t scan_size = num_bits[j];
                                buf_set_u32(out_value, 0, scan_size, value[j]);
 
-                               field->tap                      = tap;
                                field->num_bits         = scan_size;
                                field->out_value        = buf_cpy(out_value, cmd_queue_alloc(DIV_ROUND_UP(scan_size, 8)), scan_size);
                                field->in_value         = NULL;
@@ -333,7 +284,6 @@ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
                else
                {
 
-                       field->tap                              = tap;
                        field->num_bits                 = 1;
                        field->out_value                = NULL;
                        field->in_value                 = NULL;
@@ -345,32 +295,40 @@ void interface_jtag_add_dr_out(struct jtag_tap *target_tap,
        assert(target_tap_match);       /* target_tap should be enabled and not bypassed */
 }
 
-/**
- * see jtag_add_plain_dr_scan()
- *
- */
-int interface_jtag_add_plain_dr_scan(int in_num_fields, const struct scan_field *in_fields, tap_state_t state)
+static int jtag_add_plain_scan(int num_bits, const uint8_t *out_bits,
+               uint8_t *in_bits, tap_state_t state, bool ir_scan)
 {
        struct jtag_command * cmd               = cmd_queue_alloc(sizeof(struct jtag_command));
        struct scan_command * scan              = cmd_queue_alloc(sizeof(struct scan_command));
-       struct scan_field * out_fields  = cmd_queue_alloc(in_num_fields * sizeof(struct scan_field));
+       struct scan_field * out_fields  = cmd_queue_alloc(sizeof(struct scan_field));
 
        jtag_queue_command(cmd);
 
        cmd->type                               = JTAG_SCAN;
        cmd->cmd.scan                   = scan;
 
-       scan->ir_scan                   = false;
-       scan->num_fields                = in_num_fields;
+       scan->ir_scan                   = ir_scan;
+       scan->num_fields                = 1;
        scan->fields                    = out_fields;
        scan->end_state                 = state;
 
-       for (int i = 0; i < in_num_fields; i++)
-               cmd_queue_scan_field_clone(out_fields + i, in_fields + i);
+       out_fields->num_bits    = num_bits;
+       out_fields->out_value   = buf_cpy(out_bits, cmd_queue_alloc(DIV_ROUND_UP(num_bits, 8)), num_bits);
+       out_fields->in_value    = in_bits;
 
        return ERROR_OK;
 }
 
+int interface_jtag_add_plain_dr_scan(int num_bits, const uint8_t *out_bits, uint8_t *in_bits, tap_state_t state)
+{
+       return jtag_add_plain_scan(num_bits, out_bits, in_bits, state, false);
+}
+
+int interface_jtag_add_plain_ir_scan(int num_bits, const uint8_t *out_bits, uint8_t *in_bits, tap_state_t state)
+{
+       return jtag_add_plain_scan(num_bits, out_bits, in_bits, state, true);
+}
+
 int interface_jtag_add_tlr(void)
 {
        tap_state_t state = TAP_RESET;
@@ -380,7 +338,7 @@ int interface_jtag_add_tlr(void)
 
        jtag_queue_command(cmd);
 
-       cmd->type = JTAG_STATEMOVE;
+       cmd->type = JTAG_TLR_RESET;
 
        cmd->cmd.statemove = cmd_queue_alloc(sizeof(struct statemove_command));
        cmd->cmd.statemove->end_state = state;
@@ -388,7 +346,7 @@ int interface_jtag_add_tlr(void)
        return ERROR_OK;
 }
 
-int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq)
+int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state)
 {
        struct jtag_command *cmd;