From: Øyvind H. <go...@us...> - 2010-03-18 08:41:29
|
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 fccdfc1cd78ddfb687e0d1fc630c3fa10af2b5f9 (commit) from 0529431fe740fbf04b41129d84e2d8633b13fabe (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 fccdfc1cd78ddfb687e0d1fc630c3fa10af2b5f9 Author: Ãyvind Harboe <oyv...@zy...> Date: Wed Mar 17 21:50:23 2010 +0100 linker error: fix problem with duplicate fn A fn was copied instead of moved to a new file. The linker can discard exact copies of fn's without warning. This is a C++'ism. However on my Ubuntu 9.10 machine, it fails. Signed-off-by: Ãyvind Harboe <oyv...@zy...> diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index dcad0fb..4afd50c 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1597,36 +1597,3 @@ static const uint8_t jtag2swd_bitseq[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; -/** - * Put the debug link into SWD mode, if the target supports it. - * The link's initial mode may be either JTAG (for example, - * with SWJ-DP after reset) or SWD. - * - * @param target Enters SWD mode (if possible). - * - * Note that targets using the JTAG-DP do not support SWD, and that - * some targets which could otherwise support it may have have been - * configured to disable SWD signaling - * - * @return ERROR_OK or else a fault code. - */ -int dap_to_swd(struct target *target) -{ - int retval; - - LOG_DEBUG("Enter SWD mode"); - - /* REVISIT it's nasty to need to make calls to a "jtag" - * subsystem if the link isn't in JTAG mode... - */ - - retval = jtag_add_tms_seq(8 * sizeof(jtag2swd_bitseq), - jtag2swd_bitseq, TAP_INVALID); - if (retval == ERROR_OK) - retval = jtag_execute_queue(); - - /* REVISIT set up the DAP's ops vector for SWD mode. */ - - return retval; -} - ----------------------------------------------------------------------- Summary of changes: src/target/arm_adi_v5.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) hooks/post-receive -- Main OpenOCD repository |