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
U8, U16, U32 data type changes
[o-du/l2.git]
/
src
/
5gnrsch
/
sch.c
diff --git
a/src/5gnrsch/sch.c
b/src/5gnrsch/sch.c
index
7b1199f
..
03896c0
100644
(file)
--- a/
src/5gnrsch/sch.c
+++ b/
src/5gnrsch/sch.c
@@
-113,7
+113,7
@@
uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason)
* reason for success/failure of this function.
*
* @param[in] RgCfg *cfg, the Configuaration information
* reason for success/failure of this function.
*
* @param[in] RgCfg *cfg, the Configuaration information
- * @return
U16
+ * @return
uint16_t
* -# LCM_REASON_NOT_APPL
* -# LCM_REASON_INVALID_MSGTYPE
* -# LCM_REASON_MEM_NOAVAIL
* -# LCM_REASON_NOT_APPL
* -# LCM_REASON_INVALID_MSGTYPE
* -# LCM_REASON_MEM_NOAVAIL
@@
-130,8
+130,8
@@
uint8_t SchInstCfg(RgCfg *cfg, Inst dInst)
return LCM_REASON_INVALID_MSGTYPE;
}
/* Update the Pst structure for LM interface */
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;
sizeof(Pst));
schCb[inst].schInit.inst = inst;
@@
-151,9
+151,9
@@
uint8_t SchInstCfg(RgCfg *cfg, Inst dInst)
schCb[inst].genCfg.startCellId = cfg->s.schInstCfg.genCfg.startCellId;
#if 0
/* Initialzie the timer queue */
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 */
/* 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 */
schCb[inst].tmrTqCp.tmrLen = RGSCH_TQ_SIZE;
/* SS_MT_TMR needs to be enabled as schActvTmr needs instance information */
@@
-193,8
+193,8
@@
uint8_t SchInstCfg(RgCfg *cfg, Inst dInst)
**/
uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
{
**/
uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
{
- uint8_t
ret = LCM_PRIM_OK;
- uint16_t
reason = LCM_REASON_NOT_APPL;
+ uint8_t ret = LCM_PRIM_OK;
+ uint16_t reason = LCM_REASON_NOT_APPL;
RgMngmt cfm;
Pst cfmPst;
RgMngmt cfm;
Pst cfmPst;
@@
-210,7
+210,7
@@
uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
memset(&cfmPst, 0 , sizeof(Pst));
SchFillCfmPst(pst, &cfmPst, 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 =
#ifdef LMINT3
cfm.hdr.transId =
@@
-463,7
+463,7
@@
void fillSchSib1Cfg(Inst schInst, SchSib1Cfg *sib1SchCfg, uint16_t pci, \
sib1SchCfg->n0 = slotIndex;
/* calculate the PRBs */
sib1SchCfg->n0 = slotIndex;
/* calculate the PRBs */
-
schAllocFreqDomRs
cType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
+
freqDomRscAllo
cType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
/* fill BWP */
bwp->freqAlloc.numPrb = MAX_NUM_RB; /* whole of BW */
/* fill BWP */
bwp->freqAlloc.numPrb = MAX_NUM_RB; /* whole of BW */
@@
-672,7
+672,6
@@
uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo)
Inst inst = pst->dstInst-SCH_INST_START;
DU_LOG("\nSCH : Received RLC BO Status indication");
Inst inst = pst->dstInst-SCH_INST_START;
DU_LOG("\nSCH : Received RLC BO Status indication");
-
cell = schCb[inst].cells[inst];
GET_UE_IDX(dlBoInfo->crnti, ueIdx);
cell = schCb[inst].cells[inst];
GET_UE_IDX(dlBoInfo->crnti, ueIdx);
@@
-683,7
+682,7
@@
uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo)
(lcId >= MIN_DRB_LCID && lcId <= MAX_DRB_LCID))
{
SET_ONE_BIT(ueIdx, cell->boIndBitMap);
(lcId >= MIN_DRB_LCID && lcId <= MAX_DRB_LCID))
{
SET_ONE_BIT(ueIdx, cell->boIndBitMap);
- ueCb->dlLcCtxt[lcId].bo = dlBoInfo->dataVolume;
+ ueCb->dl
Info.dl
LcCtxt[lcId].bo = dlBoInfo->dataVolume;
}
else if(lcId != SRB0_LCID)
{
}
else if(lcId != SRB0_LCID)
{
@@
-740,7
+739,6
@@
uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd)
uint8_t lcgIdx;
DU_LOG("\nSCH : Received BSR");
uint8_t lcgIdx;
DU_LOG("\nSCH : Received BSR");
-
cellCb = schCb[schInst].cells[schInst];
ueCb = schGetUeCb(cellCb, bsrInd->crnti);
cellCb = schCb[schInst].cells[schInst];
ueCb = schGetUeCb(cellCb, bsrInd->crnti);
@@
-778,6
+776,7
@@
uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd)
SchCellCb *cellCb = schCb[inst].cells[inst];
DU_LOG("\nSCH : Received SR");
SchCellCb *cellCb = schCb[inst].cells[inst];
DU_LOG("\nSCH : Received SR");
+
ueCb = schGetUeCb(cellCb, uciInd->crnti);
if(uciInd->numSrBits)
ueCb = schGetUeCb(cellCb, uciInd->crnti);
if(uciInd->numSrBits)