From c4f2a018a594d5cc93f557e30a7906641b59ec56 Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Fri, 27 Jan 2012 16:45:29 +0000 Subject: [PATCH] build: cleanup src/pld directory Change-Id: I9edb027c76e5d7fe21d557a11e6a9691fa581e86 Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/408 Tested-by: jenkins --- src/pld/pld.c | 65 ++++++++++++++---------------------------- src/pld/pld.h | 18 ++++++------ src/pld/virtex2.c | 68 ++++++++++++++++++++------------------------ src/pld/virtex2.h | 8 +++--- src/pld/xilinx_bit.c | 39 +++++++++++-------------- src/pld/xilinx_bit.h | 6 ++-- 6 files changed, 84 insertions(+), 120 deletions(-) diff --git a/src/pld/pld.c b/src/pld/pld.c index 08a537c09c..a9431f44d5 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -30,8 +31,7 @@ */ extern struct pld_driver virtex2_pld; -static struct pld_driver *pld_drivers[] = -{ +static struct pld_driver *pld_drivers[] = { &virtex2_pld, NULL, }; @@ -43,12 +43,9 @@ struct pld_device *get_pld_device_by_num(int num) struct pld_device *p; int i = 0; - for (p = pld_devices; p; p = p->next) - { + for (p = pld_devices; p; p = p->next) { if (i++ == num) - { return p; - } } return NULL; @@ -62,14 +59,10 @@ COMMAND_HANDLER(handle_pld_device_command) int found = 0; if (CMD_ARGC < 1) - { return ERROR_COMMAND_SYNTAX_ERROR; - } - for (i = 0; pld_drivers[i]; i++) - { - if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0) - { + for (i = 0; pld_drivers[i]; i++) { + if (strcmp(CMD_ARGV[0], pld_drivers[i]->name) == 0) { struct pld_device *p, *c; /* register pld specific commands */ @@ -77,8 +70,7 @@ COMMAND_HANDLER(handle_pld_device_command) if (pld_drivers[i]->commands) { retval = register_commands(CMD_CTX, NULL, pld_drivers[i]->commands); - if (ERROR_OK != retval) - { + if (ERROR_OK != retval) { LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); return ERROR_FAIL; } @@ -90,34 +82,29 @@ COMMAND_HANDLER(handle_pld_device_command) retval = CALL_COMMAND_HANDLER( pld_drivers[i]->pld_device_command, c); - if (ERROR_OK != retval) - { + if (ERROR_OK != retval) { LOG_ERROR("'%s' driver rejected pld device", - CMD_ARGV[0]); + CMD_ARGV[0]); free(c); return ERROR_OK; } /* put pld device in linked list */ - if (pld_devices) - { + if (pld_devices) { /* find last pld device */ - for (p = pld_devices; p && p->next; p = p->next); + for (p = pld_devices; p && p->next; p = p->next) + ; if (p) p->next = c; - } - else - { + } else pld_devices = c; - } found = 1; } } /* no matching pld driver found */ - if (!found) - { + if (!found) { LOG_ERROR("pld driver '%s' not found", CMD_ARGV[0]); exit(-1); } @@ -130,16 +117,13 @@ COMMAND_HANDLER(handle_pld_devices_command) struct pld_device *p; int i = 0; - if (!pld_devices) - { + if (!pld_devices) { command_print(CMD_CTX, "no pld devices configured"); return ERROR_OK; } for (p = pld_devices; p; p = p->next) - { command_print(CMD_CTX, "#%i: %s", i++, p->driver->name); - } return ERROR_OK; } @@ -153,30 +137,24 @@ COMMAND_HANDLER(handle_pld_load_command) gettimeofday(&start, NULL); if (CMD_ARGC < 2) - { return ERROR_COMMAND_SYNTAX_ERROR; - } unsigned dev_id; COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id); p = get_pld_device_by_num(dev_id); - if (!p) - { + if (!p) { command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); return ERROR_OK; } - if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK) - { + retval = p->driver->load(p, CMD_ARGV[1]); + if (retval != ERROR_OK) { command_print(CMD_CTX, "failed loading file %s to pld device %u", CMD_ARGV[1], dev_id); - switch (retval) - { + switch (retval) { } return retval; - } - else - { + } else { gettimeofday(&end, NULL); timeval_subtract(&duration, &end, &start); @@ -219,9 +197,8 @@ COMMAND_HANDLER(handle_pld_init_command) if (CMD_ARGC != 0) return ERROR_COMMAND_SYNTAX_ERROR; - static bool pld_initialized = false; - if (pld_initialized) - { + static bool pld_initialized; + if (pld_initialized) { LOG_INFO("'pld init' has already been called"); return ERROR_OK; } diff --git a/src/pld/pld.h b/src/pld/pld.h index 3c7e4ffba8..eb200f622f 100644 --- a/src/pld/pld.h +++ b/src/pld/pld.h @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef PLD_H #define PLD_H @@ -25,20 +26,19 @@ struct pld_device; #define __PLD_DEVICE_COMMAND(name) \ - COMMAND_HELPER(name, struct pld_device *pld) + COMMAND_HELPER(name, struct pld_device *pld) -struct pld_driver -{ +struct pld_driver { const char *name; __PLD_DEVICE_COMMAND((*pld_device_command)); const struct command_registration *commands; int (*load)(struct pld_device *pld_device, const char *filename); }; -#define PLD_DEVICE_COMMAND_HANDLER(name) static __PLD_DEVICE_COMMAND(name) +#define PLD_DEVICE_COMMAND_HANDLER(name) \ + static __PLD_DEVICE_COMMAND(name) -struct pld_device -{ +struct pld_device { struct pld_driver *driver; void *driver_priv; struct pld_device *next; @@ -48,7 +48,7 @@ int pld_register_commands(struct command_context *cmd_ctx); struct pld_device *get_pld_device_by_num(int num); -#define ERROR_PLD_DEVICE_INVALID (-1000) -#define ERROR_PLD_FILE_LOAD_FAILED (-1001) +#define ERROR_PLD_DEVICE_INVALID (-1000) +#define ERROR_PLD_FILE_LOAD_FAILED (-1001) -#endif /* PLD_H */ +#endif /* PLD_H */ diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 74fcc40d9d..36d8f6fdea 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -25,18 +26,16 @@ #include "xilinx_bit.h" #include "pld.h" - 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) - { + if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) { struct scan_field field; field.num_bits = tap->ir_length; - void * t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1); + void *t = calloc(DIV_ROUND_UP(field.num_bits, 8), 1); field.out_value = t; buf_set_u32(t, 0, field.num_bits, new_instr); field.in_value = NULL; @@ -50,7 +49,7 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr) } static int virtex2_send_32(struct pld_device *pld_device, - int num_words, uint32_t *words) + int num_words, uint32_t *words) { struct virtex2_pld_device *virtex2_info = pld_device->driver_priv; struct scan_field scan_field; @@ -66,7 +65,7 @@ static int virtex2_send_32(struct pld_device *pld_device, for (i = 0; i < num_words; i++) buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32)); - virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */ + virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */ jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE); @@ -75,14 +74,14 @@ static int virtex2_send_32(struct pld_device *pld_device, return ERROR_OK; } -static __inline__ void virtexflip32(jtag_callback_data_t arg) +static inline void virtexflip32(jtag_callback_data_t arg) { - uint8_t *in = (uint8_t *)arg; + uint8_t *in = (uint8_t *)arg; *((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32); } static int virtex2_receive_32(struct pld_device *pld_device, - int num_words, uint32_t *words) + int num_words, uint32_t *words) { struct virtex2_pld_device *virtex2_info = pld_device->driver_priv; struct scan_field scan_field; @@ -91,17 +90,16 @@ static int virtex2_receive_32(struct pld_device *pld_device, scan_field.out_value = NULL; scan_field.in_value = NULL; - virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */ + virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */ - while (num_words--) - { + while (num_words--) { scan_field.in_value = (uint8_t *)words; jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE); jtag_add_callback(virtexflip32, (jtag_callback_data_t)words); - words++;; + words++; } return ERROR_OK; @@ -113,11 +111,11 @@ static int virtex2_read_stat(struct pld_device *pld_device, uint32_t *status) jtag_add_tlr(); - data[0] = 0xaa995566; /* synch word */ - data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */ - data[2] = 0x20000000; /* NOOP (Type 1, read, address 0, 0 words */ - data[3] = 0x20000000; /* NOOP */ - data[4] = 0x20000000; /* NOOP */ + data[0] = 0xaa995566; /* synch word */ + data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */ + data[2] = 0x20000000; /* NOOP (Type 1, read, address 0, 0 words */ + data[3] = 0x20000000; /* NOOP */ + data[4] = 0x20000000; /* NOOP */ virtex2_send_32(pld_device, 5, data); virtex2_receive_32(pld_device, 1, status); @@ -139,14 +137,15 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename) field.in_value = NULL; - if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) + retval = xilinx_read_bit_file(&bit_file, filename); + if (retval != ERROR_OK) return retval; - virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ + virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ jtag_execute_queue(); jtag_add_sleep(1000); - virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */ + virtex2_set_instr(virtex2_info->tap, 0x5); /* CFG_IN */ jtag_execute_queue(); for (i = 0; i < bit_file.length; i++) @@ -160,13 +159,13 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename) jtag_add_tlr(); - virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ + virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ jtag_add_runtest(13, TAP_IDLE); - virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ - virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ - virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ + virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ + virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ + virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ jtag_add_runtest(13, TAP_IDLE); - virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ + virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ jtag_execute_queue(); return ERROR_OK; @@ -178,15 +177,12 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command) uint32_t status; if (CMD_ARGC < 1) - { return ERROR_COMMAND_SYNTAX_ERROR; - } unsigned dev_id; COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id); device = get_pld_device_by_num(dev_id); - if (!device) - { + if (!device) { command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); return ERROR_OK; } @@ -205,9 +201,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command) struct virtex2_pld_device *virtex2_info; if (CMD_ARGC < 2) - { return ERROR_COMMAND_SYNTAX_ERROR; - } tap = jtag_tap_by_string(CMD_ARGV[1]); if (tap == NULL) { @@ -245,8 +239,8 @@ static const struct command_registration virtex2_command_handler[] = { }; struct pld_driver virtex2_pld = { - .name = "virtex2", - .commands = virtex2_command_handler, - .pld_device_command = &virtex2_pld_device_command, - .load = &virtex2_load, - }; + .name = "virtex2", + .commands = virtex2_command_handler, + .pld_device_command = &virtex2_pld_device_command, + .load = &virtex2_load, +}; diff --git a/src/pld/virtex2.h b/src/pld/virtex2.h index 4cefdf4451..f2d2be280e 100644 --- a/src/pld/virtex2.h +++ b/src/pld/virtex2.h @@ -17,14 +17,14 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef VIRTEX2_H #define VIRTEX2_H #include -struct virtex2_pld_device -{ - struct jtag_tap *tap; +struct virtex2_pld_device { + struct jtag_tap *tap; }; -#endif /* VIRTEX2_H */ +#endif /* VIRTEX2_H */ diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c index ea4f0ec889..90d44a2baf 100644 --- a/src/pld/xilinx_bit.c +++ b/src/pld/xilinx_bit.c @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -29,37 +30,32 @@ static int read_section(FILE *input_file, int length_size, char section, - uint32_t *buffer_length, uint8_t **buffer) + uint32_t *buffer_length, uint8_t **buffer) { uint8_t length_buffer[4]; int length; char section_char; int read_count; - if ((length_size != 2) && (length_size != 4)) - { + if ((length_size != 2) && (length_size != 4)) { LOG_ERROR("BUG: length_size neither 2 nor 4"); return ERROR_PLD_FILE_LOAD_FAILED; } - if ((read_count = fread(§ion_char, 1, 1, input_file)) != 1) - { + read_count = fread(§ion_char, 1, 1, input_file); + if (read_count != 1) return ERROR_PLD_FILE_LOAD_FAILED; - } if (section_char != section) - { return ERROR_PLD_FILE_LOAD_FAILED; - } - if ((read_count = fread(length_buffer, 1, length_size, input_file)) != length_size) - { + read_count = fread(length_buffer, 1, length_size, input_file); + if (read_count != length_size) return ERROR_PLD_FILE_LOAD_FAILED; - } if (length_size == 4) length = be_to_h_u32(length_buffer); - else /* (length_size == 2) */ + else /* (length_size == 2) */ length = be_to_h_u16(length_buffer); if (buffer_length) @@ -67,10 +63,9 @@ static int read_section(FILE *input_file, int length_size, char section, *buffer = malloc(length); - if ((read_count = fread(*buffer, 1, length, input_file)) != length) - { + read_count = fread(*buffer, 1, length, input_file); + if (read_count != length) return ERROR_PLD_FILE_LOAD_FAILED; - } return ERROR_OK; } @@ -84,14 +79,12 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename) if (!filename || !bit_file) return ERROR_COMMAND_SYNTAX_ERROR; - if (stat(filename, &input_stat) == -1) - { + if (stat(filename, &input_stat) == -1) { LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno)); return ERROR_PLD_FILE_LOAD_FAILED; } - if (S_ISDIR(input_stat.st_mode)) - { + if (S_ISDIR(input_stat.st_mode)) { LOG_ERROR("%s is a directory", filename); return ERROR_PLD_FILE_LOAD_FAILED; } @@ -101,14 +94,14 @@ int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename) return ERROR_PLD_FILE_LOAD_FAILED; } - if (!(input_file = fopen(filename, "rb"))) - { + input_file = fopen(filename, "rb"); + if (input_file == NULL) { LOG_ERROR("couldn't open %s: %s", filename, strerror(errno)); return ERROR_PLD_FILE_LOAD_FAILED; } - if ((read_count = fread(bit_file->unknown_header, 1, 13, input_file)) != 13) - { + read_count = fread(bit_file->unknown_header, 1, 13, input_file); + if (read_count != 13) { LOG_ERROR("couldn't read unknown_header from file '%s'", filename); return ERROR_PLD_FILE_LOAD_FAILED; } diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h index 2b40d861f0..37f1811825 100644 --- a/src/pld/xilinx_bit.h +++ b/src/pld/xilinx_bit.h @@ -17,13 +17,13 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef XILINX_BIT_H #define XILINX_BIT_H #include -struct xilinx_bit_file -{ +struct xilinx_bit_file { uint8_t unknown_header[13]; uint8_t *source_file; uint8_t *part_name; @@ -35,4 +35,4 @@ struct xilinx_bit_file int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename); -#endif /* XILINX_BIT_H */ +#endif /* XILINX_BIT_H */ -- 2.30.2