RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

arm: Rename inline functions

Browse Source 
Rename arm_status_irq_enable() to _ARMV4_Status_irq_enable() and
arm_status_restore() to _ARMV4_Status_restore().
This commit is contained in:
Sebastian Huber
2013-01-04 16:25:19 +01:00
parent 8df0e91ab0
commit 0f7abd9943
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c
View File

@@ -35,13 +35,13 @@ void bsp_interrupt_dispatch(void)
rtems_vector_number vector = VICVectAddr; rtems_vector_number vector = VICVectAddr;
/* Enable interrupts in program status register */ /* Enable interrupts in program status register */
uint32_t psr = arm_status_irq_enable(); uint32_t psr = _ARMV4_Status_irq_enable();
/* Dispatch interrupt handlers */ /* Dispatch interrupt handlers */
bsp_interrupt_handler_dispatch(vector); bsp_interrupt_handler_dispatch(vector);
/* Restore program status register */ /* Restore program status register */
arm_status_restore(psr); _ARMV4_Status_restore(psr);
/* Acknowledge interrupt */ /* Acknowledge interrupt */
VICVectAddr = 0; VICVectAddr = 0;

4
c/src/lib/libbsp/arm/lpc32xx/irq/irq.c
View File

@@ -254,11 +254,11 @@ void bsp_interrupt_dispatch(void)
lpc32xx.sic_1.er = er_sic_1 & masks->field.sic_1; lpc32xx.sic_1.er = er_sic_1 & masks->field.sic_1;
lpc32xx.sic_2.er = er_sic_2 & masks->field.sic_2; lpc32xx.sic_2.er = er_sic_2 & masks->field.sic_2;
psr = arm_status_irq_enable(); psr = _ARMV4_Status_irq_enable();
bsp_interrupt_handler_dispatch(vector); bsp_interrupt_handler_dispatch(vector);
arm_status_restore(psr); _ARMV4_Status_restore(psr);
lpc32xx.mic.er = er_mic & lpc32xx_irq_enable.field.mic; lpc32xx.mic.er = er_mic & lpc32xx_irq_enable.field.mic;
lpc32xx.sic_1.er = er_sic_1 & lpc32xx_irq_enable.field.sic_1; lpc32xx.sic_1.er = er_sic_1 & lpc32xx_irq_enable.field.sic_1;

4
cpukit/score/cpu/arm/rtems/score/armv4.h
View File

@@ -55,7 +55,7 @@ void _ARMV4_Exception_irq_default( void );
void _ARMV4_Exception_fiq_default( void ); void _ARMV4_Exception_fiq_default( void );
static inline uint32_t arm_status_irq_enable( void ) static inline uint32_t _ARMV4_Status_irq_enable( void )
{ {
uint32_t arm_switch_reg; uint32_t arm_switch_reg;
uint32_t psr; uint32_t psr;
@@ -74,7 +74,7 @@ static inline uint32_t arm_status_irq_enable( void )
return psr; return psr;
} }
static inline void arm_status_restore( uint32_t psr ) static inline void _ARMV4_Status_restore( uint32_t psr )
{ {
ARM_SWITCH_REGISTERS; ARM_SWITCH_REGISTERS;