diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-04-08 05:40:25 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-04-08 05:40:25 +0000 |
| commit | c263ea837ae7e3c0e963b798afdffd501790ce2c (patch) | |
| tree | a899d943856b48f6889cf1fe9f5b97ccc58ca598 /LUFA/Scheduler | |
| parent | de9bd767dc8578a45a195fb1e37dd4ff26ae9567 (diff) | |
| download | lufa-c263ea837ae7e3c0e963b798afdffd501790ce2c.tar.gz lufa-c263ea837ae7e3c0e963b798afdffd501790ce2c.tar.bz2 lufa-c263ea837ae7e3c0e963b798afdffd501790ce2c.zip | |
Move global interrupt enable/disable functions out to Common.h and document them.
Diffstat (limited to 'LUFA/Scheduler')
| -rw-r--r-- | LUFA/Scheduler/Scheduler.c | 6 | ||||
| -rw-r--r-- | LUFA/Scheduler/Scheduler.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/LUFA/Scheduler/Scheduler.c b/LUFA/Scheduler/Scheduler.c index 87a21491d..56e1cf41e 100644 --- a/LUFA/Scheduler/Scheduler.c +++ b/LUFA/Scheduler/Scheduler.c @@ -39,12 +39,12 @@ bool Scheduler_HasDelayElapsed(const uint_least16_t Delay, SchedulerDelayCounter_t CurrentTickValue_LCL; SchedulerDelayCounter_t DelayCounter_LCL; - uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState(); - USB_INT_GlobalDisable(); + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); + GlobalInterruptDisable(); CurrentTickValue_LCL = Scheduler_TickCounter; - USB_INT_SetGlobalEnableState(CurrentGlobalInt); + SetGlobalInterruptMask(CurrentGlobalInt); DelayCounter_LCL = *DelayCounter; diff --git a/LUFA/Scheduler/Scheduler.h b/LUFA/Scheduler/Scheduler.h index 499a63a1b..262218683 100644 --- a/LUFA/Scheduler/Scheduler.h +++ b/LUFA/Scheduler/Scheduler.h @@ -219,12 +219,12 @@ ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE; static inline void Scheduler_ResetDelay(SchedulerDelayCounter_t* const DelayCounter) { - uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState(); - USB_INT_GlobalDisable(); + uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask(); + GlobalInterruptDisable(); *DelayCounter = Scheduler_TickCounter; - USB_INT_SetGlobalEnableState(CurrentGlobalInt); + SetGlobalInterruptMask(CurrentGlobalInt); } /* Function Prototypes: */ |