X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=e96308a338a6d6b144d1952f15b50d2132efcc38;hb=c4b8f7a0c5c6491323c6a87b2d1031d61ee0188e;hp=d5176f17e31c1a9d0646b6f1501c46d8aba5b8d3;hpb=fe3e15254e67fd96dbfabec4bf7245c3b64ee415;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index d5176f17e..e96308a33 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -98,7 +98,7 @@ EXTERN Void rgGetSId ARGS((SystemId *s)); /* Public variable declaration */ ClCb clGlobalCp; -MacCb macCb; +extern MacCb macCb; int MacSchCellCfgReq(Pst *pst,MacCellCfg *macCellCfg); @@ -2217,6 +2217,52 @@ int MacSchCellCfgReq schCellCfg.schRachCfg.rsrpThreshSsb = macCellCfg->prachCfg.rsrpThreshSsb; schCellCfg.schRachCfg.raRspWindow = macCellCfg->prachCfg.raRspWindow; + /* fill initial DL BWP */ + schCellCfg.schInitialDlBwp.bwp.firstPrb = macCellCfg->initialDlBwp.bwp.firstPrb; + schCellCfg.schInitialDlBwp.bwp.numPrb = macCellCfg->initialDlBwp.bwp.numPrb; + schCellCfg.schInitialDlBwp.bwp.scs = macCellCfg->initialDlBwp.bwp.scs; + schCellCfg.schInitialDlBwp.bwp.cyclicPrefix = macCellCfg->initialDlBwp.bwp.cyclicPrefix; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.searchSpaceId = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.searchSpaceId; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.coresetId = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.coresetId; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.monitoringSlot = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.monitoringSlot; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.duration = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.duration; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.monitoringSymbol = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.monitoringSymbol; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel1 = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel1; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel2 = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel2; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel4 = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel4; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel8 = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel8; + schCellCfg.schInitialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel16 = + macCellCfg->initialDlBwp.pdcchCommon.raSearchSpace.candidate.aggLevel16; + schCellCfg.schInitialDlBwp.pdschCommon.k0 = macCellCfg->initialDlBwp.pdschCommon.k0; + schCellCfg.schInitialDlBwp.pdschCommon.mappingType = + macCellCfg->initialDlBwp.pdschCommon.mappingType; + schCellCfg.schInitialDlBwp.pdschCommon.startSymbol = + macCellCfg->initialDlBwp.pdschCommon.startSymbol; + schCellCfg.schInitialDlBwp.pdschCommon.lengthSymbol = + macCellCfg->initialDlBwp.pdschCommon.lengthSymbol; + + /* fill initial DL BWP */ + schCellCfg.schInitialUlBwp.bwp.firstPrb = macCellCfg->initialUlBwp.bwp.firstPrb; + schCellCfg.schInitialUlBwp.bwp.numPrb = macCellCfg->initialUlBwp.bwp.numPrb; + schCellCfg.schInitialUlBwp.bwp.scs = macCellCfg->initialUlBwp.bwp.scs; + schCellCfg.schInitialUlBwp.bwp.cyclicPrefix = macCellCfg->initialUlBwp.bwp.cyclicPrefix; + schCellCfg.schInitialUlBwp.puschCommon.k2 = macCellCfg->initialUlBwp.puschCommon.k2; + schCellCfg.schInitialUlBwp.puschCommon.mappingType = + macCellCfg->initialUlBwp.puschCommon.mappingType; + schCellCfg.schInitialUlBwp.puschCommon.startSymbol = + macCellCfg->initialUlBwp.puschCommon.startSymbol; + schCellCfg.schInitialUlBwp.puschCommon.lengthSymbol = + macCellCfg->initialUlBwp.puschCommon.lengthSymbol; + cfgPst.srcProcId = pst->dstProcId; cfgPst.dstProcId = pst->srcProcId;