diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-08-03 12:27:18 -0400 | 
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-08-03 17:34:03 -0400 | 
| commit | 1b85253f861967e97690d161633834e835a55ef1 (patch) | |
| tree | 14d09de087ee692c289aaa4022fdafa81822ea31 | |
| parent | ee083072a08527bf2abb59366b06c273dcf4ecf7 (diff) | |
| download | librambutan-1b85253f861967e97690d161633834e835a55ef1.tar.gz librambutan-1b85253f861967e97690d161633834e835a55ef1.zip  | |
exti.c: Clean up some bit-banding usages.
| -rw-r--r-- | libmaple/exti.c | 18 | 
1 files changed, 9 insertions, 9 deletions
diff --git a/libmaple/exti.c b/libmaple/exti.c index 4999746..a3a2db7 100644 --- a/libmaple/exti.c +++ b/libmaple/exti.c @@ -100,14 +100,14 @@ void exti_attach_interrupt(afio_exti_num num,      /* Set trigger mode */      switch (mode) {      case EXTI_RISING: -        *bb_perip(&EXTI_BASE->RTSR, num) = 1; +        bb_peri_set_bit(&EXTI_BASE->RTSR, num, 1);          break;      case EXTI_FALLING: -        *bb_perip(&EXTI_BASE->FTSR, num) = 1; +        bb_peri_set_bit(&EXTI_BASE->FTSR, num, 1);          break;      case EXTI_RISING_FALLING: -        *bb_perip(&EXTI_BASE->RTSR, num) = 1; -        *bb_perip(&EXTI_BASE->FTSR, num) = 1; +        bb_peri_set_bit(&EXTI_BASE->RTSR, num, 1); +        bb_peri_set_bit(&EXTI_BASE->FTSR, num, 1);          break;      } @@ -115,7 +115,7 @@ void exti_attach_interrupt(afio_exti_num num,      afio_exti_select(num, port);      /* Unmask external interrupt request */ -    *bb_perip(&EXTI_BASE->IMR, num) = 1; +    bb_peri_set_bit(&EXTI_BASE->IMR, num, 1);      /* Enable the interrupt line */      enable_irq(num); @@ -128,11 +128,11 @@ void exti_attach_interrupt(afio_exti_num num,   */  void exti_detach_interrupt(afio_exti_num num) {      /* First, mask the interrupt request */ -    *bb_perip(&EXTI_BASE->IMR, num) = 0; +    bb_peri_set_bit(&EXTI_BASE->IMR, num, 0);      /* Then, clear the trigger selection registers */ -    *bb_perip(&EXTI_BASE->FTSR, num) = 0; -    *bb_perip(&EXTI_BASE->RTSR, num) = 0; +    bb_peri_set_bit(&EXTI_BASE->FTSR, num, 0); +    bb_peri_set_bit(&EXTI_BASE->RTSR, num, 0);      /* Next, disable the IRQ, unless it's multiplexed and there are       * other active external interrupts on the same IRQ line */ @@ -221,7 +221,7 @@ static inline void dispatch_handler(uint32 exti_num) {  }  static inline void clear_pending(uint32 exti_num) { -    *bb_perip(&EXTI_BASE->PR, exti_num) = 1; +    EXTI_BASE->PR = 1 << exti_num;  }  static inline void enable_irq(afio_exti_num exti) {  | 
