diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2012-09-03 18:29:45 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-09-03 18:29:45 -0400 |
commit | 5a5aee7906b5c11a38d2a71fc2e8849f2afae4bc (patch) | |
tree | dfbbf24f499ca6dee1ad40a4639a196d502805c4 /libmaple/include | |
parent | 359117bc2009a9302884f61b0b359bb1723ee0bd (diff) | |
parent | 9b8d7c508f9ff0633b5ab8acf9e64bee891604dc (diff) | |
download | librambutan-5a5aee7906b5c11a38d2a71fc2e8849f2afae4bc.tar.gz librambutan-5a5aee7906b5c11a38d2a71fc2e8849f2afae4bc.zip |
Merge branch 'callback_interrupt_handlers'
Diffstat (limited to 'libmaple/include')
-rw-r--r-- | libmaple/include/libmaple/exti.h | 5 | ||||
-rw-r--r-- | libmaple/include/libmaple/libmaple_types.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libmaple/include/libmaple/exti.h b/libmaple/include/libmaple/exti.h index 3800b4a..1d201ac 100644 --- a/libmaple/include/libmaple/exti.h +++ b/libmaple/include/libmaple/exti.h @@ -115,6 +115,11 @@ void exti_attach_interrupt(exti_num num, exti_cfg port, voidFuncPtr handler, exti_trigger_mode mode); +void exti_attach_callback(exti_num num, + exti_cfg port, + voidArgumentFuncPtr handler, + void *arg, + exti_trigger_mode mode); void exti_detach_interrupt(exti_num num); /** diff --git a/libmaple/include/libmaple/libmaple_types.h b/libmaple/include/libmaple/libmaple_types.h index 9e1fbb3..60dd2ff 100644 --- a/libmaple/include/libmaple/libmaple_types.h +++ b/libmaple/include/libmaple/libmaple_types.h @@ -48,6 +48,7 @@ typedef int int32; typedef long long int64; typedef void (*voidFuncPtr)(void); +typedef void (*voidArgumentFuncPtr)(void *); #define __io volatile #define __attr_flash __attribute__((section (".USER_FLASH"))) |