From: Balaji Shankaran Date: Mon, 20 Apr 2020 14:05:16 +0000 (+0530) Subject: warning set 3: fixed warning realted to unused-variable and implicit-function-declaration X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F3331%2F5;p=o-du%2Fl2.git warning set 3: fixed warning realted to unused-variable and implicit-function-declaration Change-Id: If905dca79604bda3bf044f6c6c14a36819735297 Signed-off-by: Balaji Shankaran --- diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index a55c31bec..90230a317 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -57,9 +57,10 @@ #include "du_app_mac_inf.h" #include "rg.x" #include "lwr_mac_fsm.h" - /* This file contains message handling functionality for MAC */ +extern void sendToLowerMac(uint16_t msgType, uint32_t msgLen, void *msg); + /******************************************************************* * * @brief Handles cell start reuqest from DU APP diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index 0e6caf230..8da7b8488 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -75,7 +75,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 */ - +void unpackDuMacCellCfg(DuMacCellCfgReq func,Pst *pst,Buffer *mBuf); /** * @brief Task Activation callback function Entity SM. diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index dc71c0d45..059a7549e 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -83,7 +83,7 @@ static int RLOG_MODULE_ID=4096; #endif #include "ss_rbuf.h" #include "ss_rbuf.x" - +#include "lwr_mac.h" /* MAC CL defines */ #include "mac.h" #include "lwr_mac_phy.h" #include "lwr_mac_fsm.h" @@ -100,6 +100,8 @@ EXTERN Void rgGetSId ARGS((SystemId *s)); ClCb clGlobalCp; MacCb macCb; +int MacSchCellCfgReq(Pst *pst,MacCellCfg *macCellCfg); + /* forward references */ PRIVATE U16 rgLMMGenCfg ARGS(( Inst inst, diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index a181fd597..c94d2a855 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -1511,8 +1511,8 @@ Inst inst; #ifdef LTEMAC_SPS Bool isSpsRnti=FALSE; Pst schPst1; - RgInfSpsRelInfo relInfo; - Bool spsToBeActvtd = FALSE; + // RgInfSpsRelInfo relInfo; + Bool spsToBeActvtd = FALSE; U16 sduSize = 0; #endif U32 lcgBytes[RGINF_MAX_LCG_PER_UE]; @@ -1664,10 +1664,12 @@ Inst inst; ueCb->ul.implRelCntr = 0; ueCb->ul.explRelCntr = 0; - relInfo.cellSapId = cellCb->schInstMap.cellSapId; +#if 0 + relInfo.cellSapId = cellCb->schInstMap.cellSapId; relInfo.cRnti = ueCb->ueId; - relInfo.isExplRel = FALSE; + relInfo.isExplRel= FALSE; //TODO: commented for compilation without SCH RgMacSchSpsRel(&schPst1, &relInfo); +#endif } } else diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c index 6bc8f9487..9f23fd3b7 100755 --- a/src/5gnrrlc/kw_ptli.c +++ b/src/5gnrrlc/kw_ptli.c @@ -27,9 +27,7 @@ File: kw_ptli.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="LIM"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=238; + /** @file kw_ptli.c @brief RLC Lower Interface */ diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c index 6994b9d8f..9ba4f8860 100755 --- a/src/5gnrrlc/kw_udx_dl.c +++ b/src/5gnrrlc/kw_udx_dl.c @@ -281,7 +281,6 @@ CkwCfgInfo *cfg; { CkwCfgCfmInfo *cfgCfm; U8 idx; - S16 ret = ROK; KwCb *tKwCb; Pst *pstUdxCfm; diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c index d150d9c15..9b6c22504 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -257,7 +257,6 @@ RguDDatReqInfo *datReqInfo; RguDDatReqPerUe datPerUe; /* DL data info per UE */ RguDatReqTb datPerTb; /* DL data info per TB */ RguLchDatReq datPerLch; /* DL data info per Lch */ - RguPduInfo pduInfo; /* DL RLC PDU infor */ RlcMacData *dlData; /* DL data to be sent to MAC */ TRC3(KwLiRguDDatReq) diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index afabf2818..ac3cb3c9a 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -81,6 +81,8 @@ static int RLOG_MODULE_ID=4096; #ifdef EMTC_ENABLE #include "rg_sch_emtc_ext.x" #endif +U8 rgSCHCmnCalcPcqiBitSz(RgSchUeCb *ueCb,U8 numTxAnt); +PUBLIC S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err); /* local defines */ #ifdef EMTC_ENABLE EXTERN Bool rgSCHEmtcChkEmtcUe ARGS( diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 2b2884ac6..4d4389562 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -65,10 +65,10 @@ #include "sch.h" #include "sch_utils.h" #include "du_log.h" - extern SchCb schCb[SCH_MAX_INST]; extern int8_t coresetIdxTable[MAX_CORESET_INDEX][4]; extern int8_t searchSpaceIdxTable[MAX_SEARCH_SPACE_INDEX][4]; +void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm); /* local defines */ SchCellCfgCfmFunc SchCellCfgCfmOpts[] = { diff --git a/src/cm/kwu.c b/src/cm/kwu.c index 04c7eee62..f5ff49ad1 100755 --- a/src/cm/kwu.c +++ b/src/cm/kwu.c @@ -1259,7 +1259,6 @@ Buffer *mBuf; S16 ret1 = ROK; #endif S16 retVal; - SpId spId = 0; KwuDatReqInfo *datReq = NULLP; KwuDatReqInfo datReqTmp; diff --git a/src/du_app/du_e2ap_msg_hdl.h b/src/du_app/du_e2ap_msg_hdl.h index bf0d99143..ef1983936 100644 --- a/src/du_app/du_e2ap_msg_hdl.h +++ b/src/du_app/du_e2ap_msg_hdl.h @@ -41,9 +41,10 @@ #include "ss_msg.x" #include "du_log.h" - #define ENCODE_FAIL -1 +S16 sctpSend(Buffer *mBuf, U8 itfType); + typedef struct e2apDb { U16 ricId; diff --git a/src/du_app/du_egtp.h b/src/du_app/du_egtp.h index e264a44bd..715ecdad3 100644 --- a/src/du_app/du_egtp.h +++ b/src/du_app/du_egtp.h @@ -46,7 +46,7 @@ #define EGTP_MASK_BIT7 0x40 #define EGTP_MASK_BIT8 0x80 - +S16 unpackEgtpSrvOpenReq(EgtpSrvOpenReq func, Pst *pst, Buffer *mBuf); U8 protType; typedef struct egtpTptSrvr diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c index 2934e3eea..c8c066c4e 100644 --- a/src/du_app/du_f1ap_msg_hdl.c +++ b/src/du_app/du_f1ap_msg_hdl.c @@ -25,7 +25,6 @@ #include "GNB-DU-System-Information.h" extern char encBuf[ENC_BUF_MAX_LEN]; - extern DuCfgParams duCfgParam; S16 sctpSend(Buffer *mBuf, U8 itfType); /******************************************************************* @@ -2820,7 +2819,6 @@ S16 BuildAndSendDUConfigUpdate() * ****************************************************************/ S16 BuildAndSendULRRCMessageTransfer() { - U8 elementCnt; U8 ieId; U8 idx; diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c index 8245d2f35..21d752b0d 100644 --- a/src/du_app/du_mgr_ex_ms.c +++ b/src/du_app/du_mgr_ex_ms.c @@ -30,7 +30,8 @@ extern S16 cmUnpkLkwCfgCfm(LkwCfgCfm func,Pst *pst, Buffer *mBuf); extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf); extern S16 cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf); - +extern S16 cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf); +extern S16 cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf); /************************************************************************** * @brief Task Initiation callback function. * diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index be2bb5491..068b7282f 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -36,6 +36,11 @@ extern DuCfgParams duCfgParam; extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg); extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg); extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg); +extern S16 BuildAndSendE2SetupReq(); +extern S16 egtpHdlDatInd(EgtpMsg egtpMsg); +extern S16 BuildAndSendDUConfigUpdate(); +extern U16 getTransId(); +extern S16 cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg); packMacCellCfgReq packMacCellCfgOpts[] = { diff --git a/src/du_app/du_ue_mgr.h b/src/du_app/du_ue_mgr.h index 381a2a088..fa55370d1 100644 --- a/src/du_app/du_ue_mgr.h +++ b/src/du_app/du_ue_mgr.h @@ -31,7 +31,8 @@ S16 duHdlEgtpDlData(EgtpMsg *egtpMsg); S16 duHdlRlcUlData(Pst *pst, KwuDatIndInfo* datInd, Buffer *mBuf); - +S16 packUeCreateReq(Pst *pst,CkwCfgInfo *cfgInfo); +S16 cmPkKwuDatReq(Pst * pst,KwuDatReqInfo* datReq,Buffer * mBuf); #endif /********************************************************************** diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index b02a261f4..427c89dc1 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -1402,7 +1402,6 @@ Region reg; { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; - U8 blkCnt; U8 bktIdx= reg; TRC3(isMemThreshReached)