diff options
| -rw-r--r-- | src/pld/pld.c | 14 | ||||
| -rw-r--r-- | src/pld/pld.h | 14 | ||||
| -rw-r--r-- | src/pld/virtex2.c | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/pld/pld.c b/src/pld/pld.c index 119d75d4..e0a7eac5 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -36,12 +36,12 @@ static struct pld_driver *pld_drivers[] = NULL, }; -static pld_device_t *pld_devices; +static struct pld_device *pld_devices; static command_t *pld_cmd; -pld_device_t *get_pld_device_by_num(int num) +struct pld_device *get_pld_device_by_num(int num) { - pld_device_t *p; + struct pld_device *p; int i = 0; for (p = pld_devices; p; p = p->next) @@ -72,7 +72,7 @@ COMMAND_HANDLER(handle_pld_device_command) { if (strcmp(args[0], pld_drivers[i]->name) == 0) { - pld_device_t *p, *c; + struct pld_device *p, *c; /* register pld specific commands */ if (pld_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) @@ -81,7 +81,7 @@ COMMAND_HANDLER(handle_pld_device_command) exit(-1); } - c = malloc(sizeof(pld_device_t)); + c = malloc(sizeof(struct pld_device)); c->driver = pld_drivers[i]; c->next = NULL; @@ -122,7 +122,7 @@ COMMAND_HANDLER(handle_pld_device_command) COMMAND_HANDLER(handle_pld_devices_command) { - pld_device_t *p; + struct pld_device *p; int i = 0; if (!pld_devices) @@ -143,7 +143,7 @@ COMMAND_HANDLER(handle_pld_load_command) { int retval; struct timeval start, end, duration; - pld_device_t *p; + struct pld_device *p; gettimeofday(&start, NULL); diff --git a/src/pld/pld.h b/src/pld/pld.h index 2b88d9da..4c4c64a7 100644 --- a/src/pld/pld.h +++ b/src/pld/pld.h @@ -22,33 +22,33 @@ #include "command.h" -struct pld_device_s; +struct pld_device; #define __PLD_DEVICE_COMMAND(name) \ - COMMAND_HELPER(name, struct pld_device_s *pld) + COMMAND_HELPER(name, struct pld_device *pld) struct pld_driver { char *name; __PLD_DEVICE_COMMAND((*pld_device_command)); int (*register_commands)(struct command_context_s *cmd_ctx); - int (*load)(struct pld_device_s *pld_device, const char *filename); + int (*load)(struct pld_device *pld_device, const char *filename); }; #define PLD_DEVICE_COMMAND_HANDLER(name) static __PLD_DEVICE_COMMAND(name) -typedef struct pld_device_s +struct pld_device { struct pld_driver *driver; void *driver_priv; - struct pld_device_s *next; -} pld_device_t; + struct pld_device *next; +}; int pld_register_commands(struct command_context_s *cmd_ctx); int pld_init(struct command_context_s *cmd_ctx); -pld_device_t *get_pld_device_by_num(int num); +struct pld_device *get_pld_device_by_num(int num); #define ERROR_PLD_DEVICE_INVALID (-1000) #define ERROR_PLD_FILE_LOAD_FAILED (-1001) diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 2e5a8414..e2ebb041 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -49,7 +49,7 @@ 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) { struct virtex2_pld_device *virtex2_info = pld_device->driver_priv; @@ -82,7 +82,7 @@ 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) { struct virtex2_pld_device *virtex2_info = pld_device->driver_priv; @@ -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,7 +131,7 @@ 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) { struct virtex2_pld_device *virtex2_info = pld_device->driver_priv; struct xilinx_bit_file bit_file; @@ -179,7 +179,7 @@ static int virtex2_load(struct pld_device_s *pld_device, const char *filename) COMMAND_HANDLER(virtex2_handle_read_stat_command) { - pld_device_t *device; + struct pld_device *device; struct virtex2_pld_device *virtex2_info; uint32_t status; |