fix jtag_add_callback() args. The first argument is nothing special, it's just anothe...
[fw/openocd] / src / pld / virtex2.c
index e0cd1a11aeb7081d5e523f17a190d05554fe0fa7..1f063a0ad925dc0b89c61d3ed84ca3965ff8bc27 100644 (file)
-/***************************************************************************\r
- *   Copyright (C) 2006 by Dominic Rath                                    *\r
- *   Dominic.Rath@gmx.de                                                   *\r
- *                                                                         *\r
- *   This program is free software; you can redistribute it and/or modify  *\r
- *   it under the terms of the GNU General Public License as published by  *\r
- *   the Free Software Foundation; either version 2 of the License, or     *\r
- *   (at your option) any later version.                                   *\r
- *                                                                         *\r
- *   This program is distributed in the hope that it will be useful,       *\r
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
- *   GNU General Public License for more details.                          *\r
- *                                                                         *\r
- *   You should have received a copy of the GNU General Public License     *\r
- *   along with this program; if not, write to the                         *\r
- *   Free Software Foundation, Inc.,                                       *\r
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
- ***************************************************************************/\r
-#ifdef HAVE_CONFIG_H\r
-#include "config.h"\r
-#endif\r
-\r
-#include "virtex2.h"\r
-\r
-#include "pld.h"\r
-#include "xilinx_bit.h"\r
-#include "command.h"\r
-#include "log.h"\r
-#include "jtag.h"\r
-\r
-#include <stdlib.h>\r
-\r
-int virtex2_register_commands(struct command_context_s *cmd_ctx);\r
-int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);\r
-int virtex2_load(struct pld_device_s *pld_device, char *filename);\r
-\r
-pld_driver_t virtex2_pld =\r
-{\r
-       .name = "virtex2",\r
-       .register_commands = virtex2_register_commands,\r
-       .pld_device_command = virtex2_pld_device_command,\r
-       .load = virtex2_load,\r
-};\r
-\r
-int virtex2_set_instr(int chain_pos, u32 new_instr)\r
-{\r
-       jtag_device_t *device = jtag_get_device(chain_pos);\r
-       \r
-       if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)\r
-       {\r
-               scan_field_t field;\r
-       \r
-               field.device = chain_pos;\r
-               field.num_bits = device->ir_length;\r
-               field.out_value = calloc(CEIL(field.num_bits, 8), 1);\r
-               buf_set_u32(field.out_value, 0, field.num_bits, new_instr);\r
-               field.out_mask = NULL;\r
-               field.in_value = NULL;\r
-               field.in_check_value = NULL;\r
-               field.in_check_mask = NULL;\r
-               field.in_handler = NULL;\r
-               field.in_handler_priv = NULL;\r
-               \r
-               jtag_add_ir_scan(1, &field, TAP_RTI);\r
-               \r
-               free(field.out_value);\r
-       }\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)\r
-{\r
-       virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;\r
-       scan_field_t scan_field;\r
-       u8 *values;\r
-       int i;\r
-       \r
-       values = malloc(num_words * 4);\r
-\r
-       scan_field.device = virtex2_info->chain_pos;\r
-       scan_field.num_bits = num_words * 32;\r
-       scan_field.out_value = values;\r
-       scan_field.out_mask = NULL;\r
-       scan_field.in_value = NULL;\r
-       scan_field.in_check_value = NULL;\r
-       scan_field.in_check_mask = NULL;\r
-       scan_field.in_handler = NULL;\r
-       scan_field.in_handler_priv = NULL;\r
-       \r
-       for (i = 0; i < num_words; i++)\r
-               buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32));\r
-       \r
-       virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */\r
-       \r
-       jtag_add_dr_scan(1, &scan_field, TAP_PD);\r
-       \r
-       free(values);\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)\r
-{\r
-       u32 *dest = priv;\r
-       *dest = flip_u32(le_to_h_u32(in_buf), 32);\r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words)\r
-{\r
-       virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;\r
-       scan_field_t scan_field;\r
-       \r
-       scan_field.device = virtex2_info->chain_pos;\r
-       scan_field.num_bits = 32;\r
-       scan_field.out_value = NULL;\r
-       scan_field.out_mask = NULL;\r
-       scan_field.in_value = NULL;\r
-       scan_field.in_check_value = NULL;\r
-       scan_field.in_check_mask = NULL;\r
-       scan_field.in_handler = virtex2_jtag_buf_to_u32;\r
-       \r
-       virtex2_set_instr(virtex2_info->chain_pos, 0x4); /* CFG_OUT */\r
-       \r
-       while (num_words--)\r
-       {\r
-               scan_field.in_handler_priv = words++;\r
-               jtag_add_dr_scan(1, &scan_field, TAP_PD);\r
-       }\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)\r
-{\r
-       u32 data[5];\r
-       \r
-       jtag_add_statemove(TAP_TLR);\r
-       \r
-       data[0] = 0xaa995566; /* synch word */\r
-       data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */\r
-       data[2] = 0x20000000; /* NOOP (Type 1, read, address 0, 0 words */\r
-       data[3] = 0x20000000; /* NOOP */\r
-       data[4] = 0x20000000; /* NOOP */\r
-       virtex2_send_32(pld_device, 5, data);\r
-       \r
-       virtex2_receive_32(pld_device, 1, status);\r
-       \r
-       jtag_execute_queue();\r
-       \r
-       DEBUG("status: 0x%8.8x", *status);\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_load(struct pld_device_s *pld_device, char *filename)\r
-{\r
-       virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;\r
-       xilinx_bit_file_t bit_file;\r
-       int retval;\r
-       int i;\r
-\r
-       scan_field_t field;\r
-\r
-       field.device = virtex2_info->chain_pos;\r
-       field.out_mask = NULL;\r
-       field.in_value = NULL;\r
-       field.in_check_value = NULL;\r
-       field.in_check_mask = NULL;\r
-       field.in_handler = NULL;\r
-       field.in_handler_priv = NULL;\r
-       \r
-       if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)\r
-               return retval;\r
-       \r
-       jtag_add_end_state(TAP_RTI);\r
-       virtex2_set_instr(virtex2_info->chain_pos, 0xb); /* JPROG_B */\r
-       jtag_execute_queue();\r
-       jtag_add_sleep(1000);\r
-       \r
-       virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */\r
-       jtag_execute_queue();\r
-       \r
-       for (i = 0; i < bit_file.length; i++)\r
-               bit_file.data[i] = flip_u32(bit_file.data[i], 8);\r
-       \r
-       field.num_bits = bit_file.length * 8;\r
-       field.out_value = bit_file.data;\r
-\r
-       jtag_add_dr_scan(1, &field, TAP_PD);\r
-       jtag_execute_queue();\r
-       \r
-       jtag_add_statemove(TAP_TLR);\r
-       \r
-       jtag_add_end_state(TAP_RTI);\r
-       virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */\r
-       jtag_add_runtest(13, TAP_RTI);\r
-       virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */\r
-       virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */\r
-       virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */\r
-       jtag_add_runtest(13, TAP_RTI);\r
-       virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */\r
-       jtag_execute_queue();\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)\r
-{\r
-       pld_device_t *device;\r
-       virtex2_pld_device_t *virtex2_info;\r
-       u32 status;\r
-       \r
-       if (argc < 1)\r
-       {\r
-               command_print(cmd_ctx, "usage: virtex2 read_stat <num>");\r
-               return ERROR_OK;\r
-       }\r
-       \r
-       device = get_pld_device_by_num(strtoul(args[0], NULL, 0));\r
-       if (!device)\r
-       {\r
-               command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);\r
-               return ERROR_OK;\r
-       }\r
-\r
-       virtex2_info = device->driver_priv;\r
-       \r
-       virtex2_read_stat(device, &status);\r
-       \r
-       command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status);\r
-       \r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_register_commands(struct command_context_s *cmd_ctx)\r
-{\r
-       command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands");\r
-\r
-       register_command(cmd_ctx, virtex2_cmd, "read_stat", virtex2_handle_read_stat_command, COMMAND_EXEC,\r
-                                        "read Virtex-II status register");\r
-\r
-       return ERROR_OK;\r
-}\r
-\r
-int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device)\r
-{\r
-       virtex2_pld_device_t *virtex2_info;\r
-       \r
-       if (argc < 2)\r
-       {\r
-               WARNING("incomplete pld device 'virtex2' configuration");\r
-               return ERROR_PLD_DEVICE_INVALID;\r
-       }\r
-       \r
-       virtex2_info = malloc(sizeof(virtex2_pld_device_t));\r
-       pld_device->driver_priv = virtex2_info;\r
-       \r
-       virtex2_info->chain_pos = strtoul(args[1], NULL, 0);\r
-       \r
-       return ERROR_OK;\r
-}\r
+/***************************************************************************
+ *   Copyright (C) 2006 by Dominic Rath                                    *
+ *   Dominic.Rath@gmx.de                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "virtex2.h"
+#include "xilinx_bit.h"
+#include "pld.h"
+
+
+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 =
+{
+       .name = "virtex2",
+       .register_commands = virtex2_register_commands,
+       .pld_device_command = virtex2_pld_device_command,
+       .load = virtex2_load,
+};
+
+static int virtex2_set_instr(jtag_tap_t *tap, uint32_t new_instr)
+{
+       if (tap == NULL)
+               return ERROR_FAIL;
+
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+       {
+               scan_field_t 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.in_value = NULL;
+
+               jtag_add_ir_scan(1, &field, jtag_set_end_state(TAP_IDLE));
+
+               free(field.out_value);
+       }
+
+       return ERROR_OK;
+}
+
+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;
+       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;
+
+       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, 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);
+}
+
+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;
+
+       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 */
+
+       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_callback(virtexflip32, (jtag_callback_data_t)words);
+
+               words++;;
+       }
+
+       return ERROR_OK;
+}
+
+static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
+{
+       uint32_t data[5];
+
+       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 */
+       virtex2_send_32(pld_device, 5, data);
+
+       virtex2_receive_32(pld_device, 1, status);
+
+       jtag_execute_queue();
+
+       LOG_DEBUG("status: 0x%8.8x", *status);
+
+       return ERROR_OK;
+}
+
+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_set_end_state(TAP_IDLE);
+       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 */
+       jtag_execute_queue();
+
+       for (i = 0; i < bit_file.length; i++)
+               bit_file.data[i] = flip_u32(bit_file.data[i], 8);
+
+       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_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 */
+       jtag_execute_queue();
+
+       return ERROR_OK;
+}
+
+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;
+       uint32_t status;
+
+       if (argc < 1)
+       {
+               command_print(cmd_ctx, "usage: virtex2 read_stat <num>");
+               return ERROR_OK;
+       }
+
+       device = get_pld_device_by_num(strtoul(args[0], NULL, 0));
+       if (!device)
+       {
+               command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);
+               return ERROR_OK;
+       }
+
+       virtex2_info = device->driver_priv;
+
+       virtex2_read_stat(device, &status);
+
+       command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status);
+
+       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;
+}
+
+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;
+
+       virtex2_pld_device_t *virtex2_info;
+
+       if (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] );
+               return ERROR_OK;
+       }
+
+       virtex2_info = malloc(sizeof(virtex2_pld_device_t));
+       pld_device->driver_priv = virtex2_info;
+       virtex2_info->tap = tap;
+
+       return ERROR_OK;
+}