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 cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...
[o-du/l2.git]
/
src
/
5gnrmac
/
mac_ue_mgr.c
diff --git
a/src/5gnrmac/mac_ue_mgr.c
b/src/5gnrmac/mac_ue_mgr.c
index
9a72cce
..
f901ce9
100644
(file)
--- a/
src/5gnrmac/mac_ue_mgr.c
+++ b/
src/5gnrmac/mac_ue_mgr.c
@@
-32,7
+32,7
@@
MacSchUeCreateReqFunc macSchUeCreateReqOpts[] =
{
packMacSchUeCreateReq, /* packing for loosely coupled */
MacSchUeCreateReqFunc macSchUeCreateReqOpts[] =
{
packMacSchUeCreateReq, /* packing for loosely coupled */
-
m
acSchUeCreateReq, /* packing for tightly coupled */
+
M
acSchUeCreateReq, /* packing for tightly coupled */
packMacSchUeCreateReq /* packing for light weight loosely coupled */
};
packMacSchUeCreateReq /* packing for light weight loosely coupled */
};
@@
-664,10
+664,10
@@
uint8_t sendAddUeCreateReqToSch(MacUeCfg *ueCfg)
}
schUeCfg.numLc = ueCfg->numLcs;
}
schUeCfg.numLc = ueCfg->numLcs;
- if(schUeCfg.numLc > MAX_NUM_L
OGICAL_CHANNELS
)
+ if(schUeCfg.numLc > MAX_NUM_L
C
)
{
DU_LOG("\nMAC : Number of Logical channels %d exceeds max limit %d",\
{
DU_LOG("\nMAC : Number of Logical channels %d exceeds max limit %d",\
- schUeCfg.numLc, MAX_NUM_L
OGICAL_CHANNELS
);
+ schUeCfg.numLc, MAX_NUM_L
C
);
}
for(idx = 0; idx < schUeCfg.numLc; idx++)
{
}
for(idx = 0; idx < schUeCfg.numLc; idx++)
{
@@
-720,7
+720,7
@@
uint8_t createUeCb(MacUeCfg *ueCfg)
}
/* Check if UE already configured */
}
/* Check if UE already configured */
- ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx];
+ ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx
-1
];
if(ueCb)
{
if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti) &&\
if(ueCb)
{
if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti) &&\
@@
-862,17
+862,17
@@
uint8_t createUeCb(MacUeCfg *ueCfg)
}
/* Fill SRB1 info */
}
/* Fill SRB1 info */
- if(ueCfg->numLcs > MAX_NUM_L
OGICAL_CHANNELS
)
+ if(ueCfg->numLcs > MAX_NUM_L
C
)
{
DU_LOG("\nMAC : Number of LC to configure[%d] exceeds limit[%d]",\
{
DU_LOG("\nMAC : Number of LC to configure[%d] exceeds limit[%d]",\
- ueCfg->numLcs, MAX_NUM_L
OGICAL_CHANNELS
);
+ ueCfg->numLcs, MAX_NUM_L
C
);
return RFAILED;
}
for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++)
{
ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcId = ueCfg->lcCfgList[lcIdx].lcId;
return RFAILED;
}
for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++)
{
ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcId = ueCfg->lcCfgList[lcIdx].lcId;
- ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcState = LC_STATE_ACTIVE;
+ ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcState =
MAC_
LC_STATE_ACTIVE;
ueCb->dlInfo.numDlLc++;
}
ueCb->dlInfo.numDlLc++;
}
@@
-1010,7
+1010,7
@@
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
if(schCfgRsp->rsp == RSP_NOK)
{
DU_LOG("\nMAC : SCH UE Create Response : FAILURE [CRNTI %d]", schCfgRsp->crnti);
if(schCfgRsp->rsp == RSP_NOK)
{
DU_LOG("\nMAC : SCH UE Create Response : FAILURE [CRNTI %d]", schCfgRsp->crnti);
- memset(&macCb.macCell[cellIdx]->ueCb[schCfgRsp->ueIdx], 0, sizeof(MacUeCb));
+ memset(&macCb.macCell[cellIdx]->ueCb[schCfgRsp->ueIdx
-1
], 0, sizeof(MacUeCb));
macCb.macCell[cellIdx]->numActvUe--;
result = MAC_DU_APP_RSP_NOK;
}
macCb.macCell[cellIdx]->numActvUe--;
result = MAC_DU_APP_RSP_NOK;
}