Browse Source

jtag: move towards making out_value const

These were relatively straightforward fixes which are
backwards compatible.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
tags/v0.5.0-rc1
Øyvind Harboe 12 years ago
parent
commit
96949890ee
5 changed files with 13 additions and 11 deletions
  1. +4
    -3
      src/flash/nor/str9xpec.c
  2. +4
    -3
      src/pld/virtex2.c
  3. +1
    -1
      src/target/arm_jtag.c
  4. +3
    -3
      src/target/mips_ejtag.c
  5. +1
    -1
      src/target/xscale.c

+ 4
- 3
src/flash/nor/str9xpec.c View File

@@ -44,13 +44,14 @@ int str9xpec_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_state_t end
struct scan_field field;

field.num_bits = tap->ir_length;
field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
void * t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
field.out_value = t;
buf_set_u32(t, 0, field.num_bits, new_instr);
field.in_value = NULL;

jtag_add_ir_scan(tap, &field, end_state);

free(field.out_value);
free(t);
}

return ERROR_OK;


+ 4
- 3
src/pld/virtex2.c View File

@@ -36,13 +36,14 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
struct scan_field field;

field.num_bits = tap->ir_length;
field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
void * t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
field.out_value = t;
buf_set_u32(t, 0, field.num_bits, new_instr);
field.in_value = NULL;

jtag_add_ir_scan(tap, &field, TAP_IDLE);

free(field.out_value);
free(t);
}

return ERROR_OK;


+ 1
- 1
src/target/arm_jtag.c View File

@@ -40,7 +40,7 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr, vo

field.num_bits = tap->ir_length;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
buf_set_u32(t, 0, field.num_bits, new_instr);
field.in_value = NULL;

if (no_verify_capture == NULL)


+ 3
- 3
src/target/mips_ejtag.c View File

@@ -43,7 +43,7 @@ int mips_ejtag_set_instr(struct mips_ejtag *ejtag_info, int new_instr)

field.num_bits = tap->ir_length;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
buf_set_u32(t, 0, field.num_bits, new_instr);
field.in_value = NULL;

jtag_add_ir_scan(tap, &field, TAP_IDLE);
@@ -105,7 +105,7 @@ int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data)

field.num_bits = 32;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, *data);
buf_set_u32(t, 0, field.num_bits, *data);
field.in_value = r;

jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
@@ -136,7 +136,7 @@ int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint32_t *data)

field.num_bits = 8;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, *data);
buf_set_u32(t, 0, field.num_bits, *data);
field.in_value = r;

jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);


+ 1
- 1
src/target/xscale.c View File

@@ -171,7 +171,7 @@ static int xscale_jtag_set_instr(struct jtag_tap *tap, uint32_t new_instr, tap_s
memset(&field, 0, sizeof field);
field.num_bits = tap->ir_length;
field.out_value = scratch;
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
buf_set_u32(scratch, 0, field.num_bits, new_instr);

jtag_add_ir_scan(tap, &field, end_state);
}


Loading…
Cancel
Save