diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-01-04 16:25:19 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-01-07 15:07:41 +0100 |
commit | 0f7abd9943dc5be2f246bfe59c81a2770ed4f36c (patch) | |
tree | 487a783f955f8c67d27a5b815ee9ed482cb93af2 | |
parent | arm: Move inline functions (diff) | |
download | rtems-0f7abd9943dc5be2f246bfe59c81a2770ed4f36c.tar.bz2 |
arm: Rename inline functions
Rename arm_status_irq_enable() to _ARMV4_Status_irq_enable() and
arm_status_restore() to _ARMV4_Status_restore().
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc32xx/irq/irq.c | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/arm/rtems/score/armv4.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c b/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c index 8eeb677680..4b84c94bf8 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c +++ b/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c @@ -35,13 +35,13 @@ void bsp_interrupt_dispatch(void) rtems_vector_number vector = VICVectAddr; /* Enable interrupts in program status register */ - uint32_t psr = arm_status_irq_enable(); + uint32_t psr = _ARMV4_Status_irq_enable(); /* Dispatch interrupt handlers */ bsp_interrupt_handler_dispatch(vector); /* Restore program status register */ - arm_status_restore(psr); + _ARMV4_Status_restore(psr); /* Acknowledge interrupt */ VICVectAddr = 0; diff --git a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c index 94e0ca71f7..67506ee9f9 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c +++ b/c/src/lib/libbsp/arm/lpc32xx/irq/irq.c @@ -254,11 +254,11 @@ void bsp_interrupt_dispatch(void) lpc32xx.sic_1.er = er_sic_1 & masks->field.sic_1; 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); - arm_status_restore(psr); + _ARMV4_Status_restore(psr); lpc32xx.mic.er = er_mic & lpc32xx_irq_enable.field.mic; lpc32xx.sic_1.er = er_sic_1 & lpc32xx_irq_enable.field.sic_1; diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/rtems/score/armv4.h index 98ac84666e..dfd57bb3bb 100644 --- a/cpukit/score/cpu/arm/rtems/score/armv4.h +++ b/cpukit/score/cpu/arm/rtems/score/armv4.h @@ -55,7 +55,7 @@ void _ARMV4_Exception_irq_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 psr; @@ -74,7 +74,7 @@ static inline uint32_t arm_status_irq_enable( void ) return psr; } -static inline void arm_status_restore( uint32_t psr ) +static inline void _ARMV4_Status_restore( uint32_t psr ) { ARM_SWITCH_REGISTERS; |