X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=4c1fc53d21e323bbe805aa3af86bc57ce430521b;hp=7be68037ddac49a9ace7d0c910172af364f3f9f8;hb=db2086897a581111bb86a0fb49d72b776a9801a9;hpb=40580e2d71ac56131a5da7e5f67a0b63450e4f24 diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 7be68037dd..4c1fc53d21 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -22,48 +22,26 @@ #endif #include "virtex2.h" - -#include "pld.h" #include "xilinx_bit.h" -#include "command.h" -#include "log.h" -#include "jtag.h" - -#include - -int virtex2_register_commands(struct command_context_s *cmd_ctx); -int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device); -int virtex2_load(struct pld_device_s *pld_device, char *filename); +#include "pld.h" -pld_driver_t virtex2_pld = -{ - .name = "virtex2", - .register_commands = virtex2_register_commands, - .pld_device_command = virtex2_pld_device_command, - .load = virtex2_load, -}; -int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) +static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr) { - if (tap==NULL) + if (tap == NULL) return ERROR_FAIL; 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; field.out_value = calloc(CEIL(field.num_bits, 8), 1); buf_set_u32(field.out_value, 0, field.num_bits, new_instr); - field.out_mask = NULL; field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; - jtag_add_ir_scan(1, &field, TAP_IDLE); + jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE)); free(field.out_value); } @@ -71,11 +49,12 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) return ERROR_OK; } -int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) +static int virtex2_send_32(struct pld_device_s *pld_device, + int num_words, uint32_t *words) { virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; - scan_field_t scan_field; - u8 *values; + struct scan_field scan_field; + uint8_t *values; int i; values = malloc(num_words * 4); @@ -83,60 +62,56 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) scan_field.tap = virtex2_info->tap; scan_field.num_bits = num_words * 32; scan_field.out_value = values; - scan_field.out_mask = NULL; scan_field.in_value = NULL; - scan_field.in_check_value = NULL; - scan_field.in_check_mask = NULL; - scan_field.in_handler = NULL; - scan_field.in_handler_priv = NULL; 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 */ - jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); free(values); return ERROR_OK; } -int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field) +static __inline__ void virtexflip32(jtag_callback_data_t arg) { - u32 *dest = priv; - *dest = flip_u32(le_to_h_u32(in_buf), 32); - return ERROR_OK; + uint8_t *in = (uint8_t *)arg; + *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32); } -int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words) +static int virtex2_receive_32(struct pld_device_s *pld_device, + int num_words, uint32_t *words) { virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; - scan_field_t scan_field; + struct scan_field scan_field; scan_field.tap = virtex2_info->tap; scan_field.num_bits = 32; scan_field.out_value = NULL; - scan_field.out_mask = NULL; scan_field.in_value = NULL; - scan_field.in_check_value = NULL; - scan_field.in_check_mask = NULL; - scan_field.in_handler = virtex2_jtag_buf_to_u32; virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */ while (num_words--) { - scan_field.in_handler_priv = words++; - jtag_add_dr_scan(1, &scan_field, TAP_DRPAUSE); + scan_field.in_value = (uint8_t *)words; + + jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); + + jtag_add_callback(virtexflip32, (jtag_callback_data_t)words); + + words++;; } return ERROR_OK; } -int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status) +static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status) { - u32 data[5]; + uint32_t data[5]; jtag_add_tlr(); @@ -151,32 +126,26 @@ int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status) jtag_execute_queue(); - LOG_DEBUG("status: 0x%8.8x", *status); + LOG_DEBUG("status: 0x%8.8" PRIx32 "", *status); return ERROR_OK; } -int virtex2_load(struct pld_device_s *pld_device, char *filename) +static int virtex2_load(struct pld_device_s *pld_device, const char *filename) { virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; xilinx_bit_file_t bit_file; int retval; unsigned int i; - - scan_field_t field; + struct scan_field field; field.tap = virtex2_info->tap; - field.out_mask = NULL; field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; - field.in_handler = NULL; - field.in_handler_priv = NULL; if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) return retval; - jtag_add_end_state(TAP_IDLE); + jtag_set_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ jtag_execute_queue(); jtag_add_sleep(1000); @@ -190,29 +159,29 @@ int virtex2_load(struct pld_device_s *pld_device, char *filename) field.num_bits = bit_file.length * 8; field.out_value = bit_file.data; - jtag_add_dr_scan(1, &field, TAP_DRPAUSE); + jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE)); jtag_execute_queue(); jtag_add_tlr(); - jtag_add_end_state(TAP_IDLE); + jtag_set_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xc); /* JSTART */ - jtag_add_runtest(13, TAP_IDLE); + 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, TAP_IDLE); + jtag_add_runtest(13, jtag_set_end_state(TAP_IDLE)); virtex2_set_instr(virtex2_info->tap, 0x3f); /* BYPASS */ jtag_execute_queue(); return ERROR_OK; } -int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(virtex2_handle_read_stat_command) { pld_device_t *device; virtex2_pld_device_t *virtex2_info; - u32 status; + uint32_t status; if (argc < 1) { @@ -220,7 +189,9 @@ int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } - device = get_pld_device_by_num(strtoul(args[0], NULL, 0)); + unsigned dev_id; + COMMAND_PARSE_NUMBER(uint, args[0], dev_id); + device = get_pld_device_by_num(dev_id); if (!device) { command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]); @@ -231,24 +202,14 @@ int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cm virtex2_read_stat(device, &status); - command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status); + command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status); return ERROR_OK; } -int virtex2_register_commands(struct command_context_s *cmd_ctx) +PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command) { - command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands"); - - register_command(cmd_ctx, virtex2_cmd, "read_stat", virtex2_handle_read_stat_command, COMMAND_EXEC, - "read Virtex-II status register"); - - return ERROR_OK; -} - -int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device) -{ - jtag_tap_t *tap; + struct jtag_tap *tap; virtex2_pld_device_t *virtex2_info; @@ -258,15 +219,35 @@ int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, cha return ERROR_PLD_DEVICE_INVALID; } - tap = jtag_TapByString( args[1] ); - if( tap == NULL ){ - command_print( cmd_ctx, "Tap: %s does not exist", args[1] ); + tap = jtag_tap_by_string(args[1]); + if (tap == NULL) { + command_print(cmd_ctx, "Tap: %s does not exist", args[1]); return ERROR_OK; } virtex2_info = malloc(sizeof(virtex2_pld_device_t)); - pld_device->driver_priv = virtex2_info; virtex2_info->tap = tap; + pld->driver_priv = virtex2_info; + + return ERROR_OK; +} + +static int virtex2_register_commands(struct command_context_s *cmd_ctx) +{ + command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", + NULL, COMMAND_ANY, "virtex2 specific commands"); + + register_command(cmd_ctx, virtex2_cmd, "read_stat", + &virtex2_handle_read_stat_command, COMMAND_EXEC, + "read Virtex-II status register"); + return ERROR_OK; } + +struct pld_driver virtex2_pld = { + .name = "virtex2", + .register_commands = &virtex2_register_commands, + .pld_device_command = &virtex2_pld_device_command, + .load = &virtex2_load, + };