X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fmips_ejtag.c;h=ef7f63e36afc30723557907ca67e57122368df83;hb=a585bdf7269ce5c861c83ee3294ba1f074e9c877;hp=c03d1adb7335eef4fc63cbcb1e9e33cc4e5d782f;hpb=3813fda44adcea486b7308423a699f63d79273ee;p=openocd.git diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index c03d1adb73..ef7f63e36a 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -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) @@ -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) @@ -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); @@ -292,7 +276,7 @@ int mips_ejtag_init(mips_ejtag_t *ejtag_info) 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");