jtag_tap_t -> struct jtag_tap

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

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index eebd5fb79a63c845be748d7115c02b02ae7f4533..021e3ab4b2d49914e34c0c5a6148b563cc1f0113 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -29,10 +29,10 @@
 
 int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch)
 {
-       jtag_tap_t *tap;
+       struct jtag_tap *tap;
 
        tap = ejtag_info->tap;
-       if (tap==NULL)
+       if (tap == NULL)
                return ERROR_FAIL;
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (uint32_t)new_instr)
@@ -44,12 +44,8 @@ int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_m
                field.num_bits = tap->ir_length;
                field.out_value = t;
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-
                field.in_value = NULL;
-               
-               
-               
-               
+
                jtag_add_ir_scan(1, &field, jtag_get_end_state());
        }
 
@@ -67,12 +63,8 @@ int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, uint32_t *idcode)
        field.tap = ejtag_info->tap;
        field.num_bits = 32;
        field.out_value = NULL;
-
        field.in_value = (void*)idcode;
-       
-       
-       
-       
+
        jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        if (jtag_execute_queue() != ERROR_OK)
@@ -94,12 +86,8 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
        field.tap = ejtag_info->tap;
        field.num_bits = 32;
        field.out_value = NULL;
-
        field.in_value = (void*)impcode;
-       
-       
-       
-       
+
        jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        if (jtag_execute_queue() != ERROR_OK)
@@ -112,10 +100,10 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
 
 int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, uint32_t *data)
 {
-       jtag_tap_t *tap;
+       struct jtag_tap *tap;
        tap  = ejtag_info->tap;
 
-       if (tap==NULL)
+       if (tap == NULL)
                return ERROR_FAIL;
        scan_field_t field;
        uint8_t t[4], r[4];
@@ -125,12 +113,8 @@ int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, uint32_t *data)
        field.num_bits = 32;
        field.out_value = t;
        buf_set_u32(field.out_value, 0, field.num_bits, *data);
-
        field.in_value = r;
-       
-       
-       
-       
+
        jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        if ((retval = jtag_execute_queue()) != ERROR_OK)
@@ -212,7 +196,7 @@ int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        LOG_DEBUG("ejtag_ctrl: 0x%8.8" PRIx32 "", ejtag_ctrl);
-       if((ejtag_ctrl & EJTAG_CTRL_BRKST) == 0)
+       if ((ejtag_ctrl & EJTAG_CTRL_BRKST) == 0)
                LOG_DEBUG("Failed to enter Debug Mode!");
 
        return ERROR_OK;
@@ -222,7 +206,7 @@ int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info)
 {
        uint32_t inst;
        inst = MIPS32_DRET;
-       
+
        /* execute our dret instruction */
        mips32_pracc_exec(ejtag_info, 1, &inst, 0, NULL, 0, NULL, 0);
 
@@ -285,16 +269,16 @@ int mips_ejtag_init(mips_ejtag_t *ejtag_info)
                        break;
        }
        LOG_DEBUG("EJTAG: features:%s%s%s%s%s%s%s",
-               ejtag_info->impcode & (1<<28) ? " R3k":    " R4k",
-               ejtag_info->impcode & (1<<24) ? " DINT":   "",
-               ejtag_info->impcode & (1<<22) ? " ASID_8": "",
-               ejtag_info->impcode & (1<<21) ? " ASID_6": "",
-               ejtag_info->impcode & (1<<16) ? " MIPS16": "",
-               ejtag_info->impcode & (1<<14) ? " noDMA":  " DMA",
-               ejtag_info->impcode & (1<<0)  ? " MIPS64": " MIPS32"
-       );
-
-       if((ejtag_info->impcode & (1<<14)) == 0)
+               ejtag_info->impcode & (1 << 28) ? " R3k":    " R4k",
+               ejtag_info->impcode & (1 << 24) ? " DINT":   "",
+               ejtag_info->impcode & (1 << 22) ? " ASID_8": "",
+               ejtag_info->impcode & (1 << 21) ? " ASID_6": "",
+               ejtag_info->impcode & (1 << 16) ? " MIPS16": "",
+               ejtag_info->impcode & (1 << 14) ? " noDMA":  " DMA",
+               ejtag_info->impcode & (1 << 0)  ? " MIPS64": " MIPS32"
+);
+
+       if ((ejtag_info->impcode & (1 << 14)) == 0)
                LOG_DEBUG("EJTAG: DMA Access Mode Support Enabled");
 
        /* set initial state for ejtag control reg */