Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves the DS new data wait calls down to the HAL. (#156)

Browse Source
This commit is contained in:
Thad House
2016-07-10 23:10:05 -07:00
committed by Peter Johnson
parent 0cb288ffba
commit 4a98e68815
12 changed files with 28 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpilibj/src/athena/cpp/lib/HAL.cpp
View File

@@ -274,14 +274,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxisType(JNIEnv*, jclass,
/*
* Class: edu_wpi_first_wpilibj_hal_HAL
* Method: HALSetNewDataSem
* Signature: (J)V
* Method: HAL_waitForDSData
* Signature: ()V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_wpilibj_hal_HAL_setNewDataSem(JNIEnv* env, jclass,
jlong id) {
NETCOMM_LOG(logDEBUG) << "Mutex Ptr = " << (void *)id;
HAL_SetNewDataSem((MULTIWAIT_ID)id);
Java_edu_wpi_first_wpilibj_hal_HAL_waitForDSData(JNIEnv* env, jclass) {
HAL_WaitForDSData();
}
/*

74
wpilibj/src/athena/cpp/lib/HALUtil.cpp
View File

@@ -372,80 +372,6 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
jvm = nullptr;
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: initializeMutex
* Signature: (I)J
*/
JNIEXPORT jlong JNICALL
Java_edu_wpi_first_wpilibj_hal_HALUtil_initializeMutexNormal(
JNIEnv *env, jclass) {
HALUTIL_LOG(logDEBUG) << "Calling HALUtil initializeMutex";
MUTEX_ID mutex = HAL_InitializeMutexNormal();
HALUTIL_LOG(logDEBUG) << "Mutex Ptr = " << mutex;
return (jlong)mutex;
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: deleteMutex
* Signature: (J)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_HALUtil_deleteMutex(
JNIEnv *env, jclass, jlong id) {
HALUTIL_LOG(logDEBUG) << "Calling HALUtil deleteMutex";
HALUTIL_LOG(logDEBUG) << "Mutex Ptr = " << (MUTEX_ID)id;
HAL_DeleteMutex((MUTEX_ID)id);
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: takeMutex
* Signature: (JI)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_HALUtil_takeMutex(
JNIEnv *env, jclass, jlong id) {
// HALUTIL_LOG(logDEBUG) << "Calling HALUtil takeMutex";
// HALUTIL_LOG(logDEBUG) << "Mutex Ptr = " << (MUTEX_ID)id;
HAL_TakeMutex((MUTEX_ID)id);
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: initializeMultiWait
* Signature: ()J
*/
JNIEXPORT jlong JNICALL
Java_edu_wpi_first_wpilibj_hal_HALUtil_initializeMultiWait(
JNIEnv *env, jclass) {
HALUTIL_LOG(logDEBUG) << "Calling HALUtil initializeMultiWait";
MULTIWAIT_ID multiWait = HAL_InitializeMultiWait();
HALUTIL_LOG(logDEBUG) << "MultiWait Ptr = " << multiWait;
return (jlong)multiWait;
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: deleteMultiWait
* Signature: (J)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_HALUtil_deleteMultiWait(
JNIEnv *env, jclass, jlong id) {
HALUTIL_LOG(logDEBUG) << "Calling HALUtil deleteMultiWait";
HALUTIL_LOG(logDEBUG) << "MultiWait Ptr = " << (MULTIWAIT_ID)id;
HAL_DeleteMultiWait((MULTIWAIT_ID)id);
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: takeMultiWait
* Signature: (JJ)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_HALUtil_takeMultiWait(
JNIEnv *env, jclass, jlong multiWaitId, jlong mutexId) {
HAL_TakeMultiWait((MULTIWAIT_ID)multiWaitId, (MUTEX_ID)mutexId);
}
/*
* Class: edu_wpi_first_wpilibj_hal_HALUtil
* Method: getFPGAVersion