Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switches notifier to use a typedef for the callback, and prepends HAL_ to InterruptHandlerFunction (#216)

Browse Source
This commit is contained in:
Thad House
2016-09-05 07:31:51 -07:00
committed by Peter Johnson
parent 028efff50d
commit 59ec54887d
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hal/include/HAL/Interrupts.h
View File

@@ -15,8 +15,8 @@
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*InterruptHandlerFunction)(uint32_t interruptAssertedMask,
void* param);
typedef void (*HAL_InterruptHandlerFunction)(uint32_t interruptAssertedMask,
void* param);
HAL_InterruptHandle HAL_InitializeInterrupts(HAL_Bool watcher, int32_t* status);
void HAL_CleanInterrupts(HAL_InterruptHandle interruptHandle, int32_t* status);
@@ -36,8 +36,8 @@ void HAL_RequestInterrupts(HAL_InterruptHandle interruptHandle,
HAL_AnalogTriggerType analogTriggerType,
int32_t* status);
void HAL_AttachInterruptHandler(HAL_InterruptHandle interruptHandle,
InterruptHandlerFunction handler, void* param,
int32_t* status);
HAL_InterruptHandlerFunction handler,
void* param, int32_t* status);
void HAL_SetInterruptUpSourceEdge(HAL_InterruptHandle interruptHandle,
HAL_Bool risingEdge, HAL_Bool fallingEdge,
int32_t* status);

5
hal/include/HAL/Notifier.h
View File

@@ -14,7 +14,10 @@
#ifdef __cplusplus
extern "C" {
#endif
HAL_NotifierHandle HAL_InitializeNotifier(void (*process)(uint64_t, HAL_NotifierHandle),
typedef void (*HAL_NotifierProcessFunction)(uint64_t currentTime,
HAL_NotifierHandle handle);
HAL_NotifierHandle HAL_InitializeNotifier(HAL_NotifierProcessFunction process,
void* param, int32_t* status);
void HAL_CleanNotifier(HAL_NotifierHandle notifierHandle, int32_t* status);
void* HAL_GetNotifierParam(HAL_NotifierHandle notifierHandle, int32_t* status);

4
hal/lib/athena/Interrupts.cpp
View File

@@ -171,8 +171,8 @@ void HAL_RequestInterrupts(HAL_InterruptHandle interruptHandle,
}
void HAL_AttachInterruptHandler(HAL_InterruptHandle interruptHandle,
InterruptHandlerFunction handler, void* param,
int32_t* status) {
HAL_InterruptHandlerFunction handler,
void* param, int32_t* status) {
auto anInterrupt = interruptHandles.Get(interruptHandle);
if (anInterrupt == nullptr) {
*status = HAL_HANDLE_ERROR;

8
hal/lib/athena/Notifier.cpp
View File

@@ -32,7 +32,7 @@ namespace {
struct Notifier {
std::shared_ptr<Notifier> prev, next;
void* param;
void (*process)(uint64_t, HAL_NotifierHandle);
HAL_NotifierProcessFunction process;
uint64_t triggerTime = UINT64_MAX;
HAL_NotifierHandle handle;
};
@@ -110,7 +110,7 @@ static void cleanupNotifierAtExit() {
extern "C" {
HAL_NotifierHandle HAL_InitializeNotifier(void (*process)(uint64_t, HAL_NotifierHandle),
HAL_NotifierHandle HAL_InitializeNotifier(HAL_NotifierProcessFunction process,
void* param, int32_t* status) {
if (!process) {
*status = NULL_PARAMETER;
@@ -134,8 +134,8 @@ HAL_NotifierHandle HAL_InitializeNotifier(void (*process)(uint64_t, HAL_Notifier
std::shared_ptr<Notifier> notifier = std::make_shared<Notifier>();
HAL_NotifierHandle handle = notifierHandles.Allocate(notifier);
if (handle == HAL_kInvalidHandle) {
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
*status = HAL_HANDLE_ERROR;
return HAL_kInvalidHandle;
}
// create notifier structure and add to list
notifier->next = notifiers;

2
wpilibc/athena/include/InterruptableSensorBase.h
View File

@@ -27,7 +27,7 @@ class InterruptableSensorBase : public SensorBase {
virtual HAL_Handle GetPortHandleForRouting() const = 0;
virtual AnalogTriggerType GetAnalogTriggerTypeForRouting() const = 0;
virtual void RequestInterrupts(
InterruptHandlerFunction handler,
HAL_InterruptHandlerFunction handler,
void* param); ///< Asynchronus handler version.
virtual void RequestInterrupts(); ///< Synchronus Wait version.
virtual void

2
wpilibc/athena/src/InterruptableSensorBase.cpp
View File

@@ -22,7 +22,7 @@ InterruptableSensorBase::InterruptableSensorBase() {}
* thread. The default is interrupt on rising edges only.
*/
void InterruptableSensorBase::RequestInterrupts(
InterruptHandlerFunction handler, void* param) {
HAL_InterruptHandlerFunction handler, void* param) {
if (StatusIsFatal()) return;
wpi_assert(m_interrupt == HAL_kInvalidHandle);