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 "Implementation of function for filling k0 and k1 table [Issue-ID: ODUHIGH...
[o-du/l2.git]
/
src
/
5gnrsch
/
sch.c
diff --git
a/src/5gnrsch/sch.c
b/src/5gnrsch/sch.c
index
3be7fba
..
9d115f1
100644
(file)
--- a/
src/5gnrsch/sch.c
+++ b/
src/5gnrsch/sch.c
@@
-50,7
+50,6
@@
SchCb schCb[SCH_MAX_INST];
void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm);
SchCb schCb[SCH_MAX_INST];
void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm);
-
/* local defines */
SchCellCfgCfmFunc SchCellCfgCfmOpts[] =
{
/* local defines */
SchCellCfgCfmFunc SchCellCfgCfmOpts[] =
{
@@
-198,6
+197,10
@@
uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
RgMngmt cfm;
Pst cfmPst;
RgMngmt cfm;
Pst cfmPst;
+#ifdef CALL_FLOW_DEBUG_LOG
+ DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : GENERAL_CFG_REQ\n");
+#endif
+
if(pst->dstInst < SCH_INST_START)
{
DU_LOG("\nERROR --> SCH : Invalid inst ID");
if(pst->dstInst < SCH_INST_START)
{
DU_LOG("\nERROR --> SCH : Invalid inst ID");
@@
-239,7
+242,7
@@
uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
cfm.cfm.reason = reason;
SchSendCfgCfm(&cfmPst, &cfm);
cfm.cfm.reason = reason;
SchSendCfgCfm(&cfmPst, &cfm);
- /* S
PutSBuf
(pst->region, pst->pool, (Data *)cfg, sizeof(RgMngmt)); */
+ /* S
CH_FREE
(pst->region, pst->pool, (Data *)cfg, sizeof(RgMngmt)); */
return ROK;
}/*-- SchProcGenCfgReq --*/
return ROK;
}/*-- SchProcGenCfgReq --*/
@@
-264,6
+267,10
@@
uint8_t MacSchSlotInd(Pst *pst, SlotIndInfo *slotInd)
{
Inst inst = pst->dstInst-SCH_INST_START;
{
Inst inst = pst->dstInst-SCH_INST_START;
+#ifdef CALL_FLOW_DEBUG_LOG
+ DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_SLOT_IND_TO_SCH\n");
+#endif
+
schProcessSlotInd(slotInd, inst);
return ROK;
schProcessSlotInd(slotInd, inst);
return ROK;
@@
-288,6
+295,11
@@
uint8_t MacSchSlotInd(Pst *pst, SlotIndInfo *slotInd)
uint8_t MacSchRachInd(Pst *pst, RachIndInfo *rachInd)
{
Inst inst = pst->dstInst-SCH_INST_START;
uint8_t MacSchRachInd(Pst *pst, RachIndInfo *rachInd)
{
Inst inst = pst->dstInst-SCH_INST_START;
+
+#ifdef CALL_FLOW_DEBUG_LOG
+ DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_RACH_IND_TO_SCH\n");
+#endif
+
DU_LOG("\nINFO --> SCH : Received Rach indication");
schProcessRachInd(rachInd, inst);
return ROK;
DU_LOG("\nINFO --> SCH : Received Rach indication");
schProcessRachInd(rachInd, inst);
return ROK;
@@
-312,6
+324,10
@@
uint8_t MacSchRachInd(Pst *pst, RachIndInfo *rachInd)
* ****************************************************************/
uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd)
{
* ****************************************************************/
uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd)
{
+#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:
switch(crcInd->crcInd[0])
{
case CRC_FAILED:
@@
-840,6
+856,11
@@
uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg)
SchCellCfgCfm schCellCfgCfm;
Pst rspPst;
Inst inst = pst->dstInst-1;
SchCellCfgCfm schCellCfgCfm;
Pst rspPst;
Inst inst = pst->dstInst-1;
+ SchPdschConfig pdschCfg;
+
+#ifdef CALL_FLOW_DEBUG_LOG
+ DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_SCH_CELL_CFG\n");
+#endif
schInitCellCb(inst, schCellCfg);
cellCb = schCb[inst].cells[inst]; //cells is of MAX_CELLS, why inst
schInitCellCb(inst, schCellCfg);
cellCb = schCb[inst].cells[inst]; //cells is of MAX_CELLS, why inst
@@
-851,6
+872,10
@@
uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg)
schCellCfg->ssbSchCfg.ssbOffsetPointA);
memcpy(&cellCb->cellCfg, schCellCfg, sizeof(SchCellCfg));
schCellCfg->ssbSchCfg.ssbOffsetPointA);
memcpy(&cellCb->cellCfg, schCellCfg, sizeof(SchCellCfg));
+ /* Fill K0 - K1 table for common cfg*/
+ BuildK0K1Table(cellCb, &cellCb->cellCfg.schInitialDlBwp.k0K1InfoTbl, true, cellCb->cellCfg.schInitialDlBwp.pdschCommon,
+ pdschCfg, DEFAULT_UL_ACK_LIST_COUNT, defaultUlAckTbl);
+
/* Initializing global variables */
cellCb->actvUeBitMap = 0;
cellCb->boIndBitMap = 0;
/* Initializing global variables */
cellCb->actvUeBitMap = 0;
cellCb->boIndBitMap = 0;
@@
-864,7
+889,6
@@
uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg)
schCellCfgCfm.rsp = RSP_OK;
ret = (*SchCellCfgCfmOpts[rspPst.selector])(&rspPst, &schCellCfgCfm);
schCellCfgCfm.rsp = RSP_OK;
ret = (*SchCellCfgCfmOpts[rspPst.selector])(&rspPst, &schCellCfgCfm);
-
return ret;
}
return ret;
}
@@
-896,8
+920,12
@@
uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo)
SchUeCb *ueCb = NULLP;
SchCellCb *cell = NULLP;
SchDlSlotInfo *schDlSlotInfo = NULLP;
SchUeCb *ueCb = NULLP;
SchCellCb *cell = NULLP;
SchDlSlotInfo *schDlSlotInfo = NULLP;
-
Inst inst = pst->dstInst-SCH_INST_START;
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
+
DU_LOG("\nDEBUG --> SCH : Received RLC BO Status indication");
cell = schCb[inst].cells[inst];
DU_LOG("\nDEBUG --> SCH : Received RLC BO Status indication");
cell = schCb[inst].cells[inst];
@@
-992,6
+1020,10
@@
uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd)
SchUeCb *ueCb = NULLP;
uint8_t lcgIdx;
SchUeCb *ueCb = NULLP;
uint8_t lcgIdx;
+#ifdef CALL_FLOW_DEBUG_LOG
+ DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_SHORT_BSR\n");
+#endif
+
DU_LOG("\nDEBUG --> SCH : Received BSR");
cellCb = schCb[schInst].cells[schInst];
ueCb = schGetUeCb(cellCb, bsrInd->crnti);
DU_LOG("\nDEBUG --> SCH : Received BSR");
cellCb = schCb[schInst].cells[schInst];
ueCb = schGetUeCb(cellCb, bsrInd->crnti);
@@
-1029,6
+1061,10
@@
uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd)
SchUeCb *ueCb;
SchCellCb *cellCb = schCb[inst].cells[inst];
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 SR");
ueCb = schGetUeCb(cellCb, uciInd->crnti);
DU_LOG("\nDEBUG --> SCH : Received SR");
ueCb = schGetUeCb(cellCb, uciInd->crnti);