From f363d0fbd54fcc6b93f7475777543bbb1ad41ec6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 24 May 2021 19:11:01 +0200 Subject: [PATCH] com if passed to callback as well --- linux/spi/SpiComIF.cpp | 8 ++++---- linux/spi/spiDefinitions.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/linux/spi/SpiComIF.cpp b/linux/spi/SpiComIF.cpp index 494c112..68ae6da 100644 --- a/linux/spi/SpiComIF.cpp +++ b/linux/spi/SpiComIF.cpp @@ -165,13 +165,14 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s void* funcArgs = nullptr; spiCookie->getCallback(&sendFunc, &funcArgs); if(sendFunc != nullptr) { - result = sendFunc(spiCookie, sendData, sendLen, funcArgs); + result = sendFunc(this, spiCookie, sendData, sendLen, funcArgs); } } return result; } -ReturnValue_t SpiComIF::performRegularSendOperation(SpiCookie *spiCookie, const uint8_t *sendData, size_t sendLen) { +ReturnValue_t SpiComIF::performRegularSendOperation(SpiCookie *spiCookie, const uint8_t *sendData, + size_t sendLen) { ReturnValue_t result = HasReturnvaluesIF::RETURN_OK; int retval = 0; /* Prepare transfer */ @@ -265,8 +266,7 @@ ReturnValue_t SpiComIF::requestReceiveMessage(CookieIF *cookie, size_t requestLe return NULLPOINTER; } - bool fullDuplex = spiCookie->isFullDuplex(); - if(fullDuplex) { + if(spiCookie->isFullDuplex()) { return HasReturnvaluesIF::RETURN_OK; } diff --git a/linux/spi/spiDefinitions.h b/linux/spi/spiDefinitions.h index ff6d66d..ee56f6d 100644 --- a/linux/spi/spiDefinitions.h +++ b/linux/spi/spiDefinitions.h @@ -9,6 +9,7 @@ #include class SpiCookie; +class SpiComIF; namespace spi { @@ -25,7 +26,8 @@ enum SpiComIfModes { }; -using send_callback_function_t = ReturnValue_t (*) (SpiCookie *cookie, const uint8_t *sendData, size_t sendLen, void* args); +using send_callback_function_t = ReturnValue_t (*) (SpiComIF* comIf, SpiCookie *cookie, + const uint8_t *sendData, size_t sendLen, void* args); }