pld_driver_t -> struct pld_driver

[fw/openocd] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index ec0847fe3e6245e383ee6794edfa87850748a8d2..4c1fc53d21e323bbe805aa3af86bc57ce430521b 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -26,26 +26,14 @@
 #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)
+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)
        {
-               scan_field_t field;
+               struct scan_field field;
 
                field.tap = tap;
                field.num_bits = tap->ir_length;
@@ -65,7 +53,7 @@ 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;
+       struct scan_field scan_field;
        uint8_t *values;
        int i;
 
@@ -98,7 +86,7 @@ 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;
@@ -149,7 +137,7 @@ static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
        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.in_value = NULL;
@@ -189,8 +177,7 @@ static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
        return ERROR_OK;
 }
 
-static 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;
@@ -220,20 +207,9 @@ static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
        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)
+PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 {
-       jtag_tap_t *tap;
+       struct jtag_tap *tap;
 
        virtex2_pld_device_t *virtex2_info;
 
@@ -250,8 +226,28 @@ static int virtex2_pld_device_command(struct command_context_s *cmd_ctx,
        }
 
        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,
+       };