Improve encapsulation of JTAG event handling:

[fw/openocd] / src / jtag / jtag_driver.c

diff --git a/src/jtag/jtag_driver.c b/src/jtag/jtag_driver.c
index 813d98af2bd9faa807036145d1ff7302d0bbc3e9..ec211bf130abb013e0302b865d3f8104a19f1c1a 100644 (file)
--- a/src/jtag/jtag_driver.c
+++ b/src/jtag/jtag_driver.c
@@ -31,12 +31,10 @@
 #include "config.h"
 #endif
 
-#define INCLUDE_JTAG_MINIDRIVER_H
-#define INCLUDE_JTAG_INTERFACE_H
-#include "jtag.h"
+#include "interface.h"
+#include "minidriver.h"
 #include "command.h"
 
-#ifndef HAVE_JTAG_MINIDRIVER_H
 struct jtag_callback_entry
 {
        struct jtag_callback_entry *next;
@@ -77,7 +75,7 @@ static void cmd_queue_scan_field_clone(scan_field_t * dst, const scan_field_t *
  */
 int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
 {
-       size_t num_taps = jtag_NumEnabledTaps();
+       size_t num_taps = jtag_tap_count_enabled();
 
        jtag_command_t * cmd            = cmd_queue_alloc(sizeof(jtag_command_t));
        scan_command_t * scan           = cmd_queue_alloc(sizeof(scan_command_t));
@@ -98,7 +96,7 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields,
 
        /* loop over all enabled TAPs */
 
-       for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+       for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
        {
                /* search the input field list for fields for the current TAP */
 
@@ -140,7 +138,7 @@ int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields,
                field++;
        }
 
-       assert(field == out_fields + num_taps); /* paranoia: jtag_NumEnabledTaps() and jtag_NextEnabledTap() not in sync */
+       assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_tap_next_enabled() not in sync */
 
        return ERROR_OK;
 }
@@ -184,7 +182,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
 
        size_t bypass_devices = 0;
 
-       for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+       for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
        {
                if (tap->bypass)
                        bypass_devices++;
@@ -209,7 +207,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
 
        /* loop over all enabled TAPs */
 
-       for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+       for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
        {
                /* if TAP is not bypassed insert matching input fields */
 
@@ -273,7 +271,7 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
 
        size_t bypass_devices = 0;
 
-       for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+       for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
        {
                if (tap->bypass)
                        bypass_devices++;
@@ -301,7 +299,7 @@ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
 
        /* loop over all enabled TAPs */
 
-       for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+       for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
        {
                /* if TAP is not bypassed insert matching input fields */
 
@@ -467,7 +465,7 @@ int interface_jtag_add_sleep(u32 us)
 }
 
 /* add callback to end of queue */
-void jtag_add_callback4(jtag_callback_t callback, u8 *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
+void interface_jtag_add_callback4(jtag_callback_t callback, u8 *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
 {
        struct jtag_callback_entry *entry=cmd_queue_alloc(sizeof(struct jtag_callback_entry));
 
@@ -489,12 +487,6 @@ void jtag_add_callback4(jtag_callback_t callback, u8 *in, jtag_callback_data_t d
        }
 }
 
-void interface_jtag_add_scan_check_alloc(scan_field_t *field)
-{
-       unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
-       field->in_value = (u8 *)cmd_queue_alloc(num_bytes);
-}
-
 int interface_jtag_execute_queue(void)
 {
        int retval = default_interface_jtag_execute_queue();
@@ -515,21 +507,14 @@ int interface_jtag_execute_queue(void)
        return retval;
 }
 
-void jtag_alloc_in_value32(scan_field_t *field)
-{
-       field->in_value=(u8 *)cmd_queue_alloc(4);
-}
-
 static int jtag_convert_to_callback4(u8 *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
 {
        ((jtag_callback1_t)data1)(in);
        return ERROR_OK;
 }
 
-void jtag_add_callback(jtag_callback1_t callback, u8 *in)
+void interface_jtag_add_callback(jtag_callback1_t callback, u8 *in)
 {
        jtag_add_callback4(jtag_convert_to_callback4, in, (jtag_callback_data_t)callback, 0, 0);
 }
 
-#endif
-