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

Uses ComputeDigitalMask function across HAL DIO (#837)

Browse Source 
less risk for errors in the future.
This commit is contained in:
Thad House
2018-04-29 21:12:15 -07:00
committed by Peter Johnson
parent 11b99a016a
commit c84bd744c8
3 changed files with 43 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hal/src/main/native/include/HAL/cpp/UnsafeDIO.h
View File

@@ -10,6 +10,7 @@
#include <support/mutex.h>
#include "HAL/ChipObject.h"
#include "HAL/DIO.h"
#include "HAL/Types.h"
namespace hal {
@@ -41,10 +42,10 @@ struct DIOSetProxy {
tDIO::tDO m_unsetOutputStateReg;
tDIO* m_dio;
};
int32_t ComputeDigitalMask(uint8_t channel);
namespace detail {
wpi::mutex& UnsafeGetDIOMutex();
tDIO* UnsafeGetDigialSystem();
int32_t ComputeDigitalMask(HAL_DigitalHandle handle, int32_t* status);
} // namespace detail
/**
@@ -65,7 +66,7 @@ void UnsafeManipulateDIO(HAL_DigitalHandle handle, int32_t* status,
}
wpi::mutex& dioMutex = detail::UnsafeGetDIOMutex();
tDIO* dSys = detail::UnsafeGetDigialSystem();
auto mask = detail::ComputeDigitalMask(handle, status);
auto mask = ComputeDigitalMask(port->channel);
if (status != 0) return;
std::lock_guard<wpi::mutex> lock(dioMutex);