X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_slot_ind.c;h=98647013ca35568ab4c0a4f8dc022b32bba40daf;hb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;hp=06826958ce21a34db533910fe77ff2195d25f0de;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch_slot_ind.c b/src/5gnrsch/sch_slot_ind.c
index 06826958c..98647013c 100644
--- a/src/5gnrsch/sch_slot_ind.c
+++ b/src/5gnrsch/sch_slot_ind.c
@@ -113,11 +113,92 @@ void schCalcSlotValues(SlotIndInfo slotInd, SchSlotValue *schSlotValue)
     *        on PHY_DELTA + SCHED_DELTA + BO_DELTA                 *
     ****************************************************************/
 
-   ADD_DELTA_TO_TIME(slotInd,schSlotValue->currentTime,PHY_DELTA);
-   ADD_DELTA_TO_TIME(slotInd,schSlotValue->broadcastTime,PHY_DELTA+SCHED_DELTA);
-   ADD_DELTA_TO_TIME(slotInd,schSlotValue->rarTime,PHY_DELTA+SCHED_DELTA);
-   ADD_DELTA_TO_TIME(slotInd,schSlotValue->msg4Time,PHY_DELTA+SCHED_DELTA);
-   ADD_DELTA_TO_TIME(slotInd,schSlotValue->dlMsgTime,PHY_DELTA+SCHED_DELTA+BO_DELTA);
+   ADD_DELTA_TO_TIME(slotInd, schSlotValue->currentTime, PHY_DELTA);
+   ADD_DELTA_TO_TIME(slotInd, schSlotValue->broadcastTime, PHY_DELTA + SCHED_DELTA);
+   ADD_DELTA_TO_TIME(slotInd, schSlotValue->rarTime, PHY_DELTA + SCHED_DELTA);
+   ADD_DELTA_TO_TIME(slotInd, schSlotValue->dlMsgTime, PHY_DELTA + SCHED_DELTA);
+}
+
+/*******************************************************************
+ *
+ * @brief 
+ *
+ * @details
+ *
+ *    Function : 
+ *
+ *    Functionality:
+ 
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t schFillBoGrantDlSchedInfo(SchCellCb *cell, DlSchedInfo *dlSchedInfo, DlMsgAlloc *dlMsgAlloc)
+{
+   uint8_t ueIdx, lcIdx;
+   uint16_t slot;
+   uint16_t crnti = 0;
+   uint16_t accumalatedSize = 0;
+   SchUeCb *ueCb = NULLP;
+
+   while(cell->boIndBitMap)
+   {
+      slot = dlSchedInfo->schSlotValue.dlMsgTime.slot;
+
+      GET_RIGHT_MOST_SET_BIT(cell->boIndBitMap, ueIdx);
+      GET_CRNTI(crnti,ueIdx);
+      ueCb = &cell->ueCb[ueIdx-1];
+
+      /* allocate PDCCH and PDSCH resources for the ue */
+      SCH_ALLOC(dlMsgAlloc, sizeof(DlMsgAlloc));
+      if(!dlMsgAlloc)
+      {
+	 DU_LOG("\nMAC: Memory Allocation failed for ded DL msg alloc");
+	 return RFAILED;
+      }
+      memset(dlMsgAlloc, 0, sizeof(DlMsgAlloc));
+      dlSchedInfo->dlMsgAlloc = dlMsgAlloc;
+      dlMsgAlloc->crnti = crnti;
+
+      /* Dl ded Msg info is copied, this was earlier filled in macSchDlRlcBoInfo */
+      memcpy(&dlMsgAlloc->dlMsgInfo, cell->schDlSlotInfo[slot]->dlMsgInfo, \
+	    sizeof(DlMsgInfo));
+
+      /* scheduled LC data fill */
+      dlMsgAlloc->numLc = 0;
+      for(lcIdx = 0; lcIdx < MAX_NUM_LC; lcIdx++)
+      {
+	 if(ueCb->dlInfo.dlLcCtxt[lcIdx].bo)
+	 {
+	    dlMsgAlloc->lcSchInfo[dlMsgAlloc->numLc].lcId = lcIdx;
+
+	    /* calculation for BO includse RLC and MAC header size */
+	    dlMsgAlloc->lcSchInfo[dlMsgAlloc->numLc].schBytes = \
+	       ueCb->dlInfo.dlLcCtxt[lcIdx].bo + RLC_HDR_SIZE + MAC_HDR_SIZE;
+	    accumalatedSize += dlMsgAlloc->lcSchInfo[dlMsgAlloc->numLc].schBytes;
+	    dlMsgAlloc->numLc++;
+	 }
+	 ueCb->dlInfo.dlLcCtxt[lcIdx].bo = 0;
+      }
+
+      /* pdcch and pdsch data is filled */
+      schDlRsrcAllocDlMsg(dlMsgAlloc, cell, crnti, accumalatedSize, slot);
+
+      /* PUCCH resource */
+      schAllocPucchResource(cell, dlMsgAlloc->crnti, slot);
+
+      /* Free the dl ded msg info allocated in macSchDlRlcBoInfo */
+      SCH_FREE(cell->schDlSlotInfo[dlSchedInfo->schSlotValue.dlMsgTime.slot]->dlMsgInfo, \
+	    sizeof(DlMsgInfo));
+      cell->schDlSlotInfo[dlSchedInfo->schSlotValue.dlMsgTime.slot]->dlMsgInfo = NULL;
+
+      /* after allocation is done, unset the bo bit for that ue */
+      UNSET_ONE_BIT(ueIdx, cell->boIndBitMap);
+   }
+
+   return ROK;
 }
 
 /*******************************************************************
@@ -138,21 +219,23 @@ void schCalcSlotValues(SlotIndInfo slotInd, SchSlotValue *schSlotValue)
  * ****************************************************************/
 uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst)
 {
-   int ret = ROK;
-   uint8_t ssb_rep, ueIdx, lcgIdx;
+   uint8_t  ret = ROK;
+   uint8_t  ssb_rep, ueIdx, lcgIdx;
    uint16_t slot, sfnSlot = 0;
    DlSchedInfo dlSchedInfo;
+   DlBrdcstAlloc *dlBrdcstAlloc = NULLP;
+   RarAlloc   *rarAlloc = NULLP;
+   DlMsgAlloc  *msg4Alloc = NULLP;
+   DlMsgAlloc *dlMsgAlloc = NULLP;
+   SchCellCb  *cell = NULLP;
+
    memset(&dlSchedInfo,0,sizeof(DlSchedInfo));
-   DlBrdcstAlloc *dlBrdcstAlloc = &dlSchedInfo.brdcstAlloc;
-   RarAlloc  *rarAlloc = NULLP;
-   Msg4Alloc *msg4Alloc = NULLP;
+   schCalcSlotValues(*slotInd, &dlSchedInfo.schSlotValue);
+   dlBrdcstAlloc = &dlSchedInfo.brdcstAlloc;
    dlBrdcstAlloc->ssbTrans = NO_SSB;
    dlBrdcstAlloc->sib1Trans = NO_SIB1;
 
-   SchCellCb *cell = schCb[schInst].cells[schInst];
-
-   schCalcSlotValues(*slotInd, &dlSchedInfo.schSlotValue);
-
+   cell = schCb[schInst].cells[schInst];
    ssb_rep = cell->cellCfg.ssbSchCfg.ssbPeriod;
    memcpy(&cell->slotInfo, slotInd, sizeof(SlotIndInfo));
    dlBrdcstAlloc->ssbIdxSupported = 1;
@@ -231,30 +314,32 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst)
    }
 
    /* check for MSG4 */
