Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
armv7m_core_reg_t -> struct armv7m_core_reg
[openocd.git] / src / target / mips_ejtag.c
diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index 4e451ec75297eff58776c0f37679831a2b3b67e3..d23411f47d3858151cb2fdd3274ded7a3b50b0fd 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -29,51 +29,43 @@
 
 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) != (u32)new_instr)
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (uint32_t)new_instr)
        {
-               scan_field_t field;
-               u8 t[4];
+               struct scan_field field;
+               uint8_t t[4];
 
                field.tap = tap;
                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_add_end_state(TAP_INVALID));
+
+               jtag_add_ir_scan(1, &field, jtag_get_end_state());
        }
 
        return ERROR_OK;
 }
 
-int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode)
+int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, uint32_t *idcode)
 {
-       scan_field_t field;
+       struct scan_field field;
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
 
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IDCODE, NULL);
 
        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_add_end_state(TAP_INVALID));
+
+       jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        if (jtag_execute_queue() != ERROR_OK)
        {
@@ -83,24 +75,20 @@ int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode)
        return ERROR_OK;
 }
 
-int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode)
+int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
 {
-       scan_field_t field;
+       struct scan_field field;
 
-       jtag_add_end_state(TAP_IDLE);
+       jtag_set_end_state(TAP_IDLE);
 
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_IMPCODE, NULL);
 
        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_add_end_state(TAP_INVALID));
+
+       jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        if (jtag_execute_queue() != ERROR_OK)
        {
@@ -110,28 +98,24 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode)
        return ERROR_OK;
 }
 
-int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, u32 *data)
+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;
-       u8 t[4];
+       struct scan_field field;
+       uint8_t t[4], r[4];
        int retval;
 
        field.tap = tap;
        field.num_bits = 32;
        field.out_value = t;
        buf_set_u32(field.out_value, 0, field.num_bits, *data);
+       field.in_value = r;
 
-       field.in_value = (u8*)data;
-       
-       
-       
-       
-       jtag_add_dr_scan(1, &field, jtag_add_end_state(TAP_INVALID));
+       jtag_add_dr_scan(1, &field, jtag_get_end_state());
 
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
@@ -139,6 +123,8 @@ int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, u32 *data)
                return retval;
        }
 
+       *data = buf_get_u32(field.in_value, 0, 32);
+
        keep_alive();
 
        return ERROR_OK;
@@ -146,7 +132,7 @@ int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, u32 *data)
 
 int mips_ejtag_step_enable(mips_ejtag_t *ejtag_info)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                        MIPS32_MTC0(1,31,0),                    /* move $1 to COP0 DeSave */
                        MIPS32_MFC0(1,23,0),                    /* move COP0 Debug to $1 */
                        MIPS32_ORI(1,1,0x0100),                 /* set SSt bit in debug reg */
@@ -164,7 +150,7 @@ int mips_ejtag_step_enable(mips_ejtag_t *ejtag_info)
 }
 int mips_ejtag_step_disable(mips_ejtag_t *ejtag_info)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                        MIPS32_MTC0(15,31,0),                                                   /* move $15 to COP0 DeSave */
                        MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),     /* $15 = MIPS32_PRACC_STACK */
                        MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
@@ -198,8 +184,8 @@ int mips_ejtag_config_step(mips_ejtag_t *ejtag_info, int enable_step)
 
 int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
 {
-       u32 ejtag_ctrl;
-       jtag_add_end_state(TAP_IDLE);
+       uint32_t ejtag_ctrl;
+       jtag_set_end_state(TAP_IDLE);
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
 
        /* set debug break bit */
@@ -209,8 +195,8 @@ int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
        /* break bit will be cleared by hardware */
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       LOG_DEBUG("ejtag_ctrl: 0x%8.8x", ejtag_ctrl);
-       if((ejtag_ctrl & EJTAG_CTRL_BRKST) == 0)
+       LOG_DEBUG("ejtag_ctrl: 0x%8.8" PRIx32 "", ejtag_ctrl);
+       if ((ejtag_ctrl & EJTAG_CTRL_BRKST) == 0)
                LOG_DEBUG("Failed to enter Debug Mode!");
 
        return ERROR_OK;
@@ -218,19 +204,19 @@ int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
 
 int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info)
 {
-       u32 inst;
+       uint32_t inst;
        inst = MIPS32_DRET;
-       
+
        /* execute our dret instruction */
        mips32_pracc_exec(ejtag_info, 1, &inst, 0, NULL, 0, NULL, 0);
 
        return ERROR_OK;
 }
 
-int mips_ejtag_read_debug(mips_ejtag_t *ejtag_info, u32* debug_reg)
+int mips_ejtag_read_debug(mips_ejtag_t *ejtag_info, uint32_t* debug_reg)
 {
        /* read ejtag ECR */
-       u32 code[] = {
+       uint32_t code[] = {
                        MIPS32_MTC0(15,31,0),                                                   /* move $15 to COP0 DeSave */
                        MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),     /* $15 = MIPS32_PRACC_STACK */
                        MIPS32_ORI(15,15,LOWER16(MIPS32_PRACC_STACK)),
@@ -256,10 +242,10 @@ int mips_ejtag_read_debug(mips_ejtag_t *ejtag_info, u32* debug_reg)
 
 int mips_ejtag_init(mips_ejtag_t *ejtag_info)
 {
-       u32 ejtag_version;
+       uint32_t ejtag_version;
 
        mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode);
-       LOG_DEBUG("impcode: 0x%8.8x", ejtag_info->impcode);
+       LOG_DEBUG("impcode: 0x%8.8" PRIx32 "", ejtag_info->impcode);
 
        /* get ejtag version */
        ejtag_version = ((ejtag_info->impcode >> 29) & 0x07);
@@ -283,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 */
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)