X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=ec0847fe3e6245e383ee6794edfa87850748a8d2;hp=6af83beb8e0bde2db0ba01a839d3c201eaf4735c;hb=ca594adb5a71f2bf60c1380172b8e61b075d9479;hpb=1642dd2ea0ed1cefb49f886425043aace9a68504

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 6af83beb8e..ec0847fe3e 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -38,7 +38,7 @@ pld_driver_t virtex2_pld =
 	.load = virtex2_load,
 };
 
-static int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
+static int virtex2_set_instr(jtag_tap_t *tap, uint32_t new_instr)
 {
 	if (tap == NULL)
 		return ERROR_FAIL;
@@ -62,11 +62,11 @@ static int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
 }
 
 static int virtex2_send_32(struct pld_device_s *pld_device,
-		int num_words, u32 *words)
+		int num_words, uint32_t *words)
 {
 	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
 	scan_field_t scan_field;
-	u8 *values;
+	uint8_t *values;
 	int i;
 
 	values = malloc(num_words * 4);
@@ -88,13 +88,14 @@ static int virtex2_send_32(struct pld_device_s *pld_device,
 	return ERROR_OK;
 }
 
-static __inline__ void virtexflip32(u8 *in)
+static __inline__ void virtexflip32(jtag_callback_data_t arg)
 {
-	*((u32 *)in) = flip_u32(le_to_h_u32(in), 32);
+  uint8_t *in = (uint8_t *)arg;
+	*((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
 }
 
 static int virtex2_receive_32(struct pld_device_s *pld_device,
-		int num_words, u32 *words)
+		int num_words, uint32_t *words)
 {
 	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
 	scan_field_t scan_field;
@@ -108,11 +109,11 @@ static int virtex2_receive_32(struct pld_device_s *pld_device,
 
 	while (num_words--)
 	{
-		scan_field.in_value = (u8 *)words;
+		scan_field.in_value = (uint8_t *)words;
 
 		jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE));
 
-		jtag_add_callback(virtexflip32, (u8 *)words);
+		jtag_add_callback(virtexflip32, (jtag_callback_data_t)words);
 
 		words++;;
 	}
@@ -120,9 +121,9 @@ static int virtex2_receive_32(struct pld_device_s *pld_device,
 	return ERROR_OK;
 }
 
-static int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
+static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 {
-	u32 data[5];
+	uint32_t data[5];
 
 	jtag_add_tlr();
 
@@ -137,12 +138,12 @@ static int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
 
 	jtag_execute_queue();
 
-	LOG_DEBUG("status: 0x%8.8x", *status);
+	LOG_DEBUG("status: 0x%8.8" PRIx32 "", *status);
 
 	return ERROR_OK;
 }
 
-static int virtex2_load(struct pld_device_s *pld_device, char *filename)
+static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
 {
 	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
 	xilinx_bit_file_t bit_file;
@@ -193,7 +194,7 @@ static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
 {
 	pld_device_t *device;
 	virtex2_pld_device_t *virtex2_info;
-	u32 status;
+	uint32_t status;
 
 	if (argc < 1)
 	{
@@ -201,7 +202,9 @@ static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
 		return ERROR_OK;
 	}
 
-	device = get_pld_device_by_num(strtoul(args[0], NULL, 0));
+	unsigned dev_id;
+	COMMAND_PARSE_NUMBER(uint, args[0], dev_id);
+	device = get_pld_device_by_num(dev_id);
 	if (!device)
 	{
 		command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);
@@ -212,7 +215,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 +245,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;
 	}