Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Classification of RIC logs [JIRA ID - ODUHIGH-275]"
[o-du/l2.git]
/
src
/
5gnrsch
/
sch_ue_mgr.c
diff --git
a/src/5gnrsch/sch_ue_mgr.c
b/src/5gnrsch/sch_ue_mgr.c
index
e4612af
..
3e50010
100644
(file)
--- a/
src/5gnrsch/sch_ue_mgr.c
+++ b/
src/5gnrsch/sch_ue_mgr.c
@@
-58,8
+58,6
@@
void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\
{
Pst rspPst;
{
Pst rspPst;
- DU_LOG("\nSCH: Sending UE Create response to MAC");
-
cfgRsp->cellId = ueCfg->cellId;
cfgRsp->crnti = ueCfg->crnti;
GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx);
cfgRsp->cellId = ueCfg->cellId;
cfgRsp->crnti = ueCfg->crnti;
GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx);
@@
-68,18
+66,21
@@
void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\
/* Filling response post */
memset(&rspPst, 0, sizeof(Pst));
FILL_PST_SCH_TO_MAC(rspPst, inst);
/* Filling response post */
memset(&rspPst, 0, sizeof(Pst));
FILL_PST_SCH_TO_MAC(rspPst, inst);
- if(event == EVENT_
UE_CREATE
_REQ_TO_SCH)
+ if(event == EVENT_
ADD_UE_CONFIG
_REQ_TO_SCH)
{
{
- rspPst.event = EVENT_UE_CREATE_RSP_TO_MAC;
+ rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC;
+ DU_LOG("\nSCH: Sending UE Config response to MAC");
}
}
- else if(event == EVENT_
UE_RE
CONFIG_REQ_TO_SCH)
+ else if(event == EVENT_
MODIFY_UE_
CONFIG_REQ_TO_SCH)
{
rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC;
{
rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC;
+ DU_LOG("\nSCH: Sending UE Reconfig response to MAC");
}
SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp);
}
/*******************************************************************
}
SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp);
}
/*******************************************************************
+
*
* @brief Function to fill Dl Lc Context in SCH Ue Cb
*
*
* @brief Function to fill Dl Lc Context in SCH Ue Cb
*
@@
-293,20
+294,20
@@
SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg)
/*******************************************************************
*
/*******************************************************************
*
- * @brief
Hanles Ue create r
equest from MAC
+ * @brief
Function to Add Ue Config R
equest from MAC
*
* @details
*
*
* @details
*
- * Function : MacSch
UeCreate
Req
+ * Function : MacSch
AddUeConfig
Req
*
*
- * Functionality:
Hanles Ue create
request from MAC
+ * Functionality:
Function to Add Ue config
request from MAC
*
* @params[in]
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
*
* @params[in]
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t MacSch
UeCreate
Req(Pst *pst, SchUeCfg *ueCfg)
+uint8_t MacSch
AddUeConfig
Req(Pst *pst, SchUeCfg *ueCfg)
{
uint8_t ueIdx, lcIdx, ret = ROK;
SchCellCb *cellCb = NULLP;
{
uint8_t ueIdx, lcIdx, ret = ROK;
SchCellCb *cellCb = NULLP;
@@
-317,10
+318,10
@@
uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
if(!ueCfg)
{
if(!ueCfg)
{
- DU_LOG("\nSCH :
UE create request failed at MacSchUeCreate
Req()");
+ DU_LOG("\nSCH :
Adding UE Config Request failed at MacSchAddUeConfig
Req()");
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nSCH :
UE Create
Request for CRNTI[%d]", ueCfg->crnti);
+ DU_LOG("\nSCH :
Adding UE Config
Request for CRNTI[%d]", ueCfg->crnti);
cellCb = getSchCellCb(pst->event, inst, ueCfg);
/* Search if UE already configured */
cellCb = getSchCellCb(pst->event, inst, ueCfg);
/* Search if UE already configured */
@@
-337,7
+338,7
@@
uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg)
}
else
{
}
else
{
- DU_LOG("\n SCH : SchUeCb not found at MacSch
UeCreate
Req() ");
+ DU_LOG("\n SCH : SchUeCb not found at MacSch
AddUeConfig
Req() ");
SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
return RFAILED;
}
SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
return RFAILED;
}
@@
-383,7
+384,6
@@
uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
uint16_t puschSlot = 0;
uint16_t startRb = 0;
uint8_t numRb = 0;
uint16_t puschSlot = 0;
uint16_t startRb = 0;
uint8_t numRb = 0;
- uint8_t mcs = 4;
uint8_t numPdschSymbols= 14;
uint16_t tbSize = 0;
uint8_t buffer = 5;
uint8_t numPdschSymbols= 14;
uint16_t tbSize = 0;
uint8_t buffer = 5;
@@
-394,11
+394,11
@@
uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
uint8_t startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol;
uint8_t symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength;
uint8_t startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol;
uint8_t symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength;
- puschSlot = (pdcchSlot + k2) %
SCH_NUM_SLOTS
;
+ puschSlot = (pdcchSlot + k2) %
cellCb->numSlots
;
startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb;
tbSize = schCalcTbSize(dataVol + buffer); /* 2 bytes header + some buffer */
startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb;
tbSize = schCalcTbSize(dataVol + buffer); /* 2 bytes header + some buffer */
- numRb = schCalcNumPrb(tbSize,
mcs
, numPdschSymbols);
+ numRb = schCalcNumPrb(tbSize,
ueCb->ueCfg.ulModInfo.mcsIndex
, numPdschSymbols);
/* increment PUSCH PRB */
cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb;
/* increment PUSCH PRB */
cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb;
@@
-410,7
+410,9
@@
uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S
puschInfo->fdAlloc.numPrb = numRb;
puschInfo->tdAlloc.startSymb = startSymb;
puschInfo->tdAlloc.numSymb = symbLen;
puschInfo->fdAlloc.numPrb = numRb;
puschInfo->tdAlloc.startSymb = startSymb;
puschInfo->tdAlloc.numSymb = symbLen;
- puschInfo->tbInfo.mcs = mcs;
+ puschInfo->tbInfo.qamOrder = ueCb->ueCfg.ulModInfo.modOrder;
+ puschInfo->tbInfo.mcs = ueCb->ueCfg.ulModInfo.mcsIndex;
+ puschInfo->tbInfo.mcsTable = ueCb->ueCfg.ulModInfo.mcsTable;
puschInfo->tbInfo.ndi = 1; /* new transmission */
puschInfo->tbInfo.rv = 0;
puschInfo->tbInfo.tbSize = tbSize;
puschInfo->tbInfo.ndi = 1; /* new transmission */
puschInfo->tbInfo.rv = 0;
puschInfo->tbInfo.tbSize = tbSize;
@@
-521,20
+523,20
@@
uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo)
/*******************************************************************
*
/*******************************************************************
*
- * @brief
Hanles Ue Rec
onfig request from MAC
+ * @brief
Function to Modify Ue C
onfig request from MAC
*
* @details
*
*
* @details
*
- * Function : MacSch
UeRec
onfigReq
+ * Function : MacSch
ModUeC
onfigReq
*
*
- * Functionality:
Hanles Ue Rec
onfig request from MAC
+ * Functionality:
Function to modify Ue C
onfig request from MAC
*
* @params[in]
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
*
* @params[in]
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t MacSch
UeRec
onfigReq(Pst *pst, SchUeCfg *ueCfg)
+uint8_t MacSch
ModUeC
onfigReq(Pst *pst, SchUeCfg *ueCfg)
{
uint8_t ueIdx, lcIdx, ret = ROK;
SchCellCb *cellCb = NULLP;
{
uint8_t ueIdx, lcIdx, ret = ROK;
SchCellCb *cellCb = NULLP;
@@
-545,10
+547,10
@@
uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg)
if(!ueCfg)
{
if(!ueCfg)
{
- DU_LOG("\nSCH :
Reconfig request failed at MacSchUeRec
onfigReq()");
+ DU_LOG("\nSCH :
Modifying Ue Config request failed at MacSchModUeC
onfigReq()");
return RFAILED;
}
return RFAILED;
}
- DU_LOG("\nSCH :
Rec
onfig Request for CRNTI[%d]", ueCfg->crnti);
+ DU_LOG("\nSCH :
Modifying Ue C
onfig Request for CRNTI[%d]", ueCfg->crnti);
cellCb = getSchCellCb(pst->event, inst, ueCfg);
/* Search if UE already configured */
cellCb = getSchCellCb(pst->event, inst, ueCfg);
/* Search if UE already configured */
@@
-557,7
+559,7
@@
uint8_t MacSchUeReconfigReq(Pst *pst, SchUeCfg *ueCfg)
if(!ueCb)
{
if(!ueCb)
{
- DU_LOG("\n SCH : SchUeCb not found at MacSch
UeRec
onfigReq() ");
+ DU_LOG("\n SCH : SchUeCb not found at MacSch
ModUeC
onfigReq() ");
SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
return RFAILED;
}
SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp);
return RFAILED;
}