Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +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/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;