pld_device_t -> struct pld_device

[openocd.git] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 4c1fc53d21e323bbe805aa3af86bc57ce430521b..e2ebb04143ec4b9a63b2d74c6586747d064bf447 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -49,10 +49,10 @@ 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;
+       struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
        struct scan_field scan_field;
        uint8_t *values;
        int i;
@@ -82,10 +82,10 @@ 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;
+       struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
        struct scan_field scan_field;
 
        scan_field.tap = virtex2_info->tap;
@@ -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,10 +131,10 @@ 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;
        struct scan_field field;
@@ -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;