X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=8407d59e902266db1b9120fa316802db24558299;hp=ae03572f151255db7d2cf1061d2dd804f13f2c29;hb=245b0213f56241fb151260bbd4eda1dec71ddd7a;hpb=57bc9f37c9029f1b481cd50e15676a0f74aa9e92 diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index ae03572f15..8407d59e90 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -22,18 +22,13 @@ #endif #include "virtex2.h" - -#include "pld.h" #include "xilinx_bit.h" -#include "command.h" -#include "log.h" -#include "jtag.h" +#include "pld.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); +static int virtex2_register_commands(struct command_context_s *cmd_ctx); +static int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device); +static int virtex2_load(struct pld_device_s *pld_device, char *filename); pld_driver_t virtex2_pld = { @@ -43,9 +38,9 @@ pld_driver_t virtex2_pld = .load = virtex2_load, }; -int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) +static int virtex2_set_instr(jtag_tap_t *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) @@ -56,14 +51,9 @@ int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr) 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.in_value = 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 +61,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; + uint8_t *values; int i; values = malloc(num_words * 4); @@ -90,15 +81,21 @@ 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, TAP_DRPAUSE); + jtag_add_dr_scan(1, &scan_field, jtag_set_end_state(TAP_DRPAUSE)); free(values); return ERROR_OK; } +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); +} -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; @@ -106,24 +103,27 @@ int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *word scan_field.tap = virtex2_info->tap; scan_field.num_bits = 32; scan_field.out_value = NULL; - u8 tmp[4]; - scan_field.in_value = tmp; + scan_field.in_value = NULL; virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */ while (num_words--) { - jtag_add_dr_scan_now(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++=flip_u32(le_to_h_u32(tmp), 32); + 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(); @@ -138,32 +138,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, 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; field.tap = virtex2_info->tap; - field.in_value = 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); @@ -177,29 +171,30 @@ 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) +static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, + char *cmd, char **args, int argc) { pld_device_t *device; virtex2_pld_device_t *virtex2_info; - u32 status; + uint32_t status; if (argc < 1) { @@ -218,12 +213,12 @@ 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) +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"); @@ -233,7 +228,8 @@ int virtex2_register_commands(struct command_context_s *cmd_ctx) 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) +static 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; @@ -245,8 +241,8 @@ 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 ){ + tap = jtag_tap_by_string(args[1]); + if (tap == NULL) { command_print( cmd_ctx, "Tap: %s does not exist", args[1] ); return ERROR_OK; }