arm_adi_v5: parse ROM tables behind SoC-600 APv1 adapter

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

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index 0b8122e1cf3374470e541bcfef7da20cfd2e8e12..b21a1bdc4cf6ffb4aab0c3a4b0c02ae9a1b665a4 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -27,15 +27,12 @@
 #include "mips32.h"
 #include "mips_ejtag.h"
 #include "mips32_dmaacc.h"
-
-#if BUILD_TARGET64 == 1
 #include "mips64.h"
 #include "mips64_pracc.h"
-#endif
 
 void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info, uint32_t new_instr)
 {
-       assert(ejtag_info->tap != NULL);
+       assert(ejtag_info->tap);
        struct jtag_tap *tap = ejtag_info->tap;
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) {
@@ -43,7 +40,7 @@ void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info, uint32_t new_instr)
                struct scan_field field;
                field.num_bits = tap->ir_length;
 
-               uint8_t t[4];
+               uint8_t t[4] = { 0 };
                field.out_value = t;
                buf_set_u32(t, 0, field.num_bits, new_instr);
 
@@ -61,7 +58,7 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info)
        return mips_ejtag_drscan_32(ejtag_info, &ejtag_info->idcode);
 }
 
-int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info)
+static int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info)
 {
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE);
 
@@ -71,7 +68,7 @@ int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info)
 
 void mips_ejtag_add_scan_96(struct mips_ejtag *ejtag_info, uint32_t ctrl, uint32_t data, uint8_t *in_scan_buf)
 {
-       assert(ejtag_info->tap != NULL);
+       assert(ejtag_info->tap);
        struct jtag_tap *tap = ejtag_info->tap;
 
        struct scan_field field;
@@ -97,10 +94,10 @@ int mips_ejtag_drscan_64(struct mips_ejtag *ejtag_info, uint64_t *data)
        struct jtag_tap *tap;
        tap  = ejtag_info->tap;
 
-       if (tap == NULL)
+       if (!tap)
                return ERROR_FAIL;
        struct scan_field field;
-       uint8_t t[8], r[8];
+       uint8_t t[8] = { 0 }, r[8];
        int retval;
 
        field.num_bits = 64;
@@ -122,15 +119,16 @@ int mips_ejtag_drscan_64(struct mips_ejtag *ejtag_info, uint64_t *data)
        return ERROR_OK;
 }
 
-void mips_ejtag_drscan_32_queued(struct mips_ejtag *ejtag_info, uint32_t data_out, uint8_t *data_in)
+static void mips_ejtag_drscan_32_queued(struct mips_ejtag *ejtag_info,
+               uint32_t data_out, uint8_t *data_in)
 {
-       assert(ejtag_info->tap != NULL);
+       assert(ejtag_info->tap);
        struct jtag_tap *tap = ejtag_info->tap;
 
        struct scan_field field;
        field.num_bits = 32;
 
-       uint8_t scan_out[4];
+       uint8_t scan_out[4] = { 0 };
        field.out_value = scan_out;
        buf_set_u32(scan_out, 0, field.num_bits, data_out);
 
@@ -162,7 +160,7 @@ void mips_ejtag_drscan_32_out(struct mips_ejtag *ejtag_info, uint32_t data)
 
 int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint8_t *data)
 {
-       assert(ejtag_info->tap != NULL);
+       assert(ejtag_info->tap);
        struct jtag_tap *tap = ejtag_info->tap;
 
        struct scan_field field;
@@ -183,7 +181,7 @@ int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint8_t *data)
 
 void mips_ejtag_drscan_8_out(struct mips_ejtag *ejtag_info, uint8_t data)
 {
-       assert(ejtag_info->tap != NULL);
+       assert(ejtag_info->tap);
        struct jtag_tap *tap = ejtag_info->tap;
 
        struct scan_field field;
@@ -270,7 +268,7 @@ error:
 
 int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info)
 {
-       pa_list pracc_list = {.instr = MIPS32_DRET(ejtag_info->isa), .addr = 0};
+       struct pa_list pracc_list = {.instr = MIPS32_DRET(ejtag_info->isa), .addr = 0};
        struct pracc_queue_info ctx = {.max_code = 1, .pracc_list = &pracc_list, .code_count = 1, .store_count = 0};
 
        /* execute our dret instruction */
@@ -281,7 +279,7 @@ int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info)
        return ctx.retval;
 }
 
