X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fminidriver.h;h=46bd0028405116e8c102a8fe3689656b8121611c;hb=f90d8fa45f2d4c9d4b7990f198b232ee55cbb4e1;hp=6a759bfb48ac879776f966f731929e518200b129;hpb=a5467296097cc0a820da3aad65dcd9de196fc1be;p=openocd.git

diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index 6a759bfb48..46bd002840 100644
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -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,8 @@ 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_set_end_state(tap_state_t endstate);
+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);