From 4a5f45e87d593d6911da680cb92ffbc9b43c9486 Mon Sep 17 00:00:00 2001 From: drath Date: Wed, 28 Mar 2007 16:31:55 +0000 Subject: - merged XScale branch back into trunk - fixed some compiler warnigns in amt_jtagaccel.c, bitbang.c, parport.c - free working area and register stuff if str7x block write algorithm failed - check PC after exiting a target algorithm in armv4_5.c git-svn-id: svn://svn.berlios.de/openocd/trunk@135 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/amt_jtagaccel.c | 2 +- src/jtag/bitbang.c | 2 +- src/jtag/parport.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c index dca5c334..ac263520 100644 --- a/src/jtag/amt_jtagaccel.c +++ b/src/jtag/amt_jtagaccel.c @@ -385,7 +385,7 @@ int amt_jtagaccel_execute_queue(void) break; case JTAG_SLEEP: #ifdef _DEBUG_JTAG_IO_ - DEBUG("sleep", cmd->cmd.sleep->us); + DEBUG("sleep %i", cmd->cmd.sleep->us); #endif jtag_sleep(cmd->cmd.sleep->us); break; diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c index 2065f62a..61248364 100644 --- a/src/jtag/bitbang.c +++ b/src/jtag/bitbang.c @@ -248,7 +248,7 @@ int bitbang_execute_queue(void) break; case JTAG_SLEEP: #ifdef _DEBUG_JTAG_IO_ - DEBUG("sleep", cmd->cmd.sleep->us); + DEBUG("sleep %i", cmd->cmd.sleep->us); #endif jtag_sleep(cmd->cmd.sleep->us); break; diff --git a/src/jtag/parport.c b/src/jtag/parport.c index 6386940e..a46d611f 100644 --- a/src/jtag/parport.c +++ b/src/jtag/parport.c @@ -375,7 +375,7 @@ int parport_init(void) dataport = parport_port; statusport = parport_port + 1; - DEBUG("requesting privileges for parallel port 0x%x...", dataport); + DEBUG("requesting privileges for parallel port 0x%lx...", dataport); #if PARPORT_USE_GIVEIO == 1 if (parport_get_giveio_access() != 0) #else /* PARPORT_USE_GIVEIO */ -- cgit v1.2.3