From 6894617b8ebc8453a1ed5e672fb225d0c4f2f51b Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 8 Feb 2012 17:48:43 +0000 Subject: Fixed bug 3485667. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3944 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/PPC/SPC56x/ivor.s | 13 +++++++++++-- readme.txt | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/os/ports/GCC/PPC/SPC56x/ivor.s b/os/ports/GCC/PPC/SPC56x/ivor.s index e4610a3de..2c69afa62 100644 --- a/os/ports/GCC/PPC/SPC56x/ivor.s +++ b/os/ports/GCC/PPC/SPC56x/ivor.s @@ -76,11 +76,20 @@ IVOR10: lis %r3, 0x0800 /* DIS bit mask. */ mtspr 336, %r3 /* TSR register. */ +#if CH_DBG_SYSTEM_STATE_CHECK + bl dbg_check_enter_isr + bl dbg_check_lock_from_isr +#endif + bl chSysTimerHandlerI +#if CH_DBG_SYSTEM_STATE_CHECK + bl dbg_check_unlock_from_isr + bl dbg_check_leave_isr +#endif + /* System tick handler invocation.*/ #if CH_DBG_SYSTEM_STATE_CHECK bl dbg_check_lock #endif - bl chSysTimerHandlerI bl chSchIsPreemptionRequired cmpli cr0, %r3, 0 beq cr0, .ctxrestore @@ -124,7 +133,7 @@ IVOR4: ori %r3, %r3, INTC_IACKR@l /* IACKR register address. */ lwz %r3, 0(%r3) /* IACKR register value. */ lwz %r3, 0(%r3) - mtCTR %r3 /* Software handler address. */ + mtCTR %r3 /* Software handler address. */ #if PPC_USE_IRQ_PREEMPTION /* Allows preemption while executing the software handler.*/ diff --git a/readme.txt b/readme.txt index bb3d67989..c4ac352a4 100644 --- a/readme.txt +++ b/readme.txt @@ -79,6 +79,8 @@ ***************************************************************************** *** 2.5.0 *** +- FIX: Fixed PPC port broken when CH_DBG_SYSTEM_STATE_CHECK is activated + (bug 3485667)(backported to 2.4.1). - FIX: Fixed missing PLL3 check in STM32F107 HAL (bug 3485278)(backported to 2.4.1). - FIX: Fixed ADC maximum frequency limit in STM32F2/F4 ADC drivers (bug -- cgit v1.2.3