diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-05 00:43:23 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-05 00:43:23 +0000 |
| commit | 92cf94295e7e2508e3edc335d91551e5f327234b (patch) | |
| tree | 07c586cce7e1e448801769be77f285d4cf02d3c4 | |
| parent | 7db58396082122071e1374cd2d4f3e435bdcdc49 (diff) | |
| download | openocd+libswd-92cf94295e7e2508e3edc335d91551e5f327234b.tar.gz openocd+libswd-92cf94295e7e2508e3edc335d91551e5f327234b.tar.bz2 openocd+libswd-92cf94295e7e2508e3edc335d91551e5f327234b.tar.xz openocd+libswd-92cf94295e7e2508e3edc335d91551e5f327234b.zip | |
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_NumTotalTaps' as 'jtag_tap_count.'
git-svn-id: svn://svn.berlios.de/openocd/trunk@2067 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/jtag/jtag.c | 8 | ||||
| -rw-r--r-- | src/jtag/jtag.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index e1d32e46..d10f627f 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -241,7 +241,7 @@ jtag_tap_t *jtag_all_taps(void) return __jtag_all_taps; }; -int jtag_NumTotalTaps(void) +int jtag_tap_count(void) { return jtag_num_taps; } @@ -1103,7 +1103,7 @@ static int jtag_examine_chain(void) if (device_count != jtag_NumEnabledTaps()) { LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match (enabled) configuration (%i), total taps: %d", - device_count, jtag_NumEnabledTaps(), jtag_NumTotalTaps()); + device_count, jtag_NumEnabledTaps(), jtag_tap_count()); LOG_ERROR("check the config file and ensure proper JTAG communication (connections, speed, ...)"); return ERROR_JTAG_INIT_FAILED; } @@ -1898,9 +1898,9 @@ static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *c newargs[0] = Jim_NewStringObj( interp, "jtag", -1 ); newargs[1] = Jim_NewStringObj( interp, "newtap", -1 ); - sprintf( buf, "chip%d", jtag_NumTotalTaps() ); + sprintf( buf, "chip%d", jtag_tap_count() ); newargs[2] = Jim_NewStringObj( interp, buf, -1 ); - sprintf( buf, "tap%d", jtag_NumTotalTaps() ); + sprintf( buf, "tap%d", jtag_tap_count() ); newargs[3] = Jim_NewStringObj( interp, buf, -1 ); newargs[4] = Jim_NewStringObj( interp, "-irlen", -1 ); newargs[5] = Jim_NewStringObj( interp, args[0], -1 ); diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index af1863ca..f7944974 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -182,7 +182,7 @@ extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name); extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj); extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position); extern int jtag_NumEnabledTaps(void); -extern int jtag_NumTotalTaps(void); +extern int jtag_tap_count(void); static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p) { |