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
[Task-ID: ODUHIGH-432]Fix to send correct RLC header and PDCP SN for RRC messages...
[o-du/l2.git]
/
src
/
5gnrmac
/
rg_lim.c
diff --git
a/src/5gnrmac/rg_lim.c
b/src/5gnrmac/rg_lim.c
index
9ce6360
..
e426f8f
100755
(executable)
--- a/
src/5gnrmac/rg_lim.c
+++ b/
src/5gnrmac/rg_lim.c
@@
-32,9
+32,6
@@
@brief It has APIs exposed by Lower Interface Modulue of MAC. It acts as an
Interface handler for lower interface APIs.
*/
@brief It has APIs exposed by Lower Interface Modulue of MAC. It acts as an
Interface handler for lower interface APIs.
*/
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=182;
-static int RLOG_MODULE_ID=4096;
/* header include files -- defines (.h) */
#include "common_def.h"
#include "rgu.h" /* RGU defines */
/* header include files -- defines (.h) */
#include "common_def.h"
#include "rgu.h" /* RGU defines */
@@
-83,19
+80,12
@@
static Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgLiTfuBndCfm
(
Pst *pst,
SuId suId,
uint8_t status
)
S16 RgLiTfuBndCfm
(
Pst *pst,
SuId suId,
uint8_t status
)
-#else
-S16 RgLiTfuBndCfm(pst, suId, status)
-Pst *pst;
-SuId suId;
-uint8_t status;
-#endif
{
Inst inst;
S16 ret;
{
Inst inst;
S16 ret;
@@
-111,7
+101,7
@@
uint8_t status;
if (suId != tfuSap->sapCfg.suId)
{
if (suId != tfuSap->sapCfg.suId)
{
-
RLOG2(L_ERROR,"
Incorrect SuId. Configured (%d) Recieved (%d)",
+
DU_LOG("\nERROR --> MAC :
Incorrect SuId. Configured (%d) Recieved (%d)",
tfuSap->sapCfg.suId, suId);
return RFAILED;
}
tfuSap->sapCfg.suId, suId);
return RFAILED;
}
@@
-130,17
+120,7
@@
uint8_t status;
* -# RFAILED
*/
#ifdef UNUSED_FUNC
* -# RFAILED
*/
#ifdef UNUSED_FUNC
-#ifdef ANSI
-static S16 rgLIMValidateSap
-(
- Inst inst,
- SuId suId
-)
-#else
-static S16 rgLIMValidateSap(inst,suId)
- Inst inst;
- SuId suId;
-#endif
+static S16 rgLIMValidateSap(Inst inst,SuId suId)
{
RgLowSapCb *tfuSap;
{
RgLowSapCb *tfuSap;
@@
-150,13
+130,13
@@
static S16 rgLIMValidateSap(inst,suId)
/* First lets check the suId */
if( suId != tfuSap->sapCfg.suId)
{
/* First lets check the suId */
if( suId != tfuSap->sapCfg.suId)
{
-
RLOG2(L_ERROR,"
Incorrect SuId. Configured (%d) Recieved (%d)",
+
DU_LOG("\nERROR --> MAC :
Incorrect SuId. Configured (%d) Recieved (%d)",
tfuSap->sapCfg.suId, suId);
return RFAILED;
}
if (tfuSap->sapSta.sapState != LRG_BND)
{
tfuSap->sapCfg.suId, suId);
return RFAILED;
}
if (tfuSap->sapSta.sapState != LRG_BND)
{
-
RLOG1(L_ERROR,"
Lower SAP not enabled SuId (%d)",
+
DU_LOG("\nERROR --> MAC :
Lower SAP not enabled SuId (%d)",
tfuSap->sapCfg.suId);
return RFAILED;
}
tfuSap->sapCfg.suId);
return RFAILED;
}
@@
-176,17
+156,7
@@
static S16 rgLIMValidateSap(inst,suId)
* @param [in] Bool *error
* @return
*/
* @param [in] Bool *error
* @return
*/
-#ifdef ANSI
-static Void rgLIMUtlFreeDatIndEvnt
-(
- TfuDatIndInfo *datInd,
- Bool error
- )
-#else
-static Void rgLIMUtlFreeDatIndEvnt(datInd, error)
- TfuDatIndInfo *datInd;
- Bool error;
-#endif
+static Void rgLIMUtlFreeDatIndEvnt(TfuDatIndInfo *datInd,Bool error)
{
TfuDatInfo *datInfo;
{
TfuDatInfo *datInfo;
@@
-227,26
+197,19
@@
static Void rgLIMUtlFreeDatIndEvnt(datInd, error)
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
S16 RgLiTfuDatInd
(
Pst *pst,
SuId suId,
TfuDatIndInfo *datInd
)
S16 RgLiTfuDatInd
(
Pst *pst,
SuId suId,
TfuDatIndInfo *datInd
)
-#else
-S16 RgLiTfuDatInd(pst, suId, datInd)
-Pst *pst;
-SuId suId;
-TfuDatIndInfo *datInd;
-#endif
{
Inst inst;
S16 ret;
volatile uint32_t startTime=0;
{
Inst inst;
S16 ret;
volatile uint32_t startTime=0;
- //
printf
("5GTF:: DatindRcvd\n");
+ //
DU_LOG
("5GTF:: DatindRcvd\n");
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
RG_IS_INST_VALID(pst->dstInst);
inst = pst->dstInst - RG_INST_START;
@@
-256,7
+219,7
@@
TfuDatIndInfo *datInd;
#ifndef NO_ERRCLS
if ((ret = rgLIMValidateSap (inst,suId)) != ROK)
{
#ifndef NO_ERRCLS
if ((ret = rgLIMValidateSap (inst,suId)) != ROK)
{
-
RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"
SAP Validation failed");
+
DU_LOG("\nERROR --> MAC :
SAP Validation failed");
rgLIMUtlFreeDatIndEvnt(datInd, TRUE);
return (ret);
}
rgLIMUtlFreeDatIndEvnt(datInd, TRUE);
return (ret);
}
@@
-296,17
+259,7
@@
TfuDatIndInfo *datInd;
* @param [in] Bool *error
* @return
*/
* @param [in] Bool *error
* @return
*/
-#ifdef ANSI
-static Void rgLIMUtlFreeDatReqEvnt
-(
- TfuDatReqInfo *datReq,
- Bool error
- )
-#else
-static Void rgLIMUtlFreeDatReqEvnt(datReq, error)
- TfuDatReqInfo *datReq;
- Bool error;
-#endif
+static Void rgLIMUtlFreeDatReqEvnt(TfuDatReqInfo *datReq,Bool error)
{
TfuDatReqPduInfo *datInfo;
{
TfuDatReqPduInfo *datInfo;
@@
-364,17
+317,7
@@
static Void rgLIMUtlFreeDatReqEvnt(datReq, error)
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 rgLIMTfuDelDatReq
-(
-Inst inst,
-TfuDelDatReqInfo *delDatReq
-)
-#else
-S16 rgLIMTfuDatReq(inst,delDatReq)
-Inst inst;
-TfuDelDatReqInfo *delDatReq;
-#endif
+S16 rgLIMTfuDelDatReq(Inst inst,TfuDelDatReqInfo *delDatReq)
{
S16 ret;
RgLowSapCb *tfuSap;
{
S16 ret;
RgLowSapCb *tfuSap;
@@
-386,7
+329,7
@@
TfuDelDatReqInfo *delDatReq;
#ifndef NO_ERRCLS
if (tfuSap->sapSta.sapState != LRG_BND)
{
#ifndef NO_ERRCLS
if (tfuSap->sapSta.sapState != LRG_BND)
{
-
RLOG_ARG1(L_ERROR,DBG_CELLID,delDatReq->cellId,"
Lower SAP not bound (%d)",
+
DU_LOG("\nERROR --> MAC :
Lower SAP not bound (%d)",
tfuSap->sapSta.sapState);
return RFAILED;
}
tfuSap->sapSta.sapState);
return RFAILED;
}
@@
-395,7
+338,7
@@
TfuDelDatReqInfo *delDatReq;
if((ret = RgLiTfuDelDatReq (&tfuSap->sapCfg.sapPst, tfuSap->sapCfg.spId,
delDatReq)) != ROK)
{
if((ret = RgLiTfuDelDatReq (&tfuSap->sapCfg.sapPst, tfuSap->sapCfg.spId,
delDatReq)) != ROK)
{
-
RLOG_ARG0(L_ERROR,DBG_CELLID,delDatReq->cellId,"
Call to RgLiTfuDelDatReq() failed");
+
DU_LOG("\nERROR --> MAC :
Call to RgLiTfuDelDatReq() failed");
}
return (ret);
} /* rgLIMTfuDatReq*/
}
return (ret);
} /* rgLIMTfuDatReq*/
@@
-417,23
+360,13
@@
TfuDelDatReqInfo *delDatReq;
* -# ROK
* -# RFAILED
**/
* -# ROK
* -# RFAILED
**/
-#ifdef ANSI
-S16 RgLiTfuNonRtInd
-(
-Pst *pst,
-SuId suId
-)
-#else
-S16 RgLiTfuNonRtInd(pst, suId)
-Pst *pst;
-SuId suId;
-#endif
+S16 RgLiTfuNonRtInd(Pst *pst,SuId suId)
{
#ifdef NO_ERRCLS
if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK)
{
{
#ifdef NO_ERRCLS
if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK)
{
-
RGDBGERRNEW(pst->dstInst - RG_INST_START, (rgPBuf(pst->dstInst - RG_INST_START),"RgLiTfuNonRtInd() SAP Validation failed.\n")
);
+
DU_LOG("\nERROR --> MAC : RgLiTfuNonRtInd() SAP Validation failed.\n"
);
return RFAILED;
}
#endif
return RFAILED;
}
#endif