KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2021-08-10 11:07:58 +02:00
commit c6d80a5c81
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hal/src/fsfw_hal/linux/uart/UartComIF.cpp
View File

@ -453,9 +453,12 @@ ReturnValue_t UartComIF::flushUartRxBuffer(CookieIF *cookie) {
} }
deviceFile = uartCookie->getDeviceFile(); deviceFile = uartCookie->getDeviceFile();
uartDeviceMapIter = uartDeviceMap.find(deviceFile); uartDeviceMapIter = uartDeviceMap.find(deviceFile);
int fd = uartDeviceMapIter->second.fileDescriptor; if(uartDeviceMapIter != uartDeviceMap.end()) {
tcflush(fd, TCIFLUSH); int fd = uartDeviceMapIter->second.fileDescriptor;
return RETURN_OK; tcflush(fd, TCIFLUSH);
return RETURN_OK;
}
return RETURN_FAILED;
} }
ReturnValue_t UartComIF::flushUartTxBuffer(CookieIF *cookie) { ReturnValue_t UartComIF::flushUartTxBuffer(CookieIF *cookie) {
@ -468,9 +471,12 @@ ReturnValue_t UartComIF::flushUartTxBuffer(CookieIF *cookie) {
} }
deviceFile = uartCookie->getDeviceFile(); deviceFile = uartCookie->getDeviceFile();
uartDeviceMapIter = uartDeviceMap.find(deviceFile); uartDeviceMapIter = uartDeviceMap.find(deviceFile);
int fd = uartDeviceMapIter->second.fileDescriptor; if(uartDeviceMapIter != uartDeviceMap.end()) {
tcflush(fd, TCOFLUSH); int fd = uartDeviceMapIter->second.fileDescriptor;
return RETURN_OK; tcflush(fd, TCOFLUSH);
return RETURN_OK;
}
return RETURN_FAILED;
} }
ReturnValue_t UartComIF::flushUartTxAndRxBuf(CookieIF *cookie) { ReturnValue_t UartComIF::flushUartTxAndRxBuf(CookieIF *cookie) {
@ -483,9 +489,12 @@ ReturnValue_t UartComIF::flushUartTxAndRxBuf(CookieIF *cookie) {
} }
deviceFile = uartCookie->getDeviceFile(); deviceFile = uartCookie->getDeviceFile();
uartDeviceMapIter = uartDeviceMap.find(deviceFile); uartDeviceMapIter = uartDeviceMap.find(deviceFile);
int fd = uartDeviceMapIter->second.fileDescriptor; if(uartDeviceMapIter != uartDeviceMap.end()) {
tcflush(fd, TCIOFLUSH); int fd = uartDeviceMapIter->second.fileDescriptor;
return RETURN_OK; tcflush(fd, TCIOFLUSH);
return RETURN_OK;
}
return RETURN_FAILED;
} }
void UartComIF::setUartMode(struct termios *options, UartCookie &uartCookie) { void UartComIF::setUartMode(struct termios *options, UartCookie &uartCookie) {