-/* mips_ejtag_init_mmr - asign Memory-Mapped Registers depending
+/* mips_ejtag_init_mmr - assign Memory-Mapped Registers depending
  *                     on EJTAG version.
  */
 static void mips_ejtag_init_mmr(struct mips_ejtag *ejtag_info)
@@ -298,8 +296,8 @@ static void mips_ejtag_init_mmr(struct mips_ejtag *ejtag_info)
                ejtag_info->ejtag_dbm_offs      = EJTAG_V20_DBM_OFFS;
                ejtag_info->ejtag_dbv_offs      = EJTAG_V20_DBV_OFFS;
 
-               ejtag_info->ejtag_iba_step_size = EJTAG_V20_IBAn_STEP;
-               ejtag_info->ejtag_dba_step_size = EJTAG_V20_DBAn_STEP;
+               ejtag_info->ejtag_iba_step_size = EJTAG_V20_IBAN_STEP;
+               ejtag_info->ejtag_dba_step_size = EJTAG_V20_DBAN_STEP;
        } else {
                ejtag_info->ejtag_ibs_addr      = EJTAG_V25_IBS;
                ejtag_info->ejtag_iba0_addr     = EJTAG_V25_IBA0;
@@ -314,8 +312,8 @@ static void mips_ejtag_init_mmr(struct mips_ejtag *ejtag_info)
                ejtag_info->ejtag_dbc_offs      = EJTAG_V25_DBC_OFFS;
                ejtag_info->ejtag_dbv_offs      = EJTAG_V25_DBV_OFFS;
 
-               ejtag_info->ejtag_iba_step_size = EJTAG_V25_IBAn_STEP;
-               ejtag_info->ejtag_dba_step_size = EJTAG_V25_DBAn_STEP;
+               ejtag_info->ejtag_iba_step_size = EJTAG_V25_IBAN_STEP;
+               ejtag_info->ejtag_dba_step_size = EJTAG_V25_DBAN_STEP;
        }
 }
 
@@ -349,7 +347,7 @@ static void ejtag_main_print_imp(struct mips_ejtag *ejtag_info)
                EJTAG_IMP_HAS(EJTAG_IMP_ASID6) ? " ASID_6" : "",
                EJTAG_IMP_HAS(EJTAG_IMP_MIPS16) ? " MIPS16" : "",
                EJTAG_IMP_HAS(EJTAG_IMP_NODMA) ? " noDMA" : " DMA",
-               EJTAG_IMP_HAS(EJTAG_DCR_MIPS64) ? " MIPS64" : " MIPS32");
+               EJTAG_IMP_HAS(EJTAG_IMP_MIPS64) ? " MIPS64" : " MIPS32");
 
        switch (ejtag_info->ejtag_version) {
                case EJTAG_VERSION_20:
@@ -423,7 +421,7 @@ int mips_ejtag_init(struct mips_ejtag *ejtag_info)
 
 int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t, uint32_t *data)
 {
-       assert(ejtag_info->tap != NULL);
+       assert(ejtag_info->tap);
        struct jtag_tap *tap = ejtag_info->tap;
 
        struct scan_field fields[2];
@@ -458,8 +456,6 @@ int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t, uint32_
        return ERROR_OK;
 }
 
-#if BUILD_TARGET64 == 1
-
 int mips64_ejtag_config_step(struct mips_ejtag *ejtag_info, bool enable_step)
 {
        const uint32_t code_enable[] = {
@@ -534,7 +530,7 @@ int mips64_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, bool write_t, uint
        struct jtag_tap *tap;
 
        tap = ejtag_info->tap;
-       assert(tap != NULL);
+       assert(tap);
 
        struct scan_field fields[2];
        uint8_t spracc = 0;
@@ -564,5 +560,3 @@ int mips64_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, bool write_t, uint
 
        return ERROR_OK;
 }
-
-#endif /* BUILD_TARGET64 */