X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.c;h=3e485c4a542b4764b1da43464058a12c60b059c8;hb=97a2285207414a7948f5e1dfcb5318fa9507c123;hp=15d4dfd08a0e2c55e1a4ead918a80f6b7caf1b70;hpb=4e2a29b15e4d8412c1af8d0ba9777be95ecc3ebb;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 15d4dfd08..3e485c4a5 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -335,22 +335,12 @@ uint8_t MacSchRachInd(Pst *pst, RachIndInfo *rachInd) * ****************************************************************/ uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd) { + Inst inst = pst->dstInst-SCH_INST_START; #ifdef CALL_FLOW_DEBUG_LOG DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_CRC_IND_TO_SCH\n"); #endif - switch(crcInd->crcInd[0]) - { - case CRC_FAILED: - DU_LOG("\nDEBUG --> SCH : Received CRC indication. CRC Status [FAILURE]"); - break; - case CRC_PASSED: - DU_LOG("\nDEBUG --> SCH : Received CRC indication. CRC Status [PASS]"); - break; - default: - DU_LOG("\nDEBUG --> SCH : Invalid CRC state %d", crcInd->crcInd[0]); - return RFAILED; - } + schProcessCrcInd(crcInd, inst); return ROK; } @@ -909,6 +899,11 @@ uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg) cellCb->actvUeBitMap = 0; cellCb->boIndBitMap = 0; + cellCb->cellCfg.schHqCfg.maxDlDataHqTx = SCH_MAX_NUM_DL_HQ_TX; + cellCb->cellCfg.schHqCfg.maxMsg4HqTx = SCH_MAX_NUM_MSG4_TX; + cellCb->cellCfg.schHqCfg.maxUlDataHqTx = SCH_MAX_NUM_UL_HQ_TX; + cellCb->cellCfg.schRachCfg.maxMsg3Tx = SCH_MAX_NUM_MSG3_TX; + /* Fill and send Cell config confirm */ memset(&rspPst, 0, sizeof(Pst)); FILL_PST_SCH_TO_MAC(rspPst, pst->dstInst); @@ -945,13 +940,11 @@ uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) bool isLcIdValid = false; SchUeCb *ueCb = NULLP; SchCellCb *cell = NULLP; - Inst inst = pst->dstInst-SCH_INST_START; - CmLListCp *lcLL = NULLP; + Inst inst = pst->dstInst-SCH_INST_START; #ifdef CALL_FLOW_DEBUG_LOG DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_DL_RLC_BO_INFO_TO_SCH\n"); -#endif - +#endif DU_LOG("\nDEBUG --> SCH : Received RLC BO Status indication LCId [%d] BO [%d]", dlBoInfo->lcId, dlBoInfo->dataVolume); cell = schCb[inst].cells[inst]; @@ -982,28 +975,20 @@ uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) *Thus clearing out the LC from the Lc priority list*/ if(dlBoInfo->dataVolume == 0) { - /*Check the LC is Dedicated or default and accordingly LCList will - * be used*/ - if(ueCb->dlInfo.dlLcCtxt[lcId].isDedicated) - { - lcLL = &(ueCb->dlLcPrbEst.dedLcInfo->dedLcList); - } - else - { - lcLL = &(ueCb->dlLcPrbEst.defLcList); - } - handleLcLList(lcLL, lcId, DELETE); + /* TODO : Check the LC is Dedicated or default and accordingly LCList + * will be used*/ return ROK; } if(lcId == SRB0_LCID) { cell->raCb[ueId -1].msg4recvd = true; - cell->raCb[ueId -1].dlMsgPduLen = dlBoInfo->dataVolume; - + cell->raCb[ueId -1].dlMsgPduLen = dlBoInfo->dataVolume; } else { + /* TODO : These part of changes will be corrected during DL scheduling as + * per K0 - K1 -K2 */ SET_ONE_BIT(ueId, cell->boIndBitMap); if(ueCb->dlInfo.dlLcCtxt[lcId].lcId == lcId) { @@ -1015,7 +1000,6 @@ uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) return RFAILED; } } - /* Adding UE Id to list of pending UEs to be scheduled */ addUeToBeScheduled(cell, ueId); return ROK; @@ -1132,14 +1116,55 @@ uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd) } if(uciInd->numSrBits) { - ueCb->srRcvd = true; - + ueCb->srRcvd = true; /* Adding UE Id to list of pending UEs to be scheduled */ addUeToBeScheduled(cellCb, ueCb->ueId); } return ROK; } +/******************************************************************* + * + * @brief Processes HARQ UCI indication from MAC + * + * @details + * + * Function : MacSchHarqUciInd + * + * Functionality: + * Processes HARQ UCI indication from MAC + * + * @params[in] Post structure + * UCI Indication + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t MacSchHarqUciInd(Pst *pst, HarqUciIndInfo *uciInd) +{ + Inst inst = pst->dstInst-SCH_INST_START; + SchUeCb *ueCb; + SchCellCb *cellCb = schCb[inst].cells[inst]; + +#ifdef CALL_FLOW_DEBUG_LOG + DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_UCI_IND_TO_SCH\n"); +#endif + + DU_LOG("\nDEBUG --> SCH : Received HARQ"); + + ueCb = schGetUeCb(cellCb, uciInd->crnti); + + if(ueCb->state == SCH_UE_STATE_INACTIVE) + { + DU_LOG("\nERROR --> SCH : Crnti %d is inactive", uciInd->crnti); + return ROK; + } + + schUpdateHarqFdbk(ueCb, uciInd->numHarq, uciInd->harqPayload, &uciInd->slotInd); + + return ROK; +} + /******************************************************************* * * @brief Allocates requested PRBs for DL @@ -2138,14 +2163,14 @@ uint8_t schAddPagingIndtoList(CmLListCp *storedPageList,void * pageIndInfo) while(firstNodeOfList) { tempNode = (SchPageInfo*)(firstNodeOfList->node); - if ((recvdNode->TxTime.slot < tempNode->TxTime.slot)) + if ((recvdNode->pageTxTime.slot < tempNode->pageTxTime.slot)) { cmLListInsCrnt(storedPageList, currentNodeInfo); break; } - else if ((recvdNode->TxTime.slot == tempNode->TxTime.slot)) + else if ((recvdNode->pageTxTime.slot == tempNode->pageTxTime.slot)) { - DU_LOG("\nERROR --> SCH : schAddPagingIndtoList() : Slot[%d] is already present in the list", recvdNode->TxTime.slot); + DU_LOG("\nERROR --> SCH : schAddPagingIndtoList() : Slot[%d] is already present in the list", recvdNode->pageTxTime.slot); return RFAILED; } else @@ -2158,7 +2183,8 @@ uint8_t schAddPagingIndtoList(CmLListCp *storedPageList,void * pageIndInfo) { cmLListAdd2Tail(storedPageList, currentNodeInfo); } - DU_LOG("\nINFO --> SCH : Paging information is stored successfully"); + DU_LOG("\nDEBUG --> SCH : Paging information is stored successfully for PF:%d, Slot:%d",\ + recvdNode->pageTxTime.sfn, recvdNode->pageTxTime.slot); return ROK; } @@ -2187,7 +2213,8 @@ uint8_t MacSchPagingInd(Pst *pst, SchPageInd *pageInd) if(pageInd) { - DU_LOG("\nINFO --> SCH : Received paging indication form MAC for cellId[%d]",pageInd->cellId); + DU_LOG("\nDEBUG --> SCH : Received paging indication from MAC for cellId[%d]",\ + pageInd->cellId); /* Fetch Cell CB */ for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++) @@ -2211,9 +2238,9 @@ uint8_t MacSchPagingInd(Pst *pst, SchPageInd *pageInd) { pageInfo->pf = pageInd->pf; pageInfo->i_s = pageInd->i_s; - pageInfo->TxTime.cellId = pageInd->cellId; - pageInfo->TxTime.sfn = (pageInd->pf + cellCb->pageCb.pagMonOcc[pageInd->i_s].frameOffset) % MAX_SFN; - pageInfo->TxTime.slot = cellCb->pageCb.pagMonOcc[pageInd->i_s].pagingOccSlot; + pageInfo->pageTxTime.cellId = pageInd->cellId; + pageInfo->pageTxTime.sfn = (pageInd->pf + cellCb->pageCb.pagMonOcc[pageInd->i_s].frameOffset) % MAX_SFN; + pageInfo->pageTxTime.slot = cellCb->pageCb.pagMonOcc[pageInd->i_s].pagingOccSlot; pageInfo->mcs = DEFAULT_MCS; pageInfo->msgLen = pageInd->pduLen; SCH_ALLOC(pageInfo->pagePdu, pageInfo->msgLen); @@ -2224,7 +2251,7 @@ uint8_t MacSchPagingInd(Pst *pst, SchPageInd *pageInd) else { memcpy(pageInfo->pagePdu, pageInd->pagePdu, pageInfo->msgLen); - ret = schAddPagingIndtoList(&cellCb->pageCb.pageIndInfoRecord[pageInfo->TxTime.sfn], pageInfo); + ret = schAddPagingIndtoList(&cellCb->pageCb.pageIndInfoRecord[pageInfo->pageTxTime.sfn], pageInfo); if(ret != ROK) { DU_LOG("\nERROR --> SCH : MacSchPagingInd(): Failed to store paging record");