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

Fixes missing Extern "C" from HAL Threads (#437)

Browse Source 
Also fixes incorrect return value during set
This commit is contained in:
Thad House
2017-01-02 00:43:12 -08:00
committed by Peter Johnson
parent 182f57216f
commit 64eab1f7b3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/include/HAL/Threads.h
View File

@@ -17,6 +17,7 @@
#define NativeThreadHandle const pthread_t*
#endif
extern "C" {
int32_t HAL_GetThreadPriority(NativeThreadHandle handle, HAL_Bool* isRealTime,
int32_t* status);
int32_t HAL_GetCurrentThreadPriority(HAL_Bool* isRealTime, int32_t* status);
@@ -24,3 +25,4 @@ HAL_Bool HAL_SetThreadPriority(NativeThreadHandle handle, HAL_Bool realTime,
int32_t priority, int32_t* status);
HAL_Bool HAL_SetCurrentThreadPriority(HAL_Bool realTime, int32_t priority,
int32_t* status);
}

6
hal/lib/athena/Threads.cpp
View File

@@ -12,6 +12,7 @@
#include "HAL/Errors.h"
extern "C" {
/**
* Get the thread priority for the specified thread.
*
@@ -94,10 +95,10 @@ HAL_Bool HAL_SetThreadPriority(NativeThreadHandle handle, HAL_Bool realTime,
sch.sched_priority = 0;
if (pthread_setschedparam(*handle, scheduler, &sch)) {
*status = HAL_THREAD_PRIORITY_ERROR;
return true;
return false;
} else {
*status = 0;
return false;
return true;
}
}
@@ -118,3 +119,4 @@ HAL_Bool HAL_SetCurrentThreadPriority(HAL_Bool realTime, int32_t priority,
auto thread = pthread_self();
return HAL_SetThreadPriority(&thread, realTime, priority, status);
}
}