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
Revert "[Epic-ID: ODUHIGH-516][Task-ID: ODUHIGH-530] RIC Subscription Delete Req"
[o-du/l2.git]
/
src
/
5gnrsch
/
sch_ue_mgr.c
diff --git
a/src/5gnrsch/sch_ue_mgr.c
b/src/5gnrsch/sch_ue_mgr.c
index
1711ecb
..
67c05a8
100644
(file)
--- a/
src/5gnrsch/sch_ue_mgr.c
+++ b/
src/5gnrsch/sch_ue_mgr.c
@@
-27,6
+27,7
@@
#include "du_app_mac_inf.h"
#include "mac_sch_interface.h"
#include "sch.h"
#include "du_app_mac_inf.h"
#include "mac_sch_interface.h"
#include "sch.h"
+#include "sch_tmr.h"
#include "sch_utils.h"
#ifdef NR_DRX
#include "sch_drx.h"
#include "sch_utils.h"
#ifdef NR_DRX
#include "sch_drx.h"
@@
-53,7
+54,6
@@
void SchSendUeCfgRspToMac(SchUeCfgReq *ueCfg, Inst inst,\
Pst rspPst;
cfgRsp->cellId = ueCfg->cellId;
Pst rspPst;
cfgRsp->cellId = ueCfg->cellId;
- cfgRsp->ueId = ueCfg->ueId;
cfgRsp->crnti = ueCfg->crnti;
cfgRsp->rsp = result;
cfgRsp->crnti = ueCfg->crnti;
cfgRsp->rsp = result;
@@
-86,7
+86,6
@@
void SchSendUeRecfgRspToMac(SchUeRecfgReq *ueRecfgReq, Inst inst,\
Pst rspPst;
reCfgRsp->cellId = ueRecfgReq->cellId;
Pst rspPst;
reCfgRsp->cellId = ueRecfgReq->cellId;
- reCfgRsp->ueId = ueRecfgReq->ueId;
reCfgRsp->crnti = ueRecfgReq->crnti;
reCfgRsp->rsp = result;
reCfgRsp->crnti = ueRecfgReq->crnti;
reCfgRsp->rsp = result;
@@
-295,7
+294,7
@@
uint8_t fillSchUeCbFrmCfgReq(Inst inst, SchUeCb *ueCb, SchUeCfgReq *ueCfg)
bool isLcIdValid = FALSE;
ueCb->ueCfg.cellId = ueCfg->cellId;
bool isLcIdValid = FALSE;
ueCb->ueCfg.cellId = ueCfg->cellId;
- ueCb->ueCfg.ueId = ueC
fg
->ueId;
+ ueCb->ueCfg.ueId = ueC
b
->ueId;
ueCb->ueCfg.crnti = ueCfg->crnti;
if(ueCfg->macCellGrpCfgPres == true)
{
ueCb->ueCfg.crnti = ueCfg->crnti;
if(ueCfg->macCellGrpCfgPres == true)
{
@@
-461,8
+460,8
@@
uint8_t fillSchUeCbFrmRecfgReq(Inst inst, SchUeCb *ueCb, SchUeRecfgReq *ueRecfg)
ueCb->ueCfg.cellId = ueRecfg->cellId;
ueCb->ueCfg.cellId = ueRecfg->cellId;
- ueCb->ueCfg.ueId = ueRecfg->ueId;
ueCb->ueCfg.crnti = ueRecfg->crnti;
ueCb->ueCfg.crnti = ueRecfg->crnti;
+ GET_UE_ID(ueRecfg->crnti, ueCb->ueCfg.ueId);
ueCb->ueCfg.dataTransmissionAction = ueRecfg->dataTransmissionInfo;
if(ueRecfg->macCellGrpRecfgPres == true)
{
ueCb->ueCfg.dataTransmissionAction = ueRecfg->dataTransmissionInfo;
if(ueRecfg->macCellGrpRecfgPres == true)
{
@@
-745,6
+744,7
@@
SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, uint16_t cellId)
uint8_t SchAddUeConfigReq(Pst *pst, SchUeCfgReq *ueCfg)
{
uint8_t lcIdx = 0, ret = ROK, idx = 0;
uint8_t SchAddUeConfigReq(Pst *pst, SchUeCfgReq *ueCfg)
{
uint8_t lcIdx = 0, ret = ROK, idx = 0;
+ uint16_t ueId = 0;
SchCellCb *cellCb = NULLP;
SchUeCb *ueCb = NULLP;
SchUeCfgRsp cfgRsp;
SchCellCb *cellCb = NULLP;
SchUeCb *ueCb = NULLP;
SchUeCfgRsp cfgRsp;
@@
-765,7
+765,8
@@
uint8_t SchAddUeConfigReq(Pst *pst, SchUeCfgReq *ueCfg)
return RFAILED;
}
/* Search if UE already configured */
return RFAILED;
}
/* Search if UE already configured */
- ueCb = &cellCb->ueCb[ueCfg->ueId - 1];
+ GET_UE_ID(ueCfg->crnti, ueId);
+ ueCb = &cellCb->ueCb[ueId - 1];
if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE))
{
if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE))
{
@@
-777,11
+778,11
@@
uint8_t SchAddUeConfigReq(Pst *pst, SchUeCfgReq *ueCfg)
/* Fill received Ue Configuration in UeCb */
memset(ueCb, 0, sizeof(SchUeCb));
/* Fill received Ue Configuration in UeCb */
memset(ueCb, 0, sizeof(SchUeCb));
- ueCb->ueId = ueCfg->ueId;
ueCb->crnti = ueCfg->crnti;
ueCb->crnti = ueCfg->crnti;
+ GET_UE_ID(ueCb->crnti, ueCb->ueId);
ueCb->cellCb = cellCb;
ueCb->cellCb = cellCb;
- schUlHqEntInit(cellCb, &cellCb->ueCb[ueC
fg
->ueId-1]);
- schDlHqEntInit(cellCb, &cellCb->ueCb[ueC
fg
->ueId-1]);
+ schUlHqEntInit(cellCb, &cellCb->ueCb[ueC
b
->ueId-1]);
+ schDlHqEntInit(cellCb, &cellCb->ueCb[ueC
b
->ueId-1]);
SCH_ALLOC(ueCb->hqDlmap, sizeof(SchHqDlMap*)*(ueCb->cellCb->numSlots));
SCH_ALLOC(ueCb->hqUlmap, sizeof(SchHqUlMap*)*(ueCb->cellCb->numSlots));
SCH_ALLOC(ueCb->hqDlmap, sizeof(SchHqDlMap*)*(ueCb->cellCb->numSlots));
SCH_ALLOC(ueCb->hqUlmap, sizeof(SchHqUlMap*)*(ueCb->cellCb->numSlots));