Switch from GPLv2 to GPLv2+

[fw/altos] / src / cc1111 / ao_exti.h

diff --git a/src/cc1111/ao_exti.h b/src/cc1111/ao_exti.h
index 00d99a2b2a65e4291ed67c0bbcb28232ce081570..927a4f098a04e22661f420f9278b1d14ec9bd0b9 100644 (file)
--- a/src/cc1111/ao_exti.h
+++ b/src/cc1111/ao_exti.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,19 +40,18 @@ extern void         (*ao_int_callback)(void);
                ao_int_callback = callback;             \
        } while (0)
 
-#define ao_exti_init() do {                    \
-               IEN1 &= IEN1_P0IE;              \
-               PICTL |= PICTL_P0IENL;          \
-       } while (0)
+#define ao_exti_init()
 
 #define ao_exti_enable(port, pin) do {         \
                P0IFG &= ~(1 << pin);           \
                P0IF = 0;                       \
+               PICTL |= PICTL_P0IENL;          \
                IEN1 |= IEN1_P0IE;              \
        } while (0)
 
 #define ao_exti_disable(port, pin) do {                \
                IEN1 &= ~IEN1_P0IE;             \
+               PICTL &= ~PICTL_P0IENL;         \
        } while (0)
 
 #endif /* _AO_EXTI_H_ */