Merge branch 'ap/l4e1-delta-fwu' into 'delta-radio-fwu'

MTX-3404 mPower Oct20: Delta Radio Firmware Upgrade - L4E1 - libmts-io support

See merge request !28

1 files changed, 8 insertions, 74 deletions

diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index 22374ee..2d1ffcd 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -603,7 +603,7 @@ ICellularRadio::CODE QuectelRadio::fumoLocalApply(ICellularRadio::UpdateCb& step
     sCmd += VALUE_MTS_DELTA_PATH;
     sCmd += "\"";
 
-    rc = sendBasicCommand(sCmd, 1000);
+    rc = sendBasicCommand(sCmd, 10000);
 
     if (rc != SUCCESS) {
         printError("FUMO failed, OK not received from the radio");
@@ -837,10 +837,16 @@ ICellularRadio::CODE QuectelRadio::uploadFile(int fd, const std::string& sTarget
     size_t nChunks;
     CODE rc;
 
-    rc = getFileSize(fd, dPayloadLength, nChunks);
+    rc = getFileSize(fd, dPayloadLength);
     if (rc != SUCCESS) {
         return rc;
     }
+
+    rc = sizeToChunks(dPayloadLength, FILE_CHUNK_SIZE, nChunks);
+    if (rc != SUCCESS) {
+        return rc;
+    }
+
     printTrace("File size: %d bytes and %d chunks", dPayloadLength, nChunks);
     printTrace("Starting file upload...");
 
@@ -985,78 +991,6 @@ uint16_t QuectelRadio::getQuectelChecksum(const void* data, size_t nBytes) {
     return iChecksum;
 }
 
-ICellularRadio::CODE QuectelRadio::getFileSize(int fd, size_t& nBytes, size_t& nChunks) {
-    CODE rc = FAILURE;
-
-    do {
-        ssize_t dScrollPos;
-        dScrollPos = lseek(fd, 0, SEEK_SET);
-        if (dScrollPos < 0) {
-            printError("Failed to seek to the start of the file: %d", errno);
-            break;
-        }
-
-        dScrollPos = lseek(fd, 0, SEEK_END);
-        if (dScrollPos < 0) {
-            printError("Failed to determine the file size: %d", errno);
-            break;
-        }
-
-        nBytes = static_cast<size_t>(dScrollPos);
-        nChunks = (nBytes + FILE_CHUNK_SIZE - 1) / FILE_CHUNK_SIZE;  // round up
-
-        rc = SUCCESS;
-
-    } while (false);
-
-    lseek(fd, 0, SEEK_SET);
-    return rc;
-}
-
-ICellularRadio::CODE QuectelRadio::readChunk(int fd, char* pChunk, size_t dChunkSize, size_t& nReadBytes) {
-    size_t nUsedBuffer = 0;
-    CODE rc = FAILURE;
-
-    while (true) {
-
-        if (nUsedBuffer > dChunkSize) {
-            printError("Internal pointer error, abort upload: %d", nUsedBuffer);
-            rc = ERROR;
-            break;
-        }
-
-        if (nUsedBuffer == dChunkSize) {
-            // full chunk received
-            rc = SUCCESS;
-            nReadBytes = dChunkSize;
-            break;
-        }
-
-        char* pData = pChunk + nUsedBuffer;
-        size_t nFreeBuffer = dChunkSize - nUsedBuffer;
-
-        ssize_t dReadCount = read(fd, pData, nFreeBuffer);
-        if (dReadCount < 0) {
-            printError("Failed to read from the source file: %d", errno);
-            rc = ERROR;
-            break;
-        }
-
-        size_t duReadCount = static_cast<size_t>(dReadCount);
-        if (duReadCount == 0) {
-            // EOF. Return what was already read
-            nReadBytes = nUsedBuffer;
-            rc = SUCCESS;
-            break;
-        }
-
-        nUsedBuffer += duReadCount;
-
-    }
-
-    return rc;
-}
-
 ICellularRadio::CODE QuectelRadio::fumoWaitUpgradeFinished(ICellularRadio::UpdateCb& stepCb) {
     const uint32_t duUrcTimeout = 4 * 60 * 1000;  // wait for 4 minutes for the next URC message
     const std::string sFotaUrcPrefix = "+QIND: \"FOTA\"";  // prefix for the URC notification messages