X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.c;h=cd1e8552f4e679e6298fa2c94d9626305da93757;hb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;hp=2b92156216f62288f858117d8df8a5d0b45290e9;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 2b9215621..cd1e8552f 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -50,6 +50,7 @@ extern SchCb schCb[SCH_MAX_INST]; void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm); + /* local defines */ SchCellCfgCfmFunc SchCellCfgCfmOpts[] = { @@ -95,7 +96,7 @@ uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason) schCb[inst].schInit.acnt = FALSE; schCb[inst].schInit.usta = FALSE; schCb[inst].schInit.trc = FALSE; - schCb[inst].schInit.procId = SFndProcId(); + schCb[inst].schInit.procId = ODU_GET_PROCID(); return ROK; } /* schActvInit */ @@ -117,7 +118,7 @@ uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason) * -# LCM_REASON_INVALID_MSGTYPE * -# LCM_REASON_MEM_NOAVAIL **/ -PUBLIC uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) +uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) { uint16_t ret = LCM_REASON_NOT_APPL; Inst inst = (dInst - SCH_INST_START); @@ -129,8 +130,8 @@ PUBLIC uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) return LCM_REASON_INVALID_MSGTYPE; } /* Update the Pst structure for LM interface */ - memcpy((uint8_t *)&schCb[inst].schInit.lmPst, - (uint8_t *)&cfg->s.schInstCfg.genCfg.lmPst, + memcpy(&schCb[inst].schInit.lmPst, + &cfg->s.schInstCfg.genCfg.lmPst, sizeof(Pst)); schCb[inst].schInit.inst = inst; @@ -150,9 +151,9 @@ PUBLIC uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) schCb[inst].genCfg.startCellId = cfg->s.schInstCfg.genCfg.startCellId; #if 0 /* Initialzie the timer queue */ - memset((uint8_t *)&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE); + memset(&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE); /* Initialize the timer control point */ - memset((uint8_t *)&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); + memset(&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp)); schCb[inst].tmrTqCp.tmrLen = RGSCH_TQ_SIZE; /* SS_MT_TMR needs to be enabled as schActvTmr needs instance information */ @@ -209,7 +210,7 @@ uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) memset(&cfmPst, 0 , sizeof(Pst)); SchFillCfmPst(pst, &cfmPst, cfg); - memset((uint8_t *)&cfm, 0, sizeof(RgMngmt)); + memset(&cfm, 0, sizeof(RgMngmt)); #ifdef LMINT3 cfm.hdr.transId = @@ -462,7 +463,7 @@ void fillSchSib1Cfg(Inst schInst, SchSib1Cfg *sib1SchCfg, uint16_t pci, \ sib1SchCfg->n0 = slotIndex; /* calculate the PRBs */ - schAllocFreqDomRscType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource); + freqDomRscAllocType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource); /* fill BWP */ bwp->freqAlloc.numPrb = MAX_NUM_RB; /* whole of BW */ @@ -471,16 +472,16 @@ void fillSchSib1Cfg(Inst schInst, SchSib1Cfg *sib1SchCfg, uint16_t pci, \ bwp->cyclicPrefix = 0; /* normal */ /* fill the PDCCH PDU */ - pdcch->coreset0Cfg.coreSetSize = numRbs; - pdcch->coreset0Cfg.startSymbolIndex = firstSymbol; - pdcch->coreset0Cfg.durationSymbols = numSymbols; - memcpy(pdcch->coreset0Cfg.freqDomainResource,FreqDomainResource,6); - pdcch->coreset0Cfg.cceRegMappingType = 1; /* coreset0 is always interleaved */ - pdcch->coreset0Cfg.regBundleSize = 6; /* spec-38.211 sec 7.3.2.2 */ - pdcch->coreset0Cfg.interleaverSize = 2; /* spec-38.211 sec 7.3.2.2 */ - pdcch->coreset0Cfg.coreSetType = 0; - pdcch->coreset0Cfg.shiftIndex = pci; - pdcch->coreset0Cfg.precoderGranularity = 0; /* sameAsRegBundle */ + pdcch->coresetCfg.coreSetSize = numRbs; + pdcch->coresetCfg.startSymbolIndex = firstSymbol; + pdcch->coresetCfg.durationSymbols = numSymbols; + memcpy(pdcch->coresetCfg.freqDomainResource,FreqDomainResource,6); + pdcch->coresetCfg.cceRegMappingType = 1; /* coreset0 is always interleaved */ + pdcch->coresetCfg.regBundleSize = 6; /* spec-38.211 sec 7.3.2.2 */ + pdcch->coresetCfg.interleaverSize = 2; /* spec-38.211 sec 7.3.2.2 */ + pdcch->coresetCfg.coreSetType = 0; + pdcch->coresetCfg.shiftIndex = pci; + pdcch->coresetCfg.precoderGranularity = 0; /* sameAsRegBundle */ pdcch->numDlDci = 1; pdcch->dci.rnti = SI_RNTI; pdcch->dci.scramblingId = pci; @@ -626,6 +627,10 @@ uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg) schCellCfg->ssbSchCfg.ssbOffsetPointA); memcpy(&cellCb->cellCfg, schCellCfg, sizeof(SchCellCfg)); + /* Initializing global variables */ + cellCb->actvUeBitMap = 0; + cellCb->boIndBitMap = 0; + /* Fill and send Cell config confirm */ memset(&rspPst, 0, sizeof(Pst)); FILL_PST_SCH_TO_MAC(rspPst, pst->dstInst); @@ -656,37 +661,55 @@ uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg) * RFAILED - failure * * ****************************************************************/ -uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBOInfo *dlBoInfo) +uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) { - uint16_t lcIdx; + uint8_t lcId = 0; + uint16_t ueIdx = 0; + uint16_t slot; + SchUeCb *ueCb = NULLP; + SchCellCb *cell = NULLP; + SchDlSlotInfo *schDlSlotInfo = NULLP; + Inst inst = pst->dstInst-SCH_INST_START; DU_LOG("\nSCH : Received RLC BO Status indication"); + cell = schCb[inst].cells[inst]; - SchCellCb *cell = schCb[inst].cells[inst]; - SchDlSlotInfo *schDlSlotInfo = \ - cell->schDlSlotInfo[(cell->slotInfo.slot + SCHED_DELTA + PHY_DELTA + MSG4_DELAY) % SCH_NUM_SLOTS]; + GET_UE_IDX(dlBoInfo->crnti, ueIdx); + ueCb = &cell->ueCb[ueIdx-1]; + lcId = dlBoInfo->lcId; - for(lcIdx = 0; lcIdx < dlBoInfo->numLc; lcIdx++) + if(lcId == SRB1_LCID || lcId == SRB2_LCID || lcId == SRB3_LCID || \ + (lcId >= MIN_DRB_LCID && lcId <= MAX_DRB_LCID)) { - if(dlBoInfo->boInfo[lcIdx].lcId == CCCH_LCID) - { - SCH_ALLOC(schDlSlotInfo->msg4Info, sizeof(Msg4Info)); - if(!schDlSlotInfo->msg4Info) - { - DU_LOG("\nSCH : Memory allocation failed for msg4Info"); - schDlSlotInfo = NULL; - return RFAILED; - } - schDlSlotInfo->msg4Info->crnti = dlBoInfo->crnti; - schDlSlotInfo->msg4Info->ndi = 1; - schDlSlotInfo->msg4Info->harqProcNum = 0; - schDlSlotInfo->msg4Info->dlAssignIdx = 0; - schDlSlotInfo->msg4Info->pucchTpc = 0; - schDlSlotInfo->msg4Info->pucchResInd = 0; - schDlSlotInfo->msg4Info->harqFeedbackInd = 0; - schDlSlotInfo->msg4Info->dciFormatId = 1; - } + SET_ONE_BIT(ueIdx, cell->boIndBitMap); + ueCb->dlInfo.dlLcCtxt[lcId].bo = dlBoInfo->dataVolume; } + else if(lcId != SRB0_LCID) + { + DU_LOG("\nSCH : Invalid LC Id %d in MacSchDlRlcBoInfo", lcId); + return RFAILED; + } + + slot = (cell->slotInfo.slot + SCHED_DELTA + PHY_DELTA + BO_DELTA) % SCH_NUM_SLOTS; + schDlSlotInfo = cell->schDlSlotInfo[slot]; + + SCH_ALLOC(schDlSlotInfo->dlMsgInfo, sizeof(DlMsgInfo)); + if(!schDlSlotInfo->dlMsgInfo) + { + DU_LOG("\nSCH : Memory allocation failed for dlMsgInfo"); + schDlSlotInfo = NULL; + return RFAILED; + } + schDlSlotInfo->dlMsgInfo->crnti = dlBoInfo->crnti; + schDlSlotInfo->dlMsgInfo->ndi = 1; + schDlSlotInfo->dlMsgInfo->harqProcNum = 0; + schDlSlotInfo->dlMsgInfo->dlAssignIdx = 0; + schDlSlotInfo->dlMsgInfo->pucchTpc = 0; + schDlSlotInfo->dlMsgInfo->pucchResInd = 0; + schDlSlotInfo->dlMsgInfo->harqFeedbackInd = 0; + schDlSlotInfo->dlMsgInfo->dciFormatId = 1; + if(lcId == SRB0_LCID) + schDlSlotInfo->dlMsgInfo->isMsg4Pdu = true; return ROK; } @@ -716,7 +739,6 @@ uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd) uint8_t lcgIdx; DU_LOG("\nSCH : Received BSR"); - cellCb = schCb[schInst].cells[schInst]; ueCb = schGetUeCb(cellCb, bsrInd->crnti); @@ -754,6 +776,7 @@ uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd) SchCellCb *cellCb = schCb[inst].cells[inst]; DU_LOG("\nSCH : Received SR"); + ueCb = schGetUeCb(cellCb, uciInd->crnti); if(uciInd->numSrBits)