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
Cell and Network slicing configuration over o1.
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_lmm.c
diff --git
a/src/5gnrmac/rg_lmm.c
b/src/5gnrmac/rg_lmm.c
index
1f22ac3
..
a8fc28a
100755
(executable)
--- a/
src/5gnrmac/rg_lmm.c
+++ b/
src/5gnrmac/rg_lmm.c
@@
-45,6
+45,7
@@
#include "rgr.h" /* LRG Interface defines */
#include "rg.h" /* MAC defines */
#include "rg_err.h" /* MAC error defines */
#include "rgr.h" /* LRG Interface defines */
#include "rg.h" /* MAC defines */
#include "rg_err.h" /* MAC error defines */
+#include "mac_utils.h"
/* header/extern include files (.x) */
#include "crg.x" /* CRG Interface includes */
/* header/extern include files (.x) */
#include "crg.x" /* CRG Interface includes */
@@
-61,12
+62,11
@@
#endif
#include "ss_rbuf.h"
#include "ss_rbuf.x"
#endif
#include "ss_rbuf.h"
#include "ss_rbuf.x"
-#include "lwr_mac.h" /* MAC CL defines */
#include "mac_sch_interface.h"
#include "lwr_mac_upr_inf.h"
#include "mac.h"
#include "mac_sch_interface.h"
#include "lwr_mac_upr_inf.h"
#include "mac.h"
-#include "lwr_mac_phy.h"
#include "lwr_mac_fsm.h"
#include "lwr_mac_fsm.h"
+#include "lwr_mac_phy.h"
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-77,7
+77,6
@@
Void rgGetSId ARGS((SystemId *s));
#endif /* __cplusplus */
/* Public variable declaration */
#endif /* __cplusplus */
/* Public variable declaration */
-LwrMacCb lwrMacCb;
MacCb macCb;
/* forward references */
MacCb macCb;
/* forward references */
@@
-186,19
+185,11
@@
Reason reason /* reason */
SAttachSRngBuf(SS_RNG_BUF_ULMAC_TO_ULRLC, SS_RBUF_ENT_ULRLC,SS_RNG_RX);
#endif
SAttachSRngBuf(SS_RNG_BUF_ULMAC_TO_ULRLC, SS_RBUF_ENT_ULRLC,SS_RNG_RX);
#endif
- /* Initializing CL control block */
- memset(&lwrMacCb, 0, sizeof(LwrMacCb));
- lwrMacCb.region = region;
- lwrMacCb.pool = 0;
- lwrMacCb.clCfgDone = TRUE;
- lwrMacCb.numCell = 0;
- lwrMacCb.phyState = PHY_STATE_IDLE;
-
/* Initialize Scheduler as well */
schActvInit(ENTMAC, (DEFAULT_CELLS + SCH_INST_START), DFLT_REGION, PWR_UP);
/* Initialize lower mac */
/* Initialize Scheduler as well */
schActvInit(ENTMAC, (DEFAULT_CELLS + SCH_INST_START), DFLT_REGION, PWR_UP);
/* Initialize lower mac */
- lwrMacLayerInit();
+ lwrMacLayerInit(
region, 0
);
return ROK;
return ROK;
@@
-258,8
+249,6
@@
RgMngmt *cfg /* config structure */
#ifdef INTEL_WLS_MEM
/* Start WLS message receiver thread */
LwrMacStartWlsRcvr();
#ifdef INTEL_WLS_MEM
/* Start WLS message receiver thread */
LwrMacStartWlsRcvr();
- /* Allocate memory for UL transmissions */
- LwrMacEnqueueWlsBlock();
#endif
reason = rgLMMGenCfg(inst,&cfg->t.cfg);
break;
#endif
reason = rgLMMGenCfg(inst,&cfg->t.cfg);
break;
@@
-495,7
+484,7
@@
RgMngmt *sta /* status structure */
if (sta->t.ssta.s.sysId.ptNmb != NULLP)
{
if (sta->t.ssta.s.sysId.ptNmb != NULLP)
{
-
SPutSBuf(pst->region, pst->pool, (Data *)
sta->t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE);
+
MAC_FREE(
sta->t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE);
}
memset(&cfm, 0, sizeof(RgMngmt));
}
memset(&cfm, 0, sizeof(RgMngmt));
@@
-508,9
+497,8
@@
RgMngmt *sta /* status structure */
if(rgCb[inst].rgInit.cfgDone != TRUE)
{
SGetDateTime(&cfm.t.ssta.dt);
if(rgCb[inst].rgInit.cfgDone != TRUE)
{
SGetDateTime(&cfm.t.ssta.dt);
- if (SGetSBuf(cfmPst.region, cfmPst.pool,
- (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE)
- != ROK)
+ MAC_ALLOC(cfm.t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE);
+ if(cfm.t.ssta.s.sysId.ptNmb == NULLP)
{
DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation");
return ROK;
{
DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation");
return ROK;
@@
-529,9
+517,8
@@
RgMngmt *sta /* status structure */
{
case STGEN:
SGetDateTime(&cfm.t.ssta.dt);
{
case STGEN:
SGetDateTime(&cfm.t.ssta.dt);
- if (SGetSBuf(cfmPst.region, cfmPst.pool,
- (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE)
- != ROK)
+ MAC_ALLOC(cfm.t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE);
+ if(cfm.t.ssta.s.sysId.ptNmb == NULLP)
{
DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation");
return ROK;
{
DU_LOG("\nERROR --> MAC : Memory Unavailable for Confirmation");
return ROK;
@@
-862,10
+849,8
@@
RgCfg *cfg /* Configuaration information */
}
/* allocate RGR saps */
}
/* allocate RGR saps */
- if (SGetSBuf(rgCb[inst].rgInit.region,
- rgCb[inst].rgInit.pool,
- (Data **)&rgCb[inst].rguSap,
- (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK)
+ MAC_ALLOC(rgCb[inst].rguSap, sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps);
+ if(rgCb[inst].rguSap == NULLP)
{
DU_LOG("\nERROR --> MAC : rgGenCfg(): Failed to allocate mem for RGU SAP's.\n");
return RFAILED;
{
DU_LOG("\nERROR --> MAC : rgGenCfg(): Failed to allocate mem for RGU SAP's.\n");
return RFAILED;
@@
-892,9
+877,7
@@
RgCfg *cfg /* Configuaration information */
DU_LOG("\nERROR --> MAC : Failed to register timer");
DU_LOG("\nERROR --> MAC : Failed to register timer");
- SPutSBuf(rgCb[inst].rgInit.region,
- rgCb[inst].rgInit.pool,
- (Data *)rgCb[inst].rguSap,
+ MAC_FREE(rgCb[inst].rguSap,
(sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps));
return (LCM_REASON_MEM_NOAVAIL);
(sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps));
return (LCM_REASON_MEM_NOAVAIL);
@@
-957,11
+940,8
@@
static Void rgLMMShutdown(Inst inst)
}
/* Deleting the RGU SAPs */
}
/* Deleting the RGU SAPs */
- SPutSBuf(rgCb[inst].rgInit.region,
- rgCb[inst].rgInit.pool,
- (Data *)rgCb[inst].rguSap,
+ MAC_FREE(rgCb[inst].rguSap,
(sizeof(RgUpSapCb) * rgCb[inst].numRguSaps));
(sizeof(RgUpSapCb) * rgCb[inst].numRguSaps));
- rgCb[inst].rguSap = NULLP;
rgCb[inst].inactiveCell = NULLP;
rgCb[inst].cell = NULLP;
rgCb[inst].inactiveCell = NULLP;
rgCb[inst].cell = NULLP;
@@
-1629,7
+1609,7
@@
uint8_t event /* event */
return;
}
return;
}
- if (
SGetMsg
(pst.region, pst.pool, &dstMbuf) != ROK)
+ if (
ODU_GET_MSG_BUF
(pst.region, pst.pool, &dstMbuf) != ROK)
{
DU_LOG("\nERROR --> MAC : dstMbuf Allocation Failed");
return;
{
DU_LOG("\nERROR --> MAC : dstMbuf Allocation Failed");
return;