X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=36d8f6fdea2c8dd29ce68f945cacecf9a04e52c6;hp=1025e61c4f266efe5c9ad0a6bb18bcdc160f22fe;hb=c4f2a018a594d5cc93f557e30a7906641b59ec56;hpb=76b89755c994faa8ff0f646c722373ccb876f744 diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 1025e61c4f..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,32 +26,30 @@ #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.tap = tap; field.num_bits = tap->ir_length; - field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1); - buf_set_u32(field.out_value, 0, field.num_bits, new_instr); + 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; - jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE)); + jtag_add_ir_scan(tap, &field, TAP_IDLE); - free(field.out_value); + free(t); } return ERROR_OK; } 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; @@ -59,7 +58,6 @@ static int virtex2_send_32(struct pld_device *pld_device, values = malloc(num_words * 4); - scan_field.tap = virtex2_info->tap; scan_field.num_bits = num_words * 32; scan_field.out_value = values; scan_field.in_value = NULL; @@ -67,43 +65,41 @@ 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(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); + jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE); free(values); 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; - *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32); + 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; - scan_field.tap = virtex2_info->tap; scan_field.num_bits = 32; 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(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); + 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; @@ -115,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,18 +135,17 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename) unsigned int i; struct scan_field field; - field.tap = virtex2_info->tap; 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; - jtag_set_end_state(TAP_IDLE); - 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++) @@ -159,19 +154,18 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename) field.num_bits = bit_file.length * 8; field.out_value = bit_file.data; - jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE)); + jtag_add_dr_scan(virtex2_info->tap, 1, &field, TAP_DRPAUSE); jtag_execute_queue(); jtag_add_tlr(); - jtag_set_end_state(TAP_IDLE); - virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ - jtag_add_runtest(13, jtag_set_end_state(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 */ - jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE)); - 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 */ + virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ + jtag_add_runtest(13, TAP_IDLE); + virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ jtag_execute_queue(); return ERROR_OK; @@ -180,26 +174,19 @@ static int virtex2_load(struct pld_device *pld_device, const char *filename) COMMAND_HANDLER(virtex2_handle_read_stat_command) { struct pld_device *device; - struct virtex2_pld_device *virtex2_info; uint32_t status; if (CMD_ARGC < 1) - { - command_print(CMD_CTX, "usage: virtex2 read_stat "); - return ERROR_OK; - } + 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; } - virtex2_info = device->driver_priv; - virtex2_read_stat(device, &status); command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status); @@ -214,10 +201,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command) struct virtex2_pld_device *virtex2_info; if (CMD_ARGC < 2) - { - LOG_WARNING("incomplete pld device 'virtex2' configuration"); - return ERROR_PLD_DEVICE_INVALID; - } + return ERROR_COMMAND_SYNTAX_ERROR; tap = jtag_tap_by_string(CMD_ARGV[1]); if (tap == NULL) { @@ -237,9 +221,9 @@ static const struct command_registration virtex2_exec_command_handlers[] = { { .name = "read_stat", .mode = COMMAND_EXEC, - .handler = &virtex2_handle_read_stat_command, + .handler = virtex2_handle_read_stat_command, .help = "read status register", - .usage = "", + .usage = "pld_num", }, COMMAND_REGISTRATION_DONE }; @@ -248,19 +232,15 @@ static const struct command_registration virtex2_command_handler[] = { .name = "virtex2", .mode = COMMAND_ANY, .help = "Virtex-II specific commands", + .usage = "", .chain = virtex2_exec_command_handlers, }, COMMAND_REGISTRATION_DONE }; -static int virtex2_register_commands(struct command_context *cmd_ctx) -{ - return register_commands(cmd_ctx, NULL, virtex2_command_handler); -} - struct pld_driver virtex2_pld = { - .name = "virtex2", - .register_commands = &virtex2_register_commands, - .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, +};