Finish removing '#ifdef HAVE_JTAG_MINIDRIVER_H' from jtag.h:

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

diff --git a/src/jtag/jtag_driver.c b/src/jtag/jtag_driver.c
index 813d98af2bd9faa807036145d1ff7302d0bbc3e9..c0b9eaaa58337a21303dd82db16100c939a36954 100644 (file)
--- a/src/jtag/jtag_driver.c
+++ b/src/jtag/jtag_driver.c
@@ -31,12 +31,11 @@
 #include "config.h"
 #endif
 
-#define INCLUDE_JTAG_MINIDRIVER_H
 #define INCLUDE_JTAG_INTERFACE_H
 #include "jtag.h"
+#include "minidriver.h"
 #include "command.h"
 
-#ifndef HAVE_JTAG_MINIDRIVER_H
 struct jtag_callback_entry
 {
        struct jtag_callback_entry *next;
@@ -467,7 +466,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 +488,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 +508,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
-