use struct jtag_tap_event_action

[openocd] / src / jtag / tcl.c

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index abf875a7962410ece6b94a8014b4fd2d9fa98fa9..9d6169ccfe7c0e8fb9bd042adacd88e7bf99088b 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -49,7 +49,7 @@ static const Jim_Nvp nvp_jtag_tap_event[] = {
        { .name = NULL, .value = -1 }
 };
 
-extern jtag_interface_t *jtag_interface;
+extern struct jtag_interface *jtag_interface;
 
 enum jtag_tap_cfg_param {
        JCFG_EVENT
@@ -103,7 +103,7 @@ static int jtag_tap_configure_cmd(Jim_GetOptInfo *goi, struct jtag_tap * tap)
                                }
 
                                {
-                                       jtag_tap_event_action_t *jteap;
+                                       struct jtag_tap_event_action *jteap;
 
                                        jteap = tap->event_action;
                                        /* replace existing? */
@@ -337,7 +337,7 @@ static int jim_newtap_cmd(Jim_GetOptInfo *goi)
 
 static void jtag_tap_handle_event(struct jtag_tap *tap, enum jtag_event e)
 {
-       jtag_tap_event_action_t * jteap;
+       struct jtag_tap_event_action * jteap;
 
        for (jteap = tap->event_action; jteap != NULL; jteap = jteap->next) {
                if (jteap->event == e) {
@@ -1078,7 +1078,7 @@ static bool scan_is_safe(tap_state_t state)
 COMMAND_HANDLER(handle_irscan_command)
 {
        int i;
-       scan_field_t *fields;
+       struct scan_field *fields;
        struct jtag_tap *tap;
        tap_state_t endstate;
 
@@ -1108,7 +1108,7 @@ COMMAND_HANDLER(handle_irscan_command)
        }
 
        int num_fields = argc / 2;
-       size_t fields_len = sizeof(scan_field_t) * num_fields;
+       size_t fields_len = sizeof(struct scan_field) * num_fields;
        fields = malloc(fields_len);
        memset(fields, 0, fields_len);
 
@@ -1159,7 +1159,7 @@ error_return:
 static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
 {
        int retval;
-       scan_field_t *fields;
+       struct scan_field *fields;
        int num_fields;
        int field_count = 0;
        int i, e;
@@ -1245,7 +1245,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
        }
 
        num_fields = (argc-2)/2;
-       fields = malloc(sizeof(scan_field_t) * num_fields);
+       fields = malloc(sizeof(struct scan_field) * num_fields);
        for (i = 2; i < argc; i += 2)
        {
                long bits;