Browse Source

mips: fix error handling for jtag_execute_queue()

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
tags/v0.5.0-rc1
Øyvind Harboe 11 years ago
parent
commit
e1f5055bb0
2 changed files with 8 additions and 8 deletions
  1. +2
    -4
      src/target/mips32_pracc.c
  2. +6
    -4
      src/target/mips_ejtag.c

+ 2
- 4
src/target/mips32_pracc.c View File

@@ -176,9 +176,7 @@ static int mips32_pracc_exec_read(struct mips32_pracc_context *ctx, uint32_t add
mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl);

jtag_add_clocks(5);
jtag_execute_queue();

return ERROR_OK;
return jtag_execute_queue();
}

static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t address)
@@ -196,7 +194,7 @@ static int mips32_pracc_exec_write(struct mips32_pracc_context *ctx, uint32_t ad
mips_ejtag_drscan_32(ctx->ejtag_info, &ejtag_ctrl);

jtag_add_clocks(5);
jtag_execute_queue();
return jtag_execute_queue();

if ((address >= MIPS32_PRACC_PARAM_IN)
&& (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))


+ 6
- 4
src/target/mips_ejtag.c View File

@@ -64,11 +64,12 @@ int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode)

jtag_add_dr_scan(ejtag_info->tap, 1, &field, TAP_IDLE);

if (jtag_execute_queue() != ERROR_OK)
int retval;
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("register read failed");
return retval;
}

return ERROR_OK;
}

@@ -84,11 +85,12 @@ static int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impco

jtag_add_dr_scan(ejtag_info->tap, 1, &field, TAP_IDLE);

if (jtag_execute_queue() != ERROR_OK)
int retval;
if ((retval = jtag_execute_queue()) != ERROR_OK)
{
LOG_ERROR("register read failed");
return retval;
}

return ERROR_OK;
}



Loading…
Cancel
Save