diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-19 17:00:45 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-19 18:45:46 -0400 |
| commit | 176b6160418a667a86790165fa6a638d16fa8243 (patch) | |
| tree | 89e76c006e08fb2326d8a5cc16fe5117205f98ae /libmaple/timer.c | |
| parent | 575cc613f2673d2496642322fabec32dc2b0c21b (diff) | |
| download | librambutan-176b6160418a667a86790165fa6a638d16fa8243.tar.gz librambutan-176b6160418a667a86790165fa6a638d16fa8243.zip | |
timer: Shortening long names.
Various names in timer.h were too unwieldy. Making these slightly
more bearable.
Diffstat (limited to 'libmaple/timer.c')
| -rw-r--r-- | libmaple/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmaple/timer.c b/libmaple/timer.c index 811e407..220a543 100644 --- a/libmaple/timer.c +++ b/libmaple/timer.c @@ -221,7 +221,7 @@ void timer_attach_interrupt(timer_dev *dev, uint8 interrupt, voidFuncPtr handler) { dev->handlers[interrupt] = handler; - timer_enable_interrupt(dev, interrupt); + timer_enable_irq(dev, interrupt); enable_irq(dev, interrupt); } @@ -235,7 +235,7 @@ void timer_attach_interrupt(timer_dev *dev, * @see timer_channel */ void timer_detach_interrupt(timer_dev *dev, uint8 interrupt) { - timer_disable_interrupt(dev, interrupt); + timer_disable_irq(dev, interrupt); dev->handlers[interrupt] = NULL; } @@ -378,7 +378,7 @@ static void disable_channel(timer_dev *dev, uint8 channel) { } static void pwm_mode(timer_dev *dev, uint8 channel) { - timer_disable_interrupt(dev, channel); + timer_disable_irq(dev, channel); timer_oc_set_mode(dev, channel, TIMER_OC_MODE_PWM_1, TIMER_OC_PE); timer_cc_enable(dev, channel); } |