eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

spi com if finished

Browse Source
This commit is contained in:
Robin Müller
2021-02-23 11:56:48 +01:00
committed by Robin Mueller
parent f9edcf089c
commit 0cf486b60e
5 changed files with 121 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
linux/spi/SpiComIF.cpp
View File

@@ -2,8 +2,6 @@
#include "spiDefinitions.h"
#include <linux/spi/SpiCookie.h>
#include <linux/utility/errorhandling.h>
#include <fsfw/ipc/MutexFactory.h>
#include <fcntl.h>
@@ -12,6 +10,7 @@
#include <linux/spi/spidev.h>
#include <errno.h>
#include <fsfw/ipc/MutexHelper.h>
#include <linux/utility/utility.h>
#include <cstring>
SpiComIF::SpiComIF(object_id_t objectId, GpioIF* gpioComIF): SystemObject(objectId),
@@ -81,9 +80,10 @@ ReturnValue_t SpiComIF::initializeInterface(CookieIF *cookie) {
spiCookie->getSpiParameters(spiMode, spiSpeed, &params);
int fileDescriptor = 0;
ReturnValue_t result = openDevice(spiCookie->getSpiDevice(), &fileDescriptor);
if(result != HasReturnvaluesIF::RETURN_OK) {
return result;
utility::UnixFileHelper fileHelper(spiCookie->getSpiDevice(), &fileDescriptor, O_RDWR,
"SpiComIF::initializeInterface: ");
if(fileHelper.getOpenResult() != HasReturnvaluesIF::RETURN_OK) {
return fileHelper.getOpenResult();
}
int retval = ioctl(fileDescriptor, SPI_IOC_WR_MODE, spiSpeed);
@@ -138,6 +138,7 @@ ReturnValue_t SpiComIF::initializeInterface(CookieIF *cookie) {
ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, size_t sendLen) {
SpiCookie* spiCookie = dynamic_cast<SpiCookie*>(cookie);
ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
if(spiCookie == nullptr) {
return HasReturnvaluesIF::RETURN_FAILED;
}
@@ -160,9 +161,10 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s
spiCookie->assignTransferSize(sendLen);
int fileDescriptor = 0;
std::string device = spiCookie->getSpiDevice();
ReturnValue_t result = openDevice(device, &fileDescriptor);
if(result != HasReturnvaluesIF::RETURN_OK) {
return result;
utility::UnixFileHelper fileHelper(device, &fileDescriptor, O_RDWR,
"SpiComIF::sendMessage: ");
if(fileHelper.getOpenResult() != HasReturnvaluesIF::RETURN_OK) {
return OPENING_FILE_FAILED;
}
bool fullDuplex = spiCookie->isFullDuplex();
@@ -180,8 +182,7 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s
retval = ioctl(fileDescriptor, SPI_IOC_MESSAGE(1), spiCookie->getTransferStructHandle());
if(retval != 0) {
utility::handleIoctlError("SpiComIF::sendMessage: ioctl error.");
/* TODO: Better returnvalue */
return HasReturnvaluesIF::RETURN_FAILED;
result = FULL_DUPLEX_TRANSFER_FAILED;
}
}
else {
@@ -189,15 +190,14 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s
if (write(fileDescriptor, sendData, sendLen) != static_cast<ssize_t>(sendLen)) {
sif::warning << "SpiComIF::sendMessage: Half-Duplex write operation failed!" <<
std::endl;
/* TODO: Better returnvalue */
return HasReturnvaluesIF::RETURN_FAILED;
result = HALF_DUPLEX_TRANSFER_FAILED;
}
}
if(gpioId != gpio::NO_GPIO) {
gpioComIF->pullHigh(gpioId);
}
return HasReturnvaluesIF::RETURN_OK;
return result;
}
ReturnValue_t SpiComIF::getSendSuccess(CookieIF *cookie) {
@@ -205,6 +205,7 @@ ReturnValue_t SpiComIF::getSendSuccess(CookieIF *cookie) {
}
ReturnValue_t SpiComIF::requestReceiveMessage(CookieIF *cookie, size_t requestLen) {
ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
SpiCookie* spiCookie = dynamic_cast<SpiCookie*>(cookie);
if(spiCookie == nullptr) {
return HasReturnvaluesIF::RETURN_FAILED;
@@ -217,9 +218,10 @@ ReturnValue_t SpiComIF::requestReceiveMessage(CookieIF *cookie, size_t requestLe
std::string device = spiCookie->getSpiDevice();
int fileDescriptor = 0;
ReturnValue_t result = openDevice(device, &fileDescriptor);
if(result != HasReturnvaluesIF::RETURN_OK) {
return result;
utility::UnixFileHelper fileHelper(device, &fileDescriptor, O_RDWR,
"SpiComIF::requestReceiveMessage: ");
if(fileHelper.getOpenResult() != HasReturnvaluesIF::RETURN_OK) {
return OPENING_FILE_FAILED;
}
uint8_t* rxBuf = nullptr;
@@ -237,9 +239,11 @@ ReturnValue_t SpiComIF::requestReceiveMessage(CookieIF *cookie, size_t requestLe
if(read(fileDescriptor, rxBuf, readSize) != static_cast<ssize_t>(readSize)) {
sif::warning << "SpiComIF::sendMessage: Half-Duplex read operation failed!" << std::endl;
if(gpioId != gpio::NO_GPIO) {
gpioComIF->pullHigh(gpioId);
}
result = HALF_DUPLEX_TRANSFER_FAILED;
}
if(gpioId != gpio::NO_GPIO) {
gpioComIF->pullHigh(gpioId);
}
return HasReturnvaluesIF::RETURN_OK;
@@ -261,33 +265,6 @@ ReturnValue_t SpiComIF::readReceivedMessage(CookieIF *cookie, uint8_t **buffer,
return HasReturnvaluesIF::RETURN_OK;
}
ReturnValue_t SpiComIF::openDevice(std::string deviceFile, int *fileDescriptor, bool nonBlocking) {
if(fileDescriptor == nullptr) {
return HasReturnvaluesIF::RETURN_FAILED;
}
int flags = O_RDWR;
if(nonBlocking) {
flags |= O_NONBLOCK;
}
*fileDescriptor = open(deviceFile.c_str(), flags);
if (*fileDescriptor < 0) {
#if FSFW_VERBOSE_LEVEL >= 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "SpiComIF: Opening SPI device failed with error code " << errno << "." <<
std::endl;
sif::warning << "Error description: " << strerror(errno) << std::endl;
#else
sif::printError("SpiComIF: Opening SPI device failed with error code %d.\n");
sif::printWarning("Error description: %s\n", strerror(errno));
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
#endif /* FSFW_VERBOSE_LEVEL >= 1 */
return HasReturnvaluesIF::RETURN_FAILED;
}
return HasReturnvaluesIF::RETURN_OK;
}
ReturnValue_t SpiComIF::getReadBuffer(address_t spiAddress, uint8_t** buffer) {
if(buffer == nullptr) {
return HasReturnvaluesIF::RETURN_FAILED;