X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=831503a56b6b15065ce8f048fb6e59e5da958fd1;hb=0bcf5a6b76ad1cb4d871733f438e2a261bb88e12;hp=6e06622bc0b34976d161a7fcd0c33d0e3638f81e;hpb=86e4324f1bd4cd8135cb857e4b940b1f2e872dc3;p=openocd.git

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 6e06622bc0..831503a56b 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -88,8 +88,9 @@ static int virtex2_send_32(struct pld_device_s *pld_device,
 	return ERROR_OK;
 }
 
-static __inline__ void virtexflip32(uint8_t *in)
+static __inline__ void virtexflip32(jtag_callback_data_t arg)
 {
+  uint8_t *in = (uint8_t *)arg;
 	*((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
 }
 
@@ -112,7 +113,7 @@ static int virtex2_receive_32(struct pld_device_s *pld_device,
 
 		jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
 
-		jtag_add_callback(virtexflip32, (uint8_t *)words);
+		jtag_add_callback(virtexflip32, (jtag_callback_data_t)words);
 
 		words++;;
 	}
@@ -137,7 +138,7 @@ static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 
 	jtag_execute_queue();
 
-	LOG_DEBUG("status: 0x%8.8x", *status);
+	LOG_DEBUG("status: 0x%8.8" PRIx32 "", *status);
 
 	return ERROR_OK;
 }
@@ -212,7 +213,7 @@ static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
 
 	virtex2_read_stat(device, &status);
 
-	command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status);
+	command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status);
 
 	return ERROR_OK;
 }
@@ -242,7 +243,7 @@ static int virtex2_pld_device_command(struct command_context_s *cmd_ctx,
 
 	tap = jtag_tap_by_string(args[1]);
 	if (tap == NULL) {
-		command_print( cmd_ctx, "Tap: %s does not exist", args[1] );
+		command_print(cmd_ctx, "Tap: %s does not exist", args[1]);
 		return ERROR_OK;
 	}