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 "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-472] Handling of drx timer in SCH...
[o-du/l2.git]
/
src
/
5gnrsch
/
sch.c
diff --git
a/src/5gnrsch/sch.c
b/src/5gnrsch/sch.c
index
1bd9343
..
d05029d
100644
(file)
--- a/
src/5gnrsch/sch.c
+++ b/
src/5gnrsch/sch.c
@@
-66,11
+66,11
@@
SchSliceCfgRspFunc SchSliceCfgRspOpts[] =
};
};
-SchSliceRe
CfgRspFunc SchSliceReC
fgRspOpts[] =
+SchSliceRe
cfgRspFunc SchSliceRec
fgRspOpts[] =
{
{
- packSchSliceRe
C
fgRsp, /* LC */
- MacProcSchSliceRe
C
fgRsp, /* TC */
- packSchSliceRe
C
fgRsp /* LWLC */
+ packSchSliceRe
c
fgRsp, /* LC */
+ MacProcSchSliceRe
c
fgRsp, /* TC */
+ packSchSliceRe
c
fgRsp /* LWLC */
};
/**
};
/**
@@
-1129,42
+1129,42
@@
uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd)
/*******************************************************************
*
/*******************************************************************
*
- * @brief Processes
HARQ UCI
indication from MAC
+ * @brief Processes
DL HARQ
indication from MAC
*
* @details
*
*
* @details
*
- * Function : MacSch
HarqUci
Ind
+ * Function : MacSch
DlHarq
Ind
*
* Functionality:
*
* Functionality:
- * Processes
HARQ UCI
indication from MAC
+ * Processes
DL HARQ
indication from MAC
*
* @params[in] Post structure
*
* @params[in] Post structure
- *
UCI
Indication
+ *
DL HARQ
Indication
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t MacSch
HarqUciInd(Pst *pst, HarqUciIndInfo *uci
Ind)
+uint8_t MacSch
DlHarqInd(Pst *pst, DlHarqInd *dlHarq
Ind)
{
Inst inst = pst->dstInst-SCH_INST_START;
SchUeCb *ueCb;
SchCellCb *cellCb = schCb[inst].cells[inst];
#ifdef CALL_FLOW_DEBUG_LOG
{
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");
+ DU_LOG("\nCall Flow: ENTMAC -> ENTSCH : EVENT_
DL_HARQ
_IND_TO_SCH\n");
#endif
DU_LOG("\nDEBUG --> SCH : Received HARQ");
#endif
DU_LOG("\nDEBUG --> SCH : Received HARQ");
- ueCb = schGetUeCb(cellCb,
uci
Ind->crnti);
+ ueCb = schGetUeCb(cellCb,
dlHarq
Ind->crnti);
if(ueCb->state == SCH_UE_STATE_INACTIVE)
{
if(ueCb->state == SCH_UE_STATE_INACTIVE)
{
- DU_LOG("\nERROR --> SCH : Crnti %d is inactive",
uci
Ind->crnti);
+ DU_LOG("\nERROR --> SCH : Crnti %d is inactive",
dlHarq
Ind->crnti);
return ROK;
}
return ROK;
}
- schUpdateHarqFdbk(ueCb,
uciInd->numHarq, uciInd->harqPayload, &uci
Ind->slotInd);
+ schUpdateHarqFdbk(ueCb,
dlHarqInd->numHarq, dlHarqInd->harqPayload, &dlHarq
Ind->slotInd);
return ROK;
}
return ROK;
}
@@
-1674,7
+1674,7
@@
void SchSendSliceCfgRspToMac(Inst inst, SchSliceCfgRsp sliceCfgRsp)
* RFAILED - Failure
*
* ********************************************************************************/
* RFAILED - Failure
*
* ********************************************************************************/
-uint8_t fillSliceCfgRsp(bool sliceRe
C
fg, SchSliceCfg *storedSliceCfg, SchCellCb *cellCb, SchSliceCfgReq *schSliceCfgReq, SchSliceCfgRsp *schSliceCfgRsp, uint8_t *count)
+uint8_t fillSliceCfgRsp(bool sliceRe
c
fg, SchSliceCfg *storedSliceCfg, SchCellCb *cellCb, SchSliceCfgReq *schSliceCfgReq, SchSliceCfgRsp *schSliceCfgRsp, uint8_t *count)
{
bool sliceFound = false;
uint8_t cfgIdx = 0, sliceIdx = 0;
{
bool sliceFound = false;
uint8_t cfgIdx = 0, sliceIdx = 0;
@@
-1691,7
+1691,7
@@
uint8_t fillSliceCfgRsp(bool sliceReCfg, SchSliceCfg *storedSliceCfg, SchCellCb
{
sliceFound = false;
/* Here comparing the slice cfg request with the slice stored in cellCfg */
{
sliceFound = false;
/* Here comparing the slice cfg request with the slice stored in cellCfg */
- if(sliceRe
C
fg != true)
+ if(sliceRe
c
fg != true)
{
for(sliceIdx = 0; sliceIdx<cellCb->cellCfg.plmnInfoList.numSliceSupport; sliceIdx++)
{
{
for(sliceIdx = 0; sliceIdx<cellCb->cellCfg.plmnInfoList.numSliceSupport; sliceIdx++)
{
@@
-1819,25
+1819,25
@@
uint8_t addSliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq, S
* ROK - Success
* RFAILED - Failure
* ********************************************************************************/
* ROK - Success
* RFAILED - Failure
* ********************************************************************************/
-void freeSchSliceCfgReq(SchSliceCfgReq *
c
fgReq)
+void freeSchSliceCfgReq(SchSliceCfgReq *
sliceC
fgReq)
{
uint8_t cfgIdx = 0;
{
uint8_t cfgIdx = 0;
- if(
c
fgReq)
+ if(
sliceC
fgReq)
{
{
- if(
c
fgReq->numOfConfiguredSlice)
+ if(
sliceC
fgReq->numOfConfiguredSlice)
{
{
- for(cfgIdx = 0; cfgIdx<
c
fgReq->numOfConfiguredSlice; cfgIdx++)
+ for(cfgIdx = 0; cfgIdx<
sliceC
fgReq->numOfConfiguredSlice; cfgIdx++)
{
{
- if(
c
fgReq->listOfConfirguration[cfgIdx])
+ if(
sliceC
fgReq->listOfConfirguration[cfgIdx])
{
{
- SCH_FREE(
c
fgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo, sizeof(SchRrmPolicyRatio));
- SCH_FREE(
c
fgReq->listOfConfirguration[cfgIdx], sizeof(SchRrmPolicyOfSlice));
+ SCH_FREE(
sliceC
fgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo, sizeof(SchRrmPolicyRatio));
+ SCH_FREE(
sliceC
fgReq->listOfConfirguration[cfgIdx], sizeof(SchRrmPolicyOfSlice));
}
}
}
}
- SCH_FREE(
cfgReq->listOfConfirguration, c
fgReq->numOfConfiguredSlice * sizeof(SchRrmPolicyOfSlice*));
+ SCH_FREE(
sliceCfgReq->listOfConfirguration, sliceC
fgReq->numOfConfiguredSlice * sizeof(SchRrmPolicyOfSlice*));
}
}
- SCH_FREE(
c
fgReq, sizeof(SchSliceCfgReq));
+ SCH_FREE(
sliceC
fgReq, sizeof(SchSliceCfgReq));
}
}
/*******************************************************************************
}
}
/*******************************************************************************
@@
-1910,7
+1910,7
@@
uint8_t MacSchSliceCfgReq(Pst *pst, SchSliceCfgReq *schSliceCfgReq)
* RFAILED - Failure
*
* ********************************************************************************/
* RFAILED - Failure
*
* ********************************************************************************/
-uint8_t modifySliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSlice
CfgReq *cfgReq, SchSliceCfgRsp
cfgRsp, uint8_t count)
+uint8_t modifySliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSlice
RecfgReq *recfgReq, SchSliceRecfgRsp re
cfgRsp, uint8_t count)
{
uint8_t cfgIdx = 0, sliceIdx = 0;
{
uint8_t cfgIdx = 0, sliceIdx = 0;
@@
-1922,15
+1922,15
@@
uint8_t modifySliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq
return RFAILED;
}
return RFAILED;
}
- for(cfgIdx = 0; cfgIdx<cfgReq->numOfConfiguredSlice; cfgIdx++)
+ for(cfgIdx = 0; cfgIdx<
re
cfgReq->numOfConfiguredSlice; cfgIdx++)
{
{
- if(cfgRsp.listOfSliceCfgRsp[cfgIdx]->rsp == RSP_OK)
+ if(
re
cfgRsp.listOfSliceCfgRsp[cfgIdx]->rsp == RSP_OK)
{
for(sliceIdx = 0; sliceIdx<storeSliceCfg->numOfSliceConfigured; sliceIdx++)
{
{
for(sliceIdx = 0; sliceIdx<storeSliceCfg->numOfSliceConfigured; sliceIdx++)
{
- if(!memcmp(&storeSliceCfg->listOfConfirguration[sliceIdx]->snssai, &cfgReq->listOfConfirguration[cfgIdx]->snssai, sizeof(Snssai)))
+ if(!memcmp(&storeSliceCfg->listOfConfirguration[sliceIdx]->snssai, &
re
cfgReq->listOfConfirguration[cfgIdx]->snssai, sizeof(Snssai)))
{
{
- memcpy(storeSliceCfg->listOfConfirguration[sliceIdx]->rrmPolicyRatioInfo, cfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo,
+ memcpy(storeSliceCfg->listOfConfirguration[sliceIdx]->rrmPolicyRatioInfo,
re
cfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo,
sizeof(SchRrmPolicyRatio));
break;
}
sizeof(SchRrmPolicyRatio));
break;
}
@@
-1938,7
+1938,7
@@
uint8_t modifySliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq
}
}
}
}
}
}
- freeSchSliceCfgReq(cfgReq);
+ freeSchSliceCfgReq(
re
cfgReq);
return ROK;
}
/*******************************************************************************
return ROK;
}
/*******************************************************************************
@@
-1947,17
+1947,17
@@
uint8_t modifySliceCfgInSchDb(SchSliceCfg *storeSliceCfg, SchSliceCfgReq *cfgReq
*
* @details
*
*
* @details
*
- * Function : SchSendSlice
C
fgRspToMac
+ * Function : SchSendSlice
Rec
fgRspToMac
*
* Functionality:
* function is used to send Slice re Cfg rsp to MAC
*
*
* Functionality:
* function is used to send Slice re Cfg rsp to MAC
*
- * @params[in] Pst *pst, SchSlice
CfgRsp schSliceReC
fgRsp
+ * @params[in] Pst *pst, SchSlice
RecfgRsp schSliceRec
fgRsp
*
* @return- void
*
* ********************************************************************************/
*
* @return- void
*
* ********************************************************************************/
-void SchSendSliceRe
CfgRspToMac(Inst inst, SchSliceCfgRsp schSliceReC
fgRsp)
+void SchSendSliceRe
cfgRspToMac(Inst inst, SchSliceRecfgRsp schSliceRec
fgRsp)
{
Pst rspPst;
{
Pst rspPst;
@@
-1965,7
+1965,7
@@
void SchSendSliceReCfgRspToMac(Inst inst, SchSliceCfgRsp schSliceReCfgRsp)
FILL_PST_SCH_TO_MAC(rspPst, inst);
rspPst.event = EVENT_SLICE_RECFG_RSP_TO_MAC;
FILL_PST_SCH_TO_MAC(rspPst, inst);
rspPst.event = EVENT_SLICE_RECFG_RSP_TO_MAC;
- SchSliceRe
CfgRspOpts[rspPst.selector](&rspPst, &schSliceReC
fgRsp);
+ SchSliceRe
cfgRspOpts[rspPst.selector](&rspPst, &schSliceRec
fgRsp);
}
/*******************************************************************************
*
}
/*******************************************************************************
*
@@
-1973,48
+1973,48
@@
void SchSendSliceReCfgRspToMac(Inst inst, SchSliceCfgRsp schSliceReCfgRsp)
*
* @details
*
*
* @details
*
- * Function : MacSchSliceRe
C
fgReq
+ * Function : MacSchSliceRe
c
fgReq
*
* Functionality:
* function is used to store the slice re configuration Sch DB
*
*
* Functionality:
* function is used to store the slice re configuration Sch DB
*
- * @params[in] Pst *pst, SchSlice
CfgReq *schSliceReC
fgReq
+ * @params[in] Pst *pst, SchSlice
RecfgReq *schSliceRec
fgReq
*
* @return
* ROK - Success
* RFAILED - Failure
*
* ********************************************************************************/
*
* @return
* ROK - Success
* RFAILED - Failure
*
* ********************************************************************************/
-uint8_t MacSchSliceRe
CfgReq(Pst *pst, SchSliceCfgReq *schSliceReC
fgReq)
+uint8_t MacSchSliceRe
cfgReq(Pst *pst, SchSliceRecfgReq *schSliceRec
fgReq)
{
uint8_t count = 0;
Inst inst = pst->dstInst - SCH_INST_START;
{
uint8_t count = 0;
Inst inst = pst->dstInst - SCH_INST_START;
- SchSlice
CfgRsp schSliceReC
fgRsp;
+ SchSlice
RecfgRsp schSliceRec
fgRsp;
DU_LOG("\nINFO --> SCH : Received Slice ReCfg request from MAC");
DU_LOG("\nINFO --> SCH : Received Slice ReCfg request from MAC");
- if(schSliceRe
C
fgReq)
+ if(schSliceRe
c
fgReq)
{
{
- if(schSliceRe
C
fgReq->listOfConfirguration)
+ if(schSliceRe
c
fgReq->listOfConfirguration)
{
/* filling the slice configuration response of each slice */
{
/* filling the slice configuration response of each slice */
- if(fillSliceCfgRsp(true, &schCb[inst].sliceCfg, NULLP, schSliceRe
CfgReq, &schSliceReC
fgRsp, &count) != ROK)
+ if(fillSliceCfgRsp(true, &schCb[inst].sliceCfg, NULLP, schSliceRe
cfgReq, &schSliceRec
fgRsp, &count) != ROK)
{
DU_LOG("\nERROR --> SCH : Failed to fill sch slice cfg response");
return RFAILED;
}
/* Modify the slice configuration stored in schCb */
{
DU_LOG("\nERROR --> SCH : Failed to fill sch slice cfg response");
return RFAILED;
}
/* Modify the slice configuration stored in schCb */
- if(modifySliceCfgInSchDb(&schCb[inst].sliceCfg, schSliceRe
CfgReq, schSliceReC
fgRsp, count) != ROK)
+ if(modifySliceCfgInSchDb(&schCb[inst].sliceCfg, schSliceRe
cfgReq, schSliceRec
fgRsp, count) != ROK)
{
DU_LOG("\nERROR --> SCH : Failed to modify slice cfg of SchDb");
return RFAILED;
}
{
DU_LOG("\nERROR --> SCH : Failed to modify slice cfg of SchDb");
return RFAILED;
}
- SchSendSliceRe
CfgRspToMac(inst, schSliceReC
fgRsp);
+ SchSendSliceRe
cfgRspToMac(inst, schSliceRec
fgRsp);
}
}
else
{
}
}
else
{
- DU_LOG("\nERROR --> SCH : Received SchSlice
C
fgReq is NULL");
+ DU_LOG("\nERROR --> SCH : Received SchSlice
Rec
fgReq is NULL");
}
return ROK;
}
}
return ROK;
}