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
Replaced old SSI function with new macros jira id - ODUHIGH-212
[o-du/l2.git]
/
src
/
5gnrsch
/
sch.c
diff --git
a/src/5gnrsch/sch.c
b/src/5gnrsch/sch.c
index
a16f307
..
2b92156
100644
(file)
--- a/
src/5gnrsch/sch.c
+++ b/
src/5gnrsch/sch.c
@@
-83,7
+83,7
@@
uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason)
Inst inst = (instId - SCH_INST_START);
/* Initialize the MAC TskInit structure to zero */
Inst inst = (instId - SCH_INST_START);
/* Initialize the MAC TskInit structure to zero */
-
cmM
emset ((uint8_t *)&schCb[inst], 0, sizeof(schCb));
+
m
emset ((uint8_t *)&schCb[inst], 0, sizeof(schCb));
/* Initialize the MAC TskInit with received values */
schCb[inst].schInit.ent = entity;
/* Initialize the MAC TskInit with received values */
schCb[inst].schInit.ent = entity;
@@
-117,7
+117,7
@@
uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason)
* -# LCM_REASON_INVALID_MSGTYPE
* -# LCM_REASON_MEM_NOAVAIL
**/
* -# LCM_REASON_INVALID_MSGTYPE
* -# LCM_REASON_MEM_NOAVAIL
**/
-PUBLIC
U16
SchInstCfg(RgCfg *cfg, Inst dInst)
+PUBLIC
uint8_t
SchInstCfg(RgCfg *cfg, Inst dInst)
{
uint16_t ret = LCM_REASON_NOT_APPL;
Inst inst = (dInst - SCH_INST_START);
{
uint16_t ret = LCM_REASON_NOT_APPL;
Inst inst = (dInst - SCH_INST_START);
@@
-129,8
+129,8
@@
PUBLIC U16 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 */
-
cmMemcpy((U8
*)&schCb[inst].schInit.lmPst,
- (
U8
*)&cfg->s.schInstCfg.genCfg.lmPst,
+
memcpy((uint8_t
*)&schCb[inst].schInit.lmPst,
+ (
uint8_t
*)&cfg->s.schInstCfg.genCfg.lmPst,
sizeof(Pst));
schCb[inst].schInit.inst = inst;
sizeof(Pst));
schCb[inst].schInit.inst = inst;
@@
-150,19
+150,19
@@
PUBLIC U16 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 */
-
cmMemset((U8
*)&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE);
+
memset((uint8_t
*)&schCb[inst].tmrTq, 0, sizeof(CmTqType)*RGSCH_TQ_SIZE);
/* Initialize the timer control point */
/* Initialize the timer control point */
-
cmMemset((U8
*)&schCb[inst].tmrTqCp, 0, sizeof(CmTqCp));
+
memset((uint8_t
*)&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 */
/* Timer Registration request to SSI */
schCb[inst].tmrTqCp.tmrLen = RGSCH_TQ_SIZE;
/* SS_MT_TMR needs to be enabled as schActvTmr needs instance information */
/* Timer Registration request to SSI */
- if (
SRegTmrMt
(schCb[inst].schInit.ent, dInst,
- (
S16
)schCb[inst].genCfg.tmrRes, schActvTmr) != ROK)
+ if (
ODU_REG_TMR_MT
(schCb[inst].schInit.ent, dInst,
+ (
int
)schCb[inst].genCfg.tmrRes, schActvTmr) != ROK)
{
RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "SchInstCfg(): Failed to "
"register timer.");
{
RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "SchInstCfg(): Failed to "
"register timer.");
-
RETVALUE
(LCM_REASON_MEM_NOAVAIL);
+
return
(LCM_REASON_MEM_NOAVAIL);
}
#endif
/* Set Config done in TskInit */
}
#endif
/* Set Config done in TskInit */
@@
-190,9
+190,9
@@
PUBLIC U16 SchInstCfg(RgCfg *cfg, Inst dInst)
* @return S16
* -# ROK
**/
* @return S16
* -# ROK
**/
-
in
t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
+
uint8_
t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
{
{
- uint
16
_t ret = LCM_PRIM_OK;
+ uint
8
_t ret = LCM_PRIM_OK;
uint16_t reason = LCM_REASON_NOT_APPL;
RgMngmt cfm;
Pst cfmPst;
uint16_t reason = LCM_REASON_NOT_APPL;
RgMngmt cfm;
Pst cfmPst;
@@
-209,7
+209,7
@@
int SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
memset(&cfmPst, 0 , sizeof(Pst));
SchFillCfmPst(pst, &cfmPst, cfg);
memset(&cfmPst, 0 , sizeof(Pst));
SchFillCfmPst(pst, &cfmPst, cfg);
-
cmMemset((U8
*)&cfm, 0, sizeof(RgMngmt));
+
memset((uint8_t
*)&cfm, 0, sizeof(RgMngmt));
#ifdef LMINT3
cfm.hdr.transId =
#ifdef LMINT3
cfm.hdr.transId =
@@
-343,7
+343,7
@@
uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd)
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-
in
t schInitCellCb(Inst inst, SchCellCfg *schCellCfg)
+
uint8_
t schInitCellCb(Inst inst, SchCellCfg *schCellCfg)
{
SchCellCb *cell;
SCH_ALLOC(cell, sizeof(SchCellCb));
{
SchCellCb *cell;
SCH_ALLOC(cell, sizeof(SchCellCb));