riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/atmega_common: Make irq_arch inline-able

Browse Source 
- Moved irq_arch.c to irq_arch.h and marked all functions as
  `__attribute__((always_inline)) static inline`
This commit is contained in:
Marian Buschsieweke 2020-05-15 09:15:16 +02:00
parent 22b2f3664f
commit ba5844098d
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpu/atmega_common/include/cpu_conf.h
View File

@ -63,6 +63,11 @@ extern "C" {
*/ */
#define HAVE_HEAP_STATS #define HAVE_HEAP_STATS
/**
* @brief This arch uses the inlined IRQ API.
*/
#define IRQ_API_INLINED (1)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

25
cpu/atmega_common/irq_arch.c → cpu/atmega_common/include/irq_arch.h
View File

@ -18,15 +18,21 @@
* @author Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de> * @author Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
* @author Josua Arndt <jarndt@ias.rwth-aachen.de> * @author Josua Arndt <jarndt@ias.rwth-aachen.de>
* *
* @}
*/ */
#ifndef IRQ_ARCH_H
#define IRQ_ARCH_H
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include "irq.h" #include "irq.h"
#include "cpu.h" #include "cpu.h"
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* @brief Macro returns state of the global interrupt register * @brief Macro returns state of the global interrupt register
*/ */
@ -42,7 +48,7 @@ __attribute__((always_inline)) static inline uint8_t atmega_get_interrupt_state(
return sreg & (1 << 7); return sreg & (1 << 7);
} }
__attribute__((always_inline)) inline void atmega_set_interrupt_state(uint8_t state) __attribute__((always_inline)) static inline void atmega_set_interrupt_state(uint8_t state)
{ {
__asm__ volatile( "mov r15,%0 \n\t" __asm__ volatile( "mov r15,%0 \n\t"
"in r16, __SREG__ \n\t" "in r16, __SREG__ \n\t"
@ -57,7 +63,7 @@ __attribute__((always_inline)) inline void atmega_set_interrupt_state(uint8_t st
/** /**
* @brief Disable all maskable interrupts * @brief Disable all maskable interrupts
*/ */
unsigned int irq_disable(void) __attribute__((always_inline)) static inline unsigned int irq_disable(void)
{ {
uint8_t mask = atmega_get_interrupt_state(); uint8_t mask = atmega_get_interrupt_state();
cli(); /* <-- acts as memory barrier, see doc of avr-libc */ cli(); /* <-- acts as memory barrier, see doc of avr-libc */
@ -67,7 +73,7 @@ unsigned int irq_disable(void)
/** /**
* @brief Enable all maskable interrupts * @brief Enable all maskable interrupts
*/ */
unsigned int irq_enable(void) __attribute__((always_inline)) static inline unsigned int irq_enable(void)
{ {
uint8_t mask = atmega_get_interrupt_state(); uint8_t mask = atmega_get_interrupt_state();
sei(); /* <-- acts as memory barrier, see doc of avr-libc */ sei(); /* <-- acts as memory barrier, see doc of avr-libc */
@ -77,7 +83,7 @@ unsigned int irq_enable(void)
/** /**
* @brief Restore the state of the IRQ flags * @brief Restore the state of the IRQ flags
*/ */
void irq_restore(unsigned int state) __attribute__((always_inline)) static inline void irq_restore(unsigned int state)
{ {
atmega_set_interrupt_state(state); atmega_set_interrupt_state(state);
} }
@ -85,8 +91,15 @@ void irq_restore(unsigned int state)
/** /**
* @brief See if the current context is inside an ISR * @brief See if the current context is inside an ISR
*/ */
int irq_is_in(void) __attribute__((always_inline)) static inline int irq_is_in(void)
{ {
uint8_t state = atmega_get_state(); uint8_t state = atmega_get_state();
return (state & ATMEGA_STATE_FLAG_ISR); return (state & ATMEGA_STATE_FLAG_ISR);
} }
#ifdef __cplusplus
}
#endif
/** @} */
#endif /* IRQ_ARCH_H */