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

Adds a const buffer listener (#742)

Browse Source 
Replaces need for const_cast in SPI and I2C functions
This commit is contained in:
Thad House
2017-11-17 10:01:49 -08:00
committed by Peter Johnson
parent a20474bfc7
commit cd1dbb1e3a
10 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hal/src/main/native/sim/MockData/I2CData.cpp
View File

@@ -80,7 +80,7 @@ void I2CData::CancelReadCallback(int32_t uid) {
m_readCallbacks = CancelCallback(m_readCallbacks, uid);
}
int32_t I2CData::RegisterWriteCallback(HAL_BufferCallback callback,
int32_t I2CData::RegisterWriteCallback(HAL_ConstBufferCallback callback,
void* param) {
// Must return -1 on a null callback for error handling
if (callback == nullptr) return -1;
@@ -141,7 +141,7 @@ void HALSIM_CancelI2CReadCallback(int32_t index, int32_t uid) {
}
int32_t HALSIM_RegisterI2CWriteCallback(int32_t index,
HAL_BufferCallback callback,
HAL_ConstBufferCallback callback,
void* param) {
return SimI2CData[index].RegisterWriteCallback(callback, param);
}

4
hal/src/main/native/sim/MockData/I2CDataInternal.h
View File

@@ -32,7 +32,7 @@ class I2CData {
int32_t RegisterReadCallback(HAL_BufferCallback callback, void* param);
void CancelReadCallback(int32_t uid);
int32_t RegisterWriteCallback(HAL_BufferCallback callback, void* param);
int32_t RegisterWriteCallback(HAL_ConstBufferCallback callback, void* param);
void CancelWriteCallback(int32_t uid);
void Write(int32_t deviceAddress, const uint8_t* dataToSend,
@@ -47,7 +47,7 @@ class I2CData {
std::atomic<HAL_Bool> m_initialized{false};
std::shared_ptr<NotifyListenerVector> m_initializedCallbacks = nullptr;
std::shared_ptr<BufferListenerVector> m_readCallbacks = nullptr;
std::shared_ptr<BufferListenerVector> m_writeCallbacks = nullptr;
std::shared_ptr<ConstBufferListenerVector> m_writeCallbacks = nullptr;
};
extern I2CData SimI2CData[];
} // namespace hal

27
hal/src/main/native/sim/MockData/NotifyCallbackHelpers.cpp
View File

@@ -83,3 +83,30 @@ void InvokeCallback(std::shared_ptr<BufferListenerVector> currentVector,
listener.callback(name, listener.param, buffer, count);
}
}
std::shared_ptr<ConstBufferListenerVector> RegisterCallback(
std::shared_ptr<ConstBufferListenerVector> currentVector, const char* name,
HAL_ConstBufferCallback callback, void* param, int32_t* newUid) {
return RegisterCallbackImpl<ConstBufferListenerVector,
HAL_ConstBufferCallback>(currentVector, name,
callback, param, newUid);
}
std::shared_ptr<ConstBufferListenerVector> CancelCallback(
std::shared_ptr<ConstBufferListenerVector> currentVector, int32_t uid) {
return CancelCallbackImpl<ConstBufferListenerVector, HAL_ConstBufferCallback>(
currentVector, uid);
}
void InvokeCallback(std::shared_ptr<ConstBufferListenerVector> currentVector,
const char* name, const uint8_t* buffer, int32_t count) {
// Return if no callbacks are assigned
if (currentVector == nullptr) return;
// Get a copy of the shared_ptr, then iterate and callback listeners
auto newCallbacks = currentVector;
for (size_t i = 0; i < newCallbacks->size(); ++i) {
if (!(*newCallbacks)[i]) continue; // removed
auto listener = (*newCallbacks)[i];
listener.callback(name, listener.param, buffer, count);
}
}

12
hal/src/main/native/sim/MockData/NotifyCallbackHelpers.h
View File

@@ -30,3 +30,15 @@ std::shared_ptr<hal::BufferListenerVector> CancelCallback(
void InvokeCallback(std::shared_ptr<hal::BufferListenerVector> currentVector,
const char* name, uint8_t* buffer, int32_t count);
std::shared_ptr<hal::ConstBufferListenerVector> RegisterCallback(
std::shared_ptr<hal::ConstBufferListenerVector> currentVector,
const char* name, HAL_ConstBufferCallback callback, void* param,
int32_t* newUid);
std::shared_ptr<hal::ConstBufferListenerVector> CancelCallback(
std::shared_ptr<hal::ConstBufferListenerVector> currentVector, int32_t uid);
void InvokeCallback(
std::shared_ptr<hal::ConstBufferListenerVector> currentVector,
const char* name, const uint8_t* buffer, int32_t count);

4
hal/src/main/native/sim/MockData/SPIData.cpp
View File

@@ -82,7 +82,7 @@ void SPIData::CancelReadCallback(int32_t uid) {
m_readCallbacks = CancelCallback(m_readCallbacks, uid);
}
int32_t SPIData::RegisterWriteCallback(HAL_BufferCallback callback,
int32_t SPIData::RegisterWriteCallback(HAL_ConstBufferCallback callback,
void* param) {
// Must return -1 on a null callback for error handling
if (callback == nullptr) return -1;
@@ -219,7 +219,7 @@ void HALSIM_CancelSPIReadCallback(int32_t index, int32_t uid) {
}
int32_t HALSIM_RegisterSPIWriteCallback(int32_t index,
HAL_BufferCallback callback,
HAL_ConstBufferCallback callback,
void* param) {
return SimSPIData[index].RegisterWriteCallback(callback, param);
}

4
hal/src/main/native/sim/MockData/SPIDataInternal.h
View File

@@ -32,7 +32,7 @@ class SPIData {
int32_t RegisterReadCallback(HAL_BufferCallback callback, void* param);
void CancelReadCallback(int32_t uid);
int32_t RegisterWriteCallback(HAL_BufferCallback callback, void* param);
int32_t RegisterWriteCallback(HAL_ConstBufferCallback callback, void* param);
void CancelWriteCallback(int32_t uid);
int32_t RegisterResetAccumulatorCallback(HAL_NotifyCallback callback,
@@ -61,7 +61,7 @@ class SPIData {
std::atomic<int64_t> m_accumulatorValue{false};
std::shared_ptr<NotifyListenerVector> m_initializedCallbacks = nullptr;
std::shared_ptr<BufferListenerVector> m_readCallbacks = nullptr;
std::shared_ptr<BufferListenerVector> m_writeCallbacks = nullptr;
std::shared_ptr<ConstBufferListenerVector> m_writeCallbacks = nullptr;
std::shared_ptr<NotifyListenerVector> m_resetAccumulatorCallback = nullptr;
std::shared_ptr<NotifyListenerVector> m_setAccumulatorCallback = nullptr;
};