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

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 6af83beb8e..4c1fc53d21 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -26,26 +26,14 @@
 #include "pld.h"
 
 
-static int virtex2_register_commands(struct command_context_s *cmd_ctx);
-static int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);
-static int virtex2_load(struct pld_device_s *pld_device, char *filename);
-
-pld_driver_t virtex2_pld =
-{
-	.name = "virtex2",
-	.register_commands = virtex2_register_commands,
-	.pld_device_command = virtex2_pld_device_command,
-	.load = virtex2_load,
-};
-
-static int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
+static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 {
 	if (tap == NULL)
 		return ERROR_FAIL;
 
 	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
 	{
-		scan_field_t field;
+		struct scan_field field;
 
 		field.tap = tap;
 		field.num_bits = tap->ir_length;
@@ -62,11 +50,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;
+	struct scan_field scan_field;
+	uint8_t *values;
 	int i;
 
 	values = malloc(num_words * 4);
@@ -88,16 +76,17 @@ 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;
+	struct scan_field scan_field;
 
 	scan_field.tap = virtex2_info->tap;
 	scan_field.num_bits = 32;
@@ -108,11 +97,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 +109,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,18 +126,18 @@ 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;
 	int retval;
 	unsigned int i;
-	scan_field_t field;
+	struct scan_field field;
 
 	field.tap = virtex2_info->tap;
 	field.in_value = NULL;
@@ -188,12 +177,11 @@ static int virtex2_load(struct pld_device_s *pld_device, char *filename)
 	return ERROR_OK;
 }
 
-static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc)
+COMMAND_HANDLER(virtex2_handle_read_stat_command)
 {
 	pld_device_t *device;
 	virtex2_pld_device_t *virtex2_info;
-	u32 status;
+	uint32_t status;
 
 	if (argc < 1)
 	{
@@ -201,7 +189,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,25 +202,14 @@ 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);
-
-	return ERROR_OK;
-}
-
-static int virtex2_register_commands(struct command_context_s *cmd_ctx)
-{
-	command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands");
-
-	register_command(cmd_ctx, virtex2_cmd, "read_stat", virtex2_handle_read_stat_command, COMMAND_EXEC,
-					 "read Virtex-II status register");
+	command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status);
 
 	return ERROR_OK;
 }
 
-static int virtex2_pld_device_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc, struct pld_device_s *pld_device)
+PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 
 	virtex2_pld_device_t *virtex2_info;
 
@@ -242,13 +221,33 @@ 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;
 	}
 
 	virtex2_info = malloc(sizeof(virtex2_pld_device_t));
-	pld_device->driver_priv = virtex2_info;
 	virtex2_info->tap = tap;
 
+	pld->driver_priv = virtex2_info;
+
 	return ERROR_OK;
 }
+
+static int virtex2_register_commands(struct command_context_s *cmd_ctx)
+{
+	command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2",
+			NULL, COMMAND_ANY, "virtex2 specific commands");
+
+	register_command(cmd_ctx, virtex2_cmd, "read_stat",
+			&virtex2_handle_read_stat_command, COMMAND_EXEC,
+			"read Virtex-II status register");
+
+	return ERROR_OK;
+}
+
+struct pld_driver virtex2_pld = {
+		.name = "virtex2",
+		.register_commands = &virtex2_register_commands,
+		.pld_device_command = &virtex2_pld_device_command,
+		.load = &virtex2_load,
+	};