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

Merge pull request #4476 from kaspar030/remove_dINT_eINT

Browse Source 
core: remove eINT/dINT
This commit is contained in:
Oleg Hahm 2015-12-16 11:10:56 +01:00
commit 26ed138fe2
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/include/irq.h
View File

@ -31,8 +31,6 @@
/**
* @brief This function sets the IRQ disable bit in the status register
*
* @note This function should be used in favour of dINT().
*
* @return Previous value of status register. The return value should not
* interpreted as a boolean value. The actual value is only
* significant for restoreIRQ().
@ -44,8 +42,6 @@ unsigned disableIRQ(void);
/**
* @brief This function clears the IRQ disable bit in the status register
*
* @note This function should be used in favour of eINT().
*
* @return Previous value of status register. The return value should not
* interpreted as a boolean value. The actual value is only
* significant for restoreIRQ().
@ -60,8 +56,6 @@ unsigned enableIRQ(void);
*
* @param[in] state state to restore
*
* @note This function should be used in favour of eINT().
*
* @see enableIRQ
* @see disableIRQ
*/

8
cpu/msp430-common/include/cpu.h
View File

@ -44,14 +44,6 @@ extern "C" {
*/
#define ISR(a,b) void __attribute__((naked, interrupt (a))) b(void)
/**
* @brief Deprecated interrupt control functions for backward compatibility
* @{
*/
#define eINT enableIRQ
#define dINT disableIRQ
/** @} */
/**
* @brief Globally disable IRQs
*/

16
cpu/x86/include/cpu.h
View File

@ -50,22 +50,6 @@ extern "C" {
#define ARCH_HAS_ATOMIC_COMPARE_AND_SWAP 1
/** @} */
/**
* @brief Disable interrupts
*/
static inline void __attribute__((always_inline)) dINT(void)
{
asm volatile ("cli");
}
/**
* @brief Enable interrupts
*/
static inline void __attribute__((always_inline)) eINT(void)
{
asm volatile ("sti");
}
/**
* @brief Disable interrupts and halt forever.
*

4
cpu/x86/x86_threading.c
View File

@ -142,7 +142,7 @@ void isr_cpu_switch_context_exit(void)
void cpu_switch_context_exit(void)
{
dINT();
disableIRQ();
if (!x86_in_isr) {
x86_in_isr = true;
@ -206,7 +206,7 @@ static void fpu_used_interrupt(uint8_t intr_num, struct x86_pushad *orig_ctx, un
static void x86_thread_exit(void)
{
dINT();
disableIRQ();
if (fpu_owner == sched_active_pid) {
fpu_owner = KERNEL_PID_UNDEF;
}