mips: fix error handling for jtag_execute_queue()

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

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index 37e1f09fc464c45241b415525eeded0cc55a3cc4..6ce702fdbb0c43e07809c97db49b5b06a64c4250 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);
@@ -64,15 +64,16 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode)
 
        jtag_add_dr_scan(ejtag_info->tap, 1, &field, TAP_IDLE);
 
-       if (jtag_execute_queue() != ERROR_OK)
+       int retval;
+       if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                LOG_ERROR("register read failed");
+               return retval;
        }
-
        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;
 
@@ -84,11 +85,12 @@ int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impcode)
 
        jtag_add_dr_scan(ejtag_info->tap, 1, &field, TAP_IDLE);
 
-       if (jtag_execute_queue() != ERROR_OK)
+       int retval;
+       if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
                LOG_ERROR("register read failed");
+               return retval;
        }
-
        return ERROR_OK;
 }
 
@@ -105,7 +107,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);
@@ -136,7 +138,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);
@@ -154,7 +156,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 */
@@ -170,7 +172,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 */
@@ -299,11 +302,12 @@ int mips_ejtag_init(struct mips_ejtag *ejtag_info)
 
        /* set initial state for ejtag control reg */
        ejtag_info->ejtag_ctrl = EJTAG_CTRL_ROCC | EJTAG_CTRL_PRACC | EJTAG_CTRL_PROBEN | EJTAG_CTRL_SETDEV;
+       ejtag_info->fast_access_save = -1;
 
        return ERROR_OK;
 }
 
-int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write, uint32_t *data)
+int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t, uint32_t *data)
 {
        struct jtag_tap *tap;
        tap = ejtag_info->tap;
@@ -324,7 +328,7 @@ int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write, uint32_t
        fields[1].num_bits = 32;
        fields[1].out_value = t;
 
-       if (write)
+       if (write_t)
        {
                fields[1].in_value = NULL;
                buf_set_u32(t, 0, 32, *data);