ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced rx_avail with pending_bytes

pull/7619/head
mudassar-ublox 2018-08-15 16:54:40 +05:00
parent f9aaee55dd
commit f512668230
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.cpp
View File

@ -55,7 +55,6 @@ void UBLOX_AT_CellularStack::UUSORD_URC()
socket = find_socket(a); socket = find_socket(a);
if (socket != NULL) { if (socket != NULL) {
socket->rx_avail = true;
socket->pending_bytes = b; socket->pending_bytes = b;
// No debug prints here as they can affect timing // No debug prints here as they can affect timing
// and cause data loss in UARTSerial // and cause data loss in UARTSerial
@ -76,7 +75,6 @@ void UBLOX_AT_CellularStack::UUSORF_URC()
socket = find_socket(a); socket = find_socket(a);
if (socket != NULL) { if (socket != NULL) {
socket->rx_avail = true;
socket->pending_bytes = b; socket->pending_bytes = b;
// No debug prints here as they can affect timing // No debug prints here as they can affect timing
// and cause data loss in UARTSerial // and cause data loss in UARTSerial
@ -198,7 +196,6 @@ nsapi_size_or_error_t UBLOX_AT_CellularStack::socket_sendto_impl(CellularSocket
fhs.events = POLLIN; fhs.events = POLLIN;
int pollCount; int pollCount;
socket->rx_avail = false;
if (socket->proto == NSAPI_UDP) { if (socket->proto == NSAPI_UDP) {
if (size > UBLOX_MAX_PACKET_SIZE) { if (size > UBLOX_MAX_PACKET_SIZE) {
return NSAPI_ERROR_PARAMETER; return NSAPI_ERROR_PARAMETER;
@ -273,9 +270,9 @@ nsapi_size_or_error_t UBLOX_AT_CellularStack::socket_recvfrom_impl(CellularSocke
int port = 0; int port = 0;
Timer timer; Timer timer;
if (!socket->rx_avail) { if (socket->pending_bytes == 0) {
_at.process_oob(); _at.process_oob();
if (!socket->rx_avail) { if (socket->pending_bytes == 0) {
return NSAPI_ERROR_WOULD_BLOCK; return NSAPI_ERROR_WOULD_BLOCK;
} }
} }
@ -383,6 +380,7 @@ nsapi_size_or_error_t UBLOX_AT_CellularStack::socket_recvfrom_impl(CellularSocke
} }
timer.stop(); timer.stop();
socket->pending_bytes = 0;
if (!count || (_at.get_last_error() != NSAPI_ERROR_OK)) { if (!count || (_at.get_last_error() != NSAPI_ERROR_OK)) {
return NSAPI_ERROR_WOULD_BLOCK; return NSAPI_ERROR_WOULD_BLOCK;
} else { } else {
@ -432,7 +430,7 @@ void UBLOX_AT_CellularStack::clear_socket(CellularSocket * socket)
{ {
if (socket != NULL) { if (socket != NULL) {
socket->id = SOCKET_UNUSED; socket->id = SOCKET_UNUSED;
socket->rx_avail = 0; socket->pending_bytes = 0;
socket->_cb = NULL; socket->_cb = NULL;
socket->_data = NULL; socket->_data = NULL;
socket->created = false; socket->created = false;