andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #607. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8044 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2015-06-18 08:40:04 +00:00
parent ea7bb840b1
commit ea36f8946c
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
os/nil/ports/e200/compilers/GCC/ivor.s
View File

@ -93,10 +93,13 @@ _IVOR10:
lis %r3, 0x0800 /* DIS bit mask. */ lis %r3, 0x0800 /* DIS bit mask. */
mtspr 336, %r3 /* TSR register. */ mtspr 336, %r3 /* TSR register. */
#if PPC_USE_IRQ_PREEMPTION /* Restoring pre-IRQ MSR register value.*/
/* Allows preemption while executing the software handler.*/ mfSRR1 %r0
wrteei 1 #if !PPC_USE_IRQ_PREEMPTION
/* No preemption, keeping EE disabled.*/
se_bclri %r0, 16 /* EE = bit 16. */
#endif #endif
mtMSR %r0
/* System tick handler invocation.*/ /* System tick handler invocation.*/
bl chSysTimerHandlerI bl chSysTimerHandlerI
@ -161,10 +164,13 @@ _IVOR4:
lwz %r3, 0(%r3) lwz %r3, 0(%r3)
mtCTR %r3 /* Software handler address. */ mtCTR %r3 /* Software handler address. */
#if PPC_USE_IRQ_PREEMPTION /* Restoring pre-IRQ MSR register value.*/
/* Allows preemption while executing the software handler.*/ mfSRR1 %r0
wrteei 1 #if !PPC_USE_IRQ_PREEMPTION
/* No preemption, keeping EE disabled.*/
se_bclri %r0, 16 /* EE = bit 16. */
#endif #endif
mtMSR %r0
/* Exectes the software handler.*/ /* Exectes the software handler.*/
bctrl bctrl

18
os/rt/ports/e200/compilers/GCC/ivor.s
View File

@ -98,10 +98,13 @@ _IVOR10:
lis %r3, 0x0800 /* DIS bit mask. */ lis %r3, 0x0800 /* DIS bit mask. */
mtspr 336, %r3 /* TSR register. */ mtspr 336, %r3 /* TSR register. */
#if PPC_USE_IRQ_PREEMPTION /* Restoring pre-IRQ MSR register value.*/
/* Allows preemption while executing the software handler.*/ mfSRR1 %r0
wrteei 1 #if !PPC_USE_IRQ_PREEMPTION
/* No preemption, keeping EE disabled.*/
se_bclri %r0, 16 /* EE = bit 16. */
#endif #endif
mtMSR %r0
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK
bl _dbg_check_enter_isr bl _dbg_check_enter_isr
@ -174,10 +177,13 @@ _IVOR4:
lwz %r3, 0(%r3) lwz %r3, 0(%r3)
mtCTR %r3 /* Software handler address. */ mtCTR %r3 /* Software handler address. */
#if PPC_USE_IRQ_PREEMPTION /* Restoring pre-IRQ MSR register value.*/
/* Allows preemption while executing the software handler.*/ mfSRR1 %r0
wrteei 1 #if !PPC_USE_IRQ_PREEMPTION
/* No preemption, keeping EE disabled.*/
se_bclri %r0, 16 /* EE = bit 16. */
#endif #endif
mtMSR %r0
/* Exectes the software handler.*/ /* Exectes the software handler.*/
bctrl bctrl

2
readme.txt
View File

@ -80,6 +80,8 @@
- NIL: Added INTC priorities check to the e200z port. - NIL: Added INTC priorities check to the e200z port.
- RT: Added INTC priorities check to the e200z port. - RT: Added INTC priorities check to the e200z port.
- HAL: Added support for extra DMA channels in STM32F072 devices. - HAL: Added support for extra DMA channels in STM32F072 devices.
- RT: SPE-related issue in e200z ports (bug #607).
- NIL: SPE-related issue in e200z ports (bug #607).
- HAL: Fixed dependency between STM32 MAC driver and RT (bug #606). - HAL: Fixed dependency between STM32 MAC driver and RT (bug #606).
- HAL: Fixed wrong macro names in STM32F0xx HAL driver (bug #605). - HAL: Fixed wrong macro names in STM32F0xx HAL driver (bug #605).
- HAL: Fixed wrong check on ADC3 in STM32F3xx ADC driver (bug #604). - HAL: Fixed wrong check on ADC3 in STM32F3xx ADC driver (bug #604).