arm920t: -Wshadow warning fixes

[openocd] / src / target / mips_ejtag.c

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index d79c58d7b01256152c98f7f336b6437bfc0230d9..84ad5294b0655ab65e80573bd1c313a0a89a74d4 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -43,7 +43,7 @@ int mips_ejtag_set_instr(struct mips_ejtag *ejtag_info, int new_instr)
 
                field.num_bits = tap->ir_length;
                field.out_value = t;
-               buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+               buf_set_u32(t, 0, field.num_bits, new_instr);
                field.in_value = NULL;
 
                jtag_add_ir_scan(tap, &field, TAP_IDLE);
@@ -56,8 +56,6 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode)
 {
        struct scan_field field;
 
-       jtag_set_end_state(TAP_IDLE);
-
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IDCODE);
 
        field.num_bits = 32;
@@ -74,12 +72,10 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode)
        return ERROR_OK;
 }
 
-int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impcode)
+static int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impcode)
 {
        struct scan_field field;
 
-       jtag_set_end_state(TAP_IDLE);
-
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE);
 
        field.num_bits = 32;
@@ -109,7 +105,7 @@ int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data)
 
        field.num_bits = 32;
        field.out_value = t;
-       buf_set_u32(field.out_value, 0, field.num_bits, *data);
+       buf_set_u32(t, 0, field.num_bits, *data);
        field.in_value = r;
 
        jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
@@ -140,7 +136,7 @@ int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint32_t *data)
 
        field.num_bits = 8;
        field.out_value = t;
-       buf_set_u32(field.out_value, 0, field.num_bits, *data);
+       buf_set_u32(t, 0, field.num_bits, *data);
        field.in_value = r;
 
        jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
@@ -158,7 +154,7 @@ int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint32_t *data)
        return ERROR_OK;
 }
 
-int mips_ejtag_step_enable(struct mips_ejtag *ejtag_info)
+static int mips_ejtag_step_enable(struct mips_ejtag *ejtag_info)
 {
        static const uint32_t code[] = {
                        MIPS32_MTC0(1,31,0),                    /* move $1 to COP0 DeSave */
@@ -174,7 +170,8 @@ int mips_ejtag_step_enable(struct mips_ejtag *ejtag_info)
 
        return ERROR_OK;
 }
-int mips_ejtag_step_disable(struct mips_ejtag *ejtag_info)
+
+static int mips_ejtag_step_disable(struct mips_ejtag *ejtag_info)
 {
        static const uint32_t code[] = {
                        MIPS32_MTC0(15,31,0),                                                   /* move $15 to COP0 DeSave */
@@ -209,7 +206,6 @@ int mips_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step)
 int mips_ejtag_enter_debug(struct mips_ejtag *ejtag_info)
 {
        uint32_t ejtag_ctrl;
-       jtag_set_end_state(TAP_IDLE);
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
 
        /* set debug break bit */