Fix SARA-R4 cellular module compile warning (#24)

* Fix SARA-R4 compile warning as well as log format compile warning in cellular common.

Author: chinglee-iot

modules/sara_r4/cellular_r4.c

@@ -238,10 +238,12 @@ static CellularError_t _Cellular_GetCurrentMNOProfile( CellularContext_t * pCont
         CELLULAR_AT_WITH_PREFIX,
         "+UMNOPROF",
         _Cellular_RecvFuncGetCurrentMNOProfile,
-        pCurrentMNOProfile,
+        NULL,
         sizeof( MNOProfileType_t ),
     };
 
+    atReqGetCurrentMNOProfile.pData = pCurrentMNOProfile;
+
     /* Internal function. Callee check parameters. */
     pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqGetCurrentMNOProfile );
     cellularStatus = _Cellular_TranslatePktStatus( pktStatus );
@@ -259,7 +261,7 @@ CellularError_t rebootCellularModem( CellularContext_t * pContext,
 {
     CellularError_t cellularStatus = CELLULAR_SUCCESS;
     CellularPktStatus_t pktStatus = CELLULAR_PKT_STATUS_OK;
-    int count = 0;
+    uint32_t count = 0;
 
     CellularAtReq_t atReqGetNoResult =
     {
@@ -490,11 +492,58 @@ uint32_t _Cellular_GetSocketId( CellularContext_t * pContext,
         cellularStatus = CELLULAR_BAD_PARAMETER;
     }
 
-    if( ( cellularStatus == CELLULAR_SUCCESS ) &&
-        ( sessionId >= MIN_TCP_SESSION_ID ) && ( sessionId <= MAX_TCP_SESSION_ID ) )
+    if( ( cellularStatus == CELLULAR_SUCCESS ) && ( sessionId <= ( ( uint8_t ) MAX_TCP_SESSION_ID ) ) )
     {
         socketIndex = pModuleContext->pSessionMap[ sessionId ];
     }
 
     return socketIndex;
 }
+
+/*-----------------------------------------------------------*/
+
+uint32_t _Cellular_GetSessionId( CellularContext_t * pContext,
+                                 uint32_t socketIndex )
+{
+    cellularModuleContext_t * pModuleContext = NULL;
+    CellularError_t cellularStatus = CELLULAR_SUCCESS;
+    uint32_t sessionId = INVALID_SESSION_ID;
+
+    if( pContext == NULL )
+    {
+        LogError( ( "_Cellular_GetSessionId invalid cellular context" ) );
+        cellularStatus = CELLULAR_BAD_PARAMETER;
+    }
+    else if( socketIndex == INVALID_SOCKET_INDEX )
+    {
+        LogError( ( "_Cellular_GetSessionId invalid socketIndex" ) );
+        cellularStatus = CELLULAR_BAD_PARAMETER;
+    }
+    else
+    {
+        cellularStatus = _Cellular_GetModuleContext( pContext, ( void ** ) &pModuleContext );
+    }
+
+    if( cellularStatus == CELLULAR_SUCCESS )
+    {
+        for( sessionId = 0; sessionId < TCP_SESSION_TABLE_LEGNTH; sessionId++ )
+        {
+            if( pModuleContext->pSessionMap[ sessionId ] == socketIndex )
+            {
+                break;
+            }
+        }
+
+        /* Mapping is not found in the session mapping table. */
+        if( sessionId == TCP_SESSION_TABLE_LEGNTH )
+        {
+            sessionId = INVALID_SESSION_ID;
+        }
+    }
+    else
+    {
+        sessionId = INVALID_SESSION_ID;
+    }
+
+    return sessionId;
+}

modules/sara_r4/cellular_r4.h

@@ -34,11 +34,12 @@
 
 /*-----------------------------------------------------------*/
 
-#define MIN_TCP_SESSION_ID          ( 0U )
-#define MAX_TCP_SESSION_ID          ( 6U )
+#define MIN_TCP_SESSION_ID          ( 0 )
+#define MAX_TCP_SESSION_ID          ( 6 )
 #define TCP_SESSION_TABLE_LEGNTH    ( MAX_TCP_SESSION_ID + 1 )
 
 #define INVALID_SOCKET_INDEX        ( UINT32_MAX )
+#define INVALID_SESSION_ID          ( UINT32_MAX )
 
 /*-----------------------------------------------------------*/
 
@@ -52,6 +53,9 @@ typedef struct cellularModuleContext
 uint32_t _Cellular_GetSocketId( CellularContext_t * pContext,
                                 uint8_t sessionId );
 
+uint32_t _Cellular_GetSessionId( CellularContext_t * pContext,
+                                 uint32_t socketIndex );
+
 CellularError_t rebootCellularModem( CellularContext_t * pContext,
                                      bool disablePsm,
                                      bool disableEidrx );