From: David B. <dbr...@us...> - 2010-03-18 21:35:23
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via c09035ea2cb24dee300476a3502919d23d90d1f5 (commit) via 52a788e008ecf0ca6156f02de08a0f062d49a236 (commit) from ec108ff59e23ec32abf1223488ad96dd26205a5b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c09035ea2cb24dee300476a3502919d23d90d1f5 Merge: 52a788e ec108ff Author: David Brownell <dbr...@us...> Date: Thu Mar 18 12:11:58 2010 -0700 Merge branch 'master' of ssh://dbr...@op.../gitroot/openocd/openocd commit 52a788e008ecf0ca6156f02de08a0f062d49a236 Author: David Brownell <dbr...@us...> Date: Thu Mar 18 11:56:17 2010 -0700 remove more duplication Not sure how the original "move code to adi_v5_swd.c" patch left some code in the "arm_adi_v5.c" file, but a recent patch was only a partial fix -- it didn't remove all the duplication. Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index 4afd50c..01c274b 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1572,28 +1572,3 @@ const struct command_registration dap_command_handlers[] = { }; -/* - * This represents the bits which must be sent out on TMS/SWDIO to - * switch a DAP implemented using an SWJ-DP module into SWD mode. - * These bits are stored (and transmitted) LSB-first. - * - * See the DAP-Lite specification, section 2.2.5 for information - * about making the debug link select SWD or JTAG. (Similar info - * is in a few other ARM documents.) - */ -static const uint8_t jtag2swd_bitseq[] = { - /* More than 50 TCK/SWCLK cycles with TMS/SWDIO high, - * putting both JTAG and SWD logic into reset state. - */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - /* Switching sequence enables SWD and disables JTAG - * NOTE: bits in the DP's IDCODE may expose the need for - * an old/deprecated sequence (0xb6 0xed). - */ - 0x9e, 0xe7, - /* More than 50 TCK/SWCLK cycles with TMS/SWDIO high, - * putting both JTAG and SWD logic into reset state. - */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -}; - ----------------------------------------------------------------------- Summary of changes: src/target/arm_adi_v5.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) hooks/post-receive -- Main OpenOCD repository |