-   if(cell->schDlSlotInfo[dlSchedInfo.schSlotValue.msg4Time.slot]->msg4Info != NULLP)
+   if((cell->schDlSlotInfo[dlSchedInfo.schSlotValue.dlMsgTime.slot]->dlMsgInfo != NULLP) &&
+      (cell->schDlSlotInfo[dlSchedInfo.schSlotValue.dlMsgTime.slot]->dlMsgInfo->isMsg4Pdu))
    {
-      slot = dlSchedInfo.schSlotValue.msg4Time.slot;
-      SCH_ALLOC(msg4Alloc, sizeof(Msg4Alloc));
+      slot = dlSchedInfo.schSlotValue.dlMsgTime.slot;
+
+      SCH_ALLOC(msg4Alloc, sizeof(DlMsgAlloc));
       if(!msg4Alloc)
       {
 	 DU_LOG("\nMAC: Memory Allocation failed for msg4 alloc");
 	 return RFAILED;
       }
 
-      dlSchedInfo.msg4Alloc = msg4Alloc;
+      dlSchedInfo.dlMsgAlloc = msg4Alloc;
 
       /* Msg4 info is copied, this was earlier filled in macSchDlRlcBoInfo */
-      memcpy(&msg4Alloc->msg4Info, cell->schDlSlotInfo[slot]->msg4Info, \
-	    sizeof(Msg4Info));
+      memcpy(&msg4Alloc->dlMsgInfo, cell->schDlSlotInfo[slot]->dlMsgInfo, \
+	    sizeof(DlMsgInfo));
 
       /* pdcch and pdsch data is filled */
-      schDlRsrcAllocMsg4(msg4Alloc, cell, dlSchedInfo.schSlotValue.msg4Time.slot); 
+      schDlRsrcAllocMsg4(msg4Alloc, cell, dlSchedInfo.schSlotValue.dlMsgTime.slot); 
 
       /* PUCCH resource */
-      schAllocPucchResource(cell, msg4Alloc->msg4Info.crnti, dlSchedInfo.schSlotValue.msg4Time.slot);
+      schAllocPucchResource(cell, msg4Alloc->dlMsgInfo.crnti, dlSchedInfo.schSlotValue.dlMsgTime.slot);
 
-      SCH_FREE(cell->schDlSlotInfo[dlSchedInfo.schSlotValue.msg4Time.slot]->msg4Info, sizeof(Msg4Info));
-      cell->schDlSlotInfo[dlSchedInfo.schSlotValue.msg4Time.slot]->msg4Info = NULL;
+      SCH_FREE(cell->schDlSlotInfo[dlSchedInfo.schSlotValue.dlMsgTime.slot]->dlMsgInfo, sizeof(DlMsgInfo));
+      cell->schDlSlotInfo[dlSchedInfo.schSlotValue.dlMsgTime.slot]->dlMsgInfo = NULL;
    }
    /* check if UL grant must be sent in this slot for a SR/BSR that had been received */
    for(ueIdx=0; ueIdx<cell->numActvUe; ueIdx++)
@@ -300,6 +385,13 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst)
       }
    }
 
+   /* Check for pending BO grant for LC */
+   if((cell->schDlSlotInfo[dlSchedInfo.schSlotValue.dlMsgTime.slot]->dlMsgInfo != NULLP) &&
+      (!cell->schDlSlotInfo[dlSchedInfo.schSlotValue.dlMsgTime.slot]->dlMsgInfo->isMsg4Pdu))
+   {
+      schFillBoGrantDlSchedInfo(cell, &dlSchedInfo, dlMsgAlloc);
+   }
+
    /* send msg to MAC */
    ret = sendDlAllocToMac(&dlSchedInfo, schInst);
    if(ret != ROK)