diff options
| -rw-r--r-- | src/jtag/jtag.c | 2 | ||||
| -rw-r--r-- | src/jtag/jtag.h | 2 | ||||
| -rw-r--r-- | src/target/arm7tdmi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 0be66c28..55d035a4 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -737,7 +737,7 @@ static void jtag_add_scan_check(void (*jtag_add_scan)(int num_fields, scan_field if ((fields[i].check_value!=NULL)&&(fields[i].in_value!=NULL)) { /* this is synchronous for a minidriver */ - jtag_add_callback4(jtag_check_value_mask_callback, fields[i].in_value, fields[i].check_value, fields[i].check_mask, (jtag_callback_data_t)fields[i].num_bits); + jtag_add_callback4(jtag_check_value_mask_callback, fields[i].in_value, (jtag_callback_data_t)fields[i].check_value, (jtag_callback_data_t)fields[i].check_mask, (jtag_callback_data_t)fields[i].num_bits); } if (fields[i].allocated) { diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 6fa31c6b..e2c8df47 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -589,7 +589,7 @@ extern void jtag_add_callback(jtag_callback1_t, u8 *in); /* This type can store an integer safely by a normal cast on 64 and * 32 bit systems. */ -typedef void *jtag_callback_data_t; +typedef intptr_t jtag_callback_data_t; /* The generic callback mechanism. * diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index aea4bab8..44d9b0a5 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -278,7 +278,7 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, jtag_add_dr_scan(2, fields, TAP_INVALID); - jtag_add_callback4(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, NULL); + jtag_add_callback4(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)NULL); jtag_add_runtest(0, TAP_INVALID); |