From a1863ec1f514b4900f68bbd8fa6a60e2688175a2 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Fri, 7 Sep 2012 11:42:51 -0700 Subject: [PATCH] AP_HAL_AVR ISRRegistry: use AP_HAL::Proc types instead of private typedef --- libraries/AP_HAL_AVR/utility/ISRRegistry.cpp | 4 ++-- libraries/AP_HAL_AVR/utility/ISRRegistry.h | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL_AVR/utility/ISRRegistry.cpp b/libraries/AP_HAL_AVR/utility/ISRRegistry.cpp index 49aba388ab..cee7915054 100644 --- a/libraries/AP_HAL_AVR/utility/ISRRegistry.cpp +++ b/libraries/AP_HAL_AVR/utility/ISRRegistry.cpp @@ -6,9 +6,9 @@ using namespace AP_HAL_AVR; -proc_ptr ISRRegistry::_registry[ISR_REGISTRY_NUM_SLOTS] = {NULL}; +AP_HAL::Proc ISRRegistry::_registry[ISR_REGISTRY_NUM_SLOTS] = {NULL}; -int ISRRegistry::register_signal(int signal, proc_ptr proc) +int ISRRegistry::register_signal(int signal, AP_HAL::Proc proc) { if (signal >= 0 && signal < ISR_REGISTRY_NUM_SLOTS) { _registry[signal] = proc; diff --git a/libraries/AP_HAL_AVR/utility/ISRRegistry.h b/libraries/AP_HAL_AVR/utility/ISRRegistry.h index 3882776d8d..3940d2d16e 100644 --- a/libraries/AP_HAL_AVR/utility/ISRRegistry.h +++ b/libraries/AP_HAL_AVR/utility/ISRRegistry.h @@ -3,6 +3,7 @@ #ifndef __AP_HAL_AVR_ISR_REGISTRY_H__ #define __AP_HAL_AVR_ISR_REGISTRY_H__ +#include #include "AP_HAL_AVR_Namespace.h" #define ISR_REGISTRY_TIMER2_OVF 0 @@ -10,14 +11,12 @@ #define ISR_REGISTRY_TIMER5_CAPT 2 #define ISR_REGISTRY_NUM_SLOTS 3 -typedef void (*proc_ptr)(void); - class AP_HAL_AVR::ISRRegistry { public: - int register_signal(int isr_number, proc_ptr proc); + int register_signal(int isr_number, AP_HAL::Proc proc); int unregister_signal(int isr_number); - static proc_ptr _registry[ISR_REGISTRY_NUM_SLOTS]; + static AP_HAL::Proc _registry[ISR_REGISTRY_NUM_SLOTS]; }; #endif // __AP_HAL_AVR_ISR_REGISTRY_H__