Encapsulate JTAG Cable API and interface structure, plan for new header file.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1984 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-01 23:01:24 +00:00
parent 35082f788b
commit a88871bc6a
19 changed files with 26 additions and 0 deletions

View File

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"

View File

@ -24,6 +24,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include <usb.h> #include <usb.h>

View File

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "bitbang.h" #include "bitbang.h"

View File

@ -25,6 +25,7 @@
#endif #endif
#include "bitbang.h" #include "bitbang.h"
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
/** /**

View File

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "bitq.h" #include "bitq.h"

View File

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "bitbang.h" #include "bitbang.h"

View File

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "bitbang.h" #include "bitbang.h"

View File

@ -40,6 +40,7 @@
#endif #endif
/* project specific includes */ /* project specific includes */
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "time_support.h" #include "time_support.h"

View File

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"

View File

@ -25,6 +25,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include <usb.h> #include <usb.h>

View File

@ -29,6 +29,7 @@
#endif #endif
#define INCLUDE_JTAG_MINIDRIVER_H #define INCLUDE_JTAG_MINIDRIVER_H
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H

View File

@ -105,6 +105,8 @@ typedef struct tap_transition_s
//extern tap_transition_t tap_transitions[16]; /* describe the TAP state diagram */ //extern tap_transition_t tap_transitions[16]; /* describe the TAP state diagram */
#ifdef INCLUDE_JTAG_INTERFACE_H
/*-----<Cable Helper API>-------------------------------------------*/ /*-----<Cable Helper API>-------------------------------------------*/
/* The "Cable Helper API" is what the cable drivers can use to help implement /* The "Cable Helper API" is what the cable drivers can use to help implement
@ -254,6 +256,8 @@ static inline tap_state_t jtag_debug_state_machine(const void *tms_buf,
/*-----</Cable Helper API>------------------------------------------*/ /*-----</Cable Helper API>------------------------------------------*/
#endif // INCLUDE_JTAG_INTERFACE_H
extern tap_state_t cmd_queue_end_state; /* finish DR scans in dr_end_state */ extern tap_state_t cmd_queue_end_state; /* finish DR scans in dr_end_state */
extern tap_state_t cmd_queue_cur_state; /* current TAP state */ extern tap_state_t cmd_queue_cur_state; /* current TAP state */
@ -428,6 +432,8 @@ enum reset_line_mode {
LINE_PUSH_PULL = 0x1, LINE_PUSH_PULL = 0x1,
}; };
#ifdef INCLUDE_JTAG_INTERFACE_H
typedef struct jtag_interface_s typedef struct jtag_interface_s
{ {
char* name; char* name;
@ -477,6 +483,8 @@ typedef struct jtag_interface_s
int (*srst_asserted)(int* srst_asserted); int (*srst_asserted)(int* srst_asserted);
} jtag_interface_t; } jtag_interface_t;
#endif // INCLUDE_JTAG_INTERFACE_H
enum jtag_event { enum jtag_event {
JTAG_TRST_ASSERTED JTAG_TRST_ASSERTED
}; };

View File

@ -24,6 +24,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "bitbang.h" #include "bitbang.h"

View File

@ -25,6 +25,7 @@
#include "windows.h" #include "windows.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "time_support.h" #include "time_support.h"
#include "bitq.h" #include "bitq.h"

View File

@ -28,6 +28,7 @@
#endif #endif
/* project specific includes */ /* project specific includes */
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include "rlink.h" #include "rlink.h"
#include "st7.h" #include "st7.h"

View File

@ -34,6 +34,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include <usb.h> #include <usb.h>

View File

@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "jtag.h" #include "jtag.h"
#include <usb.h> #include <usb.h>

View File

@ -21,6 +21,7 @@
#endif #endif
#define INCLUDE_JTAG_MINIDRIVER_H #define INCLUDE_JTAG_MINIDRIVER_H
#define INCLUDE_JTAG_INTERFACE_H
#include "embeddedice.h" #include "embeddedice.h"
#include "bitbang.h" #include "bitbang.h"

View File

@ -41,6 +41,7 @@
#include "config.h" #include "config.h"
#endif #endif
#define INCLUDE_JTAG_INTERFACE_H
#include "xsvf.h" #include "xsvf.h"
#include "jtag.h" #include "jtag.h"