ft2232: less noise with _DEBUG_JTAG_IO_

[openocd] / src / jtag / minidriver.h

diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index 6a759bfb48ac879776f966f731929e518200b129..b7c01abc8e944d64c7b619ce80dc764de4e0bc5e 100644 (file)
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -38,7 +38,7 @@
  * - jtag_add_callback
  * - jtag_add_callback4
  * - interface_jtag_add_dr_out
- *  
+ *
  * The following core functions are declared in this file for use by
  * the minidriver and do @b not need to be defined by an implementation:
  * - default_interface_jtag_execute_queue()
@@ -59,7 +59,7 @@ static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field)
        if (field->num_bits > 32)
        {
                unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
-               field->in_value = (u8 *)malloc(num_bytes);
+               field->in_value = (uint8_t *)malloc(num_bytes);
                field->allocated = 1;
        }
        else
@@ -68,21 +68,29 @@ static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field)
 
 #else
 
+#include "commands.h"
+
 static inline void interface_jtag_alloc_in_value32(scan_field_t *field)
 {
-       field->in_value = (u8 *)cmd_queue_alloc(4);
+       field->in_value = (uint8_t *)cmd_queue_alloc(4);
 }
 
 static inline 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);
+       field->in_value = (uint8_t *)cmd_queue_alloc(num_bytes);
 }
 
 extern void interface_jtag_add_dr_out(jtag_tap_t* tap,
-               int num_fields, const int* num_bits, const u32* value,
+               int num_fields, const int* num_bits, const uint32_t* value,
                tap_state_t end_state);
 
+extern void interface_jtag_add_callback(jtag_callback1_t f, jtag_callback_data_t data0);
+
+extern void interface_jtag_add_callback4(jtag_callback_t f, jtag_callback_data_t data0,
+               jtag_callback_data_t data1, jtag_callback_data_t data2,
+               jtag_callback_data_t data3);
+
 #endif
 
 extern int interface_jtag_add_ir_scan(
@@ -112,8 +120,7 @@ extern int interface_jtag_add_runtest(int num_cycles, tap_state_t endstate);
  * approperiate
  */
 extern int interface_jtag_add_reset(int trst, int srst);
-extern int interface_jtag_add_end_state(tap_state_t endstate);
-extern int interface_jtag_add_sleep(u32 us);
+extern int interface_jtag_add_sleep(uint32_t us);
 extern int interface_jtag_add_clocks(int num_cycles);
 extern int interface_jtag_execute_queue(void);