diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-02 23:21:18 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-02 23:21:18 +0000 |
| commit | 84d88ef9d7d5342db54ae32d086c186852d3bbbf (patch) | |
| tree | dda4d8f7b769bd7a946ce650ad24b8847ca99354 /src/jtag/jtag.h | |
| parent | a5467296097cc0a820da3aad65dcd9de196fc1be (diff) | |
| download | openocd+libswd-84d88ef9d7d5342db54ae32d086c186852d3bbbf.tar.gz openocd+libswd-84d88ef9d7d5342db54ae32d086c186852d3bbbf.tar.bz2 openocd+libswd-84d88ef9d7d5342db54ae32d086c186852d3bbbf.tar.xz openocd+libswd-84d88ef9d7d5342db54ae32d086c186852d3bbbf.zip | |
Finish removing '#ifdef HAVE_JTAG_MINIDRIVER_H' from jtag.h:
- Wraps JTAG callback API functions:
- Outlines jtag_add_callback() and jtag_add_callback4().
- Adds interface_ prefix to existing in-tree driver implementation.
- Declare the driver interfaces routines in miniheader.h file.
This patch requires renaming the equivalent macros in out-of-tree
jtag_minidriver.h implementations.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2007 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/jtag.h')
| -rw-r--r-- | src/jtag/jtag.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 94928117..a2156b32 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -599,12 +599,8 @@ extern void jtag_add_plain_dr_scan(int num_fields, const scan_field_t* fields, t * fail, use the jtag_callback_t variant */ typedef void (*jtag_callback1_t)(u8 *in); -#ifndef HAVE_JTAG_MINIDRIVER_H /* A simpler version of jtag_add_callback4 */ extern void jtag_add_callback(jtag_callback1_t, u8 *in); -#else -/* implemented by minidriver */ -#endif /* This type can store an integer safely by a normal cast on 64 and @@ -650,11 +646,9 @@ typedef int (*jtag_callback_t)(u8 *in, jtag_callback_data_t data1, jtag_callback * If the execution of the queue fails before the callbacks, then the * callbacks may or may not be invoked depending on driver implementation. */ -#ifndef HAVE_JTAG_MINIDRIVER_H -extern void jtag_add_callback4(jtag_callback_t, u8 *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3); -#else -/* implemented by minidriver */ -#endif +extern void jtag_add_callback4(jtag_callback_t, u8 *in, + jtag_callback_data_t data1, jtag_callback_data_t data2, + jtag_callback_data_t data3); /* run a TAP_RESET reset. End state is TAP_RESET, regardless |