24bit buffer support

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

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 18bf2555d637c852586ea1613733775404114a7f..4e90933d7c966407762572b32f38a218f8fb0cd1 100644 (file)
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -679,7 +679,7 @@ int arm11_run_instr_data_to_core_noack(struct arm11_common * arm11, uint32_t opc
 
        int retval = arm11_run_instr_data_to_core_noack_inner(arm11->arm.target->tap, opcode, data, count);
 
-       if (retval != ERROR_FAIL)
+       if (retval != ERROR_OK)
                return retval;
 
        arm11_add_IR(arm11, ARM11_INTEST, ARM11_TAP_DEFAULT);
@@ -898,7 +898,7 @@ int arm11_sc7_run(struct arm11_common * arm11, struct arm11_sc7_action * actions
                }
 
                /* Timeout here so we don't get stuck. */
-               int i = 0;
+               int i_n = 0;
                while (1)
                {
                        JTAG_DEBUG("SC7 <= c%-3d Data %08x %s",
@@ -917,11 +917,11 @@ int arm11_sc7_run(struct arm11_common * arm11, struct arm11_sc7_action * actions
 
                        long long then = 0;
 
-                       if (i == 1000)
+                       if (i_n == 1000)
                        {
                                then = timeval_ms();
                        }
-                       if (i >= 1000)
+                       if (i_n >= 1000)
                        {
                                if ((timeval_ms()-then) > 1000)
                                {
@@ -930,7 +930,7 @@ int arm11_sc7_run(struct arm11_common * arm11, struct arm11_sc7_action * actions
                                }
                        }
 
-                       i++;
+                       i_n++;
                }
 
                if (!nRW)
@@ -964,7 +964,7 @@ int arm11_sc7_run(struct arm11_common * arm11, struct arm11_sc7_action * actions
  * \param arm11                Target state variable.
  *
  */
-void arm11_sc7_clear_vbw(struct arm11_common * arm11)
+int arm11_sc7_clear_vbw(struct arm11_common * arm11)
 {
        size_t clear_bw_size = arm11->brp + 1;
        struct arm11_sc7_action         *clear_bw = malloc(sizeof(struct arm11_sc7_action) * clear_bw_size);
@@ -981,9 +981,12 @@ void arm11_sc7_clear_vbw(struct arm11_common * arm11)
 
        (pos++)->address = ARM11_SC7_VCR;
 
-       arm11_sc7_run(arm11, clear_bw, clear_bw_size);
+       int retval;
+       retval = arm11_sc7_run(arm11, clear_bw, clear_bw_size);
 
        free (clear_bw);
+
+       return retval;
 }
 
 /** Write VCR register
@@ -991,7 +994,7 @@ void arm11_sc7_clear_vbw(struct arm11_common * arm11)
  * \param arm11                Target state variable.
  * \param value                Value to be written
  */
-void arm11_sc7_set_vcr(struct arm11_common * arm11, uint32_t value)
+int arm11_sc7_set_vcr(struct arm11_common * arm11, uint32_t value)
 {
        struct arm11_sc7_action         set_vcr;
 
@@ -999,7 +1002,7 @@ void arm11_sc7_set_vcr(struct arm11_common * arm11, uint32_t value)
        set_vcr.address         = ARM11_SC7_VCR;
        set_vcr.value           = value;
 
-       arm11_sc7_run(arm11, &set_vcr, 1);
+       return arm11_sc7_run(arm11, &set_vcr, 1);
 }
 
 
@@ -1086,7 +1089,7 @@ static int arm11_dpm_instr_read_data_r0(struct arm_dpm *dpm,
  * and watchpoint operations instead of running them right away.  Since we
  * pre-allocated our vector, we don't need to worry about space.
  */
-static int arm11_bpwp_enable(struct arm_dpm *dpm, unsigned index,
+static int arm11_bpwp_enable(struct arm_dpm *dpm, unsigned index_t,
                uint32_t addr, uint32_t control)
 {
        struct arm11_common *arm11 = dpm_to_arm11(dpm);
@@ -1104,15 +1107,15 @@ static int arm11_bpwp_enable(struct arm_dpm *dpm, unsigned index,
        action[0].value = addr;
        action[1].value = control;
 
-       switch (index) {
+       switch (index_t) {
        case 0 ... 15:
-               action[0].address = ARM11_SC7_BVR0 + index;
-               action[1].address = ARM11_SC7_BCR0 + index;
+               action[0].address = ARM11_SC7_BVR0 + index_t;
+               action[1].address = ARM11_SC7_BCR0 + index_t;
                break;
        case 16 ... 32:
-               index -= 16;
-               action[0].address = ARM11_SC7_WVR0 + index;
-               action[1].address = ARM11_SC7_WCR0 + index;
+               index_t -= 16;
+               action[0].address = ARM11_SC7_WVR0 + index_t;
+               action[1].address = ARM11_SC7_WCR0 + index_t;
                break;
        default:
                return ERROR_FAIL;
@@ -1123,7 +1126,7 @@ static int arm11_bpwp_enable(struct arm_dpm *dpm, unsigned index,
        return ERROR_OK;
 }
 
-static int arm11_bpwp_disable(struct arm_dpm *dpm, unsigned index)
+static int arm11_bpwp_disable(struct arm_dpm *dpm, unsigned index_t)
 {
        struct arm11_common *arm11 = dpm_to_arm11(dpm);
        struct arm11_sc7_action *action;
@@ -1133,13 +1136,13 @@ static int arm11_bpwp_disable(struct arm_dpm *dpm, unsigned index)
        action[0].write = true;
        action[0].value = 0;
 
-       switch (index) {
+       switch (index_t) {
        case 0 ... 15:
-               action[0].address = ARM11_SC7_BCR0 + index;
+               action[0].address = ARM11_SC7_BCR0 + index_t;
                break;
        case 16 ... 32:
-               index -= 16;
-               action[0].address = ARM11_SC7_WCR0 + index;
+               index_t -= 16;
+               action[0].address = ARM11_SC7_WCR0 + index_t;
                break;
        default:
                return ERROR_FAIL;