Merge "Deleted the rlog folder"

[o-du/l2.git] / src / 5gnrmac / mac_msg_hdl.c

diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c
index 694cd74..bb87730 100644 (file)
--- a/src/5gnrmac/mac_msg_hdl.c
+++ b/src/5gnrmac/mac_msg_hdl.c
@@ -143,7 +143,7 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd)
 {
    uint16_t     cellIdx;
    CrcIndInfo   crcIndInfo;
-   DU_LOG("\nMAC : Received CRC indication");
+   DU_LOG("\nDEBUG  -->  MAC : Received CRC indication");
    GET_CELL_IDX(crcInd->cellId, cellIdx);
    /* Considering one pdu and one preamble */ 
    crcIndInfo.cellId = macCb.macCell[cellIdx]->cellId;
@@ -177,7 +177,7 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd)
 uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd)
 {
    uint16_t pduIdx;
-   DU_LOG("\nMAC : Received Rx Data indication");
+   DU_LOG("\nDEBUG  -->  MAC : Received Rx Data indication");
    /* TODO : compare the handle received in RxDataInd with handle send in PUSCH
     * PDU, which is stored in raCb */
 
@@ -211,14 +211,16 @@ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd)
 uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData)
 {
    uint8_t   pduIdx =0;
+   uint8_t   lcIdx = 0;
    uint8_t   *txPdu =NULLP;
    uint16_t  tbSize =0;
    MacDlData macDlData;
    MacDlSlot *currDlSlot = NULLP;
+   DlRlcBoInfo dlBoInfo;
   
    memset(&macDlData , 0, sizeof(MacDlData));
-   DU_LOG("\nMAC: Received DL data for sfn=%d slot=%d", \
-      dlData->slotInfo.sfn, dlData->slotInfo.slot);
+   DU_LOG("\nDEBUG  -->  MAC: Received DL data for sfn=%d slot=%d numPdu= %d", \
+      dlData->slotInfo.sfn, dlData->slotInfo.slot, dlData->numPdu);
    /* Copy the pdus to be muxed into mac Dl data */
    macDlData.numPdu = dlData->numPdu;
    for(pduIdx = 0;  pduIdx < dlData->numPdu; pduIdx++)
@@ -238,7 +240,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData)
         MAC_ALLOC(txPdu, tbSize);
         if(!txPdu)
         {
-           DU_LOG("\nMAC : Memory allocation failed in MacProcRlcDlData");
+           DU_LOG("\nERROR  -->  MAC : Memory allocation failed in MacProcRlcDlData");
            return RFAILED;
         }
         macMuxPdu(&macDlData, NULLP, txPdu, tbSize);
@@ -248,6 +250,19 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData)
       }
    }
 
+   for(lcIdx = 0; lcIdx < dlData->numLc; lcIdx++)
+   {
+      if(dlData->boStatus[lcIdx].bo)
+      {
+         memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo));
+         dlBoInfo.cellId = dlData->boStatus[lcIdx].cellId;
+         GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueIdx);
+         dlBoInfo.lcId = dlData->boStatus[lcIdx].lcId;
+         dlBoInfo.dataVolume = dlData->boStatus[lcIdx].bo;
+         sendDlRlcBoInfoToSch(&dlBoInfo);
+      }
+   }
+
    /* Free memory */
    for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++)
    {
@@ -256,9 +271,8 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData)
    }
    if(pstInfo->selector == ODU_SELECTOR_LWLC)
    {
-      MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcData));
+     MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcData));
    }
-
    return ROK;
 }
 
@@ -292,7 +306,7 @@ uint8_t lcId, uint16_t pduLen, uint8_t *pdu)
    MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcData));
    if(!ulData)
    {
-      DU_LOG("\nMAC : Memory allocation failed while sending UL data to RLC");
+      DU_LOG("\nERROR  -->  MAC : Memory allocation failed while sending UL data to RLC");
       return RFAILED;
    }
    memset(ulData, 0, sizeof(RlcData));
@@ -380,11 +394,11 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo)
    MAC_ALLOC_SHRABL_BUF(schedRpt, sizeof(RlcSchedResultRpt));
    if(!schedRpt)
    {
-      DU_LOG("\nMAC: Memory allocation failure in sendSchResultRepToRlc");
+      DU_LOG("\nERROR  -->  MAC: Memory allocation failure in sendSchResultRepToRlc");
       return RFAILED;
    }
 
-   DU_LOG("\nMAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot);
+   DU_LOG("\nDEBUG  -->  MAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot);
    schedRpt->cellId = dlInfo.cellId;
    schedRpt->rnti = dlInfo.dlMsgAlloc->crnti;
    schedRpt->numLc = dlInfo.dlMsgAlloc->numLc;
@@ -402,7 +416,7 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo)
    FILL_PST_MAC_TO_RLC(pst, RLC_DL_INST, EVENT_SCHED_RESULT_TO_RLC);
    if(MacSendSchedResultRptToRlc(&pst, schedRpt) != ROK)
    {
-      DU_LOG("\nMAC: Failed to send Schedule result report to RLC");
+      DU_LOG("\nERROR  -->  MAC: Failed to send Schedule result report to RLC");
       MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, schedRpt, sizeof(RlcSchedResultRpt));
       return RFAILED;
    }
@@ -429,7 +443,7 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo)
  * ****************************************************************/
 uint8_t MacProcCellStart(Pst *pst, OduCellId  *cellId)
 {
-   DU_LOG("\nMAC : Handling cell start request");
+   DU_LOG("\nINFO  -->  MAC : Handling cell start request");
    gSlotCount = 0;
    sendToLowerMac(START_REQUEST, 0, cellId);
 
@@ -462,7 +476,7 @@ uint8_t MacProcCellStop(Pst *pst, OduCellId  *cellId)
    uint16_t      cellIdx; 
    SlotIndInfo   slotInfo;
 
-   DU_LOG("\nMAC : Sending cell stop request to Lower Mac");
+   DU_LOG("\nINFO  -->  MAC : Sending cell stop request to Lower Mac");
    GET_CELL_IDX(cellId->cellId, cellIdx);
    slotInfo.cellId = cellId->cellId;
    slotInfo.sfn = macCb.macCell[cellIdx]->currTime.sfn;
@@ -501,7 +515,7 @@ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
    DlRlcBoInfo  dlBoInfo;
    memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo));
 
-   DU_LOG("\nMAC : Handling DL CCCH IND");
+   DU_LOG("\nDEBUG  -->  MAC : Handling DL CCCH IND");
 
    GET_CELL_IDX(dlCcchIndInfo->cellId, cellIdx);
 
@@ -566,7 +580,7 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize,
    MAC_ALLOC_SHRABL_BUF(ulCcchIndInfo, sizeof(UlCcchIndInfo));
    if(!ulCcchIndInfo)
    {
-      DU_LOG("\nMAC: Memory failed in macProcUlCcchInd");
+      DU_LOG("\nERROR  -->  MAC: Memory failed in macProcUlCcchInd");
       return RFAILED;
    }
 
@@ -580,7 +594,7 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize,
 
    if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK)
    {
-      DU_LOG("\nMAC: Failed to send UL CCCH Ind to DU APP");
+      DU_LOG("\nERROR  -->  MAC: Failed to send UL CCCH Ind to DU APP");
       MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, ulCcchIndInfo->ulCcchMsgLen);
       MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo, sizeof(UlCcchIndInfo));
       ret = RFAILED;
@@ -700,7 +714,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd)
             case UCI_IND_PUCCH_F0F1:
                if(macUciInd->pdus[pduIdx].uci.uciPucchF0F1.srInfo.srIndPres)
                {
-                  DU_LOG("\nMAC : Received SR UCI indication");
+                  DU_LOG("\nDEBUG  -->  MAC : Received SR UCI indication");
                  crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; 
                  ret = buildAndSendSrInd(macUciInd, crnti);
                }
@@ -708,7 +722,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd)
             case UCI_IND_PUCCH_F2F3F4:
                break;
             default:
-               DU_LOG("\nMAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType);
+               DU_LOG("\nERROR  -->  MAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType);
                ret = RFAILED;
                break;
          }
@@ -718,7 +732,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd)
    }
    else
    {
-      DU_LOG("\nMAC: Received Uci Ind is NULL at FapiMacUciInd()");
+      DU_LOG("\nERROR  -->  MAC: Received Uci Ind is NULL at FapiMacUciInd()");
       ret = RFAILED;
    }
    MAC_FREE_SHRABL_BUF(pst->region, pst->pool, macUciInd, sizeof(UciInd));