X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=f4657bcf48670636f74cf25b5233436592b86d52;hp=821699ac95b34d1e8e9b3c42e438f19d6fe5aa4d;hb=f6a3fc818bc6a24b6c5bbcc6057f72d2b0b2e2ab;hpb=689e9664b00a81b637d82e990096338a10c4b720 diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index 821699ac95..f4657bcf48 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -26,56 +26,39 @@ #include "pld.h" -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); - -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); - + 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(tap, &field, TAP_IDLE); - - - - jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE)); - - free(field.out_value); + free(t); } 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 *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 virtex2_pld_device *virtex2_info = pld_device->driver_priv; + struct scan_field scan_field; + uint8_t *values; int i; 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; @@ -85,24 +68,25 @@ int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) 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(u8 *in) +static __inline__ void virtexflip32(jtag_callback_data_t arg) { - *((u32 *)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); } -int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words) +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; - scan_field_t scan_field; + 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; @@ -111,11 +95,11 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word while (num_words--) { - scan_field.in_value = (u8 *)words; - - jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); + scan_field.in_value = (uint8_t *)words; + + jtag_add_dr_scan(virtex2_info->tap, 1, &scan_field, TAP_DRPAUSE); - jtag_add_callback(virtexflip32, (u8 *)words); + jtag_add_callback(virtexflip32, (jtag_callback_data_t)words); words++;; } @@ -123,9 +107,9 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word return ERROR_OK; } -int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status) +static int virtex2_read_stat(struct pld_device *pld_device, uint32_t *status) { - u32 data[5]; + uint32_t data[5]; jtag_add_tlr(); @@ -140,32 +124,24 @@ 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 *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; - - scan_field_t field; - - field.tap = virtex2_info->tap; + struct scan_field field; field.in_value = NULL; - - - - if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) return retval; - jtag_set_end_state(TAP_IDLE); virtex2_set_instr(virtex2_info->tap, 0xb); /* JPROG_B */ jtag_execute_queue(); jtag_add_sleep(1000); @@ -179,40 +155,41 @@ 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, 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)); + 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, jtag_set_end_state(TAP_IDLE)); + jtag_add_runtest(13, 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; + struct pld_device *device; + struct virtex2_pld_device *virtex2_info; + uint32_t status; - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, "usage: virtex2 read_stat "); + command_print(CMD_CTX, "usage: virtex2 read_stat "); return ERROR_OK; } - device = get_pld_device_by_num(strtoul(args[0], NULL, 0)); + unsigned dev_id; + COMMAND_PARSE_NUMBER(uint, CMD_ARGV[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]); + command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); return ERROR_OK; } @@ -220,42 +197,60 @@ 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); - - return ERROR_OK; -} - -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"); + command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status); 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) +PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command) { - jtag_tap_t *tap; + struct jtag_tap *tap; - virtex2_pld_device_t *virtex2_info; + struct virtex2_pld_device *virtex2_info; - if (argc < 2) + if (CMD_ARGC < 2) { LOG_WARNING("incomplete pld device 'virtex2' configuration"); return ERROR_PLD_DEVICE_INVALID; } - tap = jtag_tap_by_string( args[1] ); - if( tap == NULL ){ - command_print( cmd_ctx, "Tap: %s does not exist", args[1] ); + tap = jtag_tap_by_string(CMD_ARGV[1]); + if (tap == NULL) { + command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]); return ERROR_OK; } - virtex2_info = malloc(sizeof(virtex2_pld_device_t)); - pld_device->driver_priv = virtex2_info; + virtex2_info = malloc(sizeof(struct virtex2_pld_device)); virtex2_info->tap = tap; + pld->driver_priv = virtex2_info; + return ERROR_OK; } + +static const struct command_registration virtex2_exec_command_handlers[] = { + { + .name = "read_stat", + .mode = COMMAND_EXEC, + .handler = virtex2_handle_read_stat_command, + .help = "read status register", + .usage = "pld_num", + }, + COMMAND_REGISTRATION_DONE +}; +static const struct command_registration virtex2_command_handler[] = { + { + .name = "virtex2", + .mode = COMMAND_ANY, + .help = "Virtex-II specific commands", + .chain = virtex2_exec_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; + +struct pld_driver virtex2_pld = { + .name = "virtex2", + .commands = virtex2_command_handler, + .pld_device_command = &virtex2_pld_device_command, + .load = &virtex2_load, + };