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

Revert "Uses ComputeDigitalMask function across HAL DIO (#837)" (#1005)

Browse Source 
This reverts commit c84bd744c8.
This commit is contained in:
Peter Johnson
2018-04-29 21:48:53 -07:00
committed by GitHub
parent c84bd744c8
commit a8fd88840d
3 changed files with 116 additions and 43 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,7 +10,6 @@
#include <support/mutex.h>
#include "HAL/ChipObject.h"
#include "HAL/DIO.h"
#include "HAL/Types.h"
namespace hal {
@@ -42,10 +41,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
/**
@@ -66,7 +65,7 @@ void UnsafeManipulateDIO(HAL_DigitalHandle handle, int32_t* status,
}
wpi::mutex& dioMutex = detail::UnsafeGetDIOMutex();
tDIO* dSys = detail::UnsafeGetDigialSystem();
auto mask = ComputeDigitalMask(port->channel);
auto mask = detail::ComputeDigitalMask(handle, status);
if (status != 0) return;
std::lock_guard<wpi::mutex> lock(dioMutex);