Merge "SIB1 optional parameters, Cell start request, stop request and slot indication"

[o-du/l2.git] / src / cm / rgu.c

diff --git a/src/cm/rgu.c b/src/cm/rgu.c
index 1125b6b..f764545 100755 (executable)
--- a/src/cm/rgu.c
+++ b/src/cm/rgu.c
@@ -420,7 +420,7 @@ Buffer *mBuf;
 *
 * @details
 *
-*     Function : packSendDlData
+*     Function : packDlData
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -429,21 +429,21 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 packSendDlData
+PUBLIC S16 packDlData
 (
 Pst* pst,
 SpId spId,
 RlcMacData  *dlData
 )
 #else
-PUBLIC S16 packSendDlData(pst, spId, dlData)
+PUBLIC S16 packDlData(pst, spId, dlData)
 Pst* pst;
 SpId spId;
 RlcMacData  dlData;
 #endif
 {
    Buffer *mBuf = NULLP;
-   TRC3(packSendDlData)
+   TRC3(packDlData)
 
    if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -516,7 +516,7 @@ RlcMacData  dlData;
 *
 * @details
 *
-*     Function : unpackSendDlData
+*     Function : unpackDlData
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -525,14 +525,14 @@ RlcMacData  dlData;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 unpackSendDlData
+PUBLIC S16 unpackDlData
 (
 RguDDatReq func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 unpackSendDlData(func, pst, mBuf)
+PUBLIC S16 unpackDlData(func, pst, mBuf)
 RguDDatReq func;
 Pst *pst;
 Buffer *mBuf;
@@ -542,7 +542,7 @@ Buffer *mBuf;
 //   RguDDatReqInfo *datReq;
    RlcMacData *dlData;
    
-   TRC3(unpackSendDlData)
+   TRC3(unpackDlData)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
       SPutMsg(mBuf);
@@ -1021,7 +1021,7 @@ Buffer *mBuf;
 *
 * @details
 *
-*     Function : packSendBOStatus,
+*     Function : packBOStatus,
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -1030,14 +1030,14 @@ Buffer *mBuf;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 packSendBOStatus
+PUBLIC S16 packBOStatus
 (
 Pst* pst,
 SpId spId,
 RlcMacBOStatus  *boStatus
 )
 #else
-PUBLIC S16 packSendBOStatus(pst, spId, staRsp)
+PUBLIC S16 packBOStatus(pst, spId, staRsp)
 Pst* pst;
 SpId spId;
 RlcMacBOStatus  *boStatus;
@@ -1115,7 +1115,7 @@ RlcMacBOStatus  *boStatus;
 *
 * @details
 *
-*     Function : unpackSendBOStatus
+*     Function : unpackBOStatus
 *
 *  @param[in]   Pst*  pst
 *  @param[in]   SpId  spId
@@ -1124,14 +1124,14 @@ RlcMacBOStatus  *boStatus;
 *      -# ROK
 **/
 #ifdef ANSI
-PUBLIC S16 unpackSendBOStatus
+PUBLIC S16 unpackBOStatus
 (
 RguDStaRsp func,
 Pst *pst,
 Buffer *mBuf
 )
 #else
-PUBLIC S16 unpackSendBOStatus(func, pst, mBuf)
+PUBLIC S16 unpackBOStatus(func, pst, mBuf)
 RguDStaRsp func;
 Pst *pst;
 Buffer *mBuf;
@@ -1140,7 +1140,7 @@ Buffer *mBuf;
    SpId spId;
    RlcMacBOStatus *boSta;
 
-   TRC3(unpackSendBOStatus)
+   TRC3(unpackBOStatus)
 
    if (SUnpkS16(&spId, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)      
@@ -2702,7 +2702,7 @@ Buffer *mBuf;
 
    for (i=param->nmbPdu-1; i >= 0; i--)
    {
-      MsgLen msgLen = 0;
+      msgLen = 0;
       if (SFndLenMsg(param->pduInfo[i].pduBuf, &msgLen) != ROK)
          RETVALUE(RFAILED);
       if (SCatMsg(mBuf, param->pduInfo[i].pduBuf, M1M2) != ROK)
@@ -2762,7 +2762,7 @@ Buffer *mBuf;
 
       CMCHKUNPK(cmUnpkBool, &param->pduInfo[i].commCh, mBuf);
       CMCHKUNPK(cmUnpkLteLcId, &param->pduInfo[i].lcId, mBuf);
-      CMCHKUNPK(cmPkMsgLen, &param->pduInfo[i].pduLen, mBuf);
+      CMCHKUNPK(cmUnpkMsgLen, &param->pduInfo[i].pduLen, mBuf);
       if (SFndLenMsg(mBuf, &totalMsgLen) != ROK)
          RETVALUE(RFAILED);
       if (SSegMsg(mBuf, totalMsgLen-param->pduInfo[i].pduLen, &param->pduInfo[i].pduBuf) != ROK)
@@ -3155,7 +3155,6 @@ RlcMacSchedRep *param;
 Buffer *mBuf;
 #endif
 {
-   S32 i;
    S32 idx;
 
    TRC3(packSchedRepInfo);
@@ -3203,7 +3202,6 @@ RlcMacSchedRep *param;
 Buffer *mBuf;
 #endif
 {
-   S32 i;
    S32 idx;
 
    TRC3(unpackSchedRepInfo);