X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=e2ebb04143ec4b9a63b2d74c6586747d064bf447;hp=2d06a0e98f5aaf8ce19702af626c195f11e1bbee;hb=95bf461c0af385fc6b3abfff610e5510534ef571;hpb=42ef503d37b18d907da16d26e99167566d5aabd1

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 2d06a0e98f..e2ebb04143 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -33,7 +33,7 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 
 	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;
@@ -49,11 +49,11 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 	return ERROR_OK;
 }
 
-static int virtex2_send_32(struct pld_device_s *pld_device,
+static int virtex2_send_32(struct pld_device *pld_device,
 		int num_words, uint32_t *words)
 {
-	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
-	scan_field_t scan_field;
+	struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
+	struct scan_field scan_field;
 	uint8_t *values;
 	int i;
 
@@ -82,11 +82,11 @@ static __inline__ void virtexflip32(jtag_callback_data_t arg)
 	*((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
 }
 
-static int virtex2_receive_32(struct pld_device_s *pld_device,
+static int virtex2_receive_32(struct pld_device *pld_device,
 		int num_words, uint32_t *words)
 {
-	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
-	scan_field_t scan_field;
+	struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
+	struct scan_field scan_field;
 
 	scan_field.tap = virtex2_info->tap;
 	scan_field.num_bits = 32;
@@ -109,7 +109,7 @@ 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, uint32_t *status)
+static int virtex2_read_stat(struct pld_device *pld_device, uint32_t *status)
 {
 	uint32_t data[5];
 
@@ -131,13 +131,13 @@ static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 	return ERROR_OK;
 }
 
-static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
+static int virtex2_load(struct pld_device *pld_device, const char *filename)
 {
-	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
-	xilinx_bit_file_t bit_file;
+	struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
+	struct xilinx_bit_file bit_file;
 	int retval;
 	unsigned int i;
-	scan_field_t field;
+	struct scan_field field;
 
 	field.tap = virtex2_info->tap;
 	field.in_value = NULL;
@@ -179,8 +179,8 @@ static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
 
 COMMAND_HANDLER(virtex2_handle_read_stat_command)
 {
-	pld_device_t *device;
-	virtex2_pld_device_t *virtex2_info;
+	struct pld_device *device;
+	struct virtex2_pld_device *virtex2_info;
 	uint32_t status;
 
 	if (argc < 1)
@@ -211,7 +211,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 {
 	struct jtag_tap *tap;
 
-	virtex2_pld_device_t *virtex2_info;
+	struct virtex2_pld_device *virtex2_info;
 
 	if (argc < 2)
 	{
@@ -225,7 +225,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 		return ERROR_OK;
 	}
 
-	virtex2_info = malloc(sizeof(virtex2_pld_device_t));
+	virtex2_info = malloc(sizeof(struct virtex2_pld_device));
 	virtex2_info->tap = tap;
 
 	pld->driver_priv = virtex2_info;
@@ -245,7 +245,7 @@ static int virtex2_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-pld_driver_t virtex2_pld = {
+struct pld_driver virtex2_pld = {
 		.name = "virtex2",
 		.register_commands = &virtex2_register_commands,
 		.pld_device_command = &virtex2_pld_device_command,