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
Slot indication from MAC to DU APP : LWLC fix and LC
[o-du/l2.git]
/
src
/
du_app
/
du_msg_hdl.c
diff --git
a/src/du_app/du_msg_hdl.c
b/src/du_app/du_msg_hdl.c
index
be2bb54
..
a0f040e
100644
(file)
--- a/
src/du_app/du_msg_hdl.c
+++ b/
src/du_app/du_msg_hdl.c
@@
-36,6
+36,11
@@
extern DuCfgParams duCfgParam;
extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg);
extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg);
extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
+extern S16 BuildAndSendE2SetupReq();
+extern S16 egtpHdlDatInd(EgtpMsg egtpMsg);
+extern S16 BuildAndSendDUConfigUpdate();
+extern U16 getTransId();
+extern S16 cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg);
packMacCellCfgReq packMacCellCfgOpts[] =
{
packMacCellCfgReq packMacCellCfgOpts[] =
{
@@
-681,7
+686,7
@@
S16 duBuildMacGenCfg()
genCfg = &(rgMngmt.t.cfg.s.genCfg);
/*----------- Fill General Configuration Parameters ---------*/
genCfg = &(rgMngmt.t.cfg.s.genCfg);
/*----------- Fill General Configuration Parameters ---------*/
- genCfg->mem.region =
RG
_MEM_REGION;
+ genCfg->mem.region =
MAC
_MEM_REGION;
genCfg->mem.pool = RG_POOL;
genCfg->tmrRes = 10;
genCfg->numRguSaps = 2;
genCfg->mem.pool = RG_POOL;
genCfg->tmrRes = 10;
genCfg->numRguSaps = 2;
@@
-694,7
+699,7
@@
S16 duBuildMacGenCfg()
genCfg->lmPst.srcInst = macCfgInst;
genCfg->lmPst.prior = PRIOR0;
genCfg->lmPst.route = RTESPEC;
genCfg->lmPst.srcInst = macCfgInst;
genCfg->lmPst.prior = PRIOR0;
genCfg->lmPst.route = RTESPEC;
- genCfg->lmPst.region =
RG
_MEM_REGION;
+ genCfg->lmPst.region =
MAC
_MEM_REGION;
genCfg->lmPst.pool = RG_POOL;
genCfg->lmPst.selector = DU_SELECTOR_LC;
genCfg->lmPst.pool = RG_POOL;
genCfg->lmPst.selector = DU_SELECTOR_LC;
@@
-710,7
+715,7
@@
S16 duBuildMacGenCfg()
rgMngmt.hdr.response.prior = PRIOR0;
rgMngmt.hdr.response.route = RTESPEC;
rgMngmt.hdr.response.prior = PRIOR0;
rgMngmt.hdr.response.route = RTESPEC;
- rgMngmt.hdr.response.mem.region =
RG
_MEM_REGION;
+ rgMngmt.hdr.response.mem.region =
MAC
_MEM_REGION;
rgMngmt.hdr.response.mem.pool = RG_POOL;
rgMngmt.hdr.response.selector = DU_SELECTOR_LC;
rgMngmt.hdr.response.mem.pool = RG_POOL;
rgMngmt.hdr.response.selector = DU_SELECTOR_LC;
@@
-757,7
+762,7
@@
S16 duBuildMacUsapCfg(SpId sapId)
uSap = &(rgMngmt.t.cfg.s.rguSap);
uSap = &(rgMngmt.t.cfg.s.rguSap);
- uSap->mem.region =
RG
_MEM_REGION;
+ uSap->mem.region =
MAC
_MEM_REGION;
uSap->mem.pool = RG_POOL;
uSap->suId = 0;
uSap->spId = sapId;
uSap->mem.pool = RG_POOL;
uSap->suId = 0;
uSap->spId = sapId;
@@
-773,7
+778,7
@@
S16 duBuildMacUsapCfg(SpId sapId)
rgMngmt.hdr.entId.ent = ENTRG;
rgMngmt.hdr.entId.inst = (Inst)0;
rgMngmt.hdr.elmId.elmnt = STRGUSAP;
rgMngmt.hdr.entId.ent = ENTRG;
rgMngmt.hdr.entId.inst = (Inst)0;
rgMngmt.hdr.elmId.elmnt = STRGUSAP;
- rgMngmt.hdr.response.mem.region =
RG
_MEM_REGION;
+ rgMngmt.hdr.response.mem.region =
MAC
_MEM_REGION;
rgMngmt.hdr.response.mem.pool = RG_POOL;
/* fill pst */
rgMngmt.hdr.response.mem.pool = RG_POOL;
/* fill pst */
@@
-1362,7
+1367,7
@@
S16 duSendSchCfg()
/* Filling of Instance Id */
cfg->instId = DEFAULT_CELLS + 1;
/* Filling of Gen config */
/* Filling of Instance Id */
cfg->instId = DEFAULT_CELLS + 1;
/* Filling of Gen config */
- cfg->genCfg.mem.region =
RG
_MEM_REGION;
+ cfg->genCfg.mem.region =
MAC
_MEM_REGION;
cfg->genCfg.mem.pool = RG_POOL;
cfg->genCfg.tmrRes = 10;
cfg->genCfg.mem.pool = RG_POOL;
cfg->genCfg.tmrRes = 10;
@@
-1379,7
+1384,7
@@
S16 duSendSchCfg()
cfg->genCfg.lmPst.srcInst = DEFAULT_CELLS + 1;
cfg->genCfg.lmPst.prior = PRIOR0;
cfg->genCfg.lmPst.route = RTESPEC;
cfg->genCfg.lmPst.srcInst = DEFAULT_CELLS + 1;
cfg->genCfg.lmPst.prior = PRIOR0;
cfg->genCfg.lmPst.route = RTESPEC;
- cfg->genCfg.lmPst.region =
RG
_MEM_REGION;
+ cfg->genCfg.lmPst.region =
MAC
_MEM_REGION;
cfg->genCfg.lmPst.pool = RG_POOL;
cfg->genCfg.lmPst.selector = DU_SELECTOR_LC;
cfg->genCfg.lmPst.pool = RG_POOL;
cfg->genCfg.lmPst.selector = DU_SELECTOR_LC;
@@
-1388,7
+1393,7
@@
S16 duSendSchCfg()
rgMngmt.hdr.entId.ent = ENTRG;
rgMngmt.hdr.entId.inst = DU_INST;
rgMngmt.hdr.elmId.elmnt = STSCHINST;
rgMngmt.hdr.entId.ent = ENTRG;
rgMngmt.hdr.entId.inst = DU_INST;
rgMngmt.hdr.elmId.elmnt = STSCHINST;
- rgMngmt.hdr.response.mem.region =
RG
_MEM_REGION;
+ rgMngmt.hdr.response.mem.region =
MAC
_MEM_REGION;
rgMngmt.hdr.response.mem.pool = RG_POOL;
/* Fill Pst */
rgMngmt.hdr.response.mem.pool = RG_POOL;
/* Fill Pst */
@@
-1581,7
+1586,7
@@
S16 duBuildAndSendMacCellCfg()
* RFAILED - failure
*
***************************************************************************/
* RFAILED - failure
*
***************************************************************************/
-
uint16_t duHandleMacCellCfgCfm(
MacCellCfgCfm *macCellCfgCfm)
+
int duHandleMacCellCfgCfm(Pst *pst,
MacCellCfgCfm *macCellCfgCfm)
{
S16 ret = ROK;
{
S16 ret = ROK;
@@
-1661,7
+1666,10
@@
uint16_t duHandleSlotInd(Pst *pst, SlotInfo *slotInfo)
#ifdef EGTP_TEST
duSendEgtpSlotInd();
#endif
#ifdef EGTP_TEST
duSendEgtpSlotInd();
#endif
- DU_FREE_MEM(pst->region, pst->pool, slotInfo, sizeof(SlotInfo));
+
+ if((pst->selector == DU_SELECTOR_LWLC) || (pst->selector == DU_SELECTOR_TC))
+ DU_FREE_SHRABL_BUF(MAC_MEM_REGION, pst->pool, slotInfo, sizeof(SlotInfo));
+
return ROK;
}
return ROK;
}