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
Merge "replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC()...
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_ex_ms.c
diff --git
a/src/5gnrmac/rg_ex_ms.c
b/src/5gnrmac/rg_ex_ms.c
index
736b6b2
..
31e0fda
100755
(executable)
--- a/
src/5gnrmac/rg_ex_ms.c
+++ b/
src/5gnrmac/rg_ex_ms.c
@@
-56,7
+56,7
@@
registered with SSI during the LTE MAC Task initialization.
#include "rg_prg.x" /*PRG interface includes*/
#include "du_app_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#include "rg_prg.x" /*PRG interface includes*/
#include "du_app_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
-int unpackDuMacCellCfg(DuMacCellCfgReq func,Pst *pst,Buffer *mBuf);
+#include "rlc_mac_inf.h"
/**
* @brief Task Activation callback function Entity SM.
/**
* @brief Task Activation callback function Entity SM.
@@
-84,8
+84,6
@@
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
Buffer *mBuf; /* message buffer */
#endif
{
- TRC2(rgHdlSMEvents)
-
switch(pst->event)
{
#ifdef LCRGMILRG
switch(pst->event)
{
#ifdef LCRGMILRG
@@
-112,23
+110,23
@@
Buffer *mBuf; /* message buffer */
#endif /* LCRGMILRG */
case EVENT_MAC_CELL_CONFIG_REQ:
/* Process MAC cell config */
#endif /* LCRGMILRG */
case EVENT_MAC_CELL_CONFIG_REQ:
/* Process MAC cell config */
- unpackDuMacCellCfg(Mac
Hdl
CellCfgReq, pst, mBuf);
+ unpackDuMacCellCfg(Mac
Proc
CellCfgReq, pst, mBuf);
break;
case EVENT_MAC_CELL_START_REQ:
/* Process MAC cell start request */
break;
case EVENT_MAC_CELL_START_REQ:
/* Process MAC cell start request */
- unpackMacCellStartReq(Mac
Hdl
CellStartReq, pst, mBuf);
+ unpackMacCellStartReq(Mac
Proc
CellStartReq, pst, mBuf);
break;
case EVENT_MAC_CELL_STOP_REQ:
/* Process MAC cell stop request */
break;
case EVENT_MAC_CELL_STOP_REQ:
/* Process MAC cell stop request */
- unpackMacCellStopReq(Mac
Hdl
CellStopReq, pst, mBuf);
+ unpackMacCellStopReq(Mac
Proc
CellStopReq, pst, mBuf);
break;
case EVENT_MAC_DL_CCCH_IND:
/* Process DL CCCH Ind */
break;
case EVENT_MAC_DL_CCCH_IND:
/* Process DL CCCH Ind */
- unpackMacDlCcchInd(Mac
Hdl
DlCcchInd, pst, mBuf);
+ unpackMacDlCcchInd(Mac
Proc
DlCcchInd, pst, mBuf);
break;
case EVENT_MAC_UE_CREATE_REQ:
/* Process Ue Create Request */
break;
case EVENT_MAC_UE_CREATE_REQ:
/* Process Ue Create Request */
- unpackMacUeCreateReq(Mac
Hdl
UeCreateReq, pst, mBuf);
+ unpackMacUeCreateReq(Mac
Proc
UeCreateReq, pst, mBuf);
break;
default:
RG_FREE_MSG(mBuf);
break;
default:
RG_FREE_MSG(mBuf);
@@
-163,8
+161,6
@@
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
Buffer *mBuf; /* message buffer */
#endif
{
- TRC2(rgHdlNHEvents)
-
switch(pst->event)
{
#ifdef LCRGUICRG
switch(pst->event)
{
#ifdef LCRGUICRG
@@
-210,8
+206,6
@@
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
Buffer *mBuf; /* message buffer */
#endif
{
- TRC2(rgHdlKWEvents)
-
switch(pst->event)
{
#ifdef LCRGUIRGU
switch(pst->event)
{
#ifdef LCRGUIRGU
@@
-221,11
+215,11
@@
Buffer *mBuf; /* message buffer */
case EVTRGUUBNDREQ:
cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf);
break;
case EVTRGUUBNDREQ:
cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf);
break;
- case EV
TRLCDLDAT
:
- unpack
DlData(MacRlcPro
cDlData, pst, mBuf);
+ case EV
ENT_DL_DATA_TO_MAC
:
+ unpack
RlcDlData(MacProcRl
cDlData, pst, mBuf);
break;
break;
- case EV
TRLCBOSTA
:
- unpack
BOStatus(MacRlcProcBO
Status, pst, mBuf);
+ case EV
ENT_BO_STATUS_TO_MAC
:
+ unpack
RlcBoStatus(MacProcRlcBo
Status, pst, mBuf);
break;
#ifdef LTE_L2_MEAS
break;
#ifdef LTE_L2_MEAS
@@
-267,8
+261,6
@@
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
Buffer *mBuf; /* message buffer */
#endif
{
- TRC2(rgHdlTFEvents)
-
switch(pst->event)
{
#if (defined(LCRGLITFU) || defined(LWLCRGLITFU))
switch(pst->event)
{
#if (defined(LCRGLITFU) || defined(LWLCRGLITFU))
@@
-278,9
+270,6
@@
Buffer *mBuf; /* message buffer */
case EVTTFUDATIND:
cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf);
break;
case EVTTFUDATIND:
cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf);
break;
- case EVENT_SLOT_IND_TO_MAC:
- cmUnpackSlotInd(fapiMacSlotInd, pst, mBuf);
- break;
#if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
case EVTTFUNONRTIND:
cmUnpkTfuNonRtInd(RgLiTfuNonRtInd, pst, mBuf);
#if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
case EVTTFUNONRTIND:
cmUnpkTfuNonRtInd(RgLiTfuNonRtInd, pst, mBuf);
@@
-320,8
+309,6
@@
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
Buffer *mBuf; /* message buffer */
#endif
{
- TRC2(rgHdlRGEvents)
-
switch(pst->event)
{
#ifdef LCRG
switch(pst->event)
{
#ifdef LCRG
@@
-435,19
+422,17
@@
Buffer *mBuf; /* message buffer */
* -# ROK
**/
#ifdef ANSI
* -# ROK
**/
#ifdef ANSI
-
PUBLIC
S16 rgActvTsk
+S16 rgActvTsk
(
Pst *pst, /* post structure */
Buffer *mBuf /* message buffer */
)
#else
(
Pst *pst, /* post structure */
Buffer *mBuf /* message buffer */
)
#else
-
PUBLIC
S16 rgActvTsk(pst, mBuf)
+S16 rgActvTsk(pst, mBuf)
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
Pst *pst; /* post structure */
Buffer *mBuf; /* message buffer */
#endif
{
- TRC2(rgActvTsk)
-
switch(pst->srcEnt)
{
/* The originator of this message is the stack manager,
switch(pst->srcEnt)
{
/* The originator of this message is the stack manager,
@@
-458,21
+443,21
@@
Buffer *mBuf; /* message buffer */
case ENTNH:
rgHdlNHEvents(pst, mBuf);
break;
case ENTNH:
rgHdlNHEvents(pst, mBuf);
break;
- case ENT
KW
:
+ case ENT
RLC
:
rgHdlKWEvents(pst, mBuf);
break;
rgHdlKWEvents(pst, mBuf);
break;
- case ENT
TF
:
+ case ENT
LWRMAC
:
rgHdlTFEvents(pst, mBuf);
break;
rgHdlTFEvents(pst, mBuf);
break;
- case ENT
RG
: /* When scheduler instance sends msg to MAC */
+ case ENT
MAC
: /* When scheduler instance sends msg to MAC */
rgHdlRGEvents(pst, mBuf);
break;
default:
RG_FREE_MSG(mBuf);
break;
}
rgHdlRGEvents(pst, mBuf);
break;
default:
RG_FREE_MSG(mBuf);
break;
}
-
SExitTsk
();
-
RETVALUE(ROK)
;
+
ODU_EXIT_TASK
();
+
return ROK
;
}/* end of rgActvTsk */
\f
}/* end of rgActvTsk */
\f