From 65443172dd60a6ea312bd3a15959dbf54ad7f045 Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Tue, 20 Oct 2020 21:58:24 +0530 Subject: [PATCH] remove/replaced PRIVATE and EXTERN keywords Change-Id: Id6f86819a1e7e18e5bdac1fdc581220463d408db Signed-off-by: sphoorthi --- src/5gnrmac/lwr_mac.h | 10 +- src/5gnrmac/lwr_mac_fsm.c | 4 +- src/5gnrmac/lwr_mac_phy.c | 4 +- src/5gnrmac/lwr_mac_phy.h | 2 +- src/5gnrmac/mac_demux.c | 1 - src/5gnrmac/mac_msg_hdl.c | 2 +- src/5gnrmac/mac_slot_ind.c | 2 +- src/5gnrmac/mac_utils.h | 2 +- src/5gnrmac/rg.x | 306 +++++----- src/5gnrmac/rg_cfg.c | 46 +- src/5gnrmac/rg_com.c | 28 +- src/5gnrmac/rg_dbm.c | 30 +- src/5gnrmac/rg_dhm.c | 12 +- src/5gnrmac/rg_dux.c | 16 +- src/5gnrmac/rg_env.h | 2 +- src/5gnrmac/rg_ex_ms.c | 20 +- src/5gnrmac/rg_id.c | 4 +- src/5gnrmac/rg_l2m.c | 22 +- src/5gnrmac/rg_lim.c | 20 +- src/5gnrmac/rg_lmm.c | 40 +- src/5gnrmac/rg_mux.c | 26 +- src/5gnrmac/rg_pom_scell.c | 12 +- src/5gnrmac/rg_pom_scell.x | 24 +- src/5gnrmac/rg_prg.x | 42 +- src/5gnrmac/rg_prg_pt.c | 12 +- src/5gnrmac/rg_ptli.c | 32 +- src/5gnrmac/rg_ptmi.c | 44 +- src/5gnrmac/rg_ptui.c | 88 +-- src/5gnrmac/rg_rom.c | 32 +- src/5gnrmac/rg_tom.c | 110 ++-- src/5gnrmac/rg_uim.c | 3 +- src/5gnrmac/rg_utl.c | 23 +- src/5gnrrlc/kw.x | 6 +- src/5gnrrlc/kw_amm_dl.c | 144 ++--- src/5gnrrlc/kw_amm_ul.c | 58 +- src/5gnrrlc/kw_cfg_dl.c | 14 +- src/5gnrrlc/kw_cfg_ul.c | 14 +- src/5gnrrlc/kw_dbm_dl.c | 2 +- src/5gnrrlc/kw_dl.x | 2 +- src/5gnrrlc/kw_dl_ex_ms.c | 4 +- src/5gnrrlc/kw_id.c | 10 +- src/5gnrrlc/kw_lim.c | 2 +- src/5gnrrlc/kw_lmm.c | 98 ++-- src/5gnrrlc/kw_ptli.c | 8 +- src/5gnrrlc/kw_ptmi.c | 16 +- src/5gnrrlc/kw_ptui.c | 14 +- src/5gnrrlc/kw_tmm_dl.c | 6 +- src/5gnrrlc/kw_tmm_ul.c | 4 +- src/5gnrrlc/kw_tmr.c | 6 +- src/5gnrrlc/kw_udx.c | 8 +- src/5gnrrlc/kw_udx_dl.c | 9 +- src/5gnrrlc/kw_udx_ptdl.c | 28 +- src/5gnrrlc/kw_udx_ptul.c | 64 +- src/5gnrrlc/kw_udx_ul.c | 2 +- src/5gnrrlc/kw_ul.x | 2 +- src/5gnrrlc/kw_umm_dl.c | 16 +- src/5gnrrlc/kw_umm_ul.c | 18 +- src/5gnrrlc/kw_utl_dl.c | 16 +- src/5gnrrlc/kw_utl_ul.c | 6 +- src/5gnrsch/rg_sch.c | 6 +- src/5gnrsch/rg_sch.h | 60 +- src/5gnrsch/rg_sch.x | 946 +++++++++++++++--------------- src/5gnrsch/rg_sch_cfg.c | 288 ++++----- src/5gnrsch/rg_sch_clist.x | 10 +- src/5gnrsch/rg_sch_cmn.c | 1327 +++++++++++++++++++++--------------------- src/5gnrsch/rg_sch_cmn.x | 396 ++++++------- src/5gnrsch/rg_sch_dbm.c | 54 +- src/5gnrsch/rg_sch_dhm.c | 62 +- src/5gnrsch/rg_sch_drx.c | 82 +-- src/5gnrsch/rg_sch_gom.c | 58 +- src/5gnrsch/rg_sch_inf.x | 152 ++--- src/5gnrsch/rg_sch_l2m.c | 20 +- src/5gnrsch/rg_sch_lmm.c | 12 +- src/5gnrsch/rg_sch_mga.c | 42 +- src/5gnrsch/rg_sch_pt.c | 38 +- src/5gnrsch/rg_sch_pwr.c | 338 +++++------ src/5gnrsch/rg_sch_ram.c | 64 +- src/5gnrsch/rg_sch_sc1.c | 234 ++++---- src/5gnrsch/rg_sch_sc1.x | 92 +-- src/5gnrsch/rg_sch_scell.c | 22 +- src/5gnrsch/rg_sch_tmr.c | 2 +- src/5gnrsch/rg_sch_tom.c | 514 ++++++++-------- src/5gnrsch/rg_sch_uhm.c | 6 +- src/5gnrsch/rg_sch_utl.c | 129 ++-- src/5gnrsch/sch.c | 2 +- src/5gnrsch/sch_common.c | 8 +- src/5gnrsch/sch_rach.c | 4 +- src/5gnrsch/sch_slot_ind.c | 4 +- src/5gnrsch/sch_utils.h | 4 +- src/cm/ckw.c | 2 +- src/cm/ckw.h | 2 +- src/cm/ckw.x | 110 ++-- src/cm/cm5.x | 10 +- src/cm/cm_bdy5.c | 2 +- src/cm/cm_hash.c | 72 +-- src/cm/cm_hash.h | 2 +- src/cm/cm_hash.x | 18 +- src/cm/cm_inet.c | 90 +-- src/cm/cm_inet.x | 112 ++-- src/cm/cm_lib.c | 44 +- src/cm/cm_lib.x | 10 +- src/cm/cm_llist.x | 14 +- src/cm/cm_lte.h | 2 +- src/cm/cm_lte.x | 36 +- src/cm/cm_math.x | 12 +- src/cm/cm_mblk.c | 8 +- src/cm/cm_mblk.x | 18 +- src/cm/cm_mem.c | 212 +++---- src/cm/cm_mem.x | 68 +-- src/cm/cm_mem_wl.c | 274 ++++----- src/cm/cm_mem_wl.x | 64 +- src/cm/cm_tenb_stats.c | 34 +- src/cm/cm_tenb_stats.x | 14 +- src/cm/cm_tkns.x | 44 +- src/cm/cm_tpt.c | 40 +- src/cm/cm_tpt.x | 62 +- src/cm/crg.c | 8 +- src/cm/crg.x | 126 ++-- src/cm/ctf.c | 12 +- src/cm/ctf.x | 370 ++++++------ src/cm/envdep.h | 126 +--- src/cm/gen.h | 2 +- src/cm/gen.x | 140 ++--- src/cm/kwu.h | 2 +- src/cm/kwu.x | 144 ++--- src/cm/l2_tenb_stats.x | 12 +- src/cm/lkw.c | 156 ++--- src/cm/lkw.h | 2 +- src/cm/lkw.x | 2 +- src/cm/lrg.c | 48 +- src/cm/lrg.x | 4 +- src/cm/lsctp.h | 4 +- src/cm/pj_tenb_stats.x | 12 +- src/cm/rgm.x | 82 +-- src/cm/rgr.c | 36 +- src/cm/rgr.x | 532 ++++++++--------- src/cm/rgu.x | 154 ++--- src/cm/ssi.h | 8 +- src/cm/ssi.x | 720 +++++++++++------------ src/cm/tfu.c | 44 +- src/cm/tfu.x | 634 ++++++++++---------- src/cu_stub/cu_stub_egtp.h | 2 +- src/cu_stub/cu_stub_sctp.h | 8 +- src/du_app/du_cell_mgr.c | 4 +- src/du_app/du_cfg.c | 4 +- src/du_app/du_egtp.h | 2 +- src/du_app/du_f1ap_msg_hdl.c | 2 +- src/du_app/du_f1ap_msg_hdl.h | 1 + src/du_app/du_mgr_ex_ms.c | 10 +- src/du_app/du_mgr_main.c | 12 +- src/du_app/du_msg_hdl.c | 19 +- src/du_app/du_sys_info_hdl.h | 4 +- src/mt/mt_ss.c | 178 +++--- src/mt/mt_ss.h | 6 +- src/mt/mt_ss.x | 2 +- src/mt/ss_gen.c | 38 +- src/mt/ss_gen.x | 138 ++--- src/mt/ss_mem.x | 16 +- src/mt/ss_msg.c | 40 +- src/mt/ss_queue.c | 8 +- src/mt/ss_queue.x | 12 +- src/mt/ss_rbuf.x | 38 +- src/mt/ss_strm.c | 2 +- src/mt/ss_task.c | 10 +- src/mt/ss_timer.c | 24 +- src/ric_stub/ric_stub_sctp.h | 4 +- src/rlog/rl_interface.h | 10 +- src/rlog/rl_platform.c | 4 +- src/rlog/rl_rlog.c | 4 +- src/rlog/rl_rlog.h | 42 +- src/rlog/rl_soc.h | 6 +- 171 files changed, 5936 insertions(+), 6044 deletions(-) diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h index bd690a5a3..85005a355 100644 --- a/src/5gnrmac/lwr_mac.h +++ b/src/5gnrmac/lwr_mac.h @@ -259,12 +259,12 @@ typedef struct clCellParam RssiMeasurement rssiMeasurementSupport; }ClCellParam; -EXTERN LwrMacCb lwrMacCb; -EXTERN LwrMacCellCb * lwrMacGetCellCb ARGS((uint16_t cellId)); -EXTERN uint32_t reverseBits(uint32_t num, uint8_t numBits); -EXTERN void fillDlDciPayload(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos,\ +LwrMacCb lwrMacCb; +LwrMacCellCb * lwrMacGetCellCb ARGS((uint16_t cellId)); +uint32_t reverseBits(uint32_t num, uint8_t numBits); +void fillDlDciPayload(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos,\ uint32_t val, uint8_t valSize); -EXTERN void lwrMacInit(); +void lwrMacInit(); #endif diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index bb338c51e..fd12a8263 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -43,8 +43,8 @@ #define PDU_PRESENT 1 #define SET_MSG_LEN(x, size) x += size -extern void fapiMacConfigRsp(uint16_t cellId); -extern uint8_t UnrestrictedSetNcsTable[MAX_ZERO_CORR_CFG_IDX]; +void fapiMacConfigRsp(uint16_t cellId); +uint8_t UnrestrictedSetNcsTable[MAX_ZERO_CORR_CFG_IDX]; /* Global variables */ uint8_t slotIndIdx; diff --git a/src/5gnrmac/lwr_mac_phy.c b/src/5gnrmac/lwr_mac_phy.c index b27813d8e..8a5c808cd 100644 --- a/src/5gnrmac/lwr_mac_phy.c +++ b/src/5gnrmac/lwr_mac_phy.c @@ -33,8 +33,8 @@ #include "wls_lib.h" #endif -EXTERN uint8_t rgClHndlCfgReq ARGS((void *msg)); -EXTERN void l1ProcessFapiRequest ARGS((uint8_t msgType, uint32_t msgLen, void *msg)); +uint8_t rgClHndlCfgReq ARGS((void *msg)); +void l1ProcessFapiRequest ARGS((uint8_t msgType, uint32_t msgLen, void *msg)); #ifdef INTEL_WLS diff --git a/src/5gnrmac/lwr_mac_phy.h b/src/5gnrmac/lwr_mac_phy.h index 68d81f2a0..8775071e4 100644 --- a/src/5gnrmac/lwr_mac_phy.h +++ b/src/5gnrmac/lwr_mac_phy.h @@ -59,7 +59,7 @@ typedef struct wlsBlockToFree }WlsBlockToFree; CmLListCp wlsBlockToFreeList[WLS_MEM_FREE_PRD]; -extern uint8_t slotIndIdx; +uint8_t slotIndIdx; void freeWlsBlockList(uint8_t idx); void LwrMacEnqueueWlsBlock(); diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c index e397001d9..733b1973c 100644 --- a/src/5gnrmac/mac_demux.c +++ b/src/5gnrmac/mac_demux.c @@ -26,7 +26,6 @@ #include "mac.h" #include "mac_utils.h" -extern uint32_t shortBsrBytesTable[MAX_SHORT_BSR_TABLE_ENTRIES]; /******************************************************************* * diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 72765d348..d81c29b52 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -35,7 +35,7 @@ /* This file contains message handling functionality for MAC */ -extern MacCb macCb; +MacCb macCb; uint16_t buildMacPdu(RlcData *dlData); #ifdef EGTP_TEST diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c index 02f7b09f9..77aee0d58 100644 --- a/src/5gnrmac/mac_slot_ind.c +++ b/src/5gnrmac/mac_slot_ind.c @@ -343,7 +343,7 @@ uint8_t macProcSlotInd(SlotIndInfo slotInd) uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) { uint8_t ret; - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; #ifdef ODU_SLOT_IND_DEBUG_LOG DU_LOG("\nMAC : Slot Indication received"); diff --git a/src/5gnrmac/mac_utils.h b/src/5gnrmac/mac_utils.h index 68df2c44e..960fd6928 100644 --- a/src/5gnrmac/mac_utils.h +++ b/src/5gnrmac/mac_utils.h @@ -130,7 +130,7 @@ /* Function declaration */ uint16_t getNewCrnti(uint8_t *crntiMap); - +uint32_t shortBsrBytesTable[MAX_SHORT_BSR_TABLE_ENTRIES]; /********************************************************************** End of file **********************************************************************/ diff --git a/src/5gnrmac/rg.x b/src/5gnrmac/rg.x index d87761c98..b6d5d127c 100755 --- a/src/5gnrmac/rg.x +++ b/src/5gnrmac/rg.x @@ -651,7 +651,7 @@ struct _rgCb }; /* Declaration for RgCb */ -EXTERN RgCb rgCb[RG_MAX_INST]; +RgCb rgCb[RG_MAX_INST]; /** * @brief @@ -707,176 +707,176 @@ typedef struct rgBldPduInfo /* APIs exposed by LIM */ #ifdef LTE_L2_MEAS /*LTE_L2_MEAS_PHASE2*/ -EXTERN S16 rgAddToL2MeasPerQci ARGS ((RgCellCb *cell,uint8_t qci)); +S16 rgAddToL2MeasPerQci ARGS ((RgCellCb *cell,uint8_t qci)); #endif -EXTERN S16 rgLIMTfuBndReq ARGS(( +S16 rgLIMTfuBndReq ARGS(( Inst inst, SuId suId, SpId spId)); -EXTERN S16 rgLIMTfuUbndReq ARGS(( +S16 rgLIMTfuUbndReq ARGS(( Inst inst, SuId suId, Reason reason)); -EXTERN S16 rgLIMTfuDatReq ARGS(( +S16 rgLIMTfuDatReq ARGS(( Inst inst, TfuDatReqInfo *datReq)); #ifdef L2_OPTMZ -EXTERN S16 rgLIMTfuDelDatReq ARGS(( +S16 rgLIMTfuDelDatReq ARGS(( Inst inst, TfuDelDatReqInfo *datReq)); #endif /*L2_OPTMZ */ /* APIs exposed by TOM */ -EXTERN S16 rgTOMDatInd ARGS(( +S16 rgTOMDatInd ARGS(( Inst inst, TfuDatIndInfo *datInd)); -EXTERN Void rgTOMRlsSf ARGS((Inst inst,RgDlSf *dlSf)); +Void rgTOMRlsSf ARGS((Inst inst,RgDlSf *dlSf)); -EXTERN S16 rgSchMacSfAllocReq ARGS((Pst *pst, RgInfSfAlloc *sfInfo)); +S16 rgSchMacSfAllocReq ARGS((Pst *pst, RgInfSfAlloc *sfInfo)); /* * APIs exposed by LMM */ -EXTERN S16 rgLMMStartTmr ARGS((Inst inst,S16 tmrEvnt, uint32_t tmrVal, PTR cb)); -EXTERN S16 rgLMMStopTmr ARGS((Inst inst,S16 tmrEvnt, PTR cb)); -EXTERN S16 rgLMMTmrExpiry ARGS((PTR cb, S16 tmrEvnt)); +S16 rgLMMStartTmr ARGS((Inst inst,S16 tmrEvnt, uint32_t tmrVal, PTR cb)); +S16 rgLMMStopTmr ARGS((Inst inst,S16 tmrEvnt, PTR cb)); +S16 rgLMMTmrExpiry ARGS((PTR cb, S16 tmrEvnt)); /* To send a Unsolicited Status Indication to Layer Manager */ -EXTERN S16 rgLMMStaInd ARGS((Inst inst,uint16_t category, uint16_t event, uint16_t cause, RgUstaDgn *dgn)); +S16 rgLMMStaInd ARGS((Inst inst,uint16_t category, uint16_t event, uint16_t cause, RgUstaDgn *dgn)); /* To send a Trace Indication to Layer Manager. * srcMbuf is not freed. caller has to take care. */ -EXTERN Void rgLMMTrcInd ARGS((Inst inst,Buffer *srcMbuf, uint8_t event)); +Void rgLMMTrcInd ARGS((Inst inst,Buffer *srcMbuf, uint8_t event)); /* LIM uses this to forward the BndCfm to LMM. This function invokes a * Control Confirmation to the LM. */ -EXTERN S16 rgLMMBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 rgActvTmr ARGS((Ent ent, Inst inst )); -EXTERN S16 rgActvInit ARGS((Ent entity, Inst inst, Region +S16 rgLMMBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); +S16 rgActvTmr ARGS((Ent ent, Inst inst )); +S16 rgActvInit ARGS((Ent entity, Inst inst, Region region, Reason reason)); -EXTERN S16 rgActvTsk ARGS((Pst *pst, Buffer *mBuf)); +S16 rgActvTsk ARGS((Pst *pst, Buffer *mBuf)); /* * APIs exposed by CFG module */ -EXTERN S16 rgCFGVldtCrgCellCfg ARGS((Inst inst,CrgCellCfg *cellCfg, RgErrInfo *errInfo)); -EXTERN S16 rgCFGVldtCrgUeCfg ARGS((Inst inst,CrgUeCfg *ueCfg, RgCellCb **cell, RgErrInfo +S16 rgCFGVldtCrgCellCfg ARGS((Inst inst,CrgCellCfg *cellCfg, RgErrInfo *errInfo)); +S16 rgCFGVldtCrgUeCfg ARGS((Inst inst,CrgUeCfg *ueCfg, RgCellCb **cell, RgErrInfo *errInfo)); -EXTERN S16 rgCFGVldtCrgLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell, RgUeCb +S16 rgCFGVldtCrgLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell, RgUeCb **ue, RgErrInfo *errInfo)); -EXTERN S16 rgCFGVldtCrgCellRecfg ARGS((Inst inst,CrgCellRecfg *cellRecfg, RgCellCb **cell, +S16 rgCFGVldtCrgCellRecfg ARGS((Inst inst,CrgCellRecfg *cellRecfg, RgCellCb **cell, RgErrInfo *errInfo)); -EXTERN S16 rgCFGVldtCrgUeRecfg ARGS((Inst inst,CrgUeRecfg *ueRecfg, RgCellCb **cell, +S16 rgCFGVldtCrgUeRecfg ARGS((Inst inst,CrgUeRecfg *ueRecfg, RgCellCb **cell, RgUeCb **ue, RgErrInfo *errInfo)); -EXTERN S16 rgCFGVldtCrgLcRecfg ARGS((Inst inst,CrgLchRecfg *lcRecfg, RgCellCb **cell, +S16 rgCFGVldtCrgLcRecfg ARGS((Inst inst,CrgLchRecfg *lcRecfg, RgCellCb **cell, RgUeCb **ue, RgUlLcCb **ulLc, RgErrInfo *errInfo)); -EXTERN S16 rgCFGVldtCrgUeReset ARGS ((Inst inst,CrgRst *reset,RgCellCb **cell,RgUeCb **ue, +S16 rgCFGVldtCrgUeReset ARGS ((Inst inst,CrgRst *reset,RgCellCb **cell,RgUeCb **ue, RgErrInfo *errInfo)); -EXTERN S16 rgCFGCrgCellCfg ARGS((Inst inst,CrgCellCfg *cellCfg, RgErrInfo *errInfo)); -EXTERN S16 rgCFGCrgUeCfg ARGS((Inst inst,RgCellCb *cell, CrgUeCfg *ueCfg, RgErrInfo +S16 rgCFGCrgCellCfg ARGS((Inst inst,CrgCellCfg *cellCfg, RgErrInfo *errInfo)); +S16 rgCFGCrgUeCfg ARGS((Inst inst,RgCellCb *cell, CrgUeCfg *ueCfg, RgErrInfo *errInfo)); #ifdef LTE_ADV -EXTERN S16 rgFillAndAddSCellCfg ARGS((Inst inst, RgCellCb *cell, +S16 rgFillAndAddSCellCfg ARGS((Inst inst, RgCellCb *cell, CrgUeRecfg *ueRecfg, CrgCfgTransId transId, Bool *isCfmRqrd)); -EXTERN S16 rgDelUeFrmAllSCell ARGS(( RgCellCb *cell, RgUeCb *ue)); -EXTERN S16 rgUtlVltdAddSCellCfg ARGS ((RgPrgUeSCellCfgInfo *ueSCellCb, +S16 rgDelUeFrmAllSCell ARGS(( RgCellCb *cell, RgUeCb *ue)); +S16 rgUtlVltdAddSCellCfg ARGS ((RgPrgUeSCellCfgInfo *ueSCellCb, RgCellCb *cell, Inst inst )); -EXTERN S16 rgCfgAddUeSCellCfg ARGS ((Inst dstMacInst, +S16 rgCfgAddUeSCellCfg ARGS ((Inst dstMacInst, RgPrgUeSCellCfgInfo *ueSCellCb, RgCellCb *cell )); #endif /* LTE_ADV */ -EXTERN S16 rgCFGCrgLcCfg ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue, CrgLchCfg +S16 rgCFGCrgLcCfg ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue, CrgLchCfg *lcCfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId)); -EXTERN S16 rgCFGCrgCellRecfg ARGS((Inst inst,RgCellCb *cell, CrgCellRecfg *cellRecfg, +S16 rgCFGCrgCellRecfg ARGS((Inst inst,RgCellCb *cell, CrgCellRecfg *cellRecfg, RgErrInfo *errInfo)); -EXTERN S16 rgCFGCrgUeRecfg ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue, CrgUeRecfg +S16 rgCFGCrgUeRecfg ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue, CrgUeRecfg *ueRecfg, RgErrInfo *errInfo)); -EXTERN S16 rgCFGCrgLcRecfg ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue, RgUlLcCb +S16 rgCFGCrgLcRecfg ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue, RgUlLcCb *ulLc, CrgLchRecfg *lcRecfg, RgErrInfo *errInfo, Bool *isCfmRqrd)); -EXTERN S16 rgCFGCrgCellDel ARGS((Inst inst,CrgDel *cellDelInfo, RgErrInfo *errInfo)); -EXTERN S16 rgCFGCrgUeDel ARGS((Inst inst,CrgDel *ueDelInfo, RgErrInfo *errInfo)); -EXTERN S16 rgCFGCrgLcDel ARGS((Inst inst,CrgDel *lcDelInfo, RgErrInfo +S16 rgCFGCrgCellDel ARGS((Inst inst,CrgDel *cellDelInfo, RgErrInfo *errInfo)); +S16 rgCFGCrgUeDel ARGS((Inst inst,CrgDel *ueDelInfo, RgErrInfo *errInfo)); +S16 rgCFGCrgLcDel ARGS((Inst inst,CrgDel *lcDelInfo, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId)); -EXTERN Void rgCFGFreeCellCb ARGS((RgCellCb *cell)); -EXTERN Void rgCFGFreeInactvCellCb ARGS((RgCellCb *cell)); -EXTERN S16 rgSchMacCellRegReq ARGS((Pst* pst,RgInfCellReg* regReq)); -EXTERN S16 rgCFGCrgUeReset ARGS((RgCellCb *cell,RgUeCb *ue,CrgRst *reset, +Void rgCFGFreeCellCb ARGS((RgCellCb *cell)); +Void rgCFGFreeInactvCellCb ARGS((RgCellCb *cell)); +S16 rgSchMacCellRegReq ARGS((Pst* pst,RgInfCellReg* regReq)); +S16 rgCFGCrgUeReset ARGS((RgCellCb *cell,RgUeCb *ue,CrgRst *reset, RgErrInfo *errInfo)); /* * APIs exposed by COM module */ -EXTERN S16 rgCOMCfgReq ARGS((Inst inst,CrgCfgTransId transId, CrgCfgReqInfo +S16 rgCOMCfgReq ARGS((Inst inst,CrgCfgTransId transId, CrgCfgReqInfo *cfgReqInfo)); /* APIs Exposed by UIM */ -EXTERN S16 rgUIMRguBndCfm ARGS ((Inst inst,SuId suId, uint8_t status)); -EXTERN S16 rgUIMSndDedStaInd ARGS ((Inst inst,RgUpSapCb *rguDlSap,RgRguDedStaInd *staInd)); -EXTERN S16 rgUIMSndCmnStaInd ARGS ((Inst inst,RgUpSapCb *rguDlSap,RgRguCmnStaInd *staInd)); -EXTERN S16 rgUIMSndDedDatInd ARGS ((Inst inst,RgUpSapCb *rguDlSap,RgRguDedDatInd *datInd)); +S16 rgUIMRguBndCfm ARGS ((Inst inst,SuId suId, uint8_t status)); +S16 rgUIMSndDedStaInd ARGS ((Inst inst,RgUpSapCb *rguDlSap,RgRguDedStaInd *staInd)); +S16 rgUIMSndCmnStaInd ARGS ((Inst inst,RgUpSapCb *rguDlSap,RgRguCmnStaInd *staInd)); +S16 rgUIMSndDedDatInd ARGS ((Inst inst,RgUpSapCb *rguDlSap,RgRguDedDatInd *datInd)); #ifdef LTE_L2_MEAS -EXTERN S16 rgL2mCreateMeasCb ARGS(( +S16 rgL2mCreateMeasCb ARGS(( RgCellCb *cell, RgInfL2MeasReq *measInfo, uint8_t measType, RgErrInfo *err )); -EXTERN S16 rgL2mMeasReq ARGS(( + S16 rgL2mMeasReq ARGS(( RgCellCb *cell, RgInfL2MeasReq *measInfo, RgErrInfo *err )); -EXTERN S16 rgL2Meas ARGS (( +S16 rgL2Meas ARGS (( RgCellCb *cell )); #endif /* LTE_L2_MEAS */ -EXTERN S16 rgUIMSndCmnDatInd ARGS ((Inst inst,RgUpSapCb *rguSap,RgRguCmnDatInd *datInd)); -EXTERN S16 rgUIMCrgBndCfm ARGS ((Inst inst,SuId suId,uint8_t status)); -EXTERN S16 rgUIMCrgCfgCfm ARGS ((Inst inst,CrgCfgTransId transId,uint8_t status)); +S16 rgUIMSndCmnDatInd ARGS ((Inst inst,RgUpSapCb *rguSap,RgRguCmnDatInd *datInd)); +S16 rgUIMCrgBndCfm ARGS ((Inst inst,SuId suId,uint8_t status)); +S16 rgUIMCrgCfgCfm ARGS ((Inst inst,CrgCfgTransId transId,uint8_t status)); /* * APIs exposed by ROM module */ -EXTERN S16 rgROMDedDatReq ARGS((Inst inst,RgRguDedDatReq *datReq)); -EXTERN S16 rgROMCmnDatReq ARGS((Inst inst,RgRguCmnDatReq *datReq)); -EXTERN S16 rgROMDedStaRsp ARGS((Inst inst,RgRguDedStaRsp *staRsp)); -EXTERN S16 rgROMCmnStaRsp ARGS((Inst inst,RgRguCmnStaRsp *staRsp)); +S16 rgROMDedDatReq ARGS((Inst inst,RgRguDedDatReq *datReq)); +S16 rgROMCmnDatReq ARGS((Inst inst,RgRguCmnDatReq *datReq)); +S16 rgROMDedStaRsp ARGS((Inst inst,RgRguDedStaRsp *staRsp)); +S16 rgROMCmnStaRsp ARGS((Inst inst,RgRguCmnStaRsp *staRsp)); #ifdef LTE_L2_MEAS -EXTERN S16 rgROML2MUlThrpMeasReq ARGS((Inst inst,RgRguL2MUlThrpMeasReq *measReq)); +S16 rgROML2MUlThrpMeasReq ARGS((Inst inst,RgRguL2MUlThrpMeasReq *measReq)); #endif /* * APIs exposed by RAM module */ -EXTERN RgUeCb* rgRAMCreateUeCb ARGS((RgCellCb *cell, +RgUeCb* rgRAMCreateUeCb ARGS((RgCellCb *cell, CmLteRnti tmpCrnti,Bool insert, RgErrInfo *err)); -EXTERN S16 rgRAMFreeCell ARGS((RgCellCb *cell)); -EXTERN Void rgRAMFreeUeCb ARGS((Inst inst,RgUeCb *ueCb)); -EXTERN S16 rgHndlRaResp ARGS((RgCellCb *cell,CmLteTimingInfo timingInfo, +S16 rgRAMFreeCell ARGS((RgCellCb *cell)); +Void rgRAMFreeUeCb ARGS((Inst inst,RgUeCb *ueCb)); +S16 rgHndlRaResp ARGS((RgCellCb *cell,CmLteTimingInfo timingInfo, RgInfRarInfo *rarInfo,RgErrInfo *err)); -EXTERN S16 rgSchMacRlsRntiReq ARGS((Pst *pst,RgInfRlsRnti* rlsRnti)); +S16 rgSchMacRlsRntiReq ARGS((Pst *pst,RgInfRlsRnti* rlsRnti)); /* * APIs exposed by UHM module */ -EXTERN Void rgUHMCrgUeCfg ARGS(( RgCellCb *cellCb, RgUeCb *ueCb, +Void rgUHMCrgUeCfg ARGS(( RgCellCb *cellCb, RgUeCb *ueCb, CrgUeCfg *ueCfg)); -EXTERN Void rgUHMCrgUeRecfg ARGS(( RgCellCb *cellCb, RgUeCb *ueCb, +Void rgUHMCrgUeRecfg ARGS(( RgCellCb *cellCb, RgUeCb *ueCb, CrgUeRecfg *ueRecfg)); /* * APIs exposed by DUX module */ -EXTERN S16 rgDUXDemuxData ARGS((Inst inst,RgMacPdu *pdu, RgInfCeInfo *ceInfo, +S16 rgDUXDemuxData ARGS((Inst inst,RgMacPdu *pdu, RgInfCeInfo *ceInfo, Buffer **mBuf, RgErrInfo *err)); -EXTERN S16 rgDUXExtSduLen ARGS +S16 rgDUXExtSduLen ARGS (( Inst inst, Buffer *mBuf, @@ -888,146 +888,146 @@ RgErrInfo *err * APIs exposed by DBM module */ -EXTERN S16 rgDBMInitInactvCellLst ARGS((uint16_t numBins)); -EXTERN S16 rgDBMDeInitInactvCellLst ARGS((Void)); -EXTERN S16 rgDBMInsInactvCellCb ARGS(( RgCellCb *cellCb)); -EXTERN RgCellCb* rgDBMGetInactvCellCb ARGS(( CmLteCellId cellId)); -EXTERN S16 rgDBMDelInactvCellCb ARGS(( RgCellCb *cellCb)); -EXTERN RgCellCb* rgDBMGetNextInactvCellCb ARGS((RgCellCb *cellCb)); - -EXTERN S16 rgDBMInitCellLst ARGS(( uint16_t numBins)); -EXTERN S16 rgDBMDeInitCellLst ARGS((Void)); -EXTERN S16 rgDBMInsCellCb ARGS(( RgCellCb *cellCb)); -EXTERN RgCellCb* rgDBMGetCellCb ARGS(( CmLteCellId cellId)); -EXTERN S16 rgDBMDelCellCb ARGS(( RgCellCb *cellCb)); -EXTERN RgCellCb* rgDBMGetNextCellCb ARGS((RgCellCb *cellCb)); -EXTERN S16 rgDBMInitCell ARGS((RgCellCb *cellCb)); - -EXTERN S16 rgDBMDeInitUeCbLst ARGS(( RgCellCb *cellCb)); -EXTERN S16 rgDBMInsUeCb ARGS(( RgCellCb *cellCb, RgUeCb *ueCb)); -EXTERN RgUeCb* rgDBMGetUeCb ARGS(( RgCellCb *cellCb, CmLteRnti ueId)); -EXTERN RgUeCb* rgDBMGetNextUeCb ( RgCellCb *cellCb, RgUeCb *ueCb); -EXTERN S16 rgDBMDelUeCb ARGS(( RgCellCb *cellCb, RgUeCb *ueCb)); -EXTERN Void rgDBMInitUe ARGS((RgUeCb *ueCb)); +S16 rgDBMInitInactvCellLst ARGS((uint16_t numBins)); +S16 rgDBMDeInitInactvCellLst ARGS((Void)); +S16 rgDBMInsInactvCellCb ARGS(( RgCellCb *cellCb)); +RgCellCb* rgDBMGetInactvCellCb ARGS(( CmLteCellId cellId)); +S16 rgDBMDelInactvCellCb ARGS(( RgCellCb *cellCb)); +RgCellCb* rgDBMGetNextInactvCellCb ARGS((RgCellCb *cellCb)); + +S16 rgDBMInitCellLst ARGS(( uint16_t numBins)); +S16 rgDBMDeInitCellLst ARGS((Void)); +S16 rgDBMInsCellCb ARGS(( RgCellCb *cellCb)); +RgCellCb* rgDBMGetCellCb ARGS(( CmLteCellId cellId)); +S16 rgDBMDelCellCb ARGS(( RgCellCb *cellCb)); +RgCellCb* rgDBMGetNextCellCb ARGS((RgCellCb *cellCb)); +S16 rgDBMInitCell ARGS((RgCellCb *cellCb)); + +S16 rgDBMDeInitUeCbLst ARGS(( RgCellCb *cellCb)); +S16 rgDBMInsUeCb ARGS(( RgCellCb *cellCb, RgUeCb *ueCb)); +RgUeCb* rgDBMGetUeCb ARGS(( RgCellCb *cellCb, CmLteRnti ueId)); +RgUeCb* rgDBMGetNextUeCb ( RgCellCb *cellCb, RgUeCb *ueCb); +S16 rgDBMDelUeCb ARGS(( RgCellCb *cellCb, RgUeCb *ueCb)); +Void rgDBMInitUe ARGS((RgUeCb *ueCb)); #ifdef LTE_L2_MEAS -EXTERN Void rgDBMInsUlDedLcCb ARGS((RgUeCb *ueCb, CmLteLcId idx, LteLcgId gId, +Void rgDBMInsUlDedLcCb ARGS((RgUeCb *ueCb, CmLteLcId idx, LteLcgId gId, uint8_t qci)); #else -EXTERN Void rgDBMInsUlDedLcCb ARGS((RgUeCb *ueCb, +Void rgDBMInsUlDedLcCb ARGS((RgUeCb *ueCb, CmLteLcId idx, LteLcgId gId)); #endif -EXTERN Void rgDBMUpdUlDedLcCb ARGS((RgUeCb *ueCb, +Void rgDBMUpdUlDedLcCb ARGS((RgUeCb *ueCb, RgUlLcCb *ulLcCb, LteLcgId gId)); -EXTERN Void rgDBMInsDlDedLcCb ARGS((RgUeCb *ueCb, CmLteLcId idx)); -EXTERN Void rgDBMDelUlDedLcCb ARGS((RgUeCb *ueCb, RgUlLcCb *ulLcCb)); -EXTERN Void rgDBMDelDlDedLcCb ARGS((RgUeCb *ueCb, RgDlLcCb *dlLcCb)); -EXTERN RgDlLcCb* rgDBMGetDlDedLcCb ARGS(( RgUeCb *ueCb, CmLteLcId idx)); -EXTERN RgUlLcCb* rgDBMGetUlDedLcCb ARGS(( RgUeCb *ueCb, CmLteLcId idx)); -EXTERN Void rgDBMFreeCmnLcLst ARGS((RgCellCb *cellCb)); -EXTERN S16 rgDBMChkCmnLcCb ARGS(( RgCellCb *cellCb, CmLteLcId lcId)); -EXTERN RgBcchBchLcCb* rgDBMGetBcchOnBch ARGS(( RgCellCb *cellCb )); -EXTERN RgBcchDlschLcCb* rgDBMGetBcchOnDlsch ARGS(( RgCellCb *cellCb, +Void rgDBMInsDlDedLcCb ARGS((RgUeCb *ueCb, CmLteLcId idx)); +Void rgDBMDelUlDedLcCb ARGS((RgUeCb *ueCb, RgUlLcCb *ulLcCb)); +Void rgDBMDelDlDedLcCb ARGS((RgUeCb *ueCb, RgDlLcCb *dlLcCb)); +RgDlLcCb* rgDBMGetDlDedLcCb ARGS(( RgUeCb *ueCb, CmLteLcId idx)); +RgUlLcCb* rgDBMGetUlDedLcCb ARGS(( RgUeCb *ueCb, CmLteLcId idx)); +Void rgDBMFreeCmnLcLst ARGS((RgCellCb *cellCb)); +S16 rgDBMChkCmnLcCb ARGS(( RgCellCb *cellCb, CmLteLcId lcId)); +RgBcchBchLcCb* rgDBMGetBcchOnBch ARGS(( RgCellCb *cellCb )); +RgBcchDlschLcCb* rgDBMGetBcchOnDlsch ARGS(( RgCellCb *cellCb, CmLteLcId lcId)); -EXTERN RgPcchLcCb* rgDBMGetPcch ARGS(( RgCellCb *cellCb)); -EXTERN Void rgDBMInsBcchOnBch ARGS(( RgCellCb *cellCb, CmLteLcId idx)); -EXTERN Void rgDBMInsBcchOnDlsch ARGS(( RgCellCb *cellCb, CmLteLcId idx)); -EXTERN Void rgDBMInsPcch ARGS(( RgCellCb *cellCb, CmLteLcId idx)); - -EXTERN Void rgDBMInsUeCbInRachLst ARGS((RgCellCb *cellCb,RgUeCb *ueCb)); -EXTERN RgUeCb* rgDBMGetUeCbFromRachLst ARGS((RgCellCb *cellCb,CmLteRnti key)); -EXTERN RgUeCb* rgDBMGetNextUeCbFromRachLst ARGS((RgCellCb *cellCb, +RgPcchLcCb* rgDBMGetPcch ARGS(( RgCellCb *cellCb)); +Void rgDBMInsBcchOnBch ARGS(( RgCellCb *cellCb, CmLteLcId idx)); +Void rgDBMInsBcchOnDlsch ARGS(( RgCellCb *cellCb, CmLteLcId idx)); +Void rgDBMInsPcch ARGS(( RgCellCb *cellCb, CmLteLcId idx)); + +Void rgDBMInsUeCbInRachLst ARGS((RgCellCb *cellCb,RgUeCb *ueCb)); +RgUeCb* rgDBMGetUeCbFromRachLst ARGS((RgCellCb *cellCb,CmLteRnti key)); +RgUeCb* rgDBMGetNextUeCbFromRachLst ARGS((RgCellCb *cellCb, RgUeCb *ueCb)); -EXTERN Void rgDBMDelUeCbFromRachLst ARGS((RgCellCb *cellCb,RgUeCb *ueCb)); +Void rgDBMDelUeCbFromRachLst ARGS((RgCellCb *cellCb,RgUeCb *ueCb)); /* Added support for SPS*/ #ifdef LTEMAC_SPS -EXTERN S16 rgDBMDeInitSpsUeCbLst ARGS((RgCellCb *cellCb)); -EXTERN S16 rgDBMInsSpsUeCb ARGS((RgCellCb *cellCb, RgUeCb *ueCb)); -EXTERN RgUeCb* rgDBMGetSpsUeCb ARGS((RgCellCb *cellCb, CmLteRnti ueId)); -EXTERN RgUeCb* rgDBMGetNextSpsUeCb ARGS((RgCellCb *cellCb, RgUeCb *ueCb)); -EXTERN S16 rgDBMDelSpsUeCb ARGS((RgCellCb *cellCb,RgUeCb *ueCb)); +S16 rgDBMDeInitSpsUeCbLst ARGS((RgCellCb *cellCb)); +S16 rgDBMInsSpsUeCb ARGS((RgCellCb *cellCb, RgUeCb *ueCb)); +RgUeCb* rgDBMGetSpsUeCb ARGS((RgCellCb *cellCb, CmLteRnti ueId)); +RgUeCb* rgDBMGetNextSpsUeCb ARGS((RgCellCb *cellCb, RgUeCb *ueCb)); +S16 rgDBMDelSpsUeCb ARGS((RgCellCb *cellCb,RgUeCb *ueCb)); #endif /* LTEMAC_SPS */ /* * APIs exposed by DHM module */ -EXTERN Void rgCFGFreeUeCb ARGS((RgCellCb *cell, RgUeCb *ue)); -EXTERN S16 rgDHMHqEntInit ARGS((Inst inst,RgDlHqEnt *hqE, uint8_t maxHqProcs)); -EXTERN Void rgDHMRlsHqProc ARGS((RgDlHqProcCb *hqP)); -EXTERN Void rgDHMUeReset ARGS ((RgCellCb *cell, RgDlHqEnt *hqE)); -EXTERN Void rgDHMHdlBufFree ARGS((Inst inst, Buffer **mBuf)); -EXTERN Void rgDHMFreeTbBufs ARGS((Inst inst)); -EXTERN S16 rgDHMRlsHqProcTB ARGS((RgCellCb *cell, RgDlHqProcCb *hqP,uint8_t tbIndex)); -EXTERN S16 rgDHMGetHqProcFrmId ARGS((RgUeCb *ue, uint8_t idx, RgDlHqProcCb **hqP)); +Void rgCFGFreeUeCb ARGS((RgCellCb *cell, RgUeCb *ue)); +S16 rgDHMHqEntInit ARGS((Inst inst,RgDlHqEnt *hqE, uint8_t maxHqProcs)); +Void rgDHMRlsHqProc ARGS((RgDlHqProcCb *hqP)); +Void rgDHMUeReset ARGS ((RgCellCb *cell, RgDlHqEnt *hqE)); +Void rgDHMHdlBufFree ARGS((Inst inst, Buffer **mBuf)); +Void rgDHMFreeTbBufs ARGS((Inst inst)); +S16 rgDHMRlsHqProcTB ARGS((RgCellCb *cell, RgDlHqProcCb *hqP,uint8_t tbIndex)); +S16 rgDHMGetHqProcFrmId ARGS((RgUeCb *ue, uint8_t idx, RgDlHqProcCb **hqP)); /* Changes for MIMO feature addition */ /* Removed dependency on MIMO compile-time flag */ -EXTERN S16 rgDHMSndDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgTfuDatReqInfo *datInfo, +S16 rgDHMSndDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgTfuDatReqInfo *datInfo, RgDlHqProcCb *hqProc, RgErrInfo *err)); -EXTERN S16 rgDHMHndlDedDatReq ARGS((Inst inst,RgDlHqProcCb *hqProc, +S16 rgDHMHndlDedDatReq ARGS((Inst inst,RgDlHqProcCb *hqProc, RgRguDDatReqPerUe *datReq, RgDlSf *dlSf, RgErrInfo *err)); /* Changed for contention resolution timer implementation*/ -EXTERN S16 rgDHMHndlCmnDatReq ARGS((Inst inst,RgDlHqProcCb *hqProc, +S16 rgDHMHndlCmnDatReq ARGS((Inst inst,RgDlHqProcCb *hqProc, RgRguCmnDatReq *datReq, RgErrInfo *err)); /* Changes for MIMO feature addition */ /* Removed dependency on MIMO compile-time flag */ -EXTERN S16 rgDHMSndConsolidatedStaInd ARGS ((RgCellCb *cell,RgInfUeInfo *ueInfo, +S16 rgDHMSndConsolidatedStaInd ARGS ((RgCellCb *cell,RgInfUeInfo *ueInfo, CmLteTimingInfo timingInfo, RgErrInfo *err)); -EXTERN Void rgDHMFreeUe ARGS((Inst inst,RgDlHqEnt *hqE)); -EXTERN S16 rgSchMacRlsHqReq ARGS((Pst *pst, RgInfRlsHqInfo *rlshqUeInfo)); +Void rgDHMFreeUe ARGS((Inst inst,RgDlHqEnt *hqE)); +S16 rgSchMacRlsHqReq ARGS((Pst *pst, RgInfRlsHqInfo *rlshqUeInfo)); /* * APIs exposed by MUX module */ #ifndef L2_OPTMZ -EXTERN S16 rgMUXBldPdu ARGS((Inst inst, RgBldPduInfo *bldPdu, Buffer **txPdu, +S16 rgMUXBldPdu ARGS((Inst inst, RgBldPduInfo *bldPdu, Buffer **txPdu, RgErrInfo *err)); #else -EXTERN S16 rgMUXBldPdu ARGS((Inst inst, RgBldPduInfo *bldPdu, RgTfuDatReqTbInfo *tb, +S16 rgMUXBldPdu ARGS((Inst inst, RgBldPduInfo *bldPdu, RgTfuDatReqTbInfo *tb, RgErrInfo *err)); -EXTERN Bool RgUtlIsTbMuxed ARGS((TfuDatReqTbInfo *tb)); +Bool RgUtlIsTbMuxed ARGS((TfuDatReqTbInfo *tb)); #endif -EXTERN S16 rgMUXBldRarPdu ARGS((RgCellCb *cell, RgInfRaRntiInfo *alloc, +S16 rgMUXBldRarPdu ARGS((RgCellCb *cell, RgInfRaRntiInfo *alloc, Buffer **txPdu, RgErrInfo *err)); /* * Utility APIs */ -EXTERN S16 rgAllocSBuf ARGS((Inst inst,Data **pData, Size size)); -EXTERN S16 rgGetMsg ARGS((Inst inst,Buffer **mBuf)); +S16 rgAllocSBuf ARGS((Inst inst,Data **pData, Size size)); +S16 rgGetMsg ARGS((Inst inst,Buffer **mBuf)); /*ccpu00117052 - MOD Passing double pointer for proper NULLP assignment */ -EXTERN Void rgFreeSBuf ARGS((Inst inst,Data **data, Size size)); -EXTERN Void rgFillDgnParams ARGS((Inst inst,RgUstaDgn *dgn,uint8_t dgnType)); -EXTERN Void rgUpdtRguDedSts ARGS((Inst inst,RgUpSapCb *rguSap,uint8_t stsType, RgRguDedDatReq *datReq)); -EXTERN Void rgUpdtRguCmnSts ARGS((Inst inst,RgUpSapCb *rguSap,uint8_t stsType)); -EXTERN Void rgUpdtCellCnt ARGS((Inst inst,uint8_t updtType)); -EXTERN Void rgUpdtUeCnt ARGS((Inst inst,uint8_t updtType)); -EXTERN Void rgGetPstToInst ARGS((Pst *pst,Inst srcInst, Inst dstInst)); -EXTERN S16 rgAllocEventMem ARGS((Inst inst,Ptr *memPtr,Size memSize)); -EXTERN S16 rgGetEventMem ARGS((Inst inst,Ptr *ptr,Size len,Ptr memCp)); -EXTERN S16 rgAllocShrablSBuf ARGS((Inst inst,Data **pData, Size size)); -EXTERN Void rgPrintfSubFrameInfo ARGS((RgDlSf *dlSf)); -EXTERN Void printMacCellInfo ARGS((Void)); -EXTERN Void rgFreeSharableSBuf ARGS((Inst inst,Data **data, Size size)); -EXTERN void MacSendCellCfgCfm(uint8_t response); - - -EXTERN Void rgDHMFreeAllTbBufs ARGS +Void rgFreeSBuf ARGS((Inst inst,Data **data, Size size)); +Void rgFillDgnParams ARGS((Inst inst,RgUstaDgn *dgn,uint8_t dgnType)); +Void rgUpdtRguDedSts ARGS((Inst inst,RgUpSapCb *rguSap,uint8_t stsType, RgRguDedDatReq *datReq)); +Void rgUpdtRguCmnSts ARGS((Inst inst,RgUpSapCb *rguSap,uint8_t stsType)); +Void rgUpdtCellCnt ARGS((Inst inst,uint8_t updtType)); +Void rgUpdtUeCnt ARGS((Inst inst,uint8_t updtType)); +Void rgGetPstToInst ARGS((Pst *pst,Inst srcInst, Inst dstInst)); +S16 rgAllocEventMem ARGS((Inst inst,Ptr *memPtr,Size memSize)); +S16 rgGetEventMem ARGS((Inst inst,Ptr *ptr,Size len,Ptr memCp)); +S16 rgAllocShrablSBuf ARGS((Inst inst,Data **pData, Size size)); +Void rgPrintfSubFrameInfo ARGS((RgDlSf *dlSf)); +Void printMacCellInfo ARGS((Void)); +Void rgFreeSharableSBuf ARGS((Inst inst,Data **data, Size size)); +void MacSendCellCfgCfm(uint8_t response); + + +Void rgDHMFreeAllTbBufs ARGS (( Inst inst )); -EXTERN S16 rgMUXAddPadd ARGS(( +S16 rgMUXAddPadd ARGS(( Inst inst, MsgLen *schdTbSz, Buffer *sduBuf, Bool isRar, RgErrInfo *err )); -EXTERN uint16_t rgMUXCalcRiv ARGS +uint16_t rgMUXCalcRiv ARGS (( uint8_t bw, uint8_t rbStart, diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c index 333f5c9af..f7317c2b5 100755 --- a/src/5gnrmac/rg_cfg.c +++ b/src/5gnrmac/rg_cfg.c @@ -64,20 +64,20 @@ static int RLOG_MODULE_ID=4096; RgCb rgCb[RG_MAX_INST]; /* local defines */ -PRIVATE S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell, +static S16 rgCFGVldtCrgDedLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell, RgUeCb **ue, RgErrInfo *errInfo)); -PRIVATE S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell, +static S16 rgCFGVldtCrgCmnLcCfg ARGS((Inst inst,CrgLchCfg *lcCfg, RgCellCb **cell, RgErrInfo *errInfo)); -PRIVATE S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue, +static S16 rgCFGCrgDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue, CrgLchCfg *lcCfg, RgErrInfo *errInfo)); -PRIVATE S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg, +static S16 rgCFGCrgCmnLcCfg ARGS((Inst inst,RgCellCb *cell, CrgLchCfg *lcCfg, RgErrInfo *errInfo)); -PRIVATE Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell)); -PRIVATE Void rgCFGFreeUeLst ARGS((RgCellCb *cell)); +static Void rgCFGFreeCmnLcLst ARGS((RgCellCb *cell)); +static Void rgCFGFreeUeLst ARGS((RgCellCb *cell)); /* Added support for SPS*/ #ifdef LTEMAC_SPS -PRIVATE Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell)); +static Void rgCFGFreeSpsUeLst ARGS((RgCellCb *cell)); #endif /* LTEMAC_SPS */ @@ -1635,7 +1635,7 @@ CrgCfgTransId transId; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgCFGVldtCrgDedLcCfg +static S16 rgCFGVldtCrgDedLcCfg ( Inst inst, CrgLchCfg *lcCfg, @@ -1644,7 +1644,7 @@ RgUeCb **ue, RgErrInfo *errInfo ) #else -PRIVATE S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo) +static S16 rgCFGVldtCrgDedLcCfg(inst,lcCfg, cell, ue, errInfo) Inst inst; CrgLchCfg *lcCfg; RgCellCb **cell; @@ -1740,7 +1740,7 @@ RgErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgCFGVldtCrgCmnLcCfg +static S16 rgCFGVldtCrgCmnLcCfg ( Inst inst, CrgLchCfg *lcCfg, @@ -1748,7 +1748,7 @@ RgCellCb **cell, RgErrInfo *errInfo ) #else -PRIVATE S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo) +static S16 rgCFGVldtCrgCmnLcCfg(inst,lcCfg, cell, errInfo) Inst inst; CrgLchCfg *lcCfg; RgCellCb **cell; @@ -1865,7 +1865,7 @@ RgErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgCFGCrgDedLcCfg +static S16 rgCFGCrgDedLcCfg ( RgCellCb *cell, RgUeCb *ue, @@ -1873,7 +1873,7 @@ CrgLchCfg *lcCfg, RgErrInfo *errInfo ) #else -PRIVATE S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo) +static S16 rgCFGCrgDedLcCfg(cell, ue, lcCfg, errInfo) RgCellCb *cell; RgUeCb *ue; CrgLchCfg *lcCfg; @@ -1925,7 +1925,7 @@ RgErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgCFGCrgCmnLcCfg +static S16 rgCFGCrgCmnLcCfg ( Inst inst, RgCellCb *cell, @@ -1933,7 +1933,7 @@ CrgLchCfg *lcCfg, RgErrInfo *errInfo ) #else -PRIVATE S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo) +static S16 rgCFGCrgCmnLcCfg(inst,cell, lcCfg, errInfo) Inst inst; RgCellCb *cell; CrgLchCfg *lcCfg; @@ -2018,12 +2018,12 @@ RgErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgCFGFreeUeUlAlloc +static Void rgCFGFreeUeUlAlloc ( RgCellCb *cell ) #else -PRIVATE Void rgCFGFreeUeUlAlloc(cell) +static Void rgCFGFreeUeUlAlloc(cell) RgCellCb *cell; #endif { @@ -2214,12 +2214,12 @@ RgUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgCFGFreeCmnLcLst +static Void rgCFGFreeCmnLcLst ( RgCellCb *cell ) #else -PRIVATE Void rgCFGFreeCmnLcLst(cell) +static Void rgCFGFreeCmnLcLst(cell) RgCellCb *cell; #endif { @@ -2248,12 +2248,12 @@ RgCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgCFGFreeUeLst +static Void rgCFGFreeUeLst ( RgCellCb *cell ) #else -PRIVATE Void rgCFGFreeUeLst(cell) +static Void rgCFGFreeUeLst(cell) RgCellCb *cell; #endif { @@ -2295,12 +2295,12 @@ RgCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgCFGFreeSpsUeLst +static Void rgCFGFreeSpsUeLst ( RgCellCb *cell ) #else -PRIVATE Void rgCFGFreeSpsUeLst(cell) +static Void rgCFGFreeSpsUeLst(cell) RgCellCb *cell; #endif { diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c index 5dba24f54..4c8686b8e 100755 --- a/src/5gnrmac/rg_com.c +++ b/src/5gnrmac/rg_com.c @@ -61,11 +61,11 @@ static int RLOG_MODULE_ID=4096; #include "rg_pom_scell.x" #endif /* local defines */ -PRIVATE S16 rgCOMHndlCfgReq ARGS((Inst inst,CrgCfg *cfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId)); -PRIVATE S16 rgCOMHndlRecfgReq ARGS((Inst inst,CrgRecfg *recfg, RgErrInfo *errInfo, \ +static S16 rgCOMHndlCfgReq ARGS((Inst inst,CrgCfg *cfg, RgErrInfo *errInfo,Bool *isCfmRqrd,CrgCfgTransId transId)); +static S16 rgCOMHndlRecfgReq ARGS((Inst inst,CrgRecfg *recfg, RgErrInfo *errInfo, \ CrgCfgTransId transId,Bool *isCfmRqrd)); -PRIVATE S16 rgCOMHndlDelReq ARGS((Inst inst,CrgDel *del, RgErrInfo *errInfo, Bool *isCfmRqrd, CrgCfgTransId transId)); -PRIVATE S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo)); +static S16 rgCOMHndlDelReq ARGS((Inst inst,CrgDel *del, RgErrInfo *errInfo, Bool *isCfmRqrd, CrgCfgTransId transId)); +static S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo)); /* local typedefs */ /* local externs */ @@ -196,7 +196,7 @@ if(TRUE == isCfmRqrd) * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgCOMHndlCfgReq +static S16 rgCOMHndlCfgReq ( Inst inst, CrgCfg *cfg, @@ -205,7 +205,7 @@ Bool *isCfmRqrd, CrgCfgTransId transId ) #else -PRIVATE S16 rgCOMHndlCfgReq(inst,cfg, errInfo,isCfmRqrd,transId) +static S16 rgCOMHndlCfgReq(inst,cfg, errInfo,isCfmRqrd,transId) Inst inst; CrgCfg *cfg; RgErrInfo *errInfo; @@ -297,7 +297,7 @@ CrgCfgTransId transId; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgCOMHndlRecfgReq +static S16 rgCOMHndlRecfgReq ( Inst inst, CrgRecfg *recfg, @@ -306,7 +306,7 @@ CrgCfgTransId transId, Bool *isCfmRqrd ) #else -PRIVATE S16 rgCOMHndlRecfgReq(inst,recfg, errInfo, transId, isCfmRqrd) +static S16 rgCOMHndlRecfgReq(inst,recfg, errInfo, transId, isCfmRqrd) Inst inst; CrgRecfg *recfg; RgErrInfo *errInfo; @@ -434,14 +434,14 @@ Bool *isCfmRqrd; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgCOMHndlResetReq +static S16 rgCOMHndlResetReq ( Inst inst, CrgRst *reset, RgErrInfo *errInfo ) #else -PRIVATE S16 rgCOMHndlResetReq(inst,reset, errInfo) +static S16 rgCOMHndlResetReq(inst,reset, errInfo) Inst inst; CrgRst *reset; RgErrInfo *errInfo; @@ -478,7 +478,7 @@ RgErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgCOMHndlDelReq +static S16 rgCOMHndlDelReq ( Inst inst, CrgDel *del, @@ -487,7 +487,7 @@ Bool *isCfmRqrd, CrgCfgTransId transId ) #else -PRIVATE S16 rgCOMHndlDelReq(inst,del, errInfo,isCfmRqrd,transId) +static S16 rgCOMHndlDelReq(inst,del, errInfo,isCfmRqrd,transId) Inst inst; CrgDel *del; RgErrInfo *errInfo; @@ -496,8 +496,8 @@ CrgCfgTransId transId; #endif { - S16 ret; - VOLATILE uint32_t startTime=0; + S16 ret; + volatile uint32_t startTime=0; errInfo->errType = RGERR_COM_DEL_REQ; diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c index 382745a0c..da8d94586 100755 --- a/src/5gnrmac/rg_dbm.c +++ b/src/5gnrmac/rg_dbm.c @@ -53,12 +53,12 @@ #include "rg.x" /* local defines */ -PRIVATE S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, uint16_t numBins)); -PRIVATE Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb)); -PRIVATE Void rgDBMInitCmnLcLst ARGS((RgCellCb *cellCb)); -PRIVATE Void rgDBMInitRachLst ARGS((RgCellCb *cellCb)); +static S16 rgDBMInitUeCbLst ARGS(( RgCellCb *cellCb, uint16_t numBins)); +static Void rgDBMInitDedLcLst ARGS((RgUeCb *ueCb)); +static Void rgDBMInitCmnLcLst ARGS((RgCellCb *cellCb)); +static Void rgDBMInitRachLst ARGS((RgCellCb *cellCb)); #ifdef LTEMAC_SPS -PRIVATE S16 rgDBMInitSpsUeCbLst ARGS(( +static S16 rgDBMInitSpsUeCbLst ARGS(( RgCellCb *cellCb, uint16_t numBins )); @@ -133,13 +133,13 @@ RgCellCb *cellCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDBMInitUeCbLst +static S16 rgDBMInitUeCbLst ( RgCellCb *cellCb, uint16_t numBins ) #else -PRIVATE S16 rgDBMInitUeCbLst(cellCb, numBins) +static S16 rgDBMInitUeCbLst(cellCb, numBins) RgCellCb *cellCb; uint16_t numBins; #endif @@ -196,13 +196,13 @@ RgCellCb *cellCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDBMInitSpsUeCbLst +static S16 rgDBMInitSpsUeCbLst ( RgCellCb *cellCb, uint16_t numBins ) #else -PRIVATE S16 rgDBMInitSpsUeCbLst(cellCb, numBins) +static S16 rgDBMInitSpsUeCbLst(cellCb, numBins) RgCellCb *cellCb; uint16_t numBins; #endif @@ -565,12 +565,12 @@ RgUeCb *ueCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgDBMInitDedLcLst +static Void rgDBMInitDedLcLst ( RgUeCb *ueCb ) #else -PRIVATE Void rgDBMInitDedLcLst(ueCb) +static Void rgDBMInitDedLcLst(ueCb) RgUeCb *ueCb; #endif { @@ -611,12 +611,12 @@ RgUeCb *ueCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgDBMInitCmnLcLst +static Void rgDBMInitCmnLcLst ( RgCellCb *cellCb ) #else -PRIVATE Void rgDBMInitCmnLcLst(cellCb) +static Void rgDBMInitCmnLcLst(cellCb) RgCellCb *cellCb; #endif { @@ -1211,12 +1211,12 @@ CmLteLcId idx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgDBMInitRachLst +static Void rgDBMInitRachLst ( RgCellCb *cellCb ) #else -PRIVATE Void rgDBMInitRachLst(cellCb) +static Void rgDBMInitRachLst(cellCb) RgCellCb *cellCb; #endif { diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c index 87b9d1c42..84e4746fd 100755 --- a/src/5gnrmac/rg_dhm.c +++ b/src/5gnrmac/rg_dhm.c @@ -68,16 +68,16 @@ static int RLOG_MODULE_ID=4096; #include "ss_task.x" #include "ss_msg.x" /* MAC includes */ /* local defines */ -//EXTERN S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); +// S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); //void prc_trace_format_string(UINT32 group_mask, UINT16 level, const char *format, ...); #endif /* local typedefs */ /* local externs */ -EXTERN S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf); +S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf); -PRIVATE Void rgDHMBldTfuDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgDlHqProcCb *hqP, +static Void rgDHMBldTfuDatReq ARGS((RgCellCb *cellCb, RgDlSf *dlSf, RgDlHqProcCb *hqP, RgTfuDatReqPduInfo *datReq)); #ifdef L2_OPTMZ @@ -467,7 +467,7 @@ RgDlHqProcCb **hqP; return ROK; } /* rgDHMGetHqProcFrmId */ -/*PRIVATE uint32_t dataAvl; */ +/*static uint32_t dataAvl; */ /** * @brief Handler for sending data to PHY * @@ -1263,7 +1263,7 @@ RgErrInfo *err; **/ //uint8_t crashFlag = 0; #ifdef ANSI -PRIVATE Void rgDHMBldTfuDatReq +static Void rgDHMBldTfuDatReq ( RgCellCb *cellCb, RgDlSf *dlSf, @@ -1271,7 +1271,7 @@ RgDlHqProcCb *hqP, RgTfuDatReqPduInfo *datReq ) #else -PRIVATE Void rgDHMBldTfuDatReq(cellCb, dlSf, hqP, datReq) +static Void rgDHMBldTfuDatReq(cellCb, dlSf, hqP, datReq) RgCellCb *cellCb; RgDlSf *dlSf; RgDlHqProcCb *hqP; diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c index d037cfd04..d4cb889ab 100755 --- a/src/5gnrmac/rg_dux.c +++ b/src/5gnrmac/rg_dux.c @@ -149,7 +149,7 @@ static int RLOG_MODULE_ID=4096; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDUXInsSdu +static S16 rgDUXInsSdu ( Inst inst, RgMacPdu *pdu, @@ -159,7 +159,7 @@ uint16_t sduLen, RgErrInfo *err ) #else -PRIVATE S16 rgDUXInsSdu(inst,pdu, sdu, lcId, sduLen, err) +static S16 rgDUXInsSdu(inst,pdu, sdu, lcId, sduLen, err) Inst inst; RgMacPdu *pdu; RgMacSdu **sdu, @@ -208,7 +208,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDUXExtSubHdr +static S16 rgDUXExtSubHdr ( Inst inst, RgMacPdu *pdu, @@ -218,7 +218,7 @@ uint16_t *len, RgErrInfo *err ) #else -PRIVATE S16 rgDUXExtSubHdr(inst,pdu, mBuf, lcId, +static S16 rgDUXExtSubHdr(inst,pdu, mBuf, lcId, len, err) Inst inst; RgMacPdu *pdu; @@ -291,7 +291,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDUXExtCe +static S16 rgDUXExtCe ( Inst inst, RgMacPdu *pdu, @@ -302,7 +302,7 @@ uint16_t subPduLen, RgErrInfo *err ) #else -PRIVATE S16 rgDUXExtCe(inst,pdu, ceInfo, mBuf,lcId,subPduLen, err) +static S16 rgDUXExtCe(inst,pdu, ceInfo, mBuf,lcId,subPduLen, err) Inst inst; RgMacPdu *pdu; RgInfCeInfo *ceInfo; @@ -487,7 +487,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgDUXExtSdu +static S16 rgDUXExtSdu ( Inst inst, RgMacPdu *pdu, @@ -498,7 +498,7 @@ uint16_t subPduLen, RgErrInfo *err ) #else -PRIVATE S16 rgDUXExtSdu(inst,pdu, ceInfo,mBuf,lcId,subPduLen,err) +static S16 rgDUXExtSdu(inst,pdu, ceInfo,mBuf,lcId,subPduLen,err) Inst inst; RgMacPdu *pdu; RgInfCeInfo *ceInfo; diff --git a/src/5gnrmac/rg_env.h b/src/5gnrmac/rg_env.h index f1e3692d6..192d80674 100755 --- a/src/5gnrmac/rg_env.h +++ b/src/5gnrmac/rg_env.h @@ -152,7 +152,7 @@ /* per 1024 REs. */ #endif -//EXTERN uint32_t wrSmDfltNumCells; +//uint32_t wrSmDfltNumCells; #define RGSCH_MAX_UE_PER_DL_SF 32 #define RGSCH_MAX_RARNTI_PER_DL_SF 4 #define SCH_INST_START 1 diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index c74220936..b3bf9a7e0 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -73,13 +73,13 @@ registered with SSI during the LTE MAC Task initialization. * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlSMEvents +static inline void rgHdlSMEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlSMEvents(pst, mBuf) +static inline void rgHdlSMEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -154,13 +154,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlNHEvents +static inline void rgHdlNHEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlNHEvents(pst, mBuf) +static inline void rgHdlNHEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -199,13 +199,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlKWEvents +static inline void rgHdlKWEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlKWEvents(pst, mBuf) +static inline void rgHdlKWEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -254,13 +254,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlTFEvents +static inline void rgHdlTFEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlTFEvents(pst, mBuf) +static inline void rgHdlTFEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -302,13 +302,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlRGEvents +static inline void rgHdlRGEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlRGEvents(pst, mBuf) +static inline void rgHdlRGEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif diff --git a/src/5gnrmac/rg_id.c b/src/5gnrmac/rg_id.c index 1d4afde98..85c1378e2 100755 --- a/src/5gnrmac/rg_id.c +++ b/src/5gnrmac/rg_id.c @@ -45,7 +45,7 @@ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -EXTERN Void rgGetSId ARGS((SystemId *s)); +Void rgGetSId ARGS((SystemId *s)); #ifdef __cplusplus } #endif /* __cplusplus */ @@ -59,7 +59,7 @@ EXTERN Void rgGetSId ARGS((SystemId *s)); #define RGSWPN "1000372" /* LTE MAC - part number */ /* system id */ -PRIVATE CONSTANT SystemId sId ={ +static const SystemId sId ={ RGSWMV, /* LTE MAC - main version */ RGSWMR, /* LTE MAC - main revision */ RGSWBV, /* LTE MAC - branch version */ diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c index bce34a3bb..71794cb85 100755 --- a/src/5gnrmac/rg_l2m.c +++ b/src/5gnrmac/rg_l2m.c @@ -63,12 +63,12 @@ static int RLOG_MODULE_ID=4096; /* local defines */ #ifdef LTE_L2_MEAS -PRIVATE S16 rgL2mInsertMeasCb ARGS(( +static S16 rgL2mInsertMeasCb ARGS(( RgCellCb *cell, RgL2MeasCb *measCb, RgInfL2MeasReq *measInfo )); -PRIVATE RgL2MeasCb * rgL2mAllocMeasCb ARGS(( +static RgL2MeasCb * rgL2mAllocMeasCb ARGS(( RgCellCb *cell, RgInfL2MeasReq *measInfo, RgErrInfo *err)); @@ -123,7 +123,7 @@ RgErrInfo *err; return RFAILED; } //Memcpy is already done in rgL2mAllocMeasCb - /*memcpy(&measCb->measReq, (CONSTANT uint8_t *)measInfo,\ + /*memcpy(&measCb->measReq, (const uint8_t *)measInfo,\ sizeof(RgInfL2MeasReq));*/ rgL2mInsertMeasCb(cell, measCb, measInfo); measCb->measReq.timePrd = measInfo->timePrd; @@ -200,13 +200,13 @@ RgErrInfo *err; * @param [in] RgInfL2MeasCfm *measCfm */ #ifdef ANSI -PRIVATE Void rgSndL2MeasCfm +static Void rgSndL2MeasCfm ( RgCellCb *cell, RgInfL2MeasCfm *measCfm ) #else -PRIVATE Void rgSndL2MeasCfm (cell, measCfm) +static Void rgSndL2MeasCfm (cell, measCfm) RgCellCb *cell; RgInfL2MeasCfm *measCfm; #endif @@ -232,13 +232,13 @@ RgInfL2MeasCfm *measCfm; * @param [in] RgInfL2MeasCfm *measCfm */ #ifdef ANSI -PRIVATE Void rgSndL2MeasStopCfm +static Void rgSndL2MeasStopCfm ( RgCellCb *cell, RgInfL2MeasCfm *measCfm ) #else -PRIVATE Void rgSndL2MeasStopCfm (cell, measCfm) +static Void rgSndL2MeasStopCfm (cell, measCfm) RgCellCb *cell; RgInfL2MeasCfm *measCfm; #endif @@ -446,14 +446,14 @@ RgInfL2MeasSndReq *measInfo; /* Meas Req Info */ * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgL2mInsertMeasCb +static S16 rgL2mInsertMeasCb ( RgCellCb *cell, RgL2MeasCb *measCb, RgInfL2MeasReq *measInfo ) #else -PRIVATE S16 rgL2mInsertMeasCb(cell, measCb, measInfo) +static S16 rgL2mInsertMeasCb(cell, measCb, measInfo) RgCellCb *cell; RgL2MeasCb *measCb; RgInfL2MeasReq *measInfo; @@ -511,14 +511,14 @@ RgInfL2MeasReq *measInfo; * @return RgSchL2MeasCb * */ #ifdef ANSI -PRIVATE RgL2MeasCb * rgL2mAllocMeasCb +static RgL2MeasCb * rgL2mAllocMeasCb ( RgCellCb *cell, RgInfL2MeasReq *measInfo, RgErrInfo *err ) #else -PRIVATE RgL2MeasCb * rgL2mAllocMeasCb(cell, measInfo, err) +static RgL2MeasCb * rgL2mAllocMeasCb(cell, measInfo, err) RgCellCb *cell; RgInfL2MeasReq *measInfo; RgErrInfo *err; diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c index 3a5c7ca4b..6f0286d4e 100755 --- a/src/5gnrmac/rg_lim.c +++ b/src/5gnrmac/rg_lim.c @@ -56,12 +56,12 @@ static int RLOG_MODULE_ID=4096; /* local externs */ #ifdef UNUSED_FUNC -PRIVATE S16 rgLIMValidateSap ARGS((Inst inst,SuId suId)); +static S16 rgLIMValidateSap ARGS((Inst inst,SuId suId)); #endif -PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd, +static Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd, Bool error)); #ifdef RG_UNUSED -PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq, +static Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq, Bool error)); #endif /* forward references */ @@ -228,13 +228,13 @@ uint8_t status; */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgLIMValidateSap +static S16 rgLIMValidateSap ( Inst inst, SuId suId ) #else -PRIVATE S16 rgLIMValidateSap(inst,suId) +static S16 rgLIMValidateSap(inst,suId) Inst inst; SuId suId; #endif @@ -274,13 +274,13 @@ PRIVATE S16 rgLIMValidateSap(inst,suId) * @return */ #ifdef ANSI -PRIVATE Void rgLIMUtlFreeDatIndEvnt +static Void rgLIMUtlFreeDatIndEvnt ( TfuDatIndInfo *datInd, Bool error ) #else -PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error) +static Void rgLIMUtlFreeDatIndEvnt(datInd, error) TfuDatIndInfo *datInd; Bool error; #endif @@ -340,7 +340,7 @@ TfuDatIndInfo *datInd; { Inst inst; S16 ret; - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; // printf("5GTF:: DatindRcvd\n"); @@ -394,13 +394,13 @@ TfuDatIndInfo *datInd; * @return */ #ifdef ANSI -PRIVATE Void rgLIMUtlFreeDatReqEvnt +static Void rgLIMUtlFreeDatReqEvnt ( TfuDatReqInfo *datReq, Bool error ) #else -PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error) +static Void rgLIMUtlFreeDatReqEvnt(datReq, error) TfuDatReqInfo *datReq; Bool error; #endif diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index c49861eb3..eaf4975f7 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -74,44 +74,44 @@ static int RLOG_MODULE_ID=4096; #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -EXTERN Void rgGetSId ARGS((SystemId *s)); +Void rgGetSId ARGS((SystemId *s)); #ifdef __cplusplus } #endif /* __cplusplus */ /* Public variable declaration */ LwrMacCb lwrMacCb; -extern MacCb macCb; +MacCb macCb; /* forward references */ -PRIVATE uint16_t rgLMMGenCfg ARGS(( +static uint16_t rgLMMGenCfg ARGS(( Inst inst, RgCfg *cfg )); -PRIVATE uint16_t rgLMMSapCfg ARGS(( +static uint16_t rgLMMSapCfg ARGS(( Inst inst, RgCfg *cfg, Elmnt sapType )); -PRIVATE Void rgLMMShutdown ARGS(( +static Void rgLMMShutdown ARGS(( Inst inst )); -PRIVATE Void rgLMMFillCfmPst ARGS(( +static Void rgLMMFillCfmPst ARGS(( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm )); -PRIVATE Void rgLMMGenCntrl ARGS(( +static Void rgLMMGenCntrl ARGS(( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst )); -PRIVATE Void rgLMMSapCntrl ARGS(( +static Void rgLMMSapCntrl ARGS(( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst @@ -706,14 +706,14 @@ RgMngmt *cntrl; /* control structure */ * -# LCM_REASON_NOT_APPL **/ #ifdef ANSI -PRIVATE uint16_t rgLMMSapCfg +static uint16_t rgLMMSapCfg ( Inst inst, RgCfg *cfg, /* Configuaration information */ Elmnt sapType /* Sap Type */ ) #else -PRIVATE uint16_t rgLMMSapCfg(inst,cfg,sapType) +static uint16_t rgLMMSapCfg(inst,cfg,sapType) Inst inst; RgCfg *cfg; /* Configuaration information */ Elmnt sapType; /* Sap Type */ @@ -853,13 +853,13 @@ Elmnt sapType; /* Sap Type */ * -# LCM_REASON_MEM_NOAVAIL **/ #ifdef ANSI -PRIVATE uint16_t rgLMMGenCfg +static uint16_t rgLMMGenCfg ( Inst inst, RgCfg *cfg /* Configuaration information */ ) #else -PRIVATE uint16_t rgLMMGenCfg(inst,cfg) +static uint16_t rgLMMGenCfg(inst,cfg) Inst inst; RgCfg *cfg; /* Configuaration information */ #endif @@ -967,12 +967,12 @@ RgCfg *cfg; /* Configuaration information */ * **********************************************************/ #ifdef ANSI -PRIVATE Void rgLMMShutdown +static Void rgLMMShutdown ( Inst inst ) #else -PRIVATE Void rgLMMShutdown(inst) +static Void rgLMMShutdown(inst) Inst inst; #endif { @@ -1046,14 +1046,14 @@ Inst inst; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgLMMGenCntrl +static Void rgLMMGenCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) #else -PRIVATE Void rgLMMGenCntrl(cntrl, cfm, cfmPst) +static Void rgLMMGenCntrl(cntrl, cfm, cfmPst) RgMngmt *cntrl; RgMngmt *cfm; Pst *cfmPst; @@ -1170,14 +1170,14 @@ Pst *cfmPst; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgLMMSapCntrl +static Void rgLMMSapCntrl ( RgMngmt *cntrl, RgMngmt *cfm, Pst *cfmPst ) #else -PRIVATE Void rgLMMSapCntrl(cntrl, cfm, cfmPst) +static Void rgLMMSapCntrl(cntrl, cfm, cfmPst) RgMngmt *cntrl; RgMngmt *cfm; Pst *cfmPst; @@ -1332,14 +1332,14 @@ Pst *cfmPst; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgLMMFillCfmPst +static Void rgLMMFillCfmPst ( Pst *reqPst, Pst *cfmPst, RgMngmt *cfm ) #else -PRIVATE Void rgLMMFillCfmPst(reqPst, cfmPst, cfm) +static Void rgLMMFillCfmPst(reqPst, cfmPst, cfm) Pst *reqPst; Pst *cfmPst; RgMngmt *cfm; diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index 447ade660..bc9f0b3e7 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -66,7 +66,7 @@ static int RLOG_MODULE_ID=4096; #include "ss_msg.x" /* MAC includes */ /* local defines */ #ifndef T2K_MEM_LEAK_DBG -EXTERN S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); + S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); #else char* file = __FILE__; uint32_t line = __LINE__; @@ -79,10 +79,10 @@ uint32_t rgDlrate_rgu; /* local externs */ -PRIVATE Void rgMUXGet20bitRarGrnt ARGS((uint8_t ulBw, +static Void rgMUXGet20bitRarGrnt ARGS((uint8_t ulBw, RgInfRarUlGrnt *msg3Grnt, uint8_t *grnt)); -EXTERN uint16_t rgMUXCalcRiv ARGS((uint8_t bw, +uint16_t rgMUXCalcRiv ARGS((uint8_t bw, uint8_t rbStart, uint8_t numRb)); @@ -156,7 +156,7 @@ EXTERN uint16_t rgMUXCalcRiv ARGS((uint8_t bw, * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgMUXAddCes +static S16 rgMUXAddCes ( Inst inst, RgBldPduInfo *pdu, @@ -164,7 +164,7 @@ Buffer *ceBuf, RgErrInfo *err ) #else -PRIVATE S16 rgMUXAddCes(inst,pdu, ceShdrBuf, ceBuf, err) +static S16 rgMUXAddCes(inst,pdu, ceShdrBuf, ceBuf, err) Inst inst; RgBldPduInfo *pdu; Buffer *ceBuf; @@ -279,7 +279,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgMUXInsSdu +static S16 rgMUXInsSdu ( Inst inst, MsgLen *schdTbSz, @@ -289,7 +289,7 @@ Buffer *sduBuf, RgErrInfo *err ) #else -PRIVATE S16 rgMUXInsSdu(inst,schdTbSz, lcId, sdu, sduBuf, err) +static S16 rgMUXInsSdu(inst,schdTbSz, lcId, sdu, sduBuf, err) Inst inst; MsgLen *schdTbSz; uint8_t lcId; @@ -510,7 +510,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgMUXAddSdus +static S16 rgMUXAddSdus ( Inst inst, RgBldPduInfo *pdu, @@ -518,7 +518,7 @@ Buffer *sduBuf, RgErrInfo *err ) #else -PRIVATE S16 rgMUXAddSdus(inst,pdu, sduBuf, err) +static S16 rgMUXAddSdus(inst,pdu, sduBuf, err) Inst inst; RgBldPduInfo *pdu; Buffer *sduBuf; @@ -709,7 +709,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgMUXAddSdus +static S16 rgMUXAddSdus ( Inst inst, RgBldPduInfo *pdu, @@ -718,7 +718,7 @@ RgTfuDatReqTbInfo *tb, RgErrInfo *err ) #else -PRIVATE S16 rgMUXAddSdus(pdu, sHdrBuf, tb, err) +static S16 rgMUXAddSdus(pdu, sHdrBuf, tb, err) Inst inst; RgBldPduInfo *pdu; Buffer *sHdrBuf; @@ -1164,14 +1164,14 @@ RgErrInfo *err; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgMUXGet20bitRarGrnt +static Void rgMUXGet20bitRarGrnt ( uint8_t ulBw, RgInfRarUlGrnt *msg3Grnt, uint8_t *grnt ) #else -PRIVATE Void rgMUXGet20bitRarGrnt(ulBw, msg3Grnt, grnt) +static Void rgMUXGet20bitRarGrnt(ulBw, msg3Grnt, grnt) uint8_t ulBw; RgInfRarUlGrnt *msg3Grnt; uint8_t *grnt; diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c index 5d89ba836..8965e8f4a 100755 --- a/src/5gnrmac/rg_pom_scell.c +++ b/src/5gnrmac/rg_pom_scell.c @@ -55,13 +55,13 @@ #include "rg.x" #ifdef LTE_ADV #include "rg_pom_scell.x" -PRIVATE S16 rgPomVldtSCellDedLchCfg ARGS(( +static S16 rgPomVldtSCellDedLchCfg ARGS(( Inst inst, RgPrgUeSCellLchAddInfo *lcCfg, RgCellCb **cell, RgUeCb **ue )); -PRIVATE S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb *cell, +static S16 rgPomUeSCellDedLcCfg ARGS((RgCellCb *cell, RgUeCb *ue, RgPrgUeSCellLchAddInfo *lcCfg )); @@ -681,7 +681,7 @@ RgPrgUeSCellLchAddInfo *lcCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgPomVldtSCellDedLchCfg +static S16 rgPomVldtSCellDedLchCfg ( Inst inst, RgPrgUeSCellLchAddInfo *lcCfg, @@ -689,7 +689,7 @@ RgCellCb **cell, RgUeCb **ue ) #else -PRIVATE S16 rgPomVldtSCellDedLchCfg(inst,lcCfg, cell, ue) +static S16 rgPomVldtSCellDedLchCfg(inst,lcCfg, cell, ue) Inst inst; RgPrgUeSCellLchAddInfo *lcCfg; RgCellCb **cell; @@ -786,14 +786,14 @@ RgUeCb **ue; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgPomUeSCellDedLcCfg +static S16 rgPomUeSCellDedLcCfg ( RgCellCb *cell, RgUeCb *ue, RgPrgUeSCellLchAddInfo *lcCfg ) #else -PRIVATE S16 rgPomUeSCellDedLcCfg(cell, ue, lcCfg) +static S16 rgPomUeSCellDedLcCfg(cell, ue, lcCfg) RgCellCb *cell; RgUeCb *ue; RgPrgUeSCellLchAddInfo *lcCfg; diff --git a/src/5gnrmac/rg_pom_scell.x b/src/5gnrmac/rg_pom_scell.x index afa37632e..f40518fbb 100755 --- a/src/5gnrmac/rg_pom_scell.x +++ b/src/5gnrmac/rg_pom_scell.x @@ -39,57 +39,57 @@ extern "C" { #endif #ifdef LTE_ADV -EXTERN S16 RgPrgPMacSMacUeSCellLchModReq ARGS +S16 RgPrgPMacSMacUeSCellLchModReq ARGS (( Pst *pst, RgPrgUeSCellLchModInfo *lchCfgCb )); -EXTERN S16 RgPrgPMacSMacUeSCellLchAddReq ARGS +S16 RgPrgPMacSMacUeSCellLchAddReq ARGS (( Pst *pst, RgPrgUeSCellLchAddInfo *lchCfgCb )); -EXTERN S16 RgPrgPMacSMacUeSCellLchDelReq ARGS +S16 RgPrgPMacSMacUeSCellLchDelReq ARGS (( Pst *pst, RgPrgUeSCellLchDelInfo *delLcCb )); -EXTERN S16 rgPomSndUeSCellLchDelToSmac ARGS((Inst inst,CrgDel *lcDel, +S16 rgPomSndUeSCellLchDelToSmac ARGS((Inst inst,CrgDel *lcDel, Bool *isCfmRqrd)); -EXTERN S16 rgPomSndUeSCellLchAddToSmac ARGS((Inst inst,RgCellCb *cell, +S16 rgPomSndUeSCellLchAddToSmac ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue,CrgLchCfg *lchCfg, Bool *isCfmRqrd)); -EXTERN S16 rgPomSndUeSCellLchModToSmac ARGS((Inst inst,RgCellCb *cell, +S16 rgPomSndUeSCellLchModToSmac ARGS((Inst inst,RgCellCb *cell, RgUeCb *ue,CrgLchRecfg *lchRecfg, Bool *isCfmRqrd)); -EXTERN S16 rgPomVldtAddLch ARGS((Inst inst, +S16 rgPomVldtAddLch ARGS((Inst inst, RgPrgUeSCellLchAddInfo *lcCfg, RgCellCb **cell, RgUeCb **ue )); -EXTERN S16 rgPomUeSCellLcAdd ARGS((Inst inst, +S16 rgPomUeSCellLcAdd ARGS((Inst inst, RgCellCb *cell, RgUeCb *ue, RgPrgUeSCellLchAddInfo *lcCfg )); -EXTERN S16 rgPomVltdModLch ARGS ((Inst inst, +S16 rgPomVltdModLch ARGS ((Inst inst, RgPrgUeSCellLchModInfo *lchCfgCb, RgCellCb **cell, RgUeCb **ue, RgUlLcCb **ulLc )); -EXTERN S16 rgPomUeSCellLcMod ARGS((Inst inst, +S16 rgPomUeSCellLcMod ARGS((Inst inst, RgUeCb *ue, RgUlLcCb *ulLc, RgPrgUeSCellLchModInfo *lchCfgCb )); -EXTERN S16 rgPomUeSCellLcDel ARGS((Inst inst, +S16 rgPomUeSCellLcDel ARGS((Inst inst, RgPrgUeSCellLchDelInfo *delLcCb, RgUeCb *ue, RgUlLcCb *ulLc, RgDlLcCb *dlLc )); -EXTERN S16 rgPomVltdDelLch ARGS ((Inst inst, +S16 rgPomVltdDelLch ARGS ((Inst inst, RgPrgUeSCellLchDelInfo *delLcCb, RgCellCb **cell, RgUeCb **ue, diff --git a/src/5gnrmac/rg_prg.x b/src/5gnrmac/rg_prg.x index cc2d5ac18..b190734d5 100755 --- a/src/5gnrmac/rg_prg.x +++ b/src/5gnrmac/rg_prg.x @@ -311,14 +311,14 @@ typedef struct rgPrgUeSCellLchAddInfo Function Prototypes */ /** @brief Request from PMAC to SMAC to add Ue Scell config. */ -EXTERN S16 RgPrgPMacSMacUeSCellCfg ARGS +S16 RgPrgPMacSMacUeSCellCfg ARGS (( Pst *pst, RgPrgUeSCellCfgInfo *ueSCellCb )); /** @brief Request from PMAC to SMAC to add Ue Scell config. */ -EXTERN S16 RgPrgPMacSMacUeSCellCfgReq ARGS +S16 RgPrgPMacSMacUeSCellCfgReq ARGS (( Pst *pst, RgPrgUeSCellCfgInfo *ueSCellCb @@ -331,13 +331,13 @@ typedef S16 (*RgPrgUeSCellCfgReq) ARGS (( )); /** @brief Config confirm of Ue SCell config Req from SMAC to PMAC */ -EXTERN S16 RgPrgSMacPMacCfg ARGS (( +S16 RgPrgSMacPMacCfg ARGS (( Pst *pst, RgPrgCfgCfmInfo *cfgCfm )); /** @brief Config confirm from SMAC to PMAC */ -EXTERN S16 RgPrgSMacPMacCfgCfm ARGS (( +S16 RgPrgSMacPMacCfgCfm ARGS (( Pst *pst, RgPrgCfgCfmInfo *cfgCfm )); @@ -350,14 +350,14 @@ typedef S16 (*RgSMacPMacCfgCfm) ARGS(( /** * @brief Ue SCell cfg delete Req from PMac to SMac*/ -EXTERN S16 RgPrgPMacSMacUeSCellDel ARGS (( +S16 RgPrgPMacSMacUeSCellDel ARGS (( Pst *pst, RgPrgUeSCellDelInfo *sCellUedelReq )); /** * @brief Ue SCell cfg delete Req from PMac to SMac*/ -EXTERN S16 RgPrgPMacSMacUeSCellDelReq ARGS (( +S16 RgPrgPMacSMacUeSCellDelReq ARGS (( Pst *pst, RgPrgUeSCellDelInfo *sCellUedelReq )); @@ -374,12 +374,12 @@ typedef S16 (*RgUeSCellDelReq) ARGS(( * @brief Ue SCell Cfg Req from PMac to SMac. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkPrgPMacSMacUeSCellCfgReq ARGS (( +S16 cmPkPrgPMacSMacUeSCellCfgReq ARGS (( Pst *pst, RgPrgUeSCellCfgInfo *ueSCellCb )); -EXTERN S16 cmUnpkPrgPMacSMacUeSCellCfgReq ARGS (( +S16 cmUnpkPrgPMacSMacUeSCellCfgReq ARGS (( RgPrgUeSCellCfgReq func, Pst *pst, Buffer *mBuf @@ -389,13 +389,13 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellCfgReq ARGS (( * @brief Ue SCell Add Cfg cfm from SMac to PMac. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkPrgSMacPMacCfgCfm ARGS(( +S16 cmPkPrgSMacPMacCfgCfm ARGS(( Pst *pst, RgPrgCfgCfmInfo *cfgCfm )); -EXTERN S16 cmUnpkPrgSMacPMacCfgCfm ARGS(( +S16 cmUnpkPrgSMacPMacCfgCfm ARGS(( RgSMacPMacCfgCfm func, Pst *pst, Buffer *mBuf @@ -404,13 +404,13 @@ EXTERN S16 cmUnpkPrgSMacPMacCfgCfm ARGS(( * @brief SCell Ue Delete Req from PMac to SMac. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkPrgPMacSMacUeSCellDelReq ARGS(( +S16 cmPkPrgPMacSMacUeSCellDelReq ARGS(( Pst *pst, RgPrgUeSCellDelInfo *sCellUeDelInfo )); -EXTERN S16 cmUnpkPrgPMacSMacUeSCellDelReq ARGS(( +S16 cmUnpkPrgPMacSMacUeSCellDelReq ARGS(( RgUeSCellDelReq func, Pst *pst, Buffer *mBuf @@ -421,12 +421,12 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellDelReq ARGS(( * @brief Ue Lch recfg Req from PMac to SMac. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkPrgPMacSMacUeSCellLchModReq ARGS(( +S16 cmPkPrgPMacSMacUeSCellLchModReq ARGS(( Pst *pst, RgPrgUeSCellLchModInfo *lchCfgCb )); -EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchModReq ARGS(( +S16 cmUnpkPrgPMacSMacUeSCellLchModReq ARGS(( RgPrgUeScellModLchReq func, Pst *pst, Buffer *mBuf @@ -436,13 +436,13 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchModReq ARGS(( * @brief SCell Ue Delete Req from PMac to SMac. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkPrgPMacSMacUeSCellLchDelReq ARGS(( +S16 cmPkPrgPMacSMacUeSCellLchDelReq ARGS(( Pst *pst, RgPrgUeSCellLchDelInfo *delLcCb )); -EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchDelReq ARGS(( +S16 cmUnpkPrgPMacSMacUeSCellLchDelReq ARGS(( RgPrgUeScellDelLchReq func, Pst *pst, Buffer *mBuf @@ -452,12 +452,12 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchDelReq ARGS(( * @brief Ue Lch cfg Req from PMac to SMac. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkPrgPMacSMacUeSCellLchAddReq ARGS (( +S16 cmPkPrgPMacSMacUeSCellLchAddReq ARGS (( Pst *pst, RgPrgUeSCellLchAddInfo *lchCfgCb )); -EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchAddReq ARGS (( +S16 cmUnpkPrgPMacSMacUeSCellLchAddReq ARGS (( RgPrgUeScellAddLchReq func, Pst *pst, Buffer *mBuf @@ -467,7 +467,7 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchAddReq ARGS (( #endif /* LCPRG */ /** @brief Request from PMAC to SMAC to add Lch Reconfig. */ -EXTERN S16 RgPrgPMacSMacUeScellLchMod ARGS +S16 RgPrgPMacSMacUeScellLchMod ARGS (( Pst *pst, RgPrgUeSCellLchModInfo *lchCfgCb @@ -482,7 +482,7 @@ typedef S16 (*RgPrgUeScellModLchReq) ARGS(( )); /** @brief Request from PMAC to SMAC to delete Lch . */ -EXTERN S16 RgPrgPMacSMacUeScellLchDel ARGS +S16 RgPrgPMacSMacUeScellLchDel ARGS (( Pst *pst, RgPrgUeSCellLchDelInfo *delLcCb @@ -498,7 +498,7 @@ typedef S16 (*RgPrgUeScellDelLchReq) ARGS(( /** @brief Request from PMAC to SMAC to add Lch config. */ -EXTERN S16 RgPrgPMacSMacUeScellLchAdd ARGS +S16 RgPrgPMacSMacUeScellLchAdd ARGS (( Pst *pst, RgPrgUeSCellLchAddInfo *lchCfgCb diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c index 9e01cf896..5834fdef0 100755 --- a/src/5gnrmac/rg_prg_pt.c +++ b/src/5gnrmac/rg_prg_pt.c @@ -54,7 +54,7 @@ #include "rg_pom_scell.x" /* Matrix for Ue SCell Config Req*/ -PRIVATE CONSTANT RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] = +static const RgPrgUeSCellCfgReq RgPrgPMacSMacUeSCellCfgReqMt[RG_PRG_MAX] = { #ifdef LCPRG cmPkPrgPMacSMacUeSCellCfgReq, @@ -92,7 +92,7 @@ S16 RgPrgPMacSMacUeSCellCfg(pst, ueSCellCfgInfo) } /* Matrix for config confirm from SMac to Pmac*/ -PRIVATE CONSTANT RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] = +static const RgSMacPMacCfgCfm RgPrgSMacPMacCfgCfmMt[RG_PRG_MAX] = { #ifdef LCPRG cmPkPrgSMacPMacCfgCfm, @@ -130,7 +130,7 @@ S16 RgPrgSMacPMacCfg(pst, cfgCfm) } /* Matrix for Ue SCell delete req/Ue Id change req from PMac to SMac */ -PRIVATE CONSTANT RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] = +static const RgUeSCellDelReq RgPrgPMacSMacUeSCellDelReqMt[RG_PRG_MAX] = { #ifdef LCPRG cmPkPrgPMacSMacUeSCellDelReq, @@ -170,7 +170,7 @@ S16 RgPrgPMacSMacUeSCellDel(pst, ueSCellDelInfo) /* Matrix for Lch ReConfig Req*/ -PRIVATE CONSTANT RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] = +static const RgPrgUeScellModLchReq RgPrgPMacSMacUeScellModLchReqMt[RG_PRG_MAX] = { #ifdef LCPRG cmPkPrgPMacSMacUeSCellLchModReq, @@ -210,7 +210,7 @@ S16 RgPrgPMacSMacUeScellLchMod(pst, lchCfgInfo) /* Matrix for delete Lch Req*/ -PRIVATE CONSTANT RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] = +static const RgPrgUeScellDelLchReq RgPrgPMacSMacUeScellDelLchReqMt[RG_PRG_MAX] = { #ifdef LCPRG cmPkPrgPMacSMacUeSCellLchDelReq, @@ -250,7 +250,7 @@ S16 RgPrgPMacSMacUeScellLchDel(pst, delLcCb) /* Matrix for Lch Config Req*/ -PRIVATE CONSTANT RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] = +static const RgPrgUeScellAddLchReq RgPrgPMacSMacUeScellAddLchReqMt[RG_PRG_MAX] = { #ifdef LCPRG cmPkPrgPMacSMacUeSCellLchAddReq, diff --git a/src/5gnrmac/rg_ptli.c b/src/5gnrmac/rg_ptli.c index 7d49cf70e..a1b4dab7f 100755 --- a/src/5gnrmac/rg_ptli.c +++ b/src/5gnrmac/rg_ptli.c @@ -59,28 +59,28 @@ extern "C" { * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -EXTERN S16 PtLiTfuBndReq ARGS((Pst * pst, SuId suId, SpId spId)); +S16 PtLiTfuBndReq ARGS((Pst * pst, SuId suId, SpId spId)); /** @brief This API is used to send a Bind Request from Scheduler to PHY. * @param pst Pointer to the post structure. * @param suId SAP ID of the service user. * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -EXTERN S16 PtLiTfuSchBndReq ARGS((Pst * pst, SuId suId, SpId spId)); +S16 PtLiTfuSchBndReq ARGS((Pst * pst, SuId suId, SpId spId)); /** @brief This API is used to send an Unbind Request from MAC to PHY. * @param pst Pointer to the post structure. * @param suId SAP ID of the service provider. * @param reason Reason for Unbind request. * @return ROK/RFAILED */ -EXTERN S16 PtLiTfuUbndReq ARGS((Pst * pst, SpId spId, Reason reason)); +S16 PtLiTfuUbndReq ARGS((Pst * pst, SpId spId, Reason reason)); /** @brief This API is used to send an Unbind Request from Scheduler to PHY. * @param pst Pointer to the post structure. * @param suId SAP ID of the service provider. * @param reason Reason for Unbind request. * @return ROK/RFAILED */ -EXTERN S16 PtLiTfuSchUbndReq ARGS((Pst * pst, SpId spId, Reason reason)); +S16 PtLiTfuSchUbndReq ARGS((Pst * pst, SpId spId, Reason reason)); /** @brief This primitive is sent from Scheduler to PHY. * @details This primitive provides PHY with all the information required by * PHY to decode transmissions from the UE on either PUCCH or PUSCH. @@ -101,7 +101,7 @@ EXTERN S16 PtLiTfuSchUbndReq ARGS((Pst * pst, SpId spId, Reason reason)); * @param recpReq Pointer to the TfuRecpReqInfo structure. * @return ROK/RFAILED */ -EXTERN S16 PtLiTfuRecpReq ARGS((Pst * pst, SpId spId, TfuRecpReqInfo * recpReq)); +S16 PtLiTfuRecpReq ARGS((Pst * pst, SpId spId, TfuRecpReqInfo * recpReq)); /** @brief This Primitive is sent from Scheduler to PHY. It provides PHY with * all the control information * @details This primitive carries the information sent on the following @@ -115,7 +115,7 @@ EXTERN S16 PtLiTfuRecpReq ARGS((Pst * pst, SpId spId, TfuRecpReqInfo * recpReq)) * @param cntrlReq pointer to TfuCntrlReqInfo * @return ROK/RFAILED */ -EXTERN S16 PtLiTfuCntrlReq ARGS((Pst * pst, SpId spId, TfuCntrlReqInfo * cntrlReq)); +S16 PtLiTfuCntrlReq ARGS((Pst * pst, SpId spId, TfuCntrlReqInfo * cntrlReq)); /** @brief This Primitive carries the Data PDUs from MAC to PHY for * transmission. * @details The data being sent in this primitive is meant to be transmitted on @@ -128,7 +128,7 @@ EXTERN S16 PtLiTfuCntrlReq ARGS((Pst * pst, SpId spId, TfuCntrlReqInfo * cntrlRe * @param tfuDatReq pointer to TfuDatReqInfo * @return */ -EXTERN S16 PtLiTfuDatReq ARGS((Pst * pst, SpId spId, TfuDatReqInfo * datReq)); +S16 PtLiTfuDatReq ARGS((Pst * pst, SpId spId, TfuDatReqInfo * datReq)); #ifdef L2_OPTMZ /** @brief This Primitive carries cellId and UeId for which datReq need to be deleted. * @details This primitive is used to send delDatReq to CL to delete the PDUs of @@ -140,7 +140,7 @@ EXTERN S16 PtLiTfuDatReq ARGS((Pst * pst, SpId spId, TfuDatReqInfo * datReq)); * @param tfuDelDatReq pointer to TfuDelDatReqInfo * @return */ -EXTERN S16 PtLiTfuDelDatReq ARGS((Pst * pst, SpId spId, TfuDelDatReqInfo * datReq)); +S16 PtLiTfuDelDatReq ARGS((Pst * pst, SpId spId, TfuDelDatReqInfo * datReq)); #endif /*L2_OPTMZ*/ #endif /*--#ifdef PTRGLITFU--*/ @@ -150,7 +150,7 @@ EXTERN S16 PtLiTfuDelDatReq ARGS((Pst * pst, SpId spId, TfuDelDatReqInfo * datRe * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -PRIVATE CONSTANT TfuBndReq RgLiTfuBndReqMt[RG_MAX_TFU_PROV] = +static const TfuBndReq RgLiTfuBndReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuBndReq, @@ -175,7 +175,7 @@ PRIVATE CONSTANT TfuBndReq RgLiTfuBndReqMt[RG_MAX_TFU_PROV] = * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -PRIVATE CONSTANT TfuSchBndReq RgLiTfuSchBndReqMt[RG_MAX_TFU_PROV] = +static const TfuSchBndReq RgLiTfuSchBndReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuSchBndReq, @@ -200,7 +200,7 @@ PRIVATE CONSTANT TfuSchBndReq RgLiTfuSchBndReqMt[RG_MAX_TFU_PROV] = * @param reason Reason for Unbind request. * @return ROK/RFAILED */ -PRIVATE CONSTANT TfuUbndReq RgLiTfuUbndReqMt[RG_MAX_TFU_PROV] = +static const TfuUbndReq RgLiTfuUbndReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuUbndReq, @@ -225,7 +225,7 @@ PRIVATE CONSTANT TfuUbndReq RgLiTfuUbndReqMt[RG_MAX_TFU_PROV] = * @param reason Reason for Unbind request. * @return ROK/RFAILED */ -PRIVATE CONSTANT TfuSchUbndReq RgLiTfuSchUbndReqMt[RG_MAX_TFU_PROV] = +static const TfuSchUbndReq RgLiTfuSchUbndReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuSchUbndReq, @@ -264,7 +264,7 @@ PRIVATE CONSTANT TfuSchUbndReq RgLiTfuSchUbndReqMt[RG_MAX_TFU_PROV] = * @param recpReq Pointer to the TfuRecpReqInfo structure. * @return ROK/RFAILED */ -PRIVATE CONSTANT TfuRecpReq RgLiTfuRecpReqMt[RG_MAX_TFU_PROV] = +static const TfuRecpReq RgLiTfuRecpReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuRecpReq, @@ -296,7 +296,7 @@ PRIVATE CONSTANT TfuRecpReq RgLiTfuRecpReqMt[RG_MAX_TFU_PROV] = * @param cntrlReq pointer to TfuCntrlReqInfo * @return ROK/RFAILED */ -PRIVATE CONSTANT TfuCntrlReq RgLiTfuCntrlReqMt[RG_MAX_TFU_PROV] = +static const TfuCntrlReq RgLiTfuCntrlReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuCntrlReq, @@ -327,7 +327,7 @@ PRIVATE CONSTANT TfuCntrlReq RgLiTfuCntrlReqMt[RG_MAX_TFU_PROV] = * @param tfuDatReq pointer to TfuDatReqInfo * @return */ -PRIVATE CONSTANT TfuDatReq RgLiTfuDatReqMt[RG_MAX_TFU_PROV] = +static const TfuDatReq RgLiTfuDatReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU cmPkTfuDatReq, @@ -358,7 +358,7 @@ PRIVATE CONSTANT TfuDatReq RgLiTfuDatReqMt[RG_MAX_TFU_PROV] = * @param tfuDelDatReq pointer to TfuDelDatReqInfo * @return */ -PRIVATE CONSTANT TfuDelDatReq RgLiTfuDelDatReqMt[RG_MAX_TFU_PROV] = +static const TfuDelDatReq RgLiTfuDelDatReqMt[RG_MAX_TFU_PROV] = { #ifdef LCRGLITFU PtLiTfuDelDatReq, /*calling dummy api as LC not required for this privitive*/ diff --git a/src/5gnrmac/rg_ptmi.c b/src/5gnrmac/rg_ptmi.c index a7fa99a70..0ce1260fa 100755 --- a/src/5gnrmac/rg_ptmi.c +++ b/src/5gnrmac/rg_ptmi.c @@ -54,18 +54,18 @@ extern "C" { /* portable functions at LRG interface */ #ifdef PTRGMILRG -EXTERN S16 PtMiLrgCfgCfm ARGS((Pst *pst, RgMngmt *cfm)); -EXTERN S16 PtMiLrgSchCfgCfm ARGS((Pst *pst, RgMngmt *cfm)); -EXTERN S16 PtMiLrgStsCfm ARGS((Pst *pst, RgMngmt *cfm)); -EXTERN S16 PtMiLrgStaCfm ARGS((Pst *pst, RgMngmt *cfm)); -EXTERN S16 PtMiLrgStaInd ARGS((Pst *pst, RgMngmt *usta)); -EXTERN S16 PtMiLrgSchStaInd ARGS((Pst *pst, RgMngmt *usta)); -EXTERN S16 PtMiLrgCntrlCfm ARGS((Pst *pst, RgMngmt *cfm)); -EXTERN S16 PtMiLrgSchCntrlCfm ARGS((Pst *pst, RgMngmt *cfm)); -EXTERN S16 PtMiLrgTrcInd ARGS((Pst *pst, RgMngmt *trc,Buffer *mBuf)); +S16 PtMiLrgCfgCfm ARGS((Pst *pst, RgMngmt *cfm)); +S16 PtMiLrgSchCfgCfm ARGS((Pst *pst, RgMngmt *cfm)); +S16 PtMiLrgStsCfm ARGS((Pst *pst, RgMngmt *cfm)); +S16 PtMiLrgStaCfm ARGS((Pst *pst, RgMngmt *cfm)); +S16 PtMiLrgStaInd ARGS((Pst *pst, RgMngmt *usta)); +S16 PtMiLrgSchStaInd ARGS((Pst *pst, RgMngmt *usta)); +S16 PtMiLrgCntrlCfm ARGS((Pst *pst, RgMngmt *cfm)); +S16 PtMiLrgSchCntrlCfm ARGS((Pst *pst, RgMngmt *cfm)); +S16 PtMiLrgTrcInd ARGS((Pst *pst, RgMngmt *trc,Buffer *mBuf)); #ifdef LTE_L2_MEAS -EXTERN S16 PtMiLrgSchL2MeasCfm ARGS((Pst *pst, LrgSchMeasCfmInfo *cfm)); -EXTERN S16 PtMiLrgSchL2MeasStopCfm ARGS((Pst *pst,LrgSchMeasCfmInfo *cfm )); +S16 PtMiLrgSchL2MeasCfm ARGS((Pst *pst, LrgSchMeasCfmInfo *cfm)); +S16 PtMiLrgSchL2MeasStopCfm ARGS((Pst *pst,LrgSchMeasCfmInfo *cfm )); #endif #endif @@ -89,7 +89,7 @@ EXTERN S16 PtMiLrgSchL2MeasStopCfm ARGS((Pst *pst,LrgSchMeasCfmInfo *cfm )); * In a similar fashion, the matrices for Status, Statistics and * Control confirms and, Status and trace indications are defined. **/ -PRIVATE CONSTANT LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] = +static const LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgCfgCfm, /* 0 - loosely coupled */ @@ -104,7 +104,7 @@ PRIVATE CONSTANT LrgCfgCfm RgMiLrgCfgCfmMt[RG_MAX_LRG_USR] = }; /** @brief Scheduler Config Confirm primitive Matrix */ -PRIVATE CONSTANT LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] = +static const LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgSchCfgCfm, /* 0 - loosely coupled */ @@ -119,7 +119,7 @@ PRIVATE CONSTANT LrgSchCfgCfm RgMiLrgSchCfgCfmMt[RG_MAX_LRG_USR] = }; /** @brief Statistics Confirm primitive Matrix */ -PRIVATE CONSTANT LrgStsCfm RgMiLrgStsCfmMt[RG_MAX_LRG_USR] = +static const LrgStsCfm RgMiLrgStsCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgStsCfm, /* 0 - loosely coupled */ @@ -134,7 +134,7 @@ PRIVATE CONSTANT LrgStsCfm RgMiLrgStsCfmMt[RG_MAX_LRG_USR] = }; /** @brief Status Confirm primitive Matrix */ -PRIVATE CONSTANT LrgStaCfm RgMiLrgStaCfmMt[RG_MAX_LRG_USR] = +static const LrgStaCfm RgMiLrgStaCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgStaCfm, /* 0 - loosely coupled */ @@ -150,7 +150,7 @@ PRIVATE CONSTANT LrgStaCfm RgMiLrgStaCfmMt[RG_MAX_LRG_USR] = /** @brief Status Indication primitive Matrix */ -PRIVATE CONSTANT LrgStaInd RgMiLrgStaIndMt[RG_MAX_LRG_USR] = +static const LrgStaInd RgMiLrgStaIndMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgStaInd, /* 0 - loosely coupled */ @@ -165,7 +165,7 @@ PRIVATE CONSTANT LrgStaInd RgMiLrgStaIndMt[RG_MAX_LRG_USR] = }; /** @brief Scheduler Status Indication primitive Matrix */ -PRIVATE CONSTANT LrgSchStaInd RgMiLrgSchStaIndMt[RG_MAX_LRG_USR] = +static const LrgSchStaInd RgMiLrgSchStaIndMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgSchStaInd, /* 0 - loosely coupled */ @@ -181,7 +181,7 @@ PRIVATE CONSTANT LrgSchStaInd RgMiLrgSchStaIndMt[RG_MAX_LRG_USR] = /** @brief Control Confirm primitive Matrix */ -PRIVATE CONSTANT LrgCntrlCfm RgMiLrgCntrlCfmMt[RG_MAX_LRG_USR] = +static const LrgCntrlCfm RgMiLrgCntrlCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgCntrlCfm, /* 0 - loosely coupled */ @@ -196,7 +196,7 @@ PRIVATE CONSTANT LrgCntrlCfm RgMiLrgCntrlCfmMt[RG_MAX_LRG_USR] = }; /** @brief Scheduler Control Confirm primitive Matrix */ -PRIVATE CONSTANT LrgSchCntrlCfm RgMiLrgSchCntrlCfmMt[RG_MAX_LRG_USR] = +static const LrgSchCntrlCfm RgMiLrgSchCntrlCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgSchCntrlCfm, /* 0 - loosely coupled */ @@ -211,7 +211,7 @@ PRIVATE CONSTANT LrgSchCntrlCfm RgMiLrgSchCntrlCfmMt[RG_MAX_LRG_USR] = }; /** @brief Trace Indication primitive Matrix */ -PRIVATE CONSTANT LrgTrcInd RgMiLrgTrcIndMt[RG_MAX_LRG_USR] = +static const LrgTrcInd RgMiLrgTrcIndMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgTrcInd, /* 0 - loosely coupled */ @@ -226,7 +226,7 @@ PRIVATE CONSTANT LrgTrcInd RgMiLrgTrcIndMt[RG_MAX_LRG_USR] = }; #ifdef LTE_L2_MEAS /** @brief L2 Meas Cfm primitive Matrix */ -PRIVATE CONSTANT LrgSchL2MeasCfm RgMiLrgSchL2mMeasCfmMt[RG_MAX_LRG_USR] = +static const LrgSchL2MeasCfm RgMiLrgSchL2mMeasCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgSchL2MeasCfm, /* 0 - loosely coupled */ @@ -240,7 +240,7 @@ PRIVATE CONSTANT LrgSchL2MeasCfm RgMiLrgSchL2mMeasCfmMt[RG_MAX_LRG_USR] = #endif }; /** @brief L2 Meas Stop Cfm primitive Matrix */ -PRIVATE CONSTANT LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR] = +static const LrgSchL2MeasStopCfm RgMiLrgSchL2mMeasStopCfmMt[RG_MAX_LRG_USR] = { #ifdef LCRGMILRG cmPkLrgSchL2MeasStopCfm, /* 0 - loosely coupled */ diff --git a/src/5gnrmac/rg_ptui.c b/src/5gnrmac/rg_ptui.c index f4d91207b..6d007c741 100755 --- a/src/5gnrmac/rg_ptui.c +++ b/src/5gnrmac/rg_ptui.c @@ -83,30 +83,30 @@ extern "C" { #ifdef PTRGUIRGU /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); +S16 PtUiRguBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo * datInd)); +S16 PtUiRguCDatInd ARGS((Pst* pst, SuId suId, RguCDatIndInfo * datInd)); /** @brief Data Indication from MAC to RLC to * forward the data received for dedicated channels*/ -EXTERN S16 PtUiRguDDatInd ARGS((Pst* pst, SuId suId, RguDDatIndInfo * datInd)); +S16 PtUiRguDDatInd ARGS((Pst* pst, SuId suId, RguDDatIndInfo * datInd)); /** @brief Status Indication from MAC to RLC * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on common channels. */ -EXTERN S16 PtUiRguCStaInd ARGS((Pst* pst, SuId suId, RguCStaIndInfo * staInd)); +S16 PtUiRguCStaInd ARGS((Pst* pst, SuId suId, RguCStaIndInfo * staInd)); /** @brief Status Indication from MAC to RLC * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on dedicated channels. */ -EXTERN S16 PtUiRguDStaInd ARGS((Pst* pst, SuId suId, RguDStaIndInfo * staInd)); +S16 PtUiRguDStaInd ARGS((Pst* pst, SuId suId, RguDStaIndInfo * staInd)); #ifdef LTE_L2_MEAS /**@brief HARQ Status Indication from MAC to RLC */ -EXTERN S16 PtUiRguHqStaInd ARGS((Pst* pst,SuId suId, +S16 PtUiRguHqStaInd ARGS((Pst* pst,SuId suId, RguHarqStatusInd *harqStatusInd)); #endif /**@brief PDB FLow Control Indication from MAC to RLC */ -EXTERN S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId, +S16 PtUiRguFlowCntrlInd ARGS((Pst* pst,SuId suId, RguFlowCntrlInd *flowCntrlInd)); #endif /*--#ifdef PTRGUIRGU--*/ S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd); @@ -117,17 +117,17 @@ S16 RgUiRguHqStaIndRbuf ARGS((Pst* pst,SuId suId,RguHarqStatusInd *harqStatusInd #endif #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) -PRIVATE S16 RgUiRguDDatIndRbuf ARGS((RguDDatIndInfo *datInd)); +static S16 RgUiRguDDatIndRbuf ARGS((RguDDatIndInfo *datInd)); #endif -EXTERN Void rgFreeSharableSBuf ARGS((Data **data, Size size)); +Void rgFreeSharableSBuf ARGS((Data **data, Size size)); #ifdef RGR_CQI_REPT -EXTERN S16 PtUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd)); +S16 PtUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd)); #endif /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 PtUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd)); +S16 PtUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd)); /* LTE_ADV_FLAG_REMOVED_END */ -EXTERN S16 PtUiRgrUeStaInd ARGS +S16 PtUiRgrUeStaInd ARGS (( Pst* pst, SuId suId, @@ -136,22 +136,22 @@ RgrUeStaIndInfo *staInd #ifdef PTRGUICRG /** @brief Confirmation from MAC to RRC for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); +S16 PtUiCrgBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Configuration Confirm from MAC to RRC */ -EXTERN S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status)); +S16 PtUiCrgCfgCfm ARGS((Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status)); #endif /*--#ifdef PTRGUICRG--*/ #ifdef PTRGUIRGR /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps */ -EXTERN S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); +S16 PtUiRgrBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); /** @brief Configuration Confirm from MAC to RRM */ -EXTERN S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); -EXTERN S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd)); +S16 PtUiRgrCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); +S16 PtUiRgrTtiInd ARGS((Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd)); /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH -EXTERN S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); -EXTERN S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, +S16 PtUiRgrSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status)); +S16 PtUiRgrWarningSiCfgCfm ARGS((Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t siId, uint8_t status)); #endif/*RGR_SI_SCH*/ #endif /*--#ifdef PTRGUIRGR--*/ @@ -167,7 +167,7 @@ S16 RgUiRgmChangeTransModeInd ARGS((Pst* pst, SuId suId, RgmTransModeInd *transM S16 RgUiRguFlowCntrlInd ARGS((Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd)); /* Added for sending TTI tick to RRM */ /** @brief TTI indication from MAC to RRM */ -PRIVATE CONSTANT RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] = +static const RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrTtiInd, @@ -184,7 +184,7 @@ PRIVATE CONSTANT RgrTtiInd RgUiRgrTtiIndMt[RG_MAX_RGR_USR] = /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps */ -PRIVATE CONSTANT RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] = +static const RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrBndCfm, @@ -200,7 +200,7 @@ PRIVATE CONSTANT RgrBndCfm RgUiRgrBndCfmMt[RG_MAX_RGR_USR] = /** @brief Confirmation from MAC to RRM for the bind/Unbind * request for the interface saps via RGM interface*/ -PRIVATE CONSTANT RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] = +static const RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] = { #ifdef RGM_LC cmPkRgmBndCfm, @@ -216,7 +216,7 @@ PRIVATE CONSTANT RgmBndCfm RgUiRgmBndCfmMt[RG_MAX_RGM_USR] = /** @brief Configuration Confirm from MAC to RRM */ -PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = +static const RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrCfgCfm, @@ -231,7 +231,7 @@ PRIVATE CONSTANT RgrCfgCfm RgUiRgrCfgCfmMt[RG_MAX_RGR_USR] = /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH /** @brief SI Configuration Confirm from MAC to RRM */ -PRIVATE CONSTANT RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] = +static const RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrSiCfgCfm, @@ -247,7 +247,7 @@ PRIVATE CONSTANT RgrSiCfgCfm RgUiRgrSiCfgCfmMt[RG_MAX_RGR_USR] = /** @brief Warning SI Configuration Confirm from MAC to RRM */ -PRIVATE CONSTANT RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] = +static const RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrWarningSiCfgCfm, @@ -264,7 +264,7 @@ PRIVATE CONSTANT RgrWarningSiCfgCfm RgUiRgrWarningSiCfgCfmMt[RG_MAX_RGR_USR] = #endif/*RGR_SI_SCH */ /** @brief Confirmation from MAC to RRC for the bind/Unbind * request for the interface saps */ -PRIVATE CONSTANT CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] = +static const CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] = { #ifdef LCRGUICRG cmPkCrgBndCfm, @@ -279,7 +279,7 @@ PRIVATE CONSTANT CrgBndCfm RgUiCrgBndCfmMt[RG_MAX_CRG_USR] = }; /** @brief Configuration Confirm from MAC to RRC */ -PRIVATE CONSTANT CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] = +static const CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] = { #ifdef LCRGUICRG cmPkCrgCfgCfm, @@ -296,7 +296,7 @@ PRIVATE CONSTANT CrgCfgCfm RgUiCrgCfgCfmMt[RG_MAX_CRG_USR] = /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = +static const RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU cmPkRguBndCfm, @@ -317,7 +317,7 @@ PRIVATE CONSTANT RguBndCfm RgUiRguBndCfmMt[RG_MAX_RGU_USR] = /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = +static const RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU // cmPkRguCDatInd, /* TODO : Call packRcvdUlData instead */ @@ -338,7 +338,7 @@ PRIVATE CONSTANT RguCDatInd RgUiRguCDatIndMt[RG_MAX_RGU_USR] = /** @brief Data Indication from MAC to RLC to * forward the data received for dedicated channels*/ -PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = +static const RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU // cmPkRguDDatInd, /* TODO: Call packRcvdUlData instead */ @@ -361,7 +361,7 @@ PRIVATE CONSTANT RguDDatInd RgUiRguDDatIndMt[RG_MAX_RGU_USR] = * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on common channels. */ -PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = +static const RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU //cmPkRguCStaInd, /* TODO: Call packSchedRep instead of cmPkRguCStaInd */ @@ -384,7 +384,7 @@ PRIVATE CONSTANT RguCStaInd RgUiRguCStaIndMt[RG_MAX_RGU_USR] = * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on dedicated channels. */ -PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = +static const RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU //cmPkRguDStaInd, /* TODO: Call packSchedRep instead of cmPkRguDStaInd */ @@ -408,7 +408,7 @@ PRIVATE CONSTANT RguDStaInd RgUiRguDStaIndMt[RG_MAX_RGU_USR] = * as a response to the DdatReq primitive from RLC. * Informs RLC of the successful transmission of TB's * (ACK/NACK) along with Mapping Info. */ -PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = +static const RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU cmPkRguHqStaInd, @@ -432,7 +432,7 @@ PRIVATE CONSTANT RguHqStaInd RgUiRguHqStaIndMt[RG_MAX_RGU_USR] = RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT /** @brief TTI indication from MAC to RRM */ -PRIVATE CONSTANT RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] = +static const RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrStaInd, @@ -449,7 +449,7 @@ PRIVATE CONSTANT RgrStaInd RgUiRgrStaIndMt[RG_MAX_RGR_USR] = /* LTE_ADV_FLAG_REMOVED_START */ /** @brief LOAD INF indication from MAC to RRM */ -PRIVATE CONSTANT RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] = +static const RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrLoadInfInd, @@ -465,7 +465,7 @@ PRIVATE CONSTANT RgrLoadInfInd RgUiRgrLoadInfIndMt[RG_MAX_RGR_USR] = /* LTE_ADV_FLAG_REMOVED_END */ /** @brief TTI indication from MAC to RRM */ -PRIVATE CONSTANT RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] = +static const RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] = { #ifdef LCRGUIRGR cmPkRgrUeStaInd, @@ -480,7 +480,7 @@ PRIVATE CONSTANT RgrUeStaInd RgUiRgrUeStaIndMt[RG_MAX_RGR_USR] = }; /** @brief Average PRB usage indication from MAC to RRM */ -PRIVATE CONSTANT RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] = +static const RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] = { #ifdef RGM_LC cmPkRgmPrbRprtInd, @@ -496,7 +496,7 @@ PRIVATE CONSTANT RgmPrbRprtIndFptr RgUiRgmSendPrbRprtIndMt[RG_MAX_RGM_USR] = /** @brief Transmission Mode Change indication from MAC to RRM */ -PRIVATE CONSTANT RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] = +static const RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] = { #ifdef RGM_LC cmPkRgmTransModeInd, @@ -510,7 +510,7 @@ PRIVATE CONSTANT RgmTransModeIndFptr RgUiRgmChangeTransModeIndMt[RG_MAX_RGM_USR] #endif }; -PRIVATE CONSTANT RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = +static const RguFlowCntrlIndInfo RgUiRguFlowCntrlIndMt[RG_MAX_RGU_USR] = { #ifdef LCRGUIRGU cmPkRguFlowCntrlInd, @@ -1973,7 +1973,7 @@ RgmTransModeInd *transModeInd; } #if defined(MAC_RLC_UL_RBUF) && !defined(SS_RBUF) -PRIVATE S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) +static S16 RgUiRguDDatIndRbuf(RguDDatIndInfo *datInd) { S16 ret = ROK; Void *elem = NULLP; @@ -2020,8 +2020,8 @@ Void; /* Read from Ring Buffer and process PDCP packets */ uint8_t rngBufDeqIndx = 0; - PRIVATE Pst rgDDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDDATREQ,0,0,2,0}; - PRIVATE Pst rgCDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCDATREQ,0,0,2,0}; + static Pst rgDDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDDATREQ,0,0,2,0}; + static Pst rgCDatRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCDATREQ,0,0,2,0}; Void *elmIndx = NULLP; RguInfoRingElem *datReqRing=NULLP; elmIndx = SRngGetRIndx(SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ); @@ -2090,8 +2090,8 @@ Void; /* Read from Ring Buffer and process PDCP packets */ uint8_t rngBufDeqIndx = 0; - PRIVATE Pst rgDStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDSTARSP,0,0,2,0}; - PRIVATE Pst rgCStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCSTARSP,0,0,2,0}; + static Pst rgDStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUDSTARSP,0,0,2,0}; + static Pst rgCStaRbfuPst ={1,1,ENTMAC,0,ENTRLC,1,PRIOR0,RTESPEC,EVTRGUCSTARSP,0,0,2,0}; Void *elmIndx = NULLP; RguInfoRingElem *staRspRing=NULLP; diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index f8e1f4cbb..81bbc4a64 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -66,18 +66,18 @@ static int RLOG_MODULE_ID=4096; /* local typedefs */ S16 RgMacSchBrdcmDedBoUpdtReq ARGS((Inst inst, CmLteCellId cellId, CmLteRnti rnti, CmLteLcId lcId, S32 bo )); -PRIVATE S16 rgROMHndlCcchDatReq ARGS((RgCellCb *cell, +static S16 rgROMHndlCcchDatReq ARGS((RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)); -PRIVATE S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell, +static S16 rgROMHndlBcchPcchDatReq ARGS((RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err)); -PRIVATE S16 rgROMHndlCcchStaRsp ARGS((RgCellCb *cell, +static S16 rgROMHndlCcchStaRsp ARGS((RgCellCb *cell, RgRguCmnStaRsp *staRsp, RgErrInfo *err)); -PRIVATE S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, +static S16 rgROMHndlBcchPcchStaRsp ARGS((RgCellCb *cell, RgRguCmnStaRsp *staRsp, RgErrInfo *err)); /* ADD Changes for Downlink UE Timing Optimization */ #ifdef LTEMAC_DLUE_TMGOPTMZ -PRIVATE S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb, +static S16 rgROMUpdDlSfRemDataCnt ARGS((RgCellCb *cellCb, RgDlSf *dlSf)); S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, @@ -180,7 +180,7 @@ RgRguDedDatReq *datReq; rgUpdtRguDedSts(inst,cell->rguDlSap,RG_RGU_SDU_DROP, datReq); #ifdef CA_DBG { - EXTERN uint32_t dbgDelayedDatReqInMac; + uint32_t dbgDelayedDatReqInMac; dbgDelayedDatReqInMac++; } #endif /* CA_DBG */ @@ -433,14 +433,14 @@ RgRguCmnDatReq *datReq; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgROMHndlCcchDatReq +static S16 rgROMHndlCcchDatReq ( RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err ) #else -PRIVATE S16 rgROMHndlCcchDatReq(cell, datReq, err) +static S16 rgROMHndlCcchDatReq(cell, datReq, err) RgCellCb *cell; RgRguCmnDatReq *datReq; RgErrInfo *err; @@ -531,14 +531,14 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgROMHndlBcchPcchDatReq +static S16 rgROMHndlBcchPcchDatReq ( RgCellCb *cell, RgRguCmnDatReq *datReq, RgErrInfo *err ) #else -PRIVATE S16 rgROMHndlBcchPcchDatReq(cell, datReq, err) +static S16 rgROMHndlBcchPcchDatReq(cell, datReq, err) RgCellCb *cell; RgRguCmnDatReq *datReq; RgErrInfo *err; @@ -847,14 +847,14 @@ RgRguL2MUlThrpMeasReq *measReq; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgROMHndlCcchStaRsp +static S16 rgROMHndlCcchStaRsp ( RgCellCb *cell, RgRguCmnStaRsp *staRsp, RgErrInfo *err ) #else -PRIVATE S16 rgROMHndlCcchStaRsp(cell, staRsp, err) +static S16 rgROMHndlCcchStaRsp(cell, staRsp, err) RgCellCb *cell; RgRguCmnStaRsp *staRsp; RgErrInfo *err; @@ -898,14 +898,14 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgROMHndlBcchPcchStaRsp +static S16 rgROMHndlBcchPcchStaRsp ( RgCellCb *cell, RgRguCmnStaRsp *staRsp, RgErrInfo *err ) #else -PRIVATE S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err) +static S16 rgROMHndlBcchPcchStaRsp(cell, staRsp, err) RgCellCb *cell; RgRguCmnStaRsp *staRsp; RgErrInfo *err; @@ -978,13 +978,13 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgROMUpdDlSfRemDataCnt +static S16 rgROMUpdDlSfRemDataCnt ( RgCellCb *cellCb, RgDlSf *dlSf ) #else -PRIVATE S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf) +static S16 rgROMUpdDlSfRemDataCnt(cellCb, dlSf) RgCellCb *cellCb; RgDlSf *dlSf; #endif diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index 0bd91d4d5..37c88bd5a 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -63,13 +63,13 @@ invoked by PHY towards MAC /* ADD Changes for Downlink UE Timing Optimization */ #ifndef LTEMAC_DLUE_TMGOPTMZ -PRIVATE S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, +static S16 rgTOMUtlProcDlSf ARGS(( RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err)); #else S16 rgTOMUtlProcDlSf ARGS((RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err)); #endif -PRIVATE S16 rgTOMProcCrntiCEInDatInd ARGS(( +static S16 rgTOMProcCrntiCEInDatInd ARGS(( RgMacPdu *pdu, RgUeCb *prevUeCb, RgCellCb *cellCb, @@ -78,7 +78,7 @@ RgInfCeInfo *ceInfo, uint16_t slot )); -PRIVATE S16 rgTOMProcCCCHSduInDatInd ARGS(( +static S16 rgTOMProcCCCHSduInDatInd ARGS(( RgMacPdu *pdu, RgUeCb *prevUeCb, RgCellCb *cellCb, @@ -93,27 +93,27 @@ RgCellCb *cell, RgInfSfAlloc *sfInfo ); -EXTERN S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd); +S16 RgUiRguFlowCntrlInd(Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd); #ifdef EMTC_ENABLE -EXTERN S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc *sfInfo); -EXTERN S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err); -EXTERN Void rgTOMEmtcRlsSf(RgDlSf *dlSf); +S16 rgEmtcHndl(RgCellCb *cell,RgInfSfAlloc *sfInfo); +S16 rgTOMEmtcUtlFillDatReqPdus(TfuDatReqInfo *datInfo, RgDlSf *dlSf, RgCellCb *cell, RgErrInfo *err); +Void rgTOMEmtcRlsSf(RgDlSf *dlSf); #endif #ifdef LTE_L2_MEAS -PRIVATE Void rgTOML2MCompileActiveLCs ARGS +static Void rgTOML2MCompileActiveLCs ARGS (( RgCellCb *cellCb, RgUeCb *ueCb, RgMacPdu *pdu, RgInfCeInfo *ceInfo )); -PRIVATE S16 rgTOMUtlL2MStoreBufSz ARGS +static S16 rgTOMUtlL2MStoreBufSz ARGS (( RgUeCb *ueCb, RgInfCeInfo *ceInfo )); -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS +static S16 rgTomUtlPrepareL2MUlThrpInfo ARGS (( RgCellCb *cellCb, RgUeCb *ueCb, @@ -126,7 +126,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo ARGS TB, which is not guaranteed if higher Range values are used */ /* Note: taking value 10 for BSR index 1 */ #ifndef MAC_5GTF_UPDATE -PRIVATE uint32_t rgLwrBsrTbl[64] = { +static uint32_t rgLwrBsrTbl[64] = { 0, 10, 10, 12, 14, 17, 19, 22, 26, 31, 36, 42, 49, 57, 67, 78, 91, 107, 125, 146, 171, 200, 234, 274, 321, @@ -138,7 +138,7 @@ PRIVATE uint32_t rgLwrBsrTbl[64] = { }; #else -PRIVATE uint32_t rgLwrBsrTbl[64] = { +static uint32_t rgLwrBsrTbl[64] = { 0,10,13,16,19,23,29,35,43,53,65,80,98,120,147,181,223,274,337,414, 509,625,769,945,1162,1429,1757,2161,2657,3267,4017,4940,6074,7469, 9185,11294,13888,17077,20999,25822,31752,39045,48012,59039,72598, @@ -158,7 +158,7 @@ PRIVATE uint32_t rgLwrBsrTbl[64] = { /* global variables */ uint32_t rgUlrate_tfu; #ifdef EMTC_ENABLE -EXTERN uint32_t grgUlrate_tfu; +uint32_t grgUlrate_tfu; #endif /** @brief This function fills the PDSCH data of a downlink subframe @@ -182,7 +182,7 @@ EXTERN uint32_t grgUlrate_tfu; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgTOMUtlFillDatReqPdus +static S16 rgTOMUtlFillDatReqPdus ( TfuDatReqInfo *datInfo, RgDlSf *dlSf, @@ -190,7 +190,7 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus RgErrInfo *err ) #else -PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) +static S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) TfuDatReqInfo *datInfo; RgDlSf *dlSf; RgCellCb *cellCb; @@ -372,14 +372,14 @@ PRIVATE S16 rgTOMUtlFillDatReqPdus(datInfo, dlSf, cellCb, err) /* ADD Changes for Downlink UE Timing Optimization */ #ifndef LTEMAC_DLUE_TMGOPTMZ #ifdef ANSI -PRIVATE S16 rgTOMUtlProcDlSf +static S16 rgTOMUtlProcDlSf ( RgDlSf *dlSf, RgCellCb *cellCb, RgErrInfo *err ) #else -PRIVATE S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) +static S16 rgTOMUtlProcDlSf (dlSf, cellCb, err) RgDlSf *dlSf; RgCellCb *cellCb; RgErrInfo *err; @@ -486,21 +486,21 @@ uint32_t rgMacGT; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgTOMUtlAllocPduEvnt +static S16 rgTOMUtlAllocPduEvnt ( Inst inst, RgMacPdu **pdu ) #else -PRIVATE S16 rgTOMUtlAllocPduEvnt (inst,pdu) +static S16 rgTOMUtlAllocPduEvnt (inst,pdu) Inst inst; - RgMacPdu **pdu; +RgMacPdu **pdu; #endif { Mem evntMem; RgUstaDgn dgn; /* Alarm diagnostics structure */ - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; evntMem.region = rgCb[inst].rgInit.region; @@ -544,13 +544,13 @@ Inst inst; * @return */ #ifdef ANSI -PRIVATE Void rgTOMUtlFreePduEvnt +static Void rgTOMUtlFreePduEvnt ( RgMacPdu *pdu, Bool error ) #else -PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) +static Void rgTOMUtlFreePduEvnt (pdu, error) RgMacPdu *pdu; Bool error; #endif @@ -593,13 +593,13 @@ PRIVATE Void rgTOMUtlFreePduEvnt (pdu, error) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgTOMInfAllocPduEvnt +static S16 rgTOMInfAllocPduEvnt ( Inst inst, RgInfSfDatInd **sfInfo ) #else -PRIVATE S16 rgTOMInfAllocPduEvnt (inst,sfInfo) +static S16 rgTOMInfAllocPduEvnt (inst,sfInfo) Inst inst; RgInfSfDatInd **sfInfo; #endif @@ -607,7 +607,7 @@ RgInfSfDatInd **sfInfo; Mem evntMem; RgUstaDgn dgn; /* Alarm diagnostics structure */ - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; evntMem.region = rgCb[inst].rgInit.region; @@ -649,12 +649,12 @@ RgInfSfDatInd **sfInfo; * @return */ #ifdef ANSI -PRIVATE Void rgTOMInfFreePduEvnt +static Void rgTOMInfFreePduEvnt ( RgInfSfDatInd *sfInfo ) #else -PRIVATE Void rgTOMInfFreePduEvnt (sfInfo) +static Void rgTOMInfFreePduEvnt (sfInfo) RgInfSfDatInd *sfInfo; #endif { @@ -682,14 +682,14 @@ RgInfSfDatInd *sfInfo; * @return */ #ifdef ANSI -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo +static S16 rgTomUtlPrepareL2MUlThrpInfo ( RgCellCb *cellCb, RgUeCb *ueCb, RgRguDedDatInd *dDatInd ) #else -PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) +static S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) RgCellCb *cellCb; RgUeCb *ueCb; RgRguDedDatInd *dDatInd; @@ -751,7 +751,7 @@ PRIVATE S16 rgTomUtlPrepareL2MUlThrpInfo(cellCb,ueCb,dDatInd) #ifdef LTEMAC_SPS #ifdef ANSI -PRIVATE S16 rgTOMUtlProcMsg +static S16 rgTOMUtlProcMsg ( RgCellCb *cellCb, RgUeCb *ueCb, @@ -763,7 +763,7 @@ PRIVATE S16 rgTOMUtlProcMsg uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes) +static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, slot, lcgBytes) RgCellCb *cellCb; RgUeCb *ueCb; RgMacPdu *pdu; @@ -775,7 +775,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, isSpsRnti,spsToBeActvtd,sduSize, #endif #else /* LTEMAC_SPS */ #ifdef ANSI -PRIVATE S16 rgTOMUtlProcMsg +static S16 rgTOMUtlProcMsg ( RgCellCb *cellCb, RgUeCb *ueCb, @@ -784,7 +784,7 @@ PRIVATE S16 rgTOMUtlProcMsg uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) +static S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) RgCellCb *cellCb; RgUeCb *ueCb; RgMacPdu *pdu; @@ -928,7 +928,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) } #ifdef RLC_STA_PROC_IN_MAC/* RLC Status PDU Processing */ { - extern S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, + S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu); if(ROK == rlcProcDlStatusPdu(&(cellCb->rguDlSap->sapCfg.sapPst), @@ -1127,7 +1127,7 @@ PRIVATE S16 rgTOMUtlProcMsg(cellCb, ueCb, pdu, slot, lcgBytes) */ #ifdef LTEMAC_SPS #ifdef ANSI -PRIVATE S16 rgTOMUtlInsSchInfo +static S16 rgTOMUtlInsSchInfo ( RgMacPdu *pdu, RgInfSfDatInd *sfInfo, @@ -1138,7 +1138,7 @@ uint16_t sduSize, uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes) +static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti,spsToBeActvtd,sduSize, lcgBytes) RgMacPdu *pdu; RgInfSfDatInd *sfInfo; RgInfCeInfo *ceInfo; @@ -1150,7 +1150,7 @@ uint32_t *lcgBytes; #else #ifdef ANSI -PRIVATE S16 rgTOMUtlInsSchInfo +static S16 rgTOMUtlInsSchInfo ( RgMacPdu *pdu, RgInfSfDatInd *sfInfo, @@ -1159,7 +1159,7 @@ CmLteRnti rnti, uint32_t *lcgBytes ) #else -PRIVATE S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes) +static S16 rgTOMUtlInsSchInfo (pdu, sfInfo, ceInfo, rnti, lcgBytes) RgMacPdu *pdu; RgInfSfDatInd *sfInfo; RgInfCeInfo *ceInfo; @@ -1323,7 +1323,7 @@ Inst inst; { datInfo = (TfuDatInfo*)node->node; { - //extern uint32_t ulrate_tfu; + //uint32_t ulrate_tfu; MsgLen len; SFndLenMsg(datInfo->mBuf, &len); #ifdef STUB_TTI_HANDLING_5GTF @@ -1533,7 +1533,7 @@ Inst inst; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgHndlCmnChnl +static S16 rgHndlCmnChnl ( RgCellCb *cell, CmLteTimingInfo timingInfo, @@ -1541,7 +1541,7 @@ RgInfCmnLcInfo *cmnLcInfo, RgErrInfo *err ) #else -PRIVATE S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err) +static S16 rgHndlCmnChnl(cell, timingInfo, cmnLcInfo, err) RgCellCb *cell; CmLteTimingInfo timingInfo; RgInfCmnLcInfo *cmnLcInfo; @@ -1724,7 +1724,7 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgHndlSchdUe +static S16 rgHndlSchdUe ( RgCellCb *cell, CmLteTimingInfo timingInfo, @@ -1732,7 +1732,7 @@ RgInfUeInfo *ueInfo, RgErrInfo *err ) #else -PRIVATE S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */ +static S16 rgHndlSchdUe(cell, timingInfo, ueInfo, err) /* laa_ut_fix */ RgCellCb *cell; CmLteTimingInfo timingInfo; RgInfUeInfo *ueInfo; @@ -1768,14 +1768,14 @@ RgErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgHndlUlUeInfo +static S16 rgHndlUlUeInfo ( RgCellCb *cell, CmLteTimingInfo timingInfo, RgInfUlUeInfo *ueInfo ) #else -PRIVATE S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo) +static S16 rgHndlUlUeInfo(cell, timingInfo, ueInfo) RgCellCb *cell; CmLteTimingInfo timingInfo; RgInfUlUeInfo *ueInfo; @@ -2028,7 +2028,7 @@ RgInfSfAlloc *sfInfo; RgCellCb *cell; RgDlSf *dlSf; RgErrInfo err; - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; Inst inst; @@ -2160,7 +2160,7 @@ RgInfSfAlloc *sfInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgTOMProcCrntiCEInDatInd +static S16 rgTOMProcCrntiCEInDatInd ( RgMacPdu *pdu, RgUeCb *prevUeCb, @@ -2170,7 +2170,7 @@ RgInfCeInfo *ceInfo, uint16_t slot ) #else -PRIVATE S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) +static S16 rgTOMProcCrntiCEInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) RgMacPdu *pdu; RgUeCb *prevUeCb; RgCellCb *cellCb; @@ -2261,7 +2261,7 @@ uint16_t slot; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgTOMProcCCCHSduInDatInd +static S16 rgTOMProcCCCHSduInDatInd ( RgMacPdu *pdu, RgUeCb *prevUeCb, @@ -2271,7 +2271,7 @@ RgInfCeInfo *ceInfo, uint16_t slot ) #else -PRIVATE S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) +static S16 rgTOMProcCCCHSduInDatInd( pdu, prevUeCb, cellCb, datInfo, ceInfo, slot) RgMacPdu *pdu; RgUeCb *prevUeCb; RgCellCb *cellCb; @@ -2359,13 +2359,13 @@ uint16_t slot; */ #ifdef ANSI -PRIVATE S16 rgTOMUtlL2MStoreBufSz +static S16 rgTOMUtlL2MStoreBufSz ( RgUeCb *ueCb, RgInfCeInfo *ceInfo ) #else -PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) +static S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) RgUeCb *ueCb; RgInfCeInfo *ceInfo; #endif @@ -2410,7 +2410,7 @@ PRIVATE S16 rgTOMUtlL2MStoreBufSz (ueCb, ceInfo) * -# RFAILED */ #ifdef ANSI -PRIVATE Void rgTOML2MCompileActiveLCs +static Void rgTOML2MCompileActiveLCs ( RgCellCb *cellCb, RgUeCb *ueCb, @@ -2418,7 +2418,7 @@ PRIVATE Void rgTOML2MCompileActiveLCs RgInfCeInfo *ceInfo ) #else -PRIVATE Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo) +static Void rgTOML2MCompileActiveLCs(cellCb, ueCb, pdu, ceInfo) RgCellCb *cellCb; RgUeCb *ueCb; RgMacPdu *pdu; diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index ab7110c78..6bdc8f048 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -532,7 +532,8 @@ RguDStaRspInfo *staRsp; { Inst inst; S16 ret = ROK; - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; + RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index 2e2e37964..aa02d4c70 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -70,13 +70,13 @@ static int RLOG_FILE_ID=179; /* local externs */ /* forward references */ -PRIVATE S16 rgUtlHndlCrntiChng ARGS(( +static S16 rgUtlHndlCrntiChng ARGS(( Inst inst, RgCellCb *cell, CmLteRnti rnti, CmLteRnti newRnti )); -PRIVATE Void rgUtlHndlCrntiRls ARGS(( +static Void rgUtlHndlCrntiRls ARGS(( RgCellCb *cell, RgInfRlsRnti *rlsRnti )); @@ -87,7 +87,7 @@ S16 rgDelUeFrmAllSCell ARGS(( )); #ifdef LTE_ADV -PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs ARGS(( +static S16 rgUtlSndCrntiChngReq2AllSMacs ARGS(( RgCellCb *cell, CmLteRnti rnti, CmLteRnti newRnti @@ -677,8 +677,9 @@ Ptr *memPtr; Size memSize; #endif { - Mem sMem; - VOLATILE uint32_t startTime=0; + Mem sMem; + volatile uint32_t startTime=0; + sMem.region = rgCb[inst].rgInit.region; sMem.pool = rgCb[inst].rgInit.pool; @@ -1098,7 +1099,7 @@ CmLteRnti crnti; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgUtlHndlCrntiChng +static S16 rgUtlHndlCrntiChng ( Inst inst, RgCellCb *cell, @@ -1106,7 +1107,7 @@ CmLteRnti rnti, CmLteRnti newRnti ) #else -PRIVATE S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti) +static S16 rgUtlHndlCrntiChng(inst,cell, rnti, newRnti) Inst inst; RgCellCb *cell; CmLteRnti rnti; @@ -1276,14 +1277,14 @@ S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) * -# ROK **/ #ifdef ANSI -PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs +static S16 rgUtlSndCrntiChngReq2AllSMacs ( RgCellCb *cell, CmLteRnti rnti, CmLteRnti newRnti ) #else -PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti) +static S16 rgUtlSndCrntiChngReq2AllSMacs(cell, rnti, newRnti) RgCellCb *cell; CmLteRnti rnti; CmLteRnti newRnti; @@ -1358,13 +1359,13 @@ TfuDelDatReqInfo delDatReq; * @return Void **/ #ifdef ANSI -PRIVATE Void rgUtlHndlCrntiRls +static Void rgUtlHndlCrntiRls ( RgCellCb *cell, RgInfRlsRnti *rlsRnti ) #else -PRIVATE Void rgUtlHndlCrntiRls(cell, rlsRnti) +static Void rgUtlHndlCrntiRls(cell, rlsRnti) RgCellCb *cell; CmLteRnti *rlsRnti; #endif diff --git a/src/5gnrrlc/kw.x b/src/5gnrrlc/kw.x index 40093ac55..927bbbaec 100755 --- a/src/5gnrrlc/kw.x +++ b/src/5gnrrlc/kw.x @@ -88,7 +88,7 @@ typedef struct _rlcStats UMRLCStats umRlcStats; }RLCStats; -EXTERN RLCStats gRlcStats; +RLCStats gRlcStats; /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS @@ -614,10 +614,10 @@ typedef struct rlcCb uint8_t dlSduId; /*!< Downlink SDU ID */ }RlcCb; -EXTERN RlcCb *rlcCb[MAX_RLC_INSTANCES]; /*!< RLC global control block */ +RlcCb *rlcCb[MAX_RLC_INSTANCES]; /*!< RLC global control block */ /**************************************************************************** - * EXTERN Declarations + * Declarations ***************************************************************************/ S16 rlcGetSId ARGS((SystemId *s)); diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index c7e026f8b..0c4d596fc 100755 --- a/src/5gnrrlc/kw_amm_dl.c +++ b/src/5gnrrlc/kw_amm_dl.c @@ -64,8 +64,8 @@ static int RLOG_FILE_ID=189; //UDAY #ifdef L2_OPTMZ -extern uint32_t rlcAmmStaPduList[512]; - uint32_t rlcAmmStaPduListCnt = 0; +uint32_t rlcAmmStaPduList[512]; +uint32_t rlcAmmStaPduListCnt = 0; #endif @@ -81,7 +81,7 @@ uint32_t rlcStatusPduCnt, rlcStatusAckCnt, rlcStatusNcnt, rlcSduSndCnt; /* local externs */ /* forward references */ -EXTERN Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, +Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcUdxStaPdu *pStaPdu)); @@ -104,77 +104,77 @@ EXTERN Void rlcAmmDlHndlStatusPdu ARGS ((RlcCb *gCb, /* private function declarations */ -PRIVATE Void rlcResegRetxPdus ARGS ((RlcCb *gCb, +static Void rlcResegRetxPdus ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq)); -PRIVATE Void rlcRemRetxPdu ARGS ((RlcCb *gCb, +static Void rlcRemRetxPdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx)); -PRIVATE Void rlcAmmCreateStatusPdu ARGS ((RlcCb *gCb, +static Void rlcAmmCreateStatusPdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq)); -PRIVATE Void rlcAmmDlMarkPduForReTx ARGS ((RlcCb *gCb, +static Void rlcAmmDlMarkPduForReTx ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx)); -PRIVATE Void rlcAmmDlProcessSuccessfulTxPdu ARGS((RlcCb *gCb, +static Void rlcAmmDlProcessSuccessfulTxPdu ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn sn, KwuDatCfmInfo **datCfm)); -PRIVATE Void rlcAmmDlSetTxNextAck ARGS((RlcAmDl *amDl, RlcSn sn)); +static Void rlcAmmDlSetTxNextAck ARGS((RlcAmDl *amDl, RlcSn sn)); -PRIVATE Void rlcAmmDlCheckAndStopPollTmr ARGS((RlcCb *gCb, +static Void rlcAmmDlCheckAndStopPollTmr ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn mAckSn)); -PRIVATE Void rlcAssembleSdus ARGS ((RlcCb *gCb, +static Void rlcAssembleSdus ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq)); -bool rlcAmmDlCheckAndSetPoll ARGS ((RlcCb *gCb, +static bool rlcAmmDlCheckAndSetPoll ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bufSz)); -PRIVATE Void rlcAmmCreatePdu ARGS ((RlcCb *gCb, +static Void rlcAmmCreatePdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmHdr *amHdr, RlcDlPduInfo *pduInfo, Buffer *pdu)); -PRIVATE Void rlcAmmSndStaInd ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb, RlcRetx *retx)); +static Void rlcAmmSndStaInd ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb, RlcRetx *retx)); -PRIVATE Void rlcGetNxtRetx ARGS ((RlcCb *gCb, RlcRetx **retx)); +static Void rlcGetNxtRetx ARGS ((RlcCb *gCb, RlcRetx **retx)); -PRIVATE Void rlcConstructAmHdr ARGS ((RlcAmHdr *amHdr, +static Void rlcConstructAmHdr ARGS ((RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *idx)); -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn ARGS ((RlcCb *gCb, +static Void rlcAmmDlUpdateTxAndReTxBufForAckSn ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn mAckSn, CmLList *retx, KwuDatCfmInfo **datCfm)); -PRIVATE Void rlcAmmDlMoveFrmTxtoRetxBuffer ARGS ((RlcCb *gCb, +static Void rlcAmmDlMoveFrmTxtoRetxBuffer ARGS ((RlcCb *gCb, RlcAmDl *amDl, RlcRetx **retx, RlcSn sn)); -PRIVATE Void rlcAmmDlCheckIsSDUDelivered ARGS((RlcCb *gCb, +static Void rlcAmmDlCheckIsSDUDelivered ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, RlcSduMap *sduMap, KwuDatCfmInfo **datCfm)); -PRIVATE Void rlcAmmAddPduToRetxLst ARGS((RlcAmDl *amDl, +static Void rlcAmmAddPduToRetxLst ARGS((RlcAmDl *amDl, RlcRetx *retx)); -PRIVATE Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ARGS( +static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ARGS( ( RlcCb *gCb, RlcAmDl *amDl, @@ -182,7 +182,7 @@ RlcRetx **retx, RlcDlPduInfo *pduInfo )); -PRIVATE Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ARGS( +static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ARGS( ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -191,7 +191,7 @@ RlcRetx **retx, KwuDatCfmInfo **datCfm )); -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn ARGS( +static Void rlcAmmDlUpdateTxAndReTxBufForNackSn ARGS( ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -200,7 +200,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn ARGS( KwuDatCfmInfo **datCfm )); -PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ARGS( +static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ARGS( ( RlcAmDl *amDl, RlcNackInfo *nackInfo, @@ -209,7 +209,7 @@ RlcNackInfo *nackSnInfo, uint8_t idx )); -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ARGS( +static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ARGS( ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -275,14 +275,14 @@ void rlcAmmSendDedLcBoStatus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmDl *amDl) * @return Void */ #ifdef ANSI -PRIVATE Void rlcAmmDlCheckAndStopPollTmr +static Void rlcAmmDlCheckAndStopPollTmr ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcSn mAckSn ) #else -PRIVATE Void rlcAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn) +static Void rlcAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn) RlcCb *gCb; RlcDlRbCb *rbCb; RlcSn mAckSn; @@ -312,13 +312,13 @@ RlcSn mAckSn; * @return Void */ #ifdef ANSI -PRIVATE Void rlcAmmDlSetTxNextAck +static Void rlcAmmDlSetTxNextAck ( RlcAmDl *amDl, RlcSn sn ) #else -PRIVATE Void rlcAmmDlSetTxNextAck(amDl, sn) +static Void rlcAmmDlSetTxNextAck(amDl, sn) RlcAmDl *amDl; RlcSn sn #endif @@ -342,7 +342,7 @@ RlcSn sn * @return Void */ #ifdef ANSI -PRIVATE Void rlcAmmDlProcessSuccessfulReTx +static Void rlcAmmDlProcessSuccessfulReTx ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -350,7 +350,7 @@ RlcRetx *retx, KwuDatCfmInfo **datCfm ) #else -PRIVATE Void rlcAmmDlProcessSuccessfulReTx(gCb, rbCb, retx, datCfm) +static Void rlcAmmDlProcessSuccessfulReTx(gCb, rbCb, retx, datCfm) RlcCb *gCb; RlcDlRbCb *rbCb; RlcRetx *retx; @@ -381,7 +381,7 @@ KwuDatCfmInfo **datCfm; */ #ifdef ANSI -PRIVATE Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer +static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer ( RlcCb *gCb, RlcAmDl *amDl, @@ -389,7 +389,7 @@ RlcRetx **retx, RlcDlPduInfo *pduInfo ) #else -PRIVATE Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer(gCb, amDl, retx, pduInfo) +static Void rlcAmmDlMoveSduByteSegFrmTxtoRetxBuffer(gCb, amDl, retx, pduInfo) RlcCb *gCb; RlcAmDl *amDl; RlcRetx **retx; @@ -455,7 +455,7 @@ RlcDlPduInfo *pduInfo; */ #ifdef ANSI -PRIVATE Void rlcAmmDlHndlStatus4SduByteSegInTxBuf +static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -464,7 +464,7 @@ RlcRetx **retx, KwuDatCfmInfo ** datCfm ) #else -PRIVATE Void rlcAmmDlHndlStatus4SduByteSegInTxBuf(gCb, rbCb, nackSnInfo, retx, datCfm) +static Void rlcAmmDlHndlStatus4SduByteSegInTxBuf(gCb, rbCb, nackSnInfo, retx, datCfm) ( RlcCb *gCb; RlcDlRbCb *rbCb; @@ -544,7 +544,7 @@ KwuDatCfmInfo **datCfm; * */ #ifdef ANSI -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn +static Void rlcAmmDlUpdateTxAndReTxBufForNackSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -553,7 +553,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn KwuDatCfmInfo **datCfm ) #else -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode, datCfm) +static Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode, datCfm) ( RlcCb *gCb; RlcDlRbCb *rbCb; @@ -664,7 +664,7 @@ PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode * */ #ifdef ANSI -PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx +static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ( RlcAmDl *amDl, RlcNackInfo *nackInfo, @@ -673,7 +673,7 @@ RlcNackInfo *nackSnInfo, uint8_t idx ) #else -PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx) +static Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx) ( RlcAmDl *amDl; RlcNackInfo *nackInfo; @@ -1102,7 +1102,7 @@ void rlcAmmQSdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *mBuf, KwuDatReqInfo *datReq #ifndef RGL_SPECIFIC_CHANGES #ifdef MSPD { -extern uint32_t dlrate_kwu; +uint32_t dlrate_kwu; dlrate_kwu += sdu->sduSz; } #endif @@ -1181,7 +1181,7 @@ dlrate_kwu += sdu->sduSz; * @return Void * */ -void rlcAmmDlAssembleCntrlInfo(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcAmmDlAssembleCntrlInfo(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { RlcUdxDlSapCb *sapCb; MsgLen macHdrEstmt; @@ -1329,7 +1329,7 @@ void rlcAmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq, bool f * @return Void * */ -void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint16_t size) +static void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint16_t size) { uint8_t si; RlcAmDl *amDl = &AMDL; @@ -1434,7 +1434,7 @@ void rlcSplitPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *crnt, RlcRetx *next, uint * @return Void * */ -void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { RlcAmDl *amDl; RlcRetx *retx; @@ -1665,7 +1665,7 @@ void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) * @return Void * */ -void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { Buffer *pdu = NULLP; MsgLen macGrntSz = rlcDatReq->pduSz; @@ -1698,7 +1698,7 @@ void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) uint8_t numNewPdu = 0; RlcTx *txBuf = NULLP; /* Discard new changes ends */ - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; uint32_t hdrEstmt; uint32_t fixedHdrSz; uint32_t pduSz; @@ -2151,7 +2151,7 @@ void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) * -# 0 - Poll bit is not set * */ -bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bufSz) +static bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bufSz) { bool pollBit = FALSE; RlcAmDl *amDl = &(rbCb->m.amDl); @@ -2220,7 +2220,7 @@ bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, MsgLen bu * @return Void * */ -void rlcAmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmHdr *amHdr, +static void rlcAmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmHdr *amHdr, RlcDlPduInfo *pduInfo, Buffer *pdu) { uint8_t hdr[RLC_MAX_HDRSZ]; @@ -2289,14 +2289,14 @@ RlcDlPduInfo *pduInfo, Buffer *pdu) * */ #ifdef ANSI -PRIVATE Void rlcRemRetxPdu +static Void rlcRemRetxPdu ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx ) #else -PRIVATE Void rlcRemRetxPdu(gCb, rbCb, retx) +static Void rlcRemRetxPdu(gCb, rbCb, retx) RlcCb *gCb; RlcDlRbCb *rbCb; RlcRetx *retx; @@ -2338,14 +2338,14 @@ RlcRetx *retx; * */ #ifdef ANSI -PRIVATE Void rlcAmmDlMarkPduForReTx +static Void rlcAmmDlMarkPduForReTx ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx ) #else -PRIVATE Void rlcAmmDlMarkPduForReTx(*gCb, rbCb, retx) +static Void rlcAmmDlMarkPduForReTx(*gCb, rbCb, retx) RlcCb *gCb; RlcDlRbCb *rbCb; RlcRetx *retx; @@ -2417,7 +2417,7 @@ RlcRetx *retx; * */ #ifdef ANSI -PRIVATE Void rlcAmmDlCheckIsSDUDelivered +static Void rlcAmmDlCheckIsSDUDelivered ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2425,7 +2425,7 @@ RlcSduMap *sduMap, KwuDatCfmInfo **datCfm ) #else -PRIVATE Void rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, sduMap, datCfm) +static Void rlcAmmDlCheckIsSDUDelivered(gCb, rbCb, sduMap, datCfm) RlcCb *gCb; RlcDlRbCb *rbCb; RlcSduMap *sduMap; @@ -2502,7 +2502,7 @@ KwuDatCfmInfo **datCfm; * */ #ifdef ANSI -PRIVATE Void rlcAmmDlProcessSuccessfulTxPdu +static Void rlcAmmDlProcessSuccessfulTxPdu ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2510,7 +2510,7 @@ RlcSn sn, KwuDatCfmInfo **datCfm ) #else -PRIVATE Void rlcAmmDlProcessSuccessfulTxPdu(gCb, rbCb, sn, datCfm) +static Void rlcAmmDlProcessSuccessfulTxPdu(gCb, rbCb, sn, datCfm) RlcCb *gCb; RlcDlRbCb *rbCb; RlcSn sn; @@ -2559,14 +2559,14 @@ KwuDatCfmInfo **datCfm; * */ #ifdef ANSI -PRIVATE Void rlcAmmSndStaInd +static Void rlcAmmSndStaInd ( RlcCb *gCb, RlcDlRbCb *rbCb, RlcRetx *retx ) #else -PRIVATE Void rlcAmmSndStaInd(gCb, rbCb, retx) +static Void rlcAmmSndStaInd(gCb, rbCb, retx) RlcCb *gCb; RlcDlRbCb *rbCb; RlcRetx *retx; @@ -2620,7 +2620,7 @@ RlcRetx *retx; * @return Void * */ -void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) +static void rlcGetNxtRetx(RlcCb *gCb, RlcRetx **retx) { CmLList *tNode; @@ -2891,7 +2891,7 @@ RlcDlRbCb *rbCb; */ #ifdef ANSI -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn +static Void rlcAmmDlUpdateTxAndReTxBufForAckSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2900,7 +2900,7 @@ CmLList *retxNode, KwuDatCfmInfo **datCfm ) #else -PRIVATE Void rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb, rbCb, mAckSn, retxNode, datCfm) +static Void rlcAmmDlUpdateTxAndReTxBufForAckSn(gCb, rbCb, mAckSn, retxNode, datCfm) RlcCb *gCb; RlcDlRbCb *rbCb; RlcSn mAckSn; @@ -2971,7 +2971,7 @@ KwuDatCfmInfo **datCfm; * */ #ifdef ANSI -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn +static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -2981,7 +2981,7 @@ CmLList **retxNode, KwuDatCfmInfo **datCfm ) #else -PRIVATE Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn(gCb, rbCb, sn, mNackSn, retxNode, datCfm) +static Void rlcAmmDlUpdTxAndReTxBufForLessThanNackSn(gCb, rbCb, sn, mNackSn, retxNode, datCfm) RlcCb *gCb; RlcDlRbCb *rbCb; RlcSn sn; @@ -3052,7 +3052,7 @@ KwuDatCfmInfo **datCfm; * @return Void * */ -void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *idx) +static void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *idx) { *idx = 0; hdr[0] = RLC_DATA_BITMASK; @@ -3100,13 +3100,13 @@ void rlcConstructAmHdr(RlcAmHdr *amHdr, uint8_t *hdr, uint8_t snLen, uint16_t *i * */ #ifdef ANSI -PRIVATE Void rlcAmmAddPduToRetxLst +static Void rlcAmmAddPduToRetxLst ( RlcAmDl *amDl, RlcRetx *retx ) #else -PRIVATE Void rlcAmmAddPduToRetxLst(amDl, retx) +static Void rlcAmmAddPduToRetxLst(amDl, retx) RlcAmDl *amDl; RlcRetx *retx; #endif @@ -3169,7 +3169,7 @@ RlcRetx *retx; */ #ifdef ANSI -PRIVATE Void rlcAmmDlMoveFrmTxtoRetxBuffer +static Void rlcAmmDlMoveFrmTxtoRetxBuffer ( RlcCb *gCb, RlcAmDl *amDl, @@ -3177,7 +3177,7 @@ RlcRetx **retx, RlcSn sn ) #else -PRIVATE Void rlcAmmDlMoveFrmTxtoRetxBuffer(gCb, amDl, retx, sn) +static Void rlcAmmDlMoveFrmTxtoRetxBuffer(gCb, amDl, retx, sn) RlcCb *gCb; RlcAmDl *amDl; RlcRetx **retx; @@ -3277,7 +3277,7 @@ RlcDlRbCb *rbCb; * @return Void * */ -void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) +static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { RlcSn sn; /* sequence number */ RlcSn ack_sn; /* Ack sequence number */ @@ -3572,14 +3572,14 @@ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu); #ifdef ANSI -PRIVATE Void rgAmmExtractElmnt +static Void rgAmmExtractElmnt ( RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo ) #else -PRIVATE Void rgAmmExtractElmnt(gCb, pdu, hdrInfo) +static Void rgAmmExtractElmnt(gCb, pdu, hdrInfo) RlcCb *gCb; Buffer *pdu; RlcExtHdr *hdrInfo; @@ -3652,7 +3652,7 @@ RlcExtHdr *hdrInfo; #ifdef ANSI -PRIVATE Void rgAmmUlHndlStatusPdu +static Void rgAmmUlHndlStatusPdu ( Pst *udxPst, SuId suId, @@ -3662,7 +3662,7 @@ Buffer *cntrlPdu, uint8_t *fByte ) #else -PRIVATE Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte) +static Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte) Pst *udxPst; SuId suId; RlcCb *gCb; diff --git a/src/5gnrrlc/kw_amm_ul.c b/src/5gnrrlc/kw_amm_ul.c index 9c052e3c5..500235226 100755 --- a/src/5gnrrlc/kw_amm_ul.c +++ b/src/5gnrrlc/kw_amm_ul.c @@ -66,7 +66,7 @@ static int RLOG_FILE_ID=190; #ifndef RGL_SPECIFIC_CHANGES #ifndef TENB_ACC #ifndef LTE_PAL_ENB -extern uint32_t ulrate_rgu; +uint32_t ulrate_rgu; #endif #endif #endif @@ -74,11 +74,11 @@ extern uint32_t ulrate_rgu; #ifndef TENB_ACC #ifndef TENB_T2K3K_SPECIFIC_CHANGES #ifndef LTE_PAL_ENB -extern uint32_t isMemThreshReached(Region region); +uint32_t isMemThreshReached(Region region); #endif #else #ifndef LTE_PAL_ENB -extern uint32_t isMemThreshReached(Region region); +uint32_t isMemThreshReached(Region region); #endif #endif #endif @@ -90,38 +90,38 @@ extern uint32_t isMemThreshReached(Region region); /* private function declarations */ -void rlcAmmUlAssembleCntrlInfo ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb)); +static void rlcAmmUlAssembleCntrlInfo ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb)); -uint8_t rlcAmmExtractHdr ARGS ((RlcCb *gCb, +static uint8_t rlcAmmExtractHdr ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amHdr, uint8_t *fByte)); -bool rlcAmmUlPlacePduInRecBuf ARGS ((RlcCb *gCb, +static bool rlcAmmUlPlacePduInRecBuf ARGS ((RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr *amHdr)); -void rlcAmmTriggerStatus ARGS ((RlcCb *gCb, +static void rlcAmmTriggerStatus ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg)); -uint8_t rlcAmmUlReassembleSdus ARGS ((RlcCb *gCb, +static uint8_t rlcAmmUlReassembleSdus ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *recBuf)); -PRIVATE Void rlcAmmProcPduOrSeg ARGS ((RlcCb *gCb, +static Void rlcAmmProcPduOrSeg ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu)); -PRIVATE Void rlcAmmUpdExpByteSeg ARGS ((RlcCb *gCb,RlcAmUl *amUl, RlcSeg* newSeg)); +static Void rlcAmmUpdExpByteSeg ARGS ((RlcCb *gCb,RlcAmUl *amUl, RlcSeg* newSeg)); -PRIVATE Void rlcAmmExtractElmnt ARGS ((RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo)); +static Void rlcAmmExtractElmnt ARGS ((RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo)); -PRIVATE Void rlcAmmUlHndlStatusPdu ARGS ((RlcCb *gCb, +static Void rlcAmmUlHndlStatusPdu ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_t *fByte)); @@ -159,7 +159,7 @@ PRIVATE Void rlcAmmUlHndlStatusPdu ARGS ((RlcCb *gCb, * The number of bytes required to encode this NACK information * */ -uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ +static uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ uint16_t soStart, uint16_t soEnd, RlcUdxDlStaPdu *statusPdu, RlcSn *prevNackSn) { RlcNackInfo *nackInfo = (statusPdu->nackInfo + statusPdu->nackCount); @@ -278,7 +278,7 @@ uint8_t rlcAmmUlSetNackInfo(RlcUlRbCb *rbCb, RlcSn sn, bool isSegment, \ * @return Void * */ -void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) +static void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) { RlcUdxDlStaPdu *pStatusPdu; RlcNackInfo *nackInfo; @@ -464,7 +464,7 @@ void rlcAmmUlAssembleCntrlInfo(RlcCb *gCb, RlcUlRbCb *rbCb) } #ifdef XEON_SPECIFIC_CHANGES -extern uint32_t gRlcDatIndUL; +uint32_t gRlcDatIndUL; #endif #ifdef T2K_TRIGGER_RLC_REEST @@ -569,7 +569,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) /* Changed the condition to TRUE from ROK */ if(isMemThreshReached(rlcCb[0]->init.region) == TRUE) { - extern uint32_t rlculdrop; + uint32_t rlculdrop; rlculdrop++; RLC_FREE_BUF(pdu); continue; @@ -580,7 +580,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) /*ccpu00142274 - UL memory based flow control*/ if(isMemThreshReached(rlcCb[0]->init.region) != ROK) { - extern uint32_t rlculdrop; + uint32_t rlculdrop; rlculdrop++; RLC_FREE_BUF(pdu); continue; @@ -768,7 +768,7 @@ void rlcAmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) * -# RFAILED * */ -uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amHdr, uint8_t *fByte) +static uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amHdr, uint8_t *fByte) { uint8_t snByte; RlcSn sn = 0; @@ -842,7 +842,7 @@ uint8_t rlcAmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcAmHdr *amH * */ #ifdef ANSI -PRIVATE S16 rlcAmmExtractHdrOld +static S16 rlcAmmExtractHdrOld ( RlcCb *gCb, Buffer *pdu, @@ -850,7 +850,7 @@ RlcAmHdr *amHdr, uint8_t *fByte ) #else -PRIVATE S16 rlcAmmExtractHdrOld(gCb, pdu, amHdr, fByte) +static S16 rlcAmmExtractHdrOld(gCb, pdu, amHdr, fByte) RlcCb *gCb; Buffer *pdu; RlcAmHdr *amHdr; @@ -963,7 +963,7 @@ uint8_t *fByte; * @return Void * */ -void rlcAmmUlHndlStatusPdu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_t *fByte) +static void rlcAmmUlHndlStatusPdu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_t *fByte) { uint8_t e1; RlcExtHdr hdrInfo; @@ -1141,7 +1141,7 @@ void rlcAmmUlHndlStatusPdu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *cntrlPdu, uint8_ * @return Void * */ -void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) +static void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) { RlcSeg *seg; @@ -1177,7 +1177,7 @@ void rlcAmmUlRlsAllSegs(RlcCb *gCb, RlcAmRecBuf *recBuf) * -#TRUE Successful insertion into the receiver buffer * -#FALSE Possibly a duplicate segment */ -bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu, uint16_t pduSz) +static bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu, uint16_t pduSz) { RlcAmRecBuf *recBuf = NULLP; RlcSeg *seg; @@ -1292,7 +1292,7 @@ bool rlcAmmAddRcvdSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu, * -# FALSE * */ -bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr *amHdr) +static bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr *amHdr) { RlcSn sn; MsgLen pduSz; @@ -1385,7 +1385,7 @@ bool rlcAmmUlPlacePduInRecBuf(RlcCb *gCb, Buffer *pdu, RlcUlRbCb *rbCb, RlcAmHdr * @return Void * */ -void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg) +static void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg) { bool tmrRunning; RlcSn tSn; @@ -1437,7 +1437,7 @@ void rlcAmmTriggerStatus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcSn sn, bool discFlg) * @return Void * */ -void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu) +static void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pdu) { if ((AMUL.expSn != amHdr->sn) || (AMUL.expSo != amHdr->so)) @@ -1499,7 +1499,7 @@ void rlcAmmProcPduOrSeg(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmHdr *amHdr, Buffer *pd * -# RFAILED * */ -uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *recBuf) +static uint8_t rlcAmmUlReassembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcAmRecBuf *recBuf) { RlcSeg *seg; @@ -1769,7 +1769,7 @@ RlcUlRbCb *rbCb; * */ -void rlcAmmExtractElmnt(RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo) +static void rlcAmmExtractElmnt(RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo) { uint8_t hdr; uint8_t pLen = hdrInfo->pLen; @@ -1852,7 +1852,7 @@ void rlcAmmExtractElmnt(RlcCb *gCb, Buffer *pdu, RlcExtHdr *hdrInfo) * */ -void rlcAmmUpdExpByteSeg(RlcCb *gCb, RlcAmUl *amUl, RlcSeg *seg) +static void rlcAmmUpdExpByteSeg(RlcCb *gCb, RlcAmUl *amUl, RlcSeg *seg) { uint16_t newExpSo; /* The new expected SO */ RlcSn sn = seg->amHdr.sn; diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c index c0a2788ea..f0055df49 100755 --- a/src/5gnrrlc/kw_cfg_dl.c +++ b/src/5gnrrlc/kw_cfg_dl.c @@ -82,7 +82,7 @@ static int RLOG_FILE_ID=191; * -# RFAILED * */ -PRIVATE S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) +static S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) { RlcL2MeasEvtCb *measEvtCb = NULLP; RlcL2MeasCb *measCb = NULLP; @@ -123,7 +123,7 @@ PRIVATE S16 rlcHdlMeasDlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint * -# RFAILED * */ -PRIVATE S16 rlcDelFrmDlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) +static S16 rlcDelFrmDlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) { RlcL2MeasEvtCb *measEvtCb = NULLP; RlcL2MeasCb *measCb = NULLP; @@ -160,7 +160,7 @@ PRIVATE S16 rlcDelFrmDlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) } -PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) +static S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) { RlcL2MeasEvtCb *measEvtCb = NULLP; RlcL2MeasCb *measCb = NULLP; @@ -316,7 +316,7 @@ PRIVATE S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8 * -#RFAILED */ #ifdef ANSI -PRIVATE S16 rlcCfgFillDlRbCb +static S16 rlcCfgFillDlRbCb ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -324,7 +324,7 @@ RlcDlUeCb *ueCb, RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 rlcCfgFillDlRbCb(gCb,rbCb,entCfg) +static S16 rlcCfgFillDlRbCb(gCb,rbCb,entCfg) RlcCb *gCb; RlcDlRbCb *rbCb; RlcDlUeCb *ueCb; @@ -432,7 +432,7 @@ RlcEntCfgInfo *entCfg; * -#RFAILED */ #ifdef ANSI -PRIVATE S16 rlcCfgUpdateDlRb +static S16 rlcCfgUpdateDlRb ( RlcCb *gCb, RlcDlRbCb *rbCb, @@ -440,7 +440,7 @@ void *ptr, RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 rlcCfgUpdateDlRb(gCb,rbCb, ptr, entCfg) +static S16 rlcCfgUpdateDlRb(gCb,rbCb, ptr, entCfg) RlcCb *gCb; RlcDlRbCb *rbCb; void *ptr; diff --git a/src/5gnrrlc/kw_cfg_ul.c b/src/5gnrrlc/kw_cfg_ul.c index 7c08a3db8..d2d08c06e 100755 --- a/src/5gnrrlc/kw_cfg_ul.c +++ b/src/5gnrrlc/kw_cfg_ul.c @@ -79,7 +79,7 @@ S16 rlcValidateRbCfgParams (RlcCb *gCb, CmLteRnti ueId, CmLteCellId cellId, * -# RFAILED * */ -PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) +static S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint8_t newUeId) { RlcL2MeasCb *measCb = NULLP; uint16_t cntr; @@ -117,7 +117,7 @@ PRIVATE S16 rlcHdlMeasUlUeIdChg(RlcCb *gCb, uint8_t cellId,uint8_t oldUeId, uint * -# RFAILED * */ -PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) +static S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) { RlcL2MeasCb *measCb = NULLP; uint16_t cntr; @@ -165,7 +165,7 @@ PRIVATE S16 rlcDelFrmUlL2Meas(RlcCb *gCb, uint8_t cellId,uint8_t ueId) } -PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) +static S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8_t ueId) { RlcL2MeasCb *measCb = NULLP; uint16_t cntr; @@ -307,7 +307,7 @@ PRIVATE S16 rlcAddToUlL2Meas(RlcCb *gCb, RlcUlRbCb *rlcRbCb,uint8_t cellId,uint8 * -#RFAILED */ #ifdef ANSI -PRIVATE S16 rlcCfgFillUlRbCb +static S16 rlcCfgFillUlRbCb ( RlcCb *gCb, RlcUlRbCb *rbCb, @@ -315,7 +315,7 @@ RlcUlUeCb *ueCb, RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg) +static S16 rlcCfgFillUlRbCb(gCb,rbCb, ueCb, entCfg) RlcCb *gCb; RlcUlRbCb *rbCb; RlcUlUeCb *ueCb; @@ -416,7 +416,7 @@ RlcEntCfgInfo *entCfg; * -#RFAILED */ #ifdef ANSI -PRIVATE S16 rlcCfgUpdateUlRb +static S16 rlcCfgUpdateUlRb ( RlcCb *gCb, RlcUlRbCb *rbCb, @@ -424,7 +424,7 @@ void *ptr, RlcEntCfgInfo *entCfg ) #else -PRIVATE S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg) +static S16 rlcCfgUpdateUlRb(gCb,rbCb, ptr, entCfg) RlcCb *gCb; RlcUlRbCb *rbCb; void *ptr; diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c index 123400223..c69fd18a1 100755 --- a/src/5gnrrlc/kw_dbm_dl.c +++ b/src/5gnrrlc/kw_dbm_dl.c @@ -75,7 +75,7 @@ static int RLOG_FILE_ID=193; #ifdef TENB_STATS -EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti); +TSL2UeStatsCb* TSL2MapUeStatsBlk (uint16_t rnti); #endif /** * @file gp_dbm_dl.c diff --git a/src/5gnrrlc/kw_dl.x b/src/5gnrrlc/kw_dl.x index c745c5cd5..66366449d 100755 --- a/src/5gnrrlc/kw_dl.x +++ b/src/5gnrrlc/kw_dl.x @@ -535,7 +535,7 @@ struct rlcDlUeCb }; /**************************************************************************** - * EXTERN Declarations + * Declarations ***************************************************************************/ /**************************************************************************** * Configuration Functions diff --git a/src/5gnrrlc/kw_dl_ex_ms.c b/src/5gnrrlc/kw_dl_ex_ms.c index 97d5ac36a..9ac5064aa 100755 --- a/src/5gnrrlc/kw_dl_ex_ms.c +++ b/src/5gnrrlc/kw_dl_ex_ms.c @@ -70,12 +70,12 @@ void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); #endif #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF)) -EXTERN S16 rlcDlBatchProcSplit ARGS((Void)); +S16 rlcDlBatchProcSplit ARGS((Void)); #endif //UDAY #ifdef L2_OPTMZ uint32_t rlcAmmStaPduList[512] = {0}; -EXTERN S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf)); +S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf)); #endif S16 rlcDlInitExt ARGS (( Void )); diff --git a/src/5gnrrlc/kw_id.c b/src/5gnrrlc/kw_id.c index cdc5c3a67..4272896cf 100755 --- a/src/5gnrrlc/kw_id.c +++ b/src/5gnrrlc/kw_id.c @@ -62,25 +62,25 @@ /* public variable declarations */ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /* CPLUSPLUS */ -EXTERN S16 rlcGetSId ARGS((SystemId *s)); +S16 rlcGetSId ARGS((SystemId *s)); #ifdef __cplusplus } #endif /* CPLUSPLUS */ /* copyright banner */ -CONSTANT Txt rlcBan1[] = +const Txt rlcBan1[] = {"(c) COPYRIGHT 1989-2002, Trillium Digital Systems, Inc."}; -CONSTANT Txt rlcBan2[] = +const Txt rlcBan2[] = {" All rights reserved."}; /* system id */ -PRIVATE CONSTANT SystemId sId ={ +static const SystemId sId ={ RLCSWMV, /* rlc - main version */ RLCSWMR, /* rlc - main revision */ RLCSWBV, /* rlc - branch version */ diff --git a/src/5gnrrlc/kw_lim.c b/src/5gnrrlc/kw_lim.c index 6f9d93631..60155965f 100755 --- a/src/5gnrrlc/kw_lim.c +++ b/src/5gnrrlc/kw_lim.c @@ -75,7 +75,7 @@ static int RLOG_FILE_ID=196; #include "rlc_mac_inf.h" #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /* __cplusplus */ diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c index 70118414e..08eae8cbd 100755 --- a/src/5gnrrlc/kw_lmm.c +++ b/src/5gnrrlc/kw_lmm.c @@ -79,23 +79,23 @@ RLCStats gRlcStats; * Forward Declaration of LKW Porting Functions ********************************************************************/ RlcCb *rlcCb[MAX_RLC_INSTANCES]; -EXTERN S16 rlcActvTmr ARGS ((Ent ent, Inst inst)); +S16 rlcActvTmr ARGS ((Ent ent, Inst inst)); -PRIVATE Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,uint8_t type, +static Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,uint8_t type, Header *hdr)); -PRIVATE S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg)); -PRIVATE S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); -PRIVATE S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); -PRIVATE S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); -PRIVATE S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); -PRIVATE S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta)); -PRIVATE S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta)); -PRIVATE S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta)); -PRIVATE S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action)); -PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action +static S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg)); +static S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg)); +static S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); +static S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); +static S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl)); +static S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta)); +static S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta)); +static S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta)); +static S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action)); +static S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action action)); @@ -123,13 +123,13 @@ PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action * LCM_REASON_HASHING_FAILED */ #ifdef ANSI -PRIVATE S16 rlcLmmGenCfg +static S16 rlcLmmGenCfg ( RlcCb *gCb, RlcGenCfg *cfg ) #else -PRIVATE S16 rlcLmmGenCfg(gCB,cfg) +static S16 rlcLmmGenCfg(gCB,cfg) RlcCb *gCb; RlcGenCfg *cfg; #endif @@ -423,7 +423,7 @@ RlcGenCfg *cfg; * -# ROK */ #ifdef ANSI -PRIVATE Void rlcLmmSendCfm +static Void rlcLmmSendCfm ( RlcCb *gCb, Pst *pst, @@ -432,7 +432,7 @@ uint8_t type, Header *hdr ) #else -PRIVATE Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr) +static Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr) RlcCb gCb; Pst *pst; RlcMngmt *cfm; @@ -1321,13 +1321,13 @@ uint8_t measType; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgKwuSap +static S16 rlcLmmCfgKwuSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgKwuSap(gCb,cfg) +static S16 rlcLmmCfgKwuSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif @@ -1377,13 +1377,13 @@ RlcSapCfg *cfg; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgCkwSap +static S16 rlcLmmCfgCkwSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgCkwSap(gCb,cfg) +static S16 rlcLmmCfgCkwSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif @@ -1435,13 +1435,13 @@ RlcSapCfg *cfg; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgUdxSap +static S16 rlcLmmCfgUdxSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgUdxSap(gCb,cfg) +static S16 rlcLmmCfgUdxSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif @@ -1509,13 +1509,13 @@ RlcSapCfg *cfg; * -# LCM_REASON_RECONFIG_FAIL */ #ifdef ANSI -PRIVATE S16 rlcLmmCfgRguSap +static S16 rlcLmmCfgRguSap ( RlcCb *gCb, RlcSapCfg *cfg ) #else -PRIVATE S16 rlcLmmCfgRguSap(gCb,cfg) +static S16 rlcLmmCfgRguSap(gCb,cfg) RlcCb *gCb; RlcSapCfg *cfg; #endif @@ -1570,12 +1570,12 @@ RlcSapCfg *cfg; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmValidateGenCntrl +static S16 rlcLmmValidateGenCntrl ( RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmValidateGenCntrl(cntrl) +static S16 rlcLmmValidateGenCntrl(cntrl) RlcMngmt *cntrl; #endif { @@ -1615,12 +1615,12 @@ RlcMngmt *cntrl; * @return Void */ #ifdef ANSI -PRIVATE Void rlcLmmCleanGblRsrcs +static Void rlcLmmCleanGblRsrcs ( RlcCb *gCb ) #else -PRIVATE Void rlcLmmCleanGblRsrcs(gCb) +static Void rlcLmmCleanGblRsrcs(gCb) RlcCb *gCb; #endif { @@ -1722,12 +1722,12 @@ RlcCb *gCb; * -# LCM_REASON_HASHING_FAILED */ #ifdef ANSI -PRIVATE S16 rlcLmmShutdown +static S16 rlcLmmShutdown ( RlcCb *gCb ) #else -PRIVATE S16 rlcLmmShutdown(gCb) +static S16 rlcLmmShutdown(gCb) RlcCb *gCb; #endif { @@ -1786,13 +1786,13 @@ RlcCb *gCb; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmGenCntrl +static S16 rlcLmmGenCntrl ( RlcCb *gCb, RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmGenCntrl(gCb,cntrl) +static S16 rlcLmmGenCntrl(gCb,cntrl) RlcCb *gCb; RlcMngmt *cntrl; #endif @@ -1891,13 +1891,13 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmUdxSapCntrl +static S16 rlcLmmUdxSapCntrl ( RlcCb *gCb, RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmUdxSapCntrl(gCb,cntrl) +static S16 rlcLmmUdxSapCntrl(gCb,cntrl) RlcCb *gCb; RlcMngmt *cntrl; #endif @@ -1972,13 +1972,13 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_ACTION */ #ifdef ANSI -PRIVATE S16 rlcLmmLSapCntrl +static S16 rlcLmmLSapCntrl ( RlcCb *gCb, RlcMngmt *cntrl ) #else -PRIVATE S16 rlcLmmLSapCntrl(gCb,cntrl) +static S16 rlcLmmLSapCntrl(gCb,cntrl) RlcCb *gCb; RlcMngmt *cntrl; #endif @@ -2055,13 +2055,13 @@ RlcMngmt *cntrl; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetKwuSapSta +static S16 rlcLmmGetKwuSapSta ( RlcCb *gCb, RlcKwuSapSta *sta ) #else -PRIVATE S16 rlcLmmGetKwuSapSta(gCb,sta) +static S16 rlcLmmGetKwuSapSta(gCb,sta) RlcCb *gCb; RlcKwuSapSta *sta; #endif @@ -2098,13 +2098,13 @@ RlcKwuSapSta *sta; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetRguSapSta +static S16 rlcLmmGetRguSapSta ( RlcCb *gCb, RlcRguSapSta *sta ) #else -PRIVATE S16 rlcLmmGetRguSapSta(gCb,sta) +static S16 rlcLmmGetRguSapSta(gCb,sta) RlcCb *gCb; RlcRguSapSta *sta; #endif @@ -2136,13 +2136,13 @@ RlcRguSapSta *sta; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetCkwCntSapSta +static S16 rlcLmmGetCkwCntSapSta ( RlcCb *gCb, RlcCkwCntSapSta *sta ) #else -PRIVATE S16 rlcLmmGetCkwCntSapSta(gCb,sta) +static S16 rlcLmmGetCkwCntSapSta(gCb,sta) rlcCb *gCb, RlcCkwCntSapSta *sta; #endif @@ -2175,14 +2175,14 @@ RlcCkwCntSapSta *sta; * -# LCM_REASON_INVALID_PAR_VAL(FAILURE) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetGenSts +static S16 rlcLmmGetGenSts ( RlcCb *gCb, RlcGenSts *sts, Action action ) #else -PRIVATE S16 rlcLmmGetGenSts(gCb,sts, action) +static S16 rlcLmmGetGenSts(gCb,sts, action) RlcCb *gCb; RlcGenSts *sts; Action action; @@ -2221,7 +2221,7 @@ Action action; * -# LCM_REASON_INVALID_PAR_VAL (FAIL) */ #ifdef ANSI -PRIVATE S16 rlcLmmGetSapSts +static S16 rlcLmmGetSapSts ( RlcCb *gCb, RlcMngmt *sts, @@ -2229,7 +2229,7 @@ Elmnt elmnt, Action action ) #else -PRIVATE S16 rlcLmmGetSapSts(sts, elmnt, action) +static S16 rlcLmmGetSapSts(sts, elmnt, action) RlcCb *gCb; RlcMngmt *sts; Elmnt elmnt; diff --git a/src/5gnrrlc/kw_ptli.c b/src/5gnrrlc/kw_ptli.c index e9a090f67..e53bfedc8 100755 --- a/src/5gnrrlc/kw_ptli.c +++ b/src/5gnrrlc/kw_ptli.c @@ -71,7 +71,7 @@ #endif #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /* __cplusplus */ @@ -84,7 +84,7 @@ S16 rlcLiRguDatReqRbuf(Pst *Post,SpId spId,Void *datReq); S16 rlcLiRguStaRspRbuf(Pst *Post,SpId spId,Void *staRsp); #endif #if defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS) -EXTERN S16 RlcDlHarqStaBatchProc (Void); +S16 RlcDlHarqStaBatchProc (Void); #endif @@ -280,7 +280,7 @@ RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq; #ifdef MAC_RLC_UL_RBUF S16 rlcUlBatchProc ARGS ((Void)); -EXTERN Void rlcUtlFreeUlRBuf ARGS((void)); +Void rlcUtlFreeUlRBuf ARGS((void)); #ifdef ANSI S16 rlcUlBatchProc @@ -295,7 +295,7 @@ Void; /* Read from Ring Buffer and process PDCP packets */ RguDDatIndInfo *datInd; Void *elmIndx = NULLP; - PRIVATE Pst rlcUlRbfuPst={1,1,ENTRLC,0,ENTMAC,0,PRIOR0,RTESPEC,EVTRLCULDAT,0,0,0,0}; + static Pst rlcUlRbfuPst={1,1,ENTRLC,0,ENTMAC,0,PRIOR0,RTESPEC,EVTRLCULDAT,0,0,0,0}; /* Read from Ring Buffer and process PDCP packets */ #ifndef SS_RBUF diff --git a/src/5gnrrlc/kw_ptmi.c b/src/5gnrrlc/kw_ptmi.c index ceedfdf61..bc8576d61 100755 --- a/src/5gnrrlc/kw_ptmi.c +++ b/src/5gnrrlc/kw_ptmi.c @@ -63,7 +63,7 @@ ********************************************************************/ /* Configuration confirmation primitive */ -PRIVATE RlcConfigCfm rlcMiRlcConfigCfmMt[MAXKWMI] = +static RlcConfigCfm rlcMiRlcConfigCfmMt[MAXKWMI] = { #ifdef LCKWMILKW packRlcConfigCfm, /* 0 - loosely coupled - fc */ @@ -75,7 +75,7 @@ PRIVATE RlcConfigCfm rlcMiRlcConfigCfmMt[MAXKWMI] = /* control confirmation primitives */ -PRIVATE LkwCntrlCfm kwMiLkwCntrlCfmMt[MAXKWMI] = +static LkwCntrlCfm kwMiLkwCntrlCfmMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwCntrlCfm, /* 0 - loosely coupled - fc */ @@ -87,7 +87,7 @@ PRIVATE LkwCntrlCfm kwMiLkwCntrlCfmMt[MAXKWMI] = /* Status Indication primitive */ -PRIVATE LkwStaInd kwMiLkwStaIndMt[MAXKWMI] = +static LkwStaInd kwMiLkwStaIndMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwStaInd, /* 0 - loosely coupled */ @@ -99,7 +99,7 @@ PRIVATE LkwStaInd kwMiLkwStaIndMt[MAXKWMI] = /* Status confirm primitive */ -PRIVATE LkwStaCfm kwMiLkwStaCfmMt[MAXKWMI] = +static LkwStaCfm kwMiLkwStaCfmMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwStaCfm, /* 0 - loosely coupled */ @@ -111,7 +111,7 @@ PRIVATE LkwStaCfm kwMiLkwStaCfmMt[MAXKWMI] = /* Statistics confirm primitive */ -PRIVATE LkwStsCfm kwMiLkwStsCfmMt[MAXKWMI] = +static LkwStsCfm kwMiLkwStsCfmMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwStsCfm, /* 0 - loosely coupled */ @@ -123,7 +123,7 @@ PRIVATE LkwStsCfm kwMiLkwStsCfmMt[MAXKWMI] = /* Trace indication primitive */ -PRIVATE LkwTrcInd kwMiLkwTrcIndMt[MAXKWMI] = +static LkwTrcInd kwMiLkwTrcIndMt[MAXKWMI] = { #ifdef LCKWMILKW cmPkLkwTrcInd, /* 0 - loosely coupled */ @@ -135,7 +135,7 @@ PRIVATE LkwTrcInd kwMiLkwTrcIndMt[MAXKWMI] = /* kw005.201 added support for L2 Measurement */ #ifdef LTE_L2_MEAS -PRIVATE CONSTANT LkwL2MeasCfm rlcMiLkwL2MeasCfmMt[] = +static const LkwL2MeasCfm rlcMiLkwL2MeasCfmMt[] = { #ifdef LCKWMILKW cmPkLkwL2MeasCfm, @@ -144,7 +144,7 @@ PRIVATE CONSTANT LkwL2MeasCfm rlcMiLkwL2MeasCfmMt[] = SmMiLkwL2MeasCfm, #endif }; -PRIVATE CONSTANT LkwL2MeasStopCfm RlcMiLkwL2MeasStopCfmMt[] = +static const LkwL2MeasStopCfm RlcMiLkwL2MeasStopCfmMt[] = { #ifdef LCKWMILKW cmPkLkwL2MeasStopCfm, diff --git a/src/5gnrrlc/kw_ptui.c b/src/5gnrrlc/kw_ptui.c index 5c9619cd4..47c1ab79f 100755 --- a/src/5gnrrlc/kw_ptui.c +++ b/src/5gnrrlc/kw_ptui.c @@ -63,7 +63,7 @@ static int RLOG_FILE_ID=199; #endif #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /* __cplusplus */ @@ -73,10 +73,10 @@ EXTERN "C" { #if defined(PDCP_RLC_DL_RBUF) || defined(SS_RBUF) S16 rlcDlBatchProc ARGS ((Void)); S16 rlcUtlDlFreeRlcRBuf ARGS((Void)); -EXTERN void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); -EXTERN Void rlcUtlFreeDlMem ARGS((Void)); -EXTERN SsRngBufCnt rngCb; -EXTERN S16 rlcUtlDlBatchProcPkts ARGS((Void)); +void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); +Void rlcUtlFreeDlMem ARGS((Void)); +SsRngBufCnt rngCb; +S16 rlcUtlDlBatchProcPkts ARGS((Void)); #endif #if (defined(L2_L3_SPLIT) && defined(ICC_RECV_TSK_RBUF)) @@ -862,9 +862,9 @@ Void; /* Memory regions different for BRCM and Intel */ /*dstProcId,srcProcId,dstEnt,dstInst,srcEnt,srcInst,prior,route,event,region,pool,selector*/ #ifdef SS_RBUF - PRIVATE Pst rlcDlRbfuPst ={1,1,ENTRLC,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,1,1,0,0}; + static Pst rlcDlRbfuPst ={1,1,ENTRLC,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,1,1,0,0}; #else - PRIVATE Pst rlcDlRbfuPst ={1,1,ENTRLC,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,2,1,0,0}; + static Pst rlcDlRbfuPst ={1,1,ENTRLC,1,ENTPJ,1,PRIOR0,RTESPEC,KWU_EVT_DAT_REQ,2,1,0,0}; #endif Void *elmIndx = NULLP; KwuDatReqDetl *kwuDatReqDetl = NULLP; diff --git a/src/5gnrrlc/kw_tmm_dl.c b/src/5gnrrlc/kw_tmm_dl.c index 98655d96e..279ec5700 100755 --- a/src/5gnrrlc/kw_tmm_dl.c +++ b/src/5gnrrlc/kw_tmm_dl.c @@ -66,9 +66,9 @@ #define RLC_MODULE (RLC_DBGMASK_TM | RLC_DBGMASK_DL) -PRIVATE Void rlcTmmSendBoSta ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, +static Void rlcTmmSendBoSta ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datReqInfo)); -extern uint32_t rgMacGT ; +uint32_t rgMacGT ; /** @addtogroup tmmode */ /*@{*/ @@ -417,7 +417,7 @@ RlcDlRbCb *rbCb; * -# RFAILED */ -void rlcTmmSendBoSta(RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datReqInfo) +static void rlcTmmSendBoSta(RlcCb *gCb, RlcDlRbCb *rbCb, MsgLen bo, KwuDatReqInfo *datReqInfo) { Pst pst; /* Post structure */ RlcBoStatus *boStatus; /* Buffer occupancy status information */ diff --git a/src/5gnrrlc/kw_tmm_ul.c b/src/5gnrrlc/kw_tmm_ul.c index de636d08d..72b436026 100755 --- a/src/5gnrrlc/kw_tmm_ul.c +++ b/src/5gnrrlc/kw_tmm_ul.c @@ -67,10 +67,10 @@ static int RLOG_FILE_ID=201; #if defined(PRE_DEF_UE_CTX) || defined(PRE_DEF_UE_CTX_HO) #ifdef EG_GEN_LOAD_5GTF -extern uint32_t loadStart; +uint32_t loadStart; #endif -EXTERN S16 PjUiPjuDatInd(Pst* pst,SuId suId,CmLtePdcpId * pdcpId,Buffer *mBuf); +S16 PjUiPjuDatInd(Pst* pst,SuId suId,CmLtePdcpId * pdcpId,Buffer *mBuf); #ifdef ANSI Void AddUeContext ( diff --git a/src/5gnrrlc/kw_tmr.c b/src/5gnrrlc/kw_tmr.c index a959503fd..297ab7fc8 100755 --- a/src/5gnrrlc/kw_tmr.c +++ b/src/5gnrrlc/kw_tmr.c @@ -86,7 +86,7 @@ } /* private function declarations */ -PRIVATE Void rlcBndTmrExpiry(PTR cb); +static Void rlcBndTmrExpiry(PTR cb); /** * @brief Handler to start timer @@ -417,12 +417,12 @@ bool rlcChkTmr(RlcCb *gCb, PTR cb, int16_t tmrEvnt) * @return Void */ #ifdef ANSI -PRIVATE Void rlcBndTmrExpiry +static Void rlcBndTmrExpiry ( PTR cb ) #else -PRIVATE Void rlcBndTmrExpiry(cb) +static Void rlcBndTmrExpiry(cb) PTR cb; #endif { diff --git a/src/5gnrrlc/kw_udx.c b/src/5gnrrlc/kw_udx.c index 01ce54da8..7f10dbcbc 100755 --- a/src/5gnrrlc/kw_udx.c +++ b/src/5gnrrlc/kw_udx.c @@ -54,7 +54,7 @@ * */ #ifdef ANSI -PRIVATE S16 cmUnpkUdxStruct +static S16 cmUnpkUdxStruct ( Buffer *srcMBuf, uint32_t offset, @@ -62,7 +62,7 @@ uint8_t *dstBuf, uint32_t size ) #else -PRIVATE S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size) +static S16 cmUnpkUdxStruct(dstMBuf,srcBuf,size) Buffer *srcMBuf; uint32_t offset; uint8_t *dstBuf; @@ -89,14 +89,14 @@ MsgLen size; * */ #ifdef ANSI -PRIVATE S16 cmPkUdxStruct +static S16 cmPkUdxStruct ( uint8_t *srcBuf, MsgLen size, Buffer *dstMBuf ) #else -PRIVATE S16 cmPkUdxStruct(dstMBuf,srcBuf,size) +static S16 cmPkUdxStruct(dstMBuf,srcBuf,size) uint8_t *srcBuf; MsgLen size; Buffer *dstMBuf; diff --git a/src/5gnrrlc/kw_udx_dl.c b/src/5gnrrlc/kw_udx_dl.c index 0b6ab6444..12812cbfd 100755 --- a/src/5gnrrlc/kw_udx_dl.c +++ b/src/5gnrrlc/kw_udx_dl.c @@ -58,7 +58,7 @@ static int RLOG_FILE_ID=203; #define RLC_MODULE RLC_DBGMASK_UDX /* local defines */ -EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb, +S16 rlcDlmHndlStaRsp ARGS (( RlcCb *gCb,RlcDlRbCb *rbCb, RlcUdxStaPdu *pStaPdu, RlcUdxBufLst *rlsPduLst)); @@ -612,7 +612,7 @@ RlcL2MeasReqEvt *measReqEvt; { uint32_t cntr; uint8_t measType; - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; RlcCb *tRlcCb; /*starting Task*/ @@ -688,7 +688,7 @@ uint8_t measType; uint16_t cntr; uint8_t status = ROK; /* RlcL2MeasCfmEvt measCfmEvt; */ - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; RlcCb *tRlcCb=NULLP; /*starting Task*/ @@ -746,8 +746,7 @@ uint8_t measType; { RlcL2MeasEvtCb *measEvtCb; uint16_t cntr; - - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; RlcCb *tRlcCb; tRlcCb = RLC_GET_RLCCB(pst->dstInst); diff --git a/src/5gnrrlc/kw_udx_ptdl.c b/src/5gnrrlc/kw_udx_ptdl.c index f8dd2c84b..a077743f8 100755 --- a/src/5gnrrlc/kw_udx_ptdl.c +++ b/src/5gnrrlc/kw_udx_ptdl.c @@ -59,11 +59,11 @@ #define UDX_MAX_SEL 3 #ifndef LCKWULUDX -PRIVATE S16 PtDlUdxBndCfm ARGS(( Pst *pst,SuId suId,uint8_t status )); -PRIVATE S16 PtDlUdxCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo *cfmInfo)); -PRIVATE S16 PtDlUdxUeIdChgCfm ARGS(( Pst *pst, SuId suId,uint32_t transId, +static S16 PtDlUdxBndCfm ARGS(( Pst *pst,SuId suId,uint8_t status )); +static S16 PtDlUdxCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo *cfmInfo)); +static S16 PtDlUdxUeIdChgCfm ARGS(( Pst *pst, SuId suId,uint32_t transId, CmStatus status)); -PRIVATE S16 PtDlUdxStaUpdCfm ARGS(( Pst* pst,SuId suId,CmLteRlcId *rlcId, +static S16 PtDlUdxStaUpdCfm ARGS(( Pst* pst,SuId suId,CmLteRlcId *rlcId, RlcUdxBufLst *pBufLst)); /* UDX Bind Confirm primitive */ @@ -88,14 +88,14 @@ PRIVATE S16 PtDlUdxStaUpdCfm ARGS(( Pst* pst,SuId suId,CmLteRlcId *rlcId, * */ #ifdef ANSI -PRIVATE S16 PtDlUdxBndCfm +static S16 PtDlUdxBndCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ uint8_t status /* Status */ ) #else -PRIVATE S16 PtDlUdxBndCfm(pst, suId, status) +static S16 PtDlUdxBndCfm(pst, suId, status) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ uint8_t status; /* Status */ @@ -129,14 +129,14 @@ uint8_t status; /* Status */ * */ #ifdef ANSI -PRIVATE S16 PtDlUdxCfgCfm +static S16 PtDlUdxCfgCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ RlcCfgCfmInfo *cfmInfo /* Status */ ) #else -PRIVATE S16 PtDlUdxCfgCfm(pst, suId, status) +static S16 PtDlUdxCfgCfm(pst, suId, status) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ RlcCfgCfmInfo *cfmInfo; /* Status */ @@ -168,7 +168,7 @@ RlcCfgCfmInfo *cfmInfo; /* Status */ * */ #ifdef ANSI -PRIVATE S16 PtDlUdxUeIdChgCfm +static S16 PtDlUdxUeIdChgCfm ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ @@ -176,7 +176,7 @@ uint32_t transId, CmStatus status ) #else -PRIVATE S16 PtDlUdxUeIdChgCfm(pst, suId, status) +static S16 PtDlUdxUeIdChgCfm(pst, suId, status) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ uint32_t transId; @@ -190,7 +190,7 @@ CmStatus status; -PRIVATE S16 PtDlUdxStaUpdCfm +static S16 PtDlUdxStaUpdCfm ( Pst* pst, SuId suId, @@ -201,7 +201,7 @@ RlcUdxBufLst *pBufLst return ROK; } -PRIVATE S16 PtDlUdxStaProhTmrStart +static S16 PtDlUdxStaProhTmrStart ( Pst* pst, SuId suId, @@ -212,7 +212,7 @@ CmLteRlcId *rlcId } #endif -PRIVATE UdxBndCfm rlcDlUdxBndCfmMt[UDX_MAX_SEL] = +static UdxBndCfm rlcDlUdxBndCfmMt[UDX_MAX_SEL] = { #ifdef LCKWULUDX cmPkUdxBndCfm, /* 0 - loosely coupled */ @@ -270,7 +270,7 @@ UdxUeIdChgCfm rlcDlUdxUeIdChgCfmMt[UDX_MAX_SEL] = }; -PRIVATE CONSTANT UdxStaProhTmrStart rlcDlUdxStaProhTmrStartMt[UDX_MAX_SEL] = +static const UdxStaProhTmrStart rlcDlUdxStaProhTmrStartMt[UDX_MAX_SEL] = { #ifdef LCKWULUDX cmPkUdxStaProhTmrStart, diff --git a/src/5gnrrlc/kw_udx_ptul.c b/src/5gnrrlc/kw_udx_ptul.c index 0fda76d67..5bfbbc0bd 100755 --- a/src/5gnrrlc/kw_udx_ptul.c +++ b/src/5gnrrlc/kw_udx_ptul.c @@ -56,24 +56,24 @@ #ifndef LCKWULUDX -PRIVATE S16 PtUlUdxBndReq ARGS((Pst* pst, SuId suId,SpId spId )); -PRIVATE S16 PtUlUdxUbndReq ARGS((Pst* pst, SuId suId,Reason reason)); -PRIVATE S16 PtUlUdxCfgReq ARGS((Pst *pst, SpId spId, RlcCfgInfo *cfgInfo)); -PRIVATE S16 PtUlUdxStaUpdReq ARGS((Pst* pst,SpId spId,CmLteRlcId *rlcId, +static S16 PtUlUdxBndReq ARGS((Pst* pst, SuId suId,SpId spId )); +static S16 PtUlUdxUbndReq ARGS((Pst* pst, SuId suId,Reason reason)); +static S16 PtUlUdxCfgReq ARGS((Pst *pst, SpId spId, RlcCfgInfo *cfgInfo)); +static S16 PtUlUdxStaUpdReq ARGS((Pst* pst,SpId spId,CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu )); -PRIVATE S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, +static S16 PtUlUdxUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo)); -PRIVATE S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId spId, CmLteRlcId *rlcId, +static S16 PtUlUdxStaPduReq ARGS(( Pst* pst,SpId spId, CmLteRlcId *rlcId, RlcUdxDlStaPdu *pStaPdu )); #ifdef ANSI -PRIVATE S16 PtUlUdxBndReq +static S16 PtUlUdxBndReq ( Pst *pst, /* post structure */ SuId suId, /* Service User Id */ SpId spId /* Status */ ) #else -PRIVATE S16 PtUlUdxBndReq(pst, suId,spId) +static S16 PtUlUdxBndReq(pst, suId,spId) Pst *pst; /* post structure */ SuId suId; /* Service User Id */ SpId spId; /* Status */ @@ -105,14 +105,14 @@ SpId spId; /* Status */ * */ #ifdef ANSI -PRIVATE S16 PtUlUdxUbndReq +static S16 PtUlUdxUbndReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ Reason reason /* Status */ ) #else -PRIVATE S16 PtUlUdxUbndReq(pst, suId, status) +static S16 PtUlUdxUbndReq(pst, suId, status) Pst *pst; /* post structure */ SpId spId; /* Service User Id */ Reason Reason; /* Status */ @@ -124,14 +124,14 @@ Reason Reason; /* Status */ } /* end of PtDlUdxBndReq */ #ifdef ANSI -PRIVATE S16 PtUlUdxCfgReq +static S16 PtUlUdxCfgReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ RlcCfgInfo *cfmInfo /* Config Info */ ) #else -PRIVATE S16 PtUlUdxCfgReq(pst, spId, status) +static S16 PtUlUdxCfgReq(pst, spId, status) Pst *pst; /* post structure */ SpId spId; /* Service User Id */ RlcCfgInfo *cfmInfo; /* Config Info */ @@ -143,7 +143,7 @@ RlcCfgInfo *cfmInfo; /* Config Info */ } /* end of rlcDlUdxCfgReq */ #ifdef ANSI -PRIVATE S16 PtUlUdxUeIdChgReq +static S16 PtUlUdxUeIdChgReq ( Pst *pst, /* post structure */ SpId spId, /* Service User Id */ @@ -152,7 +152,7 @@ CkwUeInfo *ueInfo, /* Config Info */ CkwUeInfo *newUeInfo /* Config Info */ ) #else -PRIVATE S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo) +static S16 PtUlUdxUeIdChgReq(pst, spId,transId, ueInfo, newUeInfo) Pst *pst; /* post structure */ SpId spId; /* Service User Id */ uint32_t transId; /* transaction Id */ @@ -166,7 +166,7 @@ CkwUeInfo *newUeInfo; /* Config Info */ } /* end of rlcDlUdxCfgReq */ -PRIVATE S16 PtUlUdxStaPduReq +static S16 PtUlUdxStaPduReq ( Pst* pst, SpId spId, @@ -191,7 +191,7 @@ RlcUdxDlStaPdu *pStaPdu * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxStaUpdReq +static S16 PtUlUdxStaUpdReq ( Pst* pst, SpId spId, @@ -199,7 +199,7 @@ CmLteRlcId *rlcId, RlcUdxStaPdu *pStaPdu ) #else -PRIVATE S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu) +static S16 PtUlUdxStaUpdReq(pst, rlcId, pStaPdu) Pst* pst; SpId spId; CmLteRlcId *rlcId; @@ -224,13 +224,13 @@ RlcUdxDlStaPdu *pStaPdu; * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasReq +static S16 PtUlUdxL2MeasReq ( Pst* pst, RlcL2MeasReqEvt *measReqEvt ) #else -PRIVATE S16 PtUlUdxL2MeasReq(pst, measReqEvt ) +static S16 PtUlUdxL2MeasReq(pst, measReqEvt ) Pst* pst; RlcL2MeasReqEvt *measReqEvt; #endif @@ -252,13 +252,13 @@ RlcL2MeasReqEvt *measReqEvt; * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasSendReq +static S16 PtUlUdxL2MeasSendReq ( Pst* pst, uint8_t status ) #else -PRIVATE S16 PtUlUdxL2MeasSendReq(pst, status ) +static S16 PtUlUdxL2MeasSendReq(pst, status ) Pst* pst; uint8_t status #endif @@ -280,13 +280,13 @@ uint8_t status * -# ROK **/ #ifdef ANSI -PRIVATE S16 PtUlUdxL2MeasStopReq +static S16 PtUlUdxL2MeasStopReq ( Pst* pst, uint8_t status ) #else -PRIVATE S16 PtUlUdxL2MeasStopReq(pst, status ) +static S16 PtUlUdxL2MeasStopReq(pst, status ) Pst* pst; uint8_t status #endif @@ -297,7 +297,7 @@ uint8_t status #endif #endif -PRIVATE UdxBndReq rlcUlUdxBndReqMt[] = +static UdxBndReq rlcUlUdxBndReqMt[] = { #ifdef LCKWULUDX cmPkUdxBndReq, /* 0 - loosely coupled */ @@ -316,7 +316,7 @@ PRIVATE UdxBndReq rlcUlUdxBndReqMt[] = #endif /* KW */ }; -PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] = +static UdxUbndReq rlcUlUdxUbndReqMt[] = { #ifdef LCKWULUDX cmPkUdxUbndReq, /* 0 - loosely coupled */ @@ -336,7 +336,7 @@ PRIVATE UdxUbndReq rlcUlUdxUbndReqMt[] = }; -PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] = +static UdxCfgReq rlcUlUdxCfgReqMt[] = { #ifdef LCKWULUDX cmPkUdxCfgReq, /* 0 - loosely coupled */ @@ -355,7 +355,7 @@ PRIVATE UdxCfgReq rlcUlUdxCfgReqMt[] = #endif /* KW */ }; -PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = +static UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = { #ifdef LCKWULUDX cmPkUdxUeIdChgReq, /* 0 - loosely coupled */ @@ -375,7 +375,7 @@ PRIVATE UdxUeIdChgReq rlcUlUdxUeIdChgReqMt[] = }; -PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = +static const UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxStaUpdReq, /* 0 - loosely coupled */ @@ -394,7 +394,7 @@ PRIVATE CONSTANT UdxStaUpdReq rlcUlUdxStaUpdReqMt[RLC_MAX_UDX] = #endif /* KW */ }; -PRIVATE CONSTANT UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] = +static const UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxStaPduReq, /* 0 - loosely coupled */ @@ -413,7 +413,7 @@ PRIVATE CONSTANT UdxStaPduReq rlcUlUdxStaPduReqMt[RLC_MAX_UDX] = #endif /* KW */ }; #ifdef LTE_L2_MEAS -PRIVATE CONSTANT UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] = +static const UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxL2MeasReq, /* 0 - loosely coupled */ @@ -432,7 +432,7 @@ PRIVATE CONSTANT UdxL2MeasReq rlcUlUdxL2MeasReqMt[RLC_MAX_UDX] = #endif /* KW */ }; -PRIVATE CONSTANT UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] = +static const UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxL2MeasSendReq, /* 0 - loosely coupled */ @@ -451,7 +451,7 @@ PRIVATE CONSTANT UdxL2MeasSendReq rlcUlUdxL2MeasSendReqMt[RLC_MAX_UDX] = #endif /* KW */ }; -PRIVATE CONSTANT UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] = +static const UdxL2MeasStopReq rlcUlUdxL2MeasStopReqMt[RLC_MAX_UDX] = { #ifdef LCKWULUDX cmPkUdxL2MeasStopReq, /* 0 - loosely coupled */ diff --git a/src/5gnrrlc/kw_udx_ul.c b/src/5gnrrlc/kw_udx_ul.c index 7cdded9c1..18385dc74 100755 --- a/src/5gnrrlc/kw_udx_ul.c +++ b/src/5gnrrlc/kw_udx_ul.c @@ -72,7 +72,7 @@ static int RLOG_FILE_ID=204; /* forward references */ /* public variable declarations */ -EXTERN S16 rlcHdlCrlcUlCfgReq ARGS((RlcCb *gCb,RlcUlCfgTmpData *cfgTmpData, +S16 rlcHdlCrlcUlCfgReq ARGS((RlcCb *gCb,RlcUlCfgTmpData *cfgTmpData, RlcCfgCfmInfo *cfmInfo, RlcCfgCfmInfo *cfgCfm)); /** diff --git a/src/5gnrrlc/kw_ul.x b/src/5gnrrlc/kw_ul.x index 6be3ced7e..833bb84b1 100755 --- a/src/5gnrrlc/kw_ul.x +++ b/src/5gnrrlc/kw_ul.x @@ -342,7 +342,7 @@ typedef struct rlcUlCfgTmpData RlcUlEntTmpData cfgEntData[CKW_MAX_ENT_CFG]; /**< Entity Data */ } RlcUlCfgTmpData; /**************************************************************************** - * EXTERN Declarations + * Declarations ***************************************************************************/ /**************************************************************************** * Configuration Functions diff --git a/src/5gnrrlc/kw_umm_dl.c b/src/5gnrrlc/kw_umm_dl.c index 86fc3dcc5..8d6f13be8 100755 --- a/src/5gnrrlc/kw_umm_dl.c +++ b/src/5gnrrlc/kw_umm_dl.c @@ -69,15 +69,15 @@ /* variables for logging :declared in BRDCM cl */ #ifndef TENB_ACC -extern uint32_t dldrops_kwu_um; -extern uint32_t dlpkt_um; -extern uint32_t buffer_occ; -extern uint32_t dlrate_kwu; +uint32_t dldrops_kwu_um; +uint32_t dlpkt_um; +uint32_t buffer_occ; +uint32_t dlrate_kwu; #endif -PRIVATE void rlcUmmEstHdrSz ARGS ((RlcUmDl *umUl)); +static void rlcUmmEstHdrSz ARGS ((RlcUmDl *umUl)); -PRIVATE Void rlcUmmCreatePdu ARGS ((RlcCb *gCb, +static Void rlcUmmCreatePdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, @@ -616,7 +616,7 @@ RlcDlRbCb *rbCb; * * @return Void */ -void rlcUmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, KwPduInfo *datReqPduInfo) +static void rlcUmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, KwPduInfo *datReqPduInfo) { RlcSn sn; /* Sequence Number */ uint32_t liCount; /* LI count */ @@ -733,7 +733,7 @@ void rlcUmmCreatePdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *pdu, uint8_t fi, KwPdu * * @return Void */ -void rlcUmmEstHdrSz(RlcUmDl *umDl) +static void rlcUmmEstHdrSz(RlcUmDl *umDl) { /* The header size is estimated as : If sdu count = 0 then 0 diff --git a/src/5gnrrlc/kw_umm_ul.c b/src/5gnrrlc/kw_umm_ul.c index 8a0f3ee18..98cfe3646 100755 --- a/src/5gnrrlc/kw_umm_ul.c +++ b/src/5gnrrlc/kw_umm_ul.c @@ -65,18 +65,18 @@ #define RLC_MODULE (RLC_DBGMASK_UM | RLC_DBGMASK_UL) -uint8_t rlcUmmExtractHdr ARGS ((RlcCb *gCb, +static uint8_t rlcUmmExtractHdr ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umHdr)); -void rlcUmmReAssembleSdus ARGS ((RlcCb *gCb, +static void rlcUmmReAssembleSdus ARGS ((RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRecBuf)); #ifndef TENB_ACC #ifndef LTE_PAL_ENB -extern uint32_t isMemThreshReached(Region region); +uint32_t isMemThreshReached(Region region); #endif #endif /** @@ -92,7 +92,7 @@ extern uint32_t isMemThreshReached(Region region); * * @return Void */ -void rlcUmmFindNextVRUR (RlcUmUl* umUl, RlcSn nextSn) +static void rlcUmmFindNextVRUR (RlcUmUl* umUl, RlcSn nextSn) { RlcSn ur = RLC_UM_GET_VALUE(umUl->vrUr, *umUl); @@ -123,7 +123,7 @@ void rlcUmmFindNextVRUR (RlcUmUl* umUl, RlcSn nextSn) * * @return Void */ -int16_t rlcUmmCheckSnInReordWindow (RlcSn sn, CONSTANT RlcUmUl* CONSTANT umUl) +static int16_t rlcUmmCheckSnInReordWindow (RlcSn sn, const RlcUmUl* const umUl) { return (RLC_UM_GET_VALUE(sn, *umUl) < RLC_UM_GET_VALUE(umUl->vrUh, *umUl)); } @@ -181,7 +181,7 @@ void rlcUmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) #ifndef RGL_SPECIFIC_CHANGES #ifndef TENB_ACC #ifndef LTE_PAL_ENB - extern uint32_t ulrate_rgu; + uint32_t ulrate_rgu; MsgLen len; ODU_GET_MSG_LEN(pdu, &len); ulrate_rgu += len; @@ -207,7 +207,7 @@ void rlcUmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) #ifndef XEON_SPECIFIC_CHANGES if(isMemThreshReached(rlcCb[0]->init.region) == TRUE) { - extern uint32_t rlculdrop; + uint32_t rlculdrop; rlculdrop++; RLC_FREE_BUF(pdu); RLC_FREE_WC(gCb, tmpRecBuf, sizeof(RlcUmRecBuf)); @@ -373,7 +373,7 @@ void rlcUmmProcessPdus(RlcCb *gCb, RlcUlRbCb *rbCb, KwPduInfo *pduInfo) * * @return Void */ -void rlcUmmReAssembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRecBuf) +static void rlcUmmReAssembleSdus(RlcCb *gCb, RlcUlRbCb *rbCb, RlcUmRecBuf *umRecBuf) { uint32_t liCount; /* LI count */ uint32_t count; /* Loop counter */ @@ -588,7 +588,7 @@ RlcUlRbCb *rbCb; * -# TRUE * -# FALSE */ -uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umHdr) +static uint8_t rlcUmmExtractHdr(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *pdu, RlcUmHdr *umHdr) { uint8_t e; /* Extension Bit */ Data dst[2]; /* Destination Buffer */ diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c index e485439b6..146eaf986 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -78,14 +78,14 @@ static int RLOG_FILE_ID=209; #include "ss_rbuf.h" #include "ss_rbuf.x" -EXTERN SsRngBufCnt rngCb; +SsRngBufCnt rngCb; #if (defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)) -extern uint32_t isDatReqProcessed; +uint32_t isDatReqProcessed; #endif #define RLC_MODULE (RLC_DBGMASK_DUT | RLC_DBGMASK_DL) /* for debugging purpose */ #if (defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)) || defined (SS_RBUF) -EXTERN void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); +void rlcUtlDlBatchProcHqStaInd ARGS ((Void)); #endif Void ResetRLCStats(Void) { @@ -1075,14 +1075,14 @@ RlcTx *pdu; * - FALSE if all the data has been freed */ #ifdef ANSI -PRIVATE Bool rlcUtlFreeDlAmRbMemory +static Bool rlcUtlFreeDlAmRbMemory ( RlcCb *gCb, RlcDlRbCb *rbCb, uint32_t *toBeFreed ) #else -PRIVATE Bool rlcUtlFreeDlAmRbMemory(gCb, rbCb, toBeFreed) +static Bool rlcUtlFreeDlAmRbMemory(gCb, rbCb, toBeFreed) RlcCb *gCb; RlcDlRbCb *rbCb; uint32_t *toBeFreed @@ -1369,7 +1369,7 @@ uint32_t schPduSz; RlcL2MeasTb *l2MeasTb = NULLP; uint8_t idx; uint8_t currTbIdx; - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; RlcContSduLst *dstContSduLst; @@ -1603,7 +1603,7 @@ uint8_t tbIdx; #endif uint8_t timeAddedFlag; S16 ret; - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; /*kw005.201 Code added for DL IP thruput measurement*/ /*starting Task*/ @@ -2047,7 +2047,7 @@ uint8_t measType; } /* rlcUtlResetDlL2MeasInRlcRb */ #endif -PRIVATE Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) +static Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) { if(dlRbCb->mode == CM_LTE_MODE_UM) { diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c index f11e7cc6e..18cf51ee8 100755 --- a/src/5gnrrlc/kw_utl_ul.c +++ b/src/5gnrrlc/kw_utl_ul.c @@ -270,7 +270,7 @@ uint8_t rlcUtlSendUlDataToDu(RlcCb *gCb, RlcUlRbCb *rbCb, Buffer *sdu) } /* rlcUtlSendUlDataToDu */ -PRIVATE Void dumpRLCUlRbInformation(RlcUlRbCb* ulRbCb) +static Void dumpRLCUlRbInformation(RlcUlRbCb* ulRbCb) { if(ulRbCb->mode == CM_LTE_MODE_UM) { @@ -414,7 +414,7 @@ RlcUlRbCb *rbCb; uint32_t ttiCnt; #endif { - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCTTI); @@ -495,7 +495,7 @@ uint32_t ttiCnt; #endif { MsgLen rlcSduSz = 0; /*Holds length of Rlc Sdu*/ - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCVOL); diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index 13667ce7f..4bb40f58c 100755 --- a/src/5gnrsch/rg_sch.c +++ b/src/5gnrsch/rg_sch.c @@ -60,8 +60,8 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch_cmn.x" #ifdef EMTC_ENABLE -EXTERN S16 rgEmtcMacSchUeDelInd ARGS((RgSchCellCb *cell,RgInfUeDelInd *ueDelInd)); -EXTERN S16 rgSCHGomEmtcHndlSiCfg ARGS(( +S16 rgEmtcMacSchUeDelInd ARGS((RgSchCellCb *cell,RgInfUeDelInd *ueDelInd)); +S16 rgSCHGomEmtcHndlSiCfg ARGS(( Region reg, Pool pool, RgSchCb *instCb, @@ -69,7 +69,7 @@ SpId spId, RgrCfgTransId transId, RgrSiCfgReqInfo *cfgReqInfo )); -EXTERN S16 rgSCHGomEmtcHndlWarningSiCfg ARGS(( +S16 rgSCHGomEmtcHndlWarningSiCfg ARGS(( Region reg, Pool pool, RgSchCb *instCb, diff --git a/src/5gnrsch/rg_sch.h b/src/5gnrsch/rg_sch.h index 28849f89b..cd6202d2d 100755 --- a/src/5gnrsch/rg_sch.h +++ b/src/5gnrsch/rg_sch.h @@ -1469,37 +1469,37 @@ do{\ #define RG_SCH_HQP_TIME_ON_PCELL 32 /*!< Time in milliseconds to be allowed for transmission of TB on PCell*/ /* SR_RACH_STATS */ -EXTERN uint32_t rgNumPrachRecvd; /* Num of Rach Req received including dedicated preambles */ -EXTERN uint32_t rgNumRarSched; /* Num of RARs sent */ -EXTERN uint32_t rgNumBI; /* Num of BackOff Ind sent */ -EXTERN uint32_t rgNumMsg3CrcPassed; /* Num of CRC success for Msg3 */ -EXTERN uint32_t rgNumMsg3CrcFailed ; /* Num of CRC fail for Msg 3 */ -EXTERN uint32_t rgNumMsg3FailMaxRetx ; /* Num of Msg3 fail after Max Retx attempts */ -EXTERN uint32_t rgNumMsg4Ack ; /* Num of Acks for Msg4 Tx */ -EXTERN uint32_t rgNumMsg4Nack ; +uint32_t rgNumPrachRecvd; /* Num of Rach Req received including dedicated preambles */ +uint32_t rgNumRarSched; /* Num of RARs sent */ +uint32_t rgNumBI; /* Num of BackOff Ind sent */ +uint32_t rgNumMsg3CrcPassed; /* Num of CRC success for Msg3 */ +uint32_t rgNumMsg3CrcFailed ; /* Num of CRC fail for Msg 3 */ +uint32_t rgNumMsg3FailMaxRetx ; /* Num of Msg3 fail after Max Retx attempts */ +uint32_t rgNumMsg4Ack ; /* Num of Acks for Msg4 Tx */ +uint32_t rgNumMsg4Nack ; /* Num of Nacks for Msg4 Tx */ -EXTERN uint32_t rgNumMsg4FailMaxRetx ; /* Num of Msg4 Tx failed after Max Retx attempts */ -EXTERN uint32_t rgNumSrRecvd; /* Num of Sched Req received */ -EXTERN uint32_t rgNumSrGrant; /* Num of Sched Req Grants sent */ -EXTERN uint32_t rgNumMsg3CrntiCE; /* Num of Msg 3 CRNTI CE received */ -EXTERN uint32_t rgNumDedPream ; /* Num of Dedicated Preambles recvd */ -EXTERN uint32_t rgNumMsg3CCCHSdu; /* Num of Msg 3 CCCH Sdus recvd */ -EXTERN uint32_t rgNumCCCHSduCrntiNotFound ; /*UE Ctx not found for CCCH SDU Msg 3 */ -EXTERN uint32_t rgNumCrntiCeCrntiNotFound ; /*UE Ctx not found for CRNTI CE Msg 3 */ -EXTERN uint32_t rgNumMsg4WithCCCHSdu ; /* Num of Msg4 with CCCH Sdu */ -EXTERN uint32_t rgNumMsg4WoCCCHSdu ; /* Num of Msg4 without CCCH Sdu */ -EXTERN uint32_t rgNumMsg4Dtx ; /* Num of DTX received for Msg 4 */ -EXTERN uint32_t rgNumMsg3AckSent ; /* Num of PHICH Ack sent for Msg 3 */ -EXTERN uint32_t rgNumMsg3NackSent ; /* Num of PHICH Nack sent for Msg 3 */ -EXTERN uint32_t rgNumMsg4PdcchWithCrnti ; /* Num of PDCCH for CRNTI based contention resolution */ -EXTERN uint32_t rgNumRarFailDuetoRntiExhaustion ; /* Num of RACH Failures due to RNTI pool exhaution */ -EXTERN uint32_t rgNumTAModified ; /* Num of times TA received is different from prev value */ -EXTERN uint32_t rgNumTASent ; /* Num of TA Command sent */ -EXTERN uint32_t rgNumMsg4ToBeTx ; /* Num of times MSG4 that should be sent */ -EXTERN uint32_t rgNumMsg4Txed ; /* Num of MSG4 actually sent *//* ysNumMsg4ToBeTx -ysNumMsg4Txed == Failed MSG4 TX */ -EXTERN uint32_t rgNumMsg3DtxRcvd; /* CRC Fail with SINR < 0 */ - -EXTERN uint32_t rgNumDedPreamUECtxtFound; +uint32_t rgNumMsg4FailMaxRetx ; /* Num of Msg4 Tx failed after Max Retx attempts */ +uint32_t rgNumSrRecvd; /* Num of Sched Req received */ +uint32_t rgNumSrGrant; /* Num of Sched Req Grants sent */ +uint32_t rgNumMsg3CrntiCE; /* Num of Msg 3 CRNTI CE received */ +uint32_t rgNumDedPream ; /* Num of Dedicated Preambles recvd */ +uint32_t rgNumMsg3CCCHSdu; /* Num of Msg 3 CCCH Sdus recvd */ +uint32_t rgNumCCCHSduCrntiNotFound ; /*UE Ctx not found for CCCH SDU Msg 3 */ +uint32_t rgNumCrntiCeCrntiNotFound ; /*UE Ctx not found for CRNTI CE Msg 3 */ +uint32_t rgNumMsg4WithCCCHSdu ; /* Num of Msg4 with CCCH Sdu */ +uint32_t rgNumMsg4WoCCCHSdu ; /* Num of Msg4 without CCCH Sdu */ +uint32_t rgNumMsg4Dtx ; /* Num of DTX received for Msg 4 */ +uint32_t rgNumMsg3AckSent ; /* Num of PHICH Ack sent for Msg 3 */ +uint32_t rgNumMsg3NackSent ; /* Num of PHICH Nack sent for Msg 3 */ +uint32_t rgNumMsg4PdcchWithCrnti ; /* Num of PDCCH for CRNTI based contention resolution */ +uint32_t rgNumRarFailDuetoRntiExhaustion ; /* Num of RACH Failures due to RNTI pool exhaution */ +uint32_t rgNumTAModified ; /* Num of times TA received is different from prev value */ +uint32_t rgNumTASent ; /* Num of TA Command sent */ +uint32_t rgNumMsg4ToBeTx ; /* Num of times MSG4 that should be sent */ +uint32_t rgNumMsg4Txed ; /* Num of MSG4 actually sent *//* ysNumMsg4ToBeTx -ysNumMsg4Txed == Failed MSG4 TX */ +uint32_t rgNumMsg3DtxRcvd; /* CRC Fail with SINR < 0 */ + +uint32_t rgNumDedPreamUECtxtFound; #endif /* __RGSCH__ */ /********************************************************************** diff --git a/src/5gnrsch/rg_sch.x b/src/5gnrsch/rg_sch.x index 22ea66f26..45400974e 100755 --- a/src/5gnrsch/rg_sch.x +++ b/src/5gnrsch/rg_sch.x @@ -430,12 +430,12 @@ Void rgSCHUtlEmtcResMngmtDeinit ARGS(( )); #ifdef RG_5GTF -EXTERN RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime ARGS(( +RgSchUlHqProcCb* rgSCHUhmGetUlProcByTime ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo frm )); -EXTERN S16 rgSCHUhmGetAvlHqProc ARGS(( +S16 rgSCHUhmGetAvlHqProc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUlHqProcCb **hqP @@ -964,7 +964,7 @@ typedef struct rgSchUlIMcsInfo uint8_t qm; uint8_t iTbs; } RgSchUlIMcsTbl[29]; -EXTERN RgSchUlIMcsTbl rgUlIMcsTbl; +RgSchUlIMcsTbl rgUlIMcsTbl; typedef struct rgSchUeCatTbl { @@ -989,7 +989,7 @@ typedef struct rgSchUeCatTbl layers for spatial multiplexing in DL*/ } RgSchUeCatTbl[CM_MAX_UE_CAT_SUPP + 1]; -EXTERN RgSchUeCatTbl rgUeCatTbl; +RgSchUeCatTbl rgUeCatTbl; /* Changes for MIMO feature addition */ /* Removed dependency on MIMO compile-time flag */ @@ -1002,9 +1002,9 @@ typedef uint8_t RgSchRaPrmblToRaFrmTbl[RGSCH_MAX_TDD_RA_PREAMBLE_FMT+1]; sub-frames from preamble format */ typedef uint8_t RgSchRaPrmblToRaFrmTbl[RGSCH_MAX_RA_PREAMBLE_FMT+1]; #endif -EXTERN RgSchRaPrmblToRaFrmTbl rgRaPrmblToRaFrmTbl; +RgSchRaPrmblToRaFrmTbl rgRaPrmblToRaFrmTbl; -EXTERN uint8_t rgRvTable[4]; +uint8_t rgRvTable[4]; typedef struct rgDciFmt { @@ -3963,7 +3963,7 @@ struct _rgSchCb }; /* Declaration for scheduler control blocks */ -EXTERN RgSchCb rgSchCb[RGSCH_MAX_INST]; +RgSchCb rgSchCb[RGSCH_MAX_INST]; /* * Data structures for RAM @@ -4056,179 +4056,179 @@ struct rgSchErrInfo #ifdef LTE_TDD #ifdef LTEMAC_SPS -EXTERN uint8_t rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG]; +uint8_t rgSchTddSpsDlMaxRetxTbl[RGSCH_MAX_TDD_UL_DL_CFG]; #endif typedef uint8_t RgSchTddUlDlSubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl; +RgSchTddUlDlSubfrmTbl rgSchTddUlDlSubfrmTbl; typedef struct rgSchTddSplSubfrmInfo RgSchTddSplSubfrmInfoTbl[RGSCH_MAX_TDD_SPL_SUBFRM_CFG]; -EXTERN RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl; +RgSchTddSplSubfrmInfoTbl rgSchTddSplSubfrmInfoTbl; typedef struct rgSchTddDlAscSetIdxK RgSchTddDlAscSetIdxKTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl; +RgSchTddDlAscSetIdxKTbl rgSchTddDlAscSetIdxKTbl; /* ccpu00132282 */ -EXTERN RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl; +RgSchTddDlAscSetIdxKTbl rgSchTddDlHqPucchResCalTbl; typedef uint8_t RgSchTddPhichMValTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddPhichMValTbl rgSchTddPhichMValTbl; +RgSchTddPhichMValTbl rgSchTddPhichMValTbl; typedef uint8_t RgSchTddKPhichTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddKPhichTbl rgSchTddKPhichTbl; +RgSchTddKPhichTbl rgSchTddKPhichTbl; typedef RgSchTddPhichOffInfo RgSchTddPhichOffInfoTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; typedef uint8_t RgSchTddUlAscIdxKDashTbl[RGSCH_MAX_TDD_UL_DL_CFG-1][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl; +RgSchTddUlAscIdxKDashTbl rgSchTddUlAscIdxKDashTbl; #ifdef LTEMAC_SPS typedef uint8_t RgSchTddInvDlAscSetIdxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl; +RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl; #endif typedef uint8_t RgSchTddPuschTxKTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl; +RgSchTddPuschTxKTbl rgSchTddPuschTxKTbl; typedef uint8_t RgSchTddUlNumHarqProcTbl[RGSCH_MAX_TDD_UL_DL_CFG]; -EXTERN RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl; +RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl; typedef uint8_t RgSchTddDlNumHarqProcTbl[RGSCH_MAX_TDD_UL_DL_CFG]; -EXTERN RgSchTddDlNumHarqProcTbl rgSchTddDlNumHarqProcTbl; +RgSchTddDlNumHarqProcTbl rgSchTddDlNumHarqProcTbl; /* Number of ACK/NACK Feedback to be stored based on UL-DL Configuration Index */ typedef uint8_t RgSchTddANFdbkMapTbl[RGSCH_MAX_TDD_UL_DL_CFG]; -EXTERN RgSchTddANFdbkMapTbl rgSchTddANFdbkMapTbl; +RgSchTddANFdbkMapTbl rgSchTddANFdbkMapTbl; /* Number of UL subframes */ typedef RgSchTddSubfrmInfo RgSchTddMaxUlSubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG]; -EXTERN RgSchTddMaxUlSubfrmTbl rgSchTddMaxUlSubfrmTbl; +RgSchTddMaxUlSubfrmTbl rgSchTddMaxUlSubfrmTbl; /* Number of UL subframes */ typedef uint8_t RgSchTddNumUlSubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl; +RgSchTddNumUlSubfrmTbl rgSchTddNumUlSubfrmTbl; /* Number of low UL subframes Indices*/ typedef uint8_t RgSchTddLowUlSubfrmIdxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddLowUlSubfrmIdxTbl rgSchTddLowUlSubfrmIdxTbl; +RgSchTddLowUlSubfrmIdxTbl rgSchTddLowUlSubfrmIdxTbl; /* Number of high UL subframes Indices*/ typedef uint8_t RgSchTddHighUlSubfrmIdxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddHighUlSubfrmIdxTbl rgSchTddHighUlSubfrmIdxTbl; +RgSchTddHighUlSubfrmIdxTbl rgSchTddHighUlSubfrmIdxTbl; /* Number of low DL subframes Indices*/ typedef uint8_t RgSchTddLowDlSubfrmIdxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl; +RgSchTddLowDlSubfrmIdxTbl rgSchTddLowDlSubfrmIdxTbl; /* Number of high DL subframes Indices*/ typedef uint8_t RgSchTddHighDlSubfrmIdxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl; +RgSchTddHighDlSubfrmIdxTbl rgSchTddHighDlSubfrmIdxTbl; /* Number of DL subframes and Special subframes with DwPTS */ typedef uint8_t RgSchTddNumDlSubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl; +RgSchTddNumDlSubfrmTbl rgSchTddNumDlSubfrmTbl; /* Number of DL subframes and Special subframes with DwPTS */ typedef RgSchTddSubfrmInfo RgSchTddMaxDlSubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG]; -EXTERN RgSchTddMaxDlSubfrmTbl rgSchTddMaxDlSubfrmTbl; +RgSchTddMaxDlSubfrmTbl rgSchTddMaxDlSubfrmTbl; typedef uint8_t RgSchTddMsg3SubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl; +RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl; #ifdef LTEMAC_SPS typedef RgSchTddMsg3SubfrmTbl RgSchTddSpsUlRsrvTbl; -EXTERN RgSchTddMsg3SubfrmTbl rgSchTddSpsUlRsrvTbl; +RgSchTddMsg3SubfrmTbl rgSchTddSpsUlRsrvTbl; #endif typedef uint8_t RgSchTddRlsDlSubfrmTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddRlsDlSubfrmTbl rgSchTddRlsDlSubfrmTbl; +RgSchTddRlsDlSubfrmTbl rgSchTddRlsDlSubfrmTbl; -EXTERN uint8_t rgSchTddPucchTxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; +uint8_t rgSchTddPucchTxTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; #endif #ifdef LTE_ADV -EXTERN RgSchCellCb* rgSchUtlGetCellCb ARGS(( +RgSchCellCb* rgSchUtlGetCellCb ARGS(( Inst inst, uint16_t cellId )); -EXTERN Void rgSCHSCellDlUeReset ARGS(( +Void rgSCHSCellDlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSCellDlLcCfg ARGS(( +Void rgSCHSCellDlLcCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -EXTERN Void rgSCHSCellDlLcDel ARGS(( +Void rgSCHSCellDlLcDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -EXTERN Void rgSCHSCellDlDedBoUpd ARGS(( +Void rgSCHSCellDlDedBoUpd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -EXTERN Void rgSCHSCellSchdActDeactCe ARGS(( +Void rgSCHSCellSchdActDeactCe ARGS(( RgSchUeCb *ueCb, RgSchDlHqTbCb *tbInfo )); -EXTERN Void rgSCHSCellAddToActDeactLst ARGS(( +Void rgSCHSCellAddToActDeactLst ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSCellRmvFrmActLst ARGS(( +Void rgSCHSCellRmvFrmActLst ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHSCellIsActive ARGS(( +S16 rgSCHSCellIsActive ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSCellHndlFdbkInd ARGS(( +Void rgSCHSCellHndlFdbkInd ARGS(( RgSchDlHqProcCb *hqP, uint8_t tbIdx, uint8_t fdbk, Bool maxHqRetxReached )); -EXTERN Void rgSCHSCellDeactTmrExpry ARGS(( +Void rgSCHSCellDeactTmrExpry ARGS(( RgSchUeCellInfo *sCell )); -EXTERN S16 rgSCHSCellTrigActDeact ARGS(( +S16 rgSCHSCellTrigActDeact ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t sCellIdx, uint8_t action )); -EXTERN S16 rgSCHSCellDelUe ARGS(( +S16 rgSCHSCellDelUe ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb )); -EXTERN Bool rgSCHIsActvReqd ARGS (( +Bool rgSCHIsActvReqd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSCellSelectAndActDeAct ARGS (( +Void rgSCHSCellSelectAndActDeAct ARGS (( RgSchCellCb *PCell, RgSchUeCb *ueCb, uint8_t action )); -EXTERN S16 rgSCHSCellPCqiCfg ARGS(( +S16 rgSCHSCellPCqiCfg ARGS(( RgSchCellCb *priCellCb, RgSchCellCb *secCellCb, RgSchUeCb *ueCb, @@ -4237,62 +4237,62 @@ CmLteUeCategory ueCat, uint8_t sCellIdx )); -EXTERN Void rgSCHUtlSndUeSCellDel2Mac ARGS (( +Void rgSCHUtlSndUeSCellDel2Mac ARGS (( RgSchCellCb *cell, CmLteRnti rnti )); -EXTERN uint8_t rgSCHUtlGetMaxTbSupp ARGS (( +uint8_t rgSCHUtlGetMaxTbSupp ARGS (( RgrTxMode txMode )); #endif/*LTE_ADV*/ /* APIs exposed by TMR module */ -EXTERN Void rgSCHTmrStartTmr ARGS(( +Void rgSCHTmrStartTmr ARGS(( RgSchCellCb *cellCb, Ptr cb, S16 tmrEvnt, uint32_t tmrVal)); -EXTERN Void rgSCHTmrStopTmr ARGS(( +Void rgSCHTmrStopTmr ARGS(( RgSchCellCb *cellCb, S16 tmrEvnt, Ptr cb)); -EXTERN Void rgSCHTmrProcTmr ARGS(( +Void rgSCHTmrProcTmr ARGS(( Ptr cb, S16 tmrEvnt)); /* APIs exposed by TOM */ -EXTERN S16 rgSCHTomRaReqInd ARGS(( +S16 rgSCHTomRaReqInd ARGS(( RgSchCellCb *cell, TfuRaReqIndInfo *raReqInd)); -EXTERN S16 rgSCHTomPucchDeltaPwrInd ARGS(( +S16 rgSCHTomPucchDeltaPwrInd ARGS(( RgSchCellCb *cell, TfuPucchDeltaPwrIndInfo *pucchDeltaPwr)); -EXTERN S16 rgSCHTomUlCqiInd ARGS(( +S16 rgSCHTomUlCqiInd ARGS(( RgSchCellCb *cell, TfuUlCqiIndInfo *ulCqiInd)); -EXTERN S16 rgSCHTomSrInd ARGS(( +S16 rgSCHTomSrInd ARGS(( RgSchCellCb *cell, TfuSrIndInfo *srInd)); -EXTERN S16 rgSCHTomDlCqiInd ARGS(( +S16 rgSCHTomDlCqiInd ARGS(( RgSchCellCb *cell, TfuDlCqiIndInfo *dlCqiInd)); /* Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN S16 rgSCHTomRawCqiInd ARGS +S16 rgSCHTomRawCqiInd ARGS (( RgSchCellCb *cell, TfuRawCqiIndInfo* rawCqiInd )); -EXTERN S16 rgSCHTomSrsInd ARGS +S16 rgSCHTomSrsInd ARGS (( RgSchCellCb *cell, TfuSrsIndInfo* srsInd @@ -4300,18 +4300,18 @@ TfuSrsIndInfo* srsInd #endif -EXTERN S16 rgSCHTomDoaInd ARGS(( +S16 rgSCHTomDoaInd ARGS(( RgSchCellCb *cell, TfuDoaIndInfo *doaInd)); -EXTERN S16 rgSCHTomCrcInd ARGS(( +S16 rgSCHTomCrcInd ARGS(( RgSchCellCb *cell, TfuCrcIndInfo *crcInd)); -EXTERN S16 rgSCHTomHarqAckInd ARGS(( +S16 rgSCHTomHarqAckInd ARGS(( RgSchCellCb *cell, TfuHqIndInfo *harqAckInd)); -EXTERN S16 rgSCHTomTimingAdvInd ARGS(( +S16 rgSCHTomTimingAdvInd ARGS(( RgSchCellCb *cell, TfuTimingAdvIndInfo *timingAdvInd)); @@ -4319,125 +4319,125 @@ EXTERN S16 rgSCHTomTimingAdvInd ARGS(( /* * APIs exposed by LMM */ -EXTERN S16 rgSCHLmmStartTmr ARGS ((Inst instId, S16 tmrEvnt, +S16 rgSCHLmmStartTmr ARGS ((Inst instId, S16 tmrEvnt, uint32_t tmrVal, PTR cb)); -EXTERN S16 rgSCHLmmStopTmr ARGS((Inst instId, S16 tmrEvnt, PTR cb)); -EXTERN S16 rgSCHLmmTmrExpiry ARGS((PTR cb, S16 tmrEvnt)); +S16 rgSCHLmmStopTmr ARGS((Inst instId, S16 tmrEvnt, PTR cb)); +S16 rgSCHLmmTmrExpiry ARGS((PTR cb, S16 tmrEvnt)); /* This function invokes a Control Confirmation to the LM from scheduler. */ -EXTERN S16 rgSCHLmmBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 schActvTmr ARGS((Ent entity, Inst inst)); +S16 rgSCHLmmBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); +S16 schActvTmr ARGS((Ent entity, Inst inst)); /* To send a Unsolicited Status Indication to Layer Manager */ -EXTERN S16 rgSCHLmmStaInd ARGS((Inst instId, uint16_t category, uint16_t event, +S16 rgSCHLmmStaInd ARGS((Inst instId, uint16_t category, uint16_t event, uint16_t cause, RgUstaDgn *dgn)); -EXTERN S16 schActvTsk ARGS((Pst *pst, Buffer *mBuf)); -EXTERN Void SchFillCfmPst ARGS((Pst *reqPst,Pst *cfmPst,RgMngmt *cfm)); -EXTERN uint16_t SchInstCfg ARGS((RgCfg *cfg, Inst inst)); -EXTERN Void printSchCellInfo ARGS((Void)); -EXTERN Void rgSCHLmmGenCntrl ARGS((RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst)); -EXTERN Void rgSCHLmmSapCntrl ARGS((RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst)); +S16 schActvTsk ARGS((Pst *pst, Buffer *mBuf)); +Void SchFillCfmPst ARGS((Pst *reqPst,Pst *cfmPst,RgMngmt *cfm)); +uint16_t SchInstCfg ARGS((RgCfg *cfg, Inst inst)); +Void printSchCellInfo ARGS((Void)); +Void rgSCHLmmGenCntrl ARGS((RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst)); +Void rgSCHLmmSapCntrl ARGS((RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst)); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHCfgEmtcCellCfg ARGS ((RgSchCellCb *cell, +S16 rgSCHCfgEmtcCellCfg ARGS ((RgSchCellCb *cell, RgrEmtcCellCfg *emtcCellCfg)); -EXTERN S16 rgSCHCfgVldtRgrEmtcCellCfg ARGS ((RgrCellCfg *cellCfg)); +S16 rgSCHCfgVldtRgrEmtcCellCfg ARGS ((RgrCellCfg *cellCfg)); -EXTERN Void rgSchTomTtiEmtcSched ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHCfgVldtEmtcUeCfg ARGS((RgSchCellCb *cell, RgrUeEmtcCfg *emtcUeCfg)); -EXTERN S16 rgSCHUtlUpdUeEmtcInfo ARGS((RgSchCellCb *cell, RgrUeCfg *ueCfg, RgSchUeCb *ueCb)); -EXTERN S16 rgSCHEmtcCellDel ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHEmtcUeDel ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN S16 rgSCHEmtcHdFddUeCfg ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb,Bool hdFddEnbl)); +Void rgSchTomTtiEmtcSched ARGS((RgSchCellCb *cell)); +S16 rgSCHCfgVldtEmtcUeCfg ARGS((RgSchCellCb *cell, RgrUeEmtcCfg *emtcUeCfg)); +S16 rgSCHUtlUpdUeEmtcInfo ARGS((RgSchCellCb *cell, RgrUeCfg *ueCfg, RgSchUeCb *ueCb)); +S16 rgSCHEmtcCellDel ARGS((RgSchCellCb *cell)); +S16 rgSCHEmtcUeDel ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +S16 rgSCHEmtcHdFddUeCfg ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb,Bool hdFddEnbl)); #endif /* * APIs exposed by CFG module */ -EXTERN S16 rgSCHCfgVldtRgrCellCfg ARGS((Inst inst, RgrCellCfg *cellCfg, +S16 rgSCHCfgVldtRgrCellCfg ARGS((Inst inst, RgrCellCfg *cellCfg, RgSchCellCb *cell, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrCellCfg ARGS((RgSchCb *instCb, SpId spId, +S16 rgSCHCfgRgrCellCfg ARGS((RgSchCb *instCb, SpId spId, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrSchedEnbCfg ARGS((Inst inst, SpId spId, +S16 rgSCHCfgRgrSchedEnbCfg ARGS((Inst inst, SpId spId, RgrSchedEnbCfg *schedEnbCfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrCellRecfg ARGS((Inst inst, RgrCellRecfg *cellRecfg, +S16 rgSCHCfgVldtRgrCellRecfg ARGS((Inst inst, RgrCellRecfg *cellRecfg, RgSchCellCb **cell, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrCellRecfg ARGS((RgSchCellCb *cell, RgrCellRecfg *cellRecfg, +S16 rgSCHCfgRgrCellRecfg ARGS((RgSchCellCb *cell, RgrCellRecfg *cellRecfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrUeCfg ARGS((Inst inst, RgrUeCfg *ueCfg, +S16 rgSCHCfgVldtRgrUeCfg ARGS((Inst inst, RgrUeCfg *ueCfg, RgSchCellCb **cell, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrUeCfg ARGS((RgSchCellCb *cell, RgrUeCfg *ueCfg, +S16 rgSCHCfgRgrUeCfg ARGS((RgSchCellCb *cell, RgrUeCfg *ueCfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrUeRecfg ARGS((Inst inst, RgrUeRecfg *ueRecfg, +S16 rgSCHCfgVldtRgrUeRecfg ARGS((Inst inst, RgrUeRecfg *ueRecfg, RgSchCellCb **cell, RgSchUeCb **ue, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrUeRecfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg +S16 rgSCHCfgRgrUeRecfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrLcCfg ARGS((Inst inst, RgrLchCfg *lcCfg, +S16 rgSCHCfgVldtRgrLcCfg ARGS((Inst inst, RgrLchCfg *lcCfg, RgSchCellCb **cell, RgSchUeCb **ue, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrLchCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHCfgRgrLchCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrLchCfg *lcCfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrLchRecfg ARGS((Inst inst, RgrLchRecfg *lcRecfg, +S16 rgSCHCfgVldtRgrLchRecfg ARGS((Inst inst, RgrLchRecfg *lcRecfg, RgSchCellCb **cell, RgSchUeCb **ue, RgSchDlLcCb **dlLc, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrLchRecfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHCfgRgrLchRecfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchRecfg *lcRecfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrLcgRecfg ARGS ((Inst inst,RgrLcgRecfg *lcgRecfg, +S16 rgSCHCfgVldtRgrLcgRecfg ARGS ((Inst inst,RgrLcgRecfg *lcgRecfg, RgSchCellCb *cell,RgSchUeCb **ue,RgSchErrInfo *errInfo )); -EXTERN S16 rgSCHCfgVldtRgrLcgCfg ARGS ((Inst inst,RgrLcgCfg *lcgCfg, +S16 rgSCHCfgVldtRgrLcgCfg ARGS ((Inst inst,RgrLcgCfg *lcgCfg, RgSchCellCb **cell,RgSchUeCb **ue,RgSchErrInfo *errInfo )); -EXTERN S16 rgSCHCfgVldtRgrSchedEnbCfg ARGS ((Inst inst, +S16 rgSCHCfgVldtRgrSchedEnbCfg ARGS ((Inst inst, RgrSchedEnbCfg *schedEnbCfg, RgSchErrInfo *errInfo )); -EXTERN S16 rgSCHCfgRgrLcgCfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, +S16 rgSCHCfgRgrLcgCfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, RgrLcgCfg *lcgCfg,RgSchErrInfo *errInfo )); -EXTERN S16 rgSCHCfgRgrLcgRecfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, +S16 rgSCHCfgRgrLcgRecfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, RgrLcgRecfg *lcgRecfg,RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgVldtRgrUeReset ARGS((Inst inst, RgrRst *reset, RgSchCellCb *cell, +S16 rgSCHCfgVldtRgrUeReset ARGS((Inst inst, RgrRst *reset, RgSchCellCb *cell, RgSchUeCb **ue,RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrUeReset ARGS((RgSchCellCb *cell,RgSchUeCb *ue,RgrRst *reset, +S16 rgSCHCfgRgrUeReset ARGS((RgSchCellCb *cell,RgSchUeCb *ue,RgrRst *reset, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrCellDel ARGS((RgSchCellCb *cell, RgrDel *cellDelInfo, +S16 rgSCHCfgRgrCellDel ARGS((RgSchCellCb *cell, RgrDel *cellDelInfo, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrUeDel ARGS((RgSchCellCb *cell, RgrDel *ueDelInfo, +S16 rgSCHCfgRgrUeDel ARGS((RgSchCellCb *cell, RgrDel *ueDelInfo, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrLcDel ARGS((RgSchCellCb *cell, RgrDel *lcDelInfo, +S16 rgSCHCfgRgrLcDel ARGS((RgSchCellCb *cell, RgrDel *lcDelInfo, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHCfgRgrLcgDel ARGS ((RgSchCellCb *cell,RgrDel *lcDelInfo, +S16 rgSCHCfgRgrLcgDel ARGS ((RgSchCellCb *cell,RgrDel *lcDelInfo, RgSchErrInfo *errInfo)); -EXTERN Void rgSCHCfgFreeCellCb ARGS((RgSchCellCb *cell)); +Void rgSCHCfgFreeCellCb ARGS((RgSchCellCb *cell)); /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH -EXTERN S16 rgSCHCfgVldtRgrSiCfg ARGS(( Inst inst, RgrSiCfgReqInfo *siCfg, +S16 rgSCHCfgVldtRgrSiCfg ARGS(( Inst inst, RgrSiCfgReqInfo *siCfg, RgSchCellCb *cell, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHGomHndlSiCfg ARGS(( Region reg, Pool pool, +S16 rgSCHGomHndlSiCfg ARGS(( Region reg, Pool pool, RgSchCb *instCb, SpId spId, RgrCfgTransId transId, RgrSiCfgReqInfo *cfgReqInfo)); -EXTERN S16 rgSCHUtlRgrSiCfgCfm ARGS ((Inst inst, SpId spId, +S16 rgSCHUtlRgrSiCfgCfm ARGS ((Inst inst, SpId spId, RgrCfgTransId transId,uint8_t status)); -EXTERN S16 rgSCHGomHndlWarningSiCfg ARGS(( Region reg, Pool pool, +S16 rgSCHGomHndlWarningSiCfg ARGS(( Region reg, Pool pool, RgSchCb *instCb, SpId spId, RgrCfgTransId transId, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo)); -EXTERN Void rgSCHGomHndlWarningSiStopReq ARGS(( Region reg, Pool pool, +Void rgSCHGomHndlWarningSiStopReq ARGS(( Region reg, Pool pool, RgSchCb *instCb, uint8_t siId, RgrCfgTransId transId, SpId spId)); -EXTERN S16 rgSCHUtlRgrWarningSiCfgCfm ARGS ((Inst inst, SpId spId, uint8_t siId, +S16 rgSCHUtlRgrWarningSiCfgCfm ARGS ((Inst inst, SpId spId, uint8_t siId, RgrCfgTransId transId,uint8_t status)); #endif /* RGR_SI_SCH */ /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 rgSchDSFRRntpInfoInit ARGS ((TknStrOSXL *rntpPtr, RgSchCellCb *cell, +S16 rgSchDSFRRntpInfoInit ARGS ((TknStrOSXL *rntpPtr, RgSchCellCb *cell, uint16_t bw)); -EXTERN S16 rgSchDSFRRntpInfoFree ARGS ((TknStrOSXL *rntpPtr, RgSchCellCb *cell, +S16 rgSchDSFRRntpInfoFree ARGS ((TknStrOSXL *rntpPtr, RgSchCellCb *cell, uint16_t bw)); -EXTERN S16 rgSchUpdtRNTPInfo ARGS ((RgSchCellCb *cell, RgSchDlSf *sf, +S16 rgSchUpdtRNTPInfo ARGS ((RgSchCellCb *cell, RgSchDlSf *sf, RgrLoadInfReqInfo *loadInfReq)); -EXTERN S16 rgSCHCfgVldtRgrLoadInf ARGS(( Inst inst, RgrLoadInfReqInfo *loadInfReq, +S16 rgSCHCfgVldtRgrLoadInf ARGS(( Inst inst, RgrLoadInfReqInfo *loadInfReq, RgSchCellCb *cell, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHGomHndlLoadInf ARGS(( Region reg, Pool pool, +S16 rgSCHGomHndlLoadInf ARGS(( Region reg, Pool pool, RgSchCb *instCb, SpId spId, RgrCfgTransId transId, RgrLoadInfReqInfo *cfgReqInfo)); /* LTE_ADV_FLAG_REMOVED_END */ @@ -4445,169 +4445,169 @@ EXTERN S16 rgSCHGomHndlLoadInf ARGS(( Region reg, Pool pool, /* * APIs exposed by GOM module */ -EXTERN S16 rgSCHGomHndlCfg ARGS((Pst *pst, RgSchCb *instCb, +S16 rgSCHGomHndlCfg ARGS((Pst *pst, RgSchCb *instCb, RgrCfgTransId transId, RgrCfgReqInfo *cfgReqInfo)); -EXTERN S16 rgSCHGomTtiHndlr ARGS((RgSchCellCb *cell, SpId spId)); +S16 rgSCHGomTtiHndlr ARGS((RgSchCellCb *cell, SpId spId)); /* * APIs exposed by RAM module */ -EXTERN S16 rgSCHRamVldtUeCfg ARGS(( +S16 rgSCHRamVldtUeCfg ARGS(( RgSchCellCb *cell, RgrUeCfg *ueCfg )); -EXTERN S16 rgSCHRamProcRaReq ARGS((uint8_t raReqCnt, RgSchCellCb *cell, CmLteRnti raRnti, +S16 rgSCHRamProcRaReq ARGS((uint8_t raReqCnt, RgSchCellCb *cell, CmLteRnti raRnti, TfuRachInfo *raReqInd, CmLteTimingInfo timingInfo, RgSchUeCb *ue, RgSchErrInfo *err)); -EXTERN S16 rgSCHRamCreateRaCb ARGS((RgSchCellCb *cell, RgSchRaCb **raCb, +S16 rgSCHRamCreateRaCb ARGS((RgSchCellCb *cell, RgSchRaCb **raCb, RgSchErrInfo *err)); -EXTERN S16 rgSCHRamRgrUeCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHRamRgrUeCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb, RgSchErrInfo *err)); -EXTERN S16 rgSCHRamProcMsg3 ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHRamProcMsg3 ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb, RgInfUeDatInd *pdu, RgSchErrInfo *err)); -EXTERN S16 rgSCHRamUpdtBo ARGS((RgSchCellCb *cell, RgSchRaCb *raCb, +S16 rgSCHRamUpdtBo ARGS((RgSchCellCb *cell, RgSchRaCb *raCb, RgInfCmnBoRpt *staRsp)); -EXTERN S16 rgSCHRamMsg3DatInd ARGS((RgSchRaCb *raCb)); -EXTERN S16 rgSCHRamMsg3FailureInd ARGS((RgSchRaCb *raCb)); -EXTERN S16 rgSCHRamMsg4FdbkInd ARGS((RgSchRaCb *raCb)); -EXTERN S16 rgSCHRamMsg4Done ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); -EXTERN S16 rgSCHRamDelRaCb ARGS((RgSchCellCb *cell, RgSchRaCb *raCb, +S16 rgSCHRamMsg3DatInd ARGS((RgSchRaCb *raCb)); +S16 rgSCHRamMsg3FailureInd ARGS((RgSchRaCb *raCb)); +S16 rgSCHRamMsg4FdbkInd ARGS((RgSchRaCb *raCb)); +S16 rgSCHRamMsg4Done ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +S16 rgSCHRamDelRaCb ARGS((RgSchCellCb *cell, RgSchRaCb *raCb, Bool rlsRnti)); -EXTERN S16 rgSCHRamFreeCell ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHRamTtiHndlr ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHCmnUlSch ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHCmnDlCommonChSch ARGS ((RgSchCellCb *cell)); +S16 rgSCHRamFreeCell ARGS((RgSchCellCb *cell)); +S16 rgSCHRamTtiHndlr ARGS((RgSchCellCb *cell)); +Void rgSCHCmnUlSch ARGS((RgSchCellCb *cell)); +Void rgSCHCmnDlCommonChSch ARGS ((RgSchCellCb *cell)); #ifdef RGR_V1 /* Added periodic BSR timer */ -EXTERN S16 rgSCHCmnBsrTmrExpry ARGS(( RgSchUeCb *ueCb)); +S16 rgSCHCmnBsrTmrExpry ARGS(( RgSchUeCb *ueCb)); #endif #ifdef LTE_TDD -EXTERN S16 rgSCHRamDelRaReq ARGS((RgSchCellCb *cell, +S16 rgSCHRamDelRaReq ARGS((RgSchCellCb *cell, CmLteTimingInfo timingInfo, uint8_t raIdx)); #endif -EXTERN S16 rgSCHRamAddToRaInfoSchdLst(RgSchCellCb *cell, RgSchRaCb *raCb); +S16 rgSCHRamAddToRaInfoSchdLst(RgSchCellCb *cell, RgSchRaCb *raCb); -EXTERN S16 rgSCHRamRmvFrmRaInfoSchdLst(RgSchCellCb *cell, RgSchRaCb *raCb); +S16 rgSCHRamRmvFrmRaInfoSchdLst(RgSchCellCb *cell, RgSchRaCb *raCb); /* APIs exposed by UHM */ /* Added for Uplink Adaptive retransmission */ -EXTERN Void rgSCHUhmNonadapRetx ARGS((RgSchUlHqProcCb *hqProc)); -EXTERN S16 rgSCHUhmHqEntInit ARGS ((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); +Void rgSCHUhmNonadapRetx ARGS((RgSchUlHqProcCb *hqProc)); +S16 rgSCHUhmHqEntInit ARGS ((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); #ifndef MAC_SCH_STATS -EXTERN Void rgSCHUhmProcDatInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUhmProcDatInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo frm)); #else /* MAC_SCH_STATS */ -EXTERN Void rgSCHUhmProcDatInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUhmProcDatInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo frm, uint8_t cqi)); #endif -EXTERN Void rgSCHUhmProcMsg3DatInd ARGS((RgSchUlHqProcCb *hqProc)); -EXTERN Void rgSCHUhmProcMsg3Failure ARGS((RgSchUlHqProcCb *hqProc)); +Void rgSCHUhmProcMsg3DatInd ARGS((RgSchUlHqProcCb *hqProc)); +Void rgSCHUhmProcMsg3Failure ARGS((RgSchUlHqProcCb *hqProc)); #ifndef MAC_SCH_STATS -EXTERN Void rgSCHUhmProcHqFailure ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUhmProcHqFailure ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo frm, TknUInt8 rv)); #else /* MAC_SCH_STATS */ -EXTERN Void rgSCHUhmProcHqFailure ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUhmProcHqFailure ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo frm, TknUInt8 rv, uint8_t cqi)); #endif -EXTERN RgSchUlHqProcCb* rgSCHUhmGetUlHqProc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +RgSchUlHqProcCb* rgSCHUhmGetUlHqProc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t idx)); -EXTERN Void rgSCHUhmNewTx ARGS((RgSchUlHqProcCb *hqProc, uint8_t maxHqRetx, +Void rgSCHUhmNewTx ARGS((RgSchUlHqProcCb *hqProc, uint8_t maxHqRetx, RgSchUlAlloc *alloc)); -EXTERN Void rgSCHUhmFreeProc ARGS((RgSchUlHqProcCb *hqProc, +Void rgSCHUhmFreeProc ARGS((RgSchUlHqProcCb *hqProc, RgSchCellCb *cell)); -EXTERN Void rgSCHUhmRetx ARGS((RgSchUlHqProcCb *hqProc, RgSchUlAlloc *alloc)); -EXTERN Void rgSCHUhmRgrUeCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, +Void rgSCHUhmRetx ARGS((RgSchUlHqProcCb *hqProc, RgSchUlAlloc *alloc)); +Void rgSCHUhmRgrUeCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeCfg *ueCfg)); -EXTERN Void rgSCHUhmRgrUeRecfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, +Void rgSCHUhmRgrUeRecfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeRecfg *ueRecfg)); -EXTERN Void rgSCHUhmFreeUe ARGS(( RgSchCellCb *cellCb, RgUeUlHqCb *hqEnt)); -EXTERN S16 rgSCHUhmAppendPhich ARGS(( RgSchCellCb *cellCb, +Void rgSCHUhmFreeUe ARGS(( RgSchCellCb *cellCb, RgUeUlHqCb *hqEnt)); +S16 rgSCHUhmAppendPhich ARGS(( RgSchCellCb *cellCb, CmLteTimingInfo frm, uint8_t idx)); /* APIs exposed by DBM */ -EXTERN S16 rgSCHDbmInitCell ARGS((RgSchCellCb *cellCb)); -EXTERN S16 rgSCHDbmDeInitUeCbLst ARGS(( RgSchCellCb *cellCb)); +S16 rgSCHDbmInitCell ARGS((RgSchCellCb *cellCb)); +S16 rgSCHDbmDeInitUeCbLst ARGS(( RgSchCellCb *cellCb)); #ifdef LTE_TDD -EXTERN S16 rgSCHDbmDeInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb)); +S16 rgSCHDbmDeInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb)); #endif -EXTERN S16 rgSCHDbmInsUeCb ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -EXTERN RgSchUeCb* rgSCHDbmGetUeCb ARGS(( RgSchCellCb *cellCb, CmLteRnti ueId)); -EXTERN RgSchUeCb* rgSCHDbmGetNextUeCb ( RgSchCellCb *cellCb, RgSchUeCb *ueCb); -EXTERN S16 rgSCHDbmDelUeCb ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); +S16 rgSCHDbmInsUeCb ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); +RgSchUeCb* rgSCHDbmGetUeCb ARGS(( RgSchCellCb *cellCb, CmLteRnti ueId)); +RgSchUeCb* rgSCHDbmGetNextUeCb ( RgSchCellCb *cellCb, RgSchUeCb *ueCb); +S16 rgSCHDbmDelUeCb ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); #ifdef LTE_L2_MEAS -EXTERN S16 rgSCHDbmDelL2MUe ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -#endif -EXTERN S16 rgSCHDbmInitUe ARGS((RgSchUeCb *ueCb)); -EXTERN Void rgSCHDbmInsDlDedLcCb ARGS((RgSchUeCb *ueCb, RgSchDlLcCb *dlLcCb)); -EXTERN Void rgSCHDbmDelDlDedLcCb ARGS((RgSchUeCb *ueCb, RgSchDlLcCb *dlLcCb)); -EXTERN RgSchDlLcCb* rgSCHDbmGetDlDedLcCb ARGS(( RgSchUeCb *ueCb, CmLteLcId idx)); -EXTERN RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb ARGS((RgSchUeCb *ueCbb)); -EXTERN RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb ARGS((RgSchUeCb *ueCb, RgSchDlLcCb *lcCb)); -EXTERN RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb ARGS(( RgSchCellCb *cellCb, CmLteLcId lcId)); -EXTERN RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch ARGS(( RgSchCellCb *cellCb )); -EXTERN RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch ARGS(( RgSchCellCb *cellCb)); -EXTERN RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch ARGS(( RgSchCellCb *cellCb)); -EXTERN RgSchClcDlLcCb* rgSCHDbmGetPcch ARGS(( RgSchCellCb *cellCb)); -EXTERN Void rgSCHDbmInsBcchOnBch ARGS(( RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)); -EXTERN Void rgSCHDbmInsBcchOnDlsch ARGS(( RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)); -EXTERN Void rgSCHDbmInsPcch ARGS(( RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)); - -EXTERN Void rgSCHDbmInitCmnLcBoLst ARGS(( RgSchClcDlLcCb *cmnDlLcCb)); -EXTERN Void rgSCHDbmInsCmnLcBoRpt ARGS(( RgSchClcDlLcCb *cmnDlLcCb, +S16 rgSCHDbmDelL2MUe ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); +#endif +S16 rgSCHDbmInitUe ARGS((RgSchUeCb *ueCb)); +Void rgSCHDbmInsDlDedLcCb ARGS((RgSchUeCb *ueCb, RgSchDlLcCb *dlLcCb)); +Void rgSCHDbmDelDlDedLcCb ARGS((RgSchUeCb *ueCb, RgSchDlLcCb *dlLcCb)); +RgSchDlLcCb* rgSCHDbmGetDlDedLcCb ARGS(( RgSchUeCb *ueCb, CmLteLcId idx)); +RgSchDlLcCb* rgSCHDbmGetFirstDlDedLcCb ARGS((RgSchUeCb *ueCbb)); +RgSchDlLcCb* rgSCHDbmGetNextDlDedLcCb ARGS((RgSchUeCb *ueCb, RgSchDlLcCb *lcCb)); +RgSchClcDlLcCb* rgSCHDbmGetCmnLcCb ARGS(( RgSchCellCb *cellCb, CmLteLcId lcId)); +RgSchClcDlLcCb* rgSCHDbmGetBcchOnBch ARGS(( RgSchCellCb *cellCb )); +RgSchClcDlLcCb* rgSCHDbmGetFirstBcchOnDlsch ARGS(( RgSchCellCb *cellCb)); +RgSchClcDlLcCb* rgSCHDbmGetSecondBcchOnDlsch ARGS(( RgSchCellCb *cellCb)); +RgSchClcDlLcCb* rgSCHDbmGetPcch ARGS(( RgSchCellCb *cellCb)); +Void rgSCHDbmInsBcchOnBch ARGS(( RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)); +Void rgSCHDbmInsBcchOnDlsch ARGS(( RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)); +Void rgSCHDbmInsPcch ARGS(( RgSchCellCb *cellCb, RgSchClcDlLcCb *cmnDlLcCb)); + +Void rgSCHDbmInitCmnLcBoLst ARGS(( RgSchClcDlLcCb *cmnDlLcCb)); +Void rgSCHDbmInsCmnLcBoRpt ARGS(( RgSchClcDlLcCb *cmnDlLcCb, RgSchClcBoRpt *cmnBoRpt)); -EXTERN RgSchRaCb* rgSCHDbmGetRaCb ARGS(( RgSchCellCb *cellCb, CmLteRnti key)); -EXTERN Void rgSCHDbmInsCrntRgrCfgElem ARGS(( RgSchCellCb *cellCb, +RgSchRaCb* rgSCHDbmGetRaCb ARGS(( RgSchCellCb *cellCb, CmLteRnti key)); +Void rgSCHDbmInsCrntRgrCfgElem ARGS(( RgSchCellCb *cellCb, RgSchCfgElem *cfgElem)); -EXTERN Void rgSCHDbmInsPndngRgrCfgElem ARGS(( RgSchCellCb *cellCb, +Void rgSCHDbmInsPndngRgrCfgElem ARGS(( RgSchCellCb *cellCb, RgSchCfgElem *cfgElem)); -EXTERN RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem ARGS(( RgSchCellCb *cellCb, +RgSchCfgElem* rgSCHDbmGetNextCrntRgrCfgElem ARGS(( RgSchCellCb *cellCb, RgSchCfgElem *cfgElem)); -EXTERN RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem ARGS(( RgSchCellCb *cellCb, +RgSchCfgElem* rgSCHDbmGetNextPndngRgrCfgElem ARGS(( RgSchCellCb *cellCb, RgSchCfgElem *cfgElem)); -EXTERN RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey ARGS(( RgSchCellCb *cellCb, +RgSchCfgElem* rgSCHDbmGetPndngRgrCfgElemByKey ARGS(( RgSchCellCb *cellCb, CmLteTimingInfo key)); -EXTERN RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem ARGS(( RgSchCellCb *cellCb, +RgSchCfgElem* rgSCHDbmDelCrntRgrCfgElem ARGS(( RgSchCellCb *cellCb, RgSchCfgElem *cfgElem)); -EXTERN RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem ARGS(( RgSchCellCb *cellCb, +RgSchCfgElem* rgSCHDbmDelPndngRgrCfgElem ARGS(( RgSchCellCb *cellCb, RgSchCfgElem *cfgElem)); -EXTERN S16 rgSCHDbmRntiDbInit ARGS(( RgSchCellCb *cellCb, uint16_t rntiStart, uint16_t maxRntis)); -EXTERN Void rgSCHDbmRntiDbDeInit ARGS(( RgSchCellCb *cellCb)); -EXTERN RgSchRntiLnk* rgSCHDbmGetRnti ARGS(( RgSchCellCb *cellCb)); -EXTERN Void rgSCHDbmRlsRnti ARGS(( RgSchCellCb *cellCb, RgSchRntiLnk *rntiLnk)); +S16 rgSCHDbmRntiDbInit ARGS(( RgSchCellCb *cellCb, uint16_t rntiStart, uint16_t maxRntis)); +Void rgSCHDbmRntiDbDeInit ARGS(( RgSchCellCb *cellCb)); +RgSchRntiLnk* rgSCHDbmGetRnti ARGS(( RgSchCellCb *cellCb)); +Void rgSCHDbmRlsRnti ARGS(( RgSchCellCb *cellCb, RgSchRntiLnk *rntiLnk)); /* Fix : syed HO UE does not have a valid ue->rntiLnk */ -EXTERN Void rgSCHUtlIndRntiRls2Mac ARGS(( RgSchCellCb *cell, CmLteRnti rnti, +Void rgSCHUtlIndRntiRls2Mac ARGS(( RgSchCellCb *cell, CmLteRnti rnti, Bool ueIdChng, CmLteRnti newRnti)); /*rg008.201 - Added support for SPS*/ #ifdef LTEMAC_SPS -EXTERN S16 rgSCHDbmDeInitSpsUeCbLst ARGS((RgSchCellCb *cellCb)); -EXTERN S16 rgSCHDbmInsSpsUeCb ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -EXTERN RgSchUeCb* rgSCHDbmGetSpsUeCb ARGS((RgSchCellCb *cellCb, CmLteRnti ueId)); -EXTERN RgSchUeCb* rgSCHDbmGetNextSpsUeCb ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -EXTERN S16 rgSCHDbmDelSpsUeCb ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb)); +S16 rgSCHDbmDeInitSpsUeCbLst ARGS((RgSchCellCb *cellCb)); +S16 rgSCHDbmInsSpsUeCb ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); +RgSchUeCb* rgSCHDbmGetSpsUeCb ARGS((RgSchCellCb *cellCb, CmLteRnti ueId)); +RgSchUeCb* rgSCHDbmGetNextSpsUeCb ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); +S16 rgSCHDbmDelSpsUeCb ARGS((RgSchCellCb *cellCb,RgSchUeCb *ueCb)); #endif /* LTEMAC_SPS */ #ifdef LTE_L2_MEAS /* * L2M APIs */ -EXTERN S16 rgSchL2mMeasReq ARGS (( +S16 rgSchL2mMeasReq ARGS (( RgSchCellCb *cell, LrgSchMeasReqInfo *measInfo, RgSchErrInfo err)); -EXTERN S16 RgSchMacL2MeasSend ARGS +S16 RgSchMacL2MeasSend ARGS (( Pst* pst, RgInfL2MeasSndReq *measInfo )); -EXTERN S16 RgSchMacL2MeasStop ARGS +S16 RgSchMacL2MeasStop ARGS (( Pst* pst, RgInfL2MeasStopReq *measInfo @@ -4617,85 +4617,85 @@ RgInfL2MeasStopReq *measInfo * DHM APIs */ /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 rgSchSFRTotalPoolInit ARGS((RgSchCellCb *cell, RgSchDlSf *sf)); +S16 rgSchSFRTotalPoolInit ARGS((RgSchCellCb *cell, RgSchDlSf *sf)); /* LTE_ADV_FLAG_REMOVED_END */ -EXTERN Void rgSCHDhmHqPAdd2FreeLst ARGS (( RgSchDlHqProcCb *hqP)); -EXTERN Void rgSCHDhmHqPAdd2InUseLst ARGS (( RgSchDlHqProcCb *hqP)); -EXTERN Void rgSCHDhmHqPDelFrmFreeLst ARGS (( RgSchDlHqProcCb *hqP)); -EXTERN Void rgSCHDhmHqPDelFrmInUseLst ARGS (( RgSchDlHqProcCb *hqP)); +Void rgSCHDhmHqPAdd2FreeLst ARGS (( RgSchDlHqProcCb *hqP)); +Void rgSCHDhmHqPAdd2InUseLst ARGS (( RgSchDlHqProcCb *hqP)); +Void rgSCHDhmHqPDelFrmFreeLst ARGS (( RgSchDlHqProcCb *hqP)); +Void rgSCHDhmHqPDelFrmInUseLst ARGS (( RgSchDlHqProcCb *hqP)); -EXTERN RgSchDlHqEnt *rgSCHDhmHqEntInit ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHDhmGetAvlHqProc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo, +RgSchDlHqEnt *rgSCHDhmHqEntInit ARGS((RgSchCellCb *cell)); +S16 rgSCHDhmGetAvlHqProc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo, RgSchDlHqProcCb **hqP)); -EXTERN Void rgSCHDhmHqRetx ARGS((RgSchDlHqEnt *hqE, CmLteTimingInfo timeInfo, +Void rgSCHDhmHqRetx ARGS((RgSchDlHqEnt *hqE, CmLteTimingInfo timeInfo, RgSchDlHqProcCb *hqP)); -EXTERN RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc ARGS((RgSchDlHqEnt *hqE)); +RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc ARGS((RgSchDlHqEnt *hqE)); /* CR timer changes*/ -EXTERN S16 rgSCHDhmGetCcchSduHqProc ARGS((RgSchUeCb *ueCb, CmLteTimingInfo timeInfo, +S16 rgSCHDhmGetCcchSduHqProc ARGS((RgSchUeCb *ueCb, CmLteTimingInfo timeInfo, RgSchDlHqProcCb **hqP)); -EXTERN S16 rgSCHDhmGetMsg4HqProc ARGS((RgSchRaCb *raCb, CmLteTimingInfo timeInfo)); -EXTERN Void rgSCHDhmRlsHqProc ARGS((RgSchDlHqProcCb *hqP)); +S16 rgSCHDhmGetMsg4HqProc ARGS((RgSchRaCb *raCb, CmLteTimingInfo timeInfo)); +Void rgSCHDhmRlsHqProc ARGS((RgSchDlHqProcCb *hqP)); /* ccpu00118350 : Correcting NDI manipulation of Harq */ -EXTERN Void rgSCHDhmRlsHqpTb ARGS((RgSchDlHqProcCb *hqP, uint8_t tbIdx, Bool togNdi)); -EXTERN Void rgSCHUtlDlHqPTbAddToTx ARGS((RgSchDlSf *subFrm, +Void rgSCHDhmRlsHqpTb ARGS((RgSchDlHqProcCb *hqP, uint8_t tbIdx, Bool togNdi)); +Void rgSCHUtlDlHqPTbAddToTx ARGS((RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, uint8_t tbIdx )); -EXTERN Void rgSCHDhmHqTbRetx ARGS(( RgSchDlHqEnt *hqE, +Void rgSCHDhmHqTbRetx ARGS(( RgSchDlHqEnt *hqE, CmLteTimingInfo timingInfo, RgSchDlHqProcCb *hqP, uint8_t tbIdx)); -EXTERN Void rgSCHUtlDlHqPTbAddToTx ARGS((RgSchDlSf *subFrm, +Void rgSCHUtlDlHqPTbAddToTx ARGS((RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, uint8_t tbIdx )); -EXTERN Void rgSCHDhmHqTbRetx ARGS(( RgSchDlHqEnt *hqE, +Void rgSCHDhmHqTbRetx ARGS(( RgSchDlHqEnt *hqE, CmLteTimingInfo timingInfo, RgSchDlHqProcCb *hqP, uint8_t tbIdx)); #ifdef RG_UNUSED -EXTERN S16 rgSCHDhmGetHqProcFrmId ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t idx, +S16 rgSCHDhmGetHqProcFrmId ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t idx, RgSchDlHqProcCb **hqP)); #endif /* Changes for MIMO feature addition */ -EXTERN Void rgSCHDhmSchdTa ARGS((RgSchUeCb *ueCb, RgSchDlHqTbCb *tbInfo)); -EXTERN S16 rgSCHDhmHqFdbkInd ARGS((Void *cb, uint8_t cbType, RgSchCellCb *cellCb, +Void rgSCHDhmSchdTa ARGS((RgSchUeCb *ueCb, RgSchDlHqTbCb *tbInfo)); +S16 rgSCHDhmHqFdbkInd ARGS((Void *cb, uint8_t cbType, RgSchCellCb *cellCb, CmLteTimingInfo timingInfo, RgTfuHqInfo *fdbk, RgInfRlsHqInfo *rlsHqBufs,RgSchErrInfo *err)); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHDhmEmtcHqFdbkInd ARGS((Void *cb, uint8_t cbType, RgSchCellCb *cellCb, +S16 rgSCHDhmEmtcHqFdbkInd ARGS((Void *cb, uint8_t cbType, RgSchCellCb *cellCb, CmLteTimingInfo timingInfo, RgTfuHqInfo *fdbk, RgInfRlsHqInfo *rlsHqBufs,RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlAddToResLst +S16 rgSCHUtlAddToResLst ( CmLListCp *cp, RgSchIotRes *iotRes ); #endif /*CA Dev Start */ -EXTERN S16 rgSCHDhmPrcFdbkForTb(RgSchCellCb *cell,RgSchUeCb *ue, +S16 rgSCHDhmPrcFdbkForTb(RgSchCellCb *cell,RgSchUeCb *ue, RgSchDlHqProcCb *hqP,RgSchDlSf *sf,Bool isMsg4, uint16_t rnti,uint8_t tbCnt,CmLteTimingInfo timingInfo, uint8_t isAck, RgInfRlsHqInfo *rlsHqBufs,RgSchErrInfo *err ); /*CA Dev End */ -EXTERN Void rgSCHDhmRgrUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +Void rgSCHDhmRgrUeCfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeCfg *ueCfg, RgSchErrInfo *err)); -EXTERN Void rgSCHDhmRgrUeRecfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, +Void rgSCHDhmRgrUeRecfg ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeRecfg *ueCfg, RgSchErrInfo *err)); -EXTERN Void rgSCHDhmRgrCellCfg ARGS((RgSchCellCb *cellCb, RgrCellCfg *cellCfg, +Void rgSCHDhmRgrCellCfg ARGS((RgSchCellCb *cellCb, RgrCellCfg *cellCfg, RgSchErrInfo *err)); -EXTERN Void rgSCHDhmRgrCellRecfg ARGS((RgSchCellCb *cellCb, RgrCellRecfg +Void rgSCHDhmRgrCellRecfg ARGS((RgSchCellCb *cellCb, RgrCellRecfg *cellRecfg, RgSchErrInfo *err)); -EXTERN Void rgSCHDhmFreeUe ARGS((RgSchUeCb *ueCb)); -EXTERN Void rgSCHDhmUpdTa ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, uint8_t ta)); -EXTERN Void rgSCHDhmProcTAExp ARGS((RgSchUeCb *ue)); +Void rgSCHDhmFreeUe ARGS((RgSchUeCb *ueCb)); +Void rgSCHDhmUpdTa ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, uint8_t ta)); +Void rgSCHDhmProcTAExp ARGS((RgSchUeCb *ue)); /* Changes for MIMO feature addition */ -EXTERN S16 rgSCHDhmAddLcData ARGS((Inst inst, RgSchLchAllocInfo *lchData, +S16 rgSCHDhmAddLcData ARGS((Inst inst, RgSchLchAllocInfo *lchData, RgSchDlHqTbCb *tbInfo)); -EXTERN S16 rgSCHDhmRlsDlsfHqProc ARGS((RgSchCellCb *cellCb, CmLteTimingInfo +S16 rgSCHDhmRlsDlsfHqProc ARGS((RgSchCellCb *cellCb, CmLteTimingInfo timingInfo)); #ifdef LTE_TDD -EXTERN S16 rgSCHDhmTddRlsSubFrm ARGS((RgSchCellCb *cell, CmLteTimingInfo uciTimingInfo)); -EXTERN S16 rgSCHCfgVldtTddDrxCycCfg ARGS((RgSchCellCb *cell, uint16_t drxCycle, +S16 rgSCHDhmTddRlsSubFrm ARGS((RgSchCellCb *cell, CmLteTimingInfo uciTimingInfo)); +S16 rgSCHCfgVldtTddDrxCycCfg ARGS((RgSchCellCb *cell, uint16_t drxCycle, uint8_t onDurTmr, uint16_t offSet)); #endif /* Added support for SPS*/ #ifdef LTEMAC_SPS -EXTERN S16 rgSCHDhmGetHqProcFrmId ARGS(( +S16 rgSCHDhmGetHqProcFrmId ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t idx, @@ -4704,64 +4704,64 @@ RgSchDlHqProcCb **hqP #endif /* LTEMAC_SPS */ /* Freeing up the HARQ proc blocked for * indefinite time in case of Retx */ -EXTERN S16 rgSCHDhmDlRetxAllocFail ARGS(( +S16 rgSCHDhmDlRetxAllocFail ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *proc )); /* MS_WORKAROUND for ccpu00122893 temp fix Incorrect HqProc release was done instead of * a Harq Entity reset. Fixing the same */ -EXTERN Void rgSCHDhmHqEntReset ARGS(( +Void rgSCHDhmHqEntReset ARGS(( RgSchDlHqEnt *hqE )); /* Measurement GAP and ACK NACK */ -EXTERN S16 rgSCHMeasGapANRepUeCfg ARGS(( +S16 rgSCHMeasGapANRepUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg )); -EXTERN S16 rgSCHMeasGapANRepUeRecfg ARGS(( +S16 rgSCHMeasGapANRepUeRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg )); /* ccpu00133470- Added extra argument to identify UE DEL*/ -EXTERN Void rgSCHMeasGapANRepUeDel ARGS(( +Void rgSCHMeasGapANRepUeDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isUeDel )); -EXTERN S16 rgSCHMeasGapANRepTtiHndl ARGS(( +S16 rgSCHMeasGapANRepTtiHndl ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHMeasGapANRepGetDlInactvUe ARGS(( +S16 rgSCHMeasGapANRepGetDlInactvUe ARGS(( RgSchCellCb *cell, CmLListCp *dlInactvUeLst )); -EXTERN S16 rgSCHMeasGapANRepGetUlInactvUe ARGS(( +S16 rgSCHMeasGapANRepGetUlInactvUe ARGS(( RgSchCellCb *cell, CmLListCp *ulInactvUeLst )); -EXTERN Void rgSCHMeasGapANRepDlInactvTmrExpry ARGS(( +Void rgSCHMeasGapANRepDlInactvTmrExpry ARGS(( RgSchUeCb *ue, uint8_t tmrEvnt )); -EXTERN Void rgSCHMeasGapANRepUlInactvTmrExpry ARGS(( +Void rgSCHMeasGapANRepUlInactvTmrExpry ARGS(( RgSchUeCb *ue, uint8_t tmrEvnt )); -EXTERN Void rgSCHMeasGapANRepTmrExpry ARGS(( +Void rgSCHMeasGapANRepTmrExpry ARGS(( RgSchUeCb *ue )); -EXTERN Void rgSCHAckNakRepTmrExpry ARGS(( +Void rgSCHAckNakRepTmrExpry ARGS(( RgSchUeCb *ue )); -EXTERN Void rgSCHAckNakRepSndHqFbkRcpReq ARGS(( +Void rgSCHAckNakRepSndHqFbkRcpReq ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, CmLteTimingInfo timingInfo)); -EXTERN Void rgSCHAckNakRepAddToQ ARGS(( +Void rgSCHAckNakRepAddToQ ARGS(( RgSchCellCb *cell, RgSchDlSf *crntDlSf)); @@ -4769,7 +4769,7 @@ RgSchDlSf *crntDlSf)); * SCH Util APIs */ #ifdef LTEMAC_SPS -EXTERN Void rgSCHUtlHdlCrcInd ARGS(( +Void rgSCHUtlHdlCrcInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo @@ -4777,40 +4777,40 @@ CmLteTimingInfo timingInfo #endif #ifdef LTE_L2_MEAS -EXTERN S16 rgSCHUtlValidateMeasReq ARGS ((RgSchCellCb *cellCb, + S16 rgSCHUtlValidateMeasReq ARGS ((RgSchCellCb *cellCb, LrgSchMeasReqInfo *schL2MeasInfo, RgSchErrInfo *err )); -EXTERN S16 rgSchL2mSndCfm ARGS((Pst *pst, +S16 rgSchL2mSndCfm ARGS((Pst *pst, RgSchL2MeasCb *measCb, LrgSchMeasReqInfo *measInfo, Bool isErr )); -EXTERN S16 rgSchFillL2MeasCfm ARGS(( + S16 rgSchFillL2MeasCfm ARGS(( RgSchCellCb *cell, RgSchL2MeasCb *measCb, LrgSchMeasCfmInfo *cfm, uint32_t measTime )); -EXTERN Void rgSchL2mFillCfmPst ARGS(( +Void rgSchL2mFillCfmPst ARGS(( Pst *pst, Pst *cfmPst, LrgSchMeasReqInfo *measInfo )); -EXTERN S16 rgSCHL2Meas ARGS(( +S16 rgSCHL2Meas ARGS(( RgSchCellCb *cell, uint8_t isCalrCrcInd )); #endif /* LTE_L2_MEAS */ /* Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN F64 rgSCHUtlPower ARGS +F64 rgSCHUtlPower ARGS (( F64 x, F64 n )); - EXTERN uint32_t rgSCHUtlParse ARGS + uint32_t rgSCHUtlParse ARGS (( uint8_t *buff, uint8_t startPos, @@ -4818,62 +4818,62 @@ F64 n uint8_t buffSize )); - EXTERN uint8_t rgSCHUtlFindDist ARGS + uint8_t rgSCHUtlFindDist ARGS (( uint16_t crntTime, uint16_t tempIdx )); #endif -EXTERN Bool rgSCHUtlPdcchAvail ARGS((RgSchCellCb *cell, RgSchPdcchInfo +Bool rgSCHUtlPdcchAvail ARGS((RgSchCellCb *cell, RgSchPdcchInfo *pdcchInfo, CmLteAggrLvl aggrLvl, RgSchPdcch **pdcch)); -EXTERN Void rgSCHUtlPdcchPut ARGS((RgSchCellCb *cell, RgSchPdcchInfo *pdcchInfo, +Void rgSCHUtlPdcchPut ARGS((RgSchCellCb *cell, RgSchPdcchInfo *pdcchInfo, RgSchPdcch *pdcch)); #ifdef LTE_TDD /* Changes for passing iPhich at TFU interface*/ -EXTERN S16 rgSCHUtlAddPhich ARGS((RgSchCellCb *cellCb, CmLteTimingInfo frm, +S16 rgSCHUtlAddPhich ARGS((RgSchCellCb *cellCb, CmLteTimingInfo frm, uint8_t hqFeedBack, uint8_t nDmrs, uint8_t rbStart, uint8_t iPhich)); #else -EXTERN S16 rgSCHUtlAddPhich ARGS((RgSchCellCb *cellCb, CmLteTimingInfo frm, +S16 rgSCHUtlAddPhich ARGS((RgSchCellCb *cellCb, CmLteTimingInfo frm, uint8_t hqFeedBack, uint8_t nDmrs, uint8_t rbStart,Bool isForMsg3)); #endif -EXTERN RgSchDlSf* rgSCHUtlSubFrmGet ARGS((RgSchCellCb *cell, +RgSchDlSf* rgSCHUtlSubFrmGet ARGS((RgSchCellCb *cell, CmLteTimingInfo frm)); -EXTERN Void rgSCHUtlSubFrmPut ARGS((RgSchCellCb *cell, RgSchDlSf *sf)); -EXTERN uint8_t rgSCHUtlLog32bitNbase2 ARGS((uint32_t n)); +Void rgSCHUtlSubFrmPut ARGS((RgSchCellCb *cell, RgSchDlSf *sf)); +uint8_t rgSCHUtlLog32bitNbase2 ARGS((uint32_t n)); /* Added support for SPS*/ #ifdef LTEMAC_SPS -EXTERN RgSchDlHqProcCb * rgSCHDhmSpsDlGetHqProc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +RgSchDlHqProcCb * rgSCHDhmSpsDlGetHqProc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo)); #endif #ifdef LTE_TDD -EXTERN uint8_t rgSCHUtlCalcNCce ARGS((uint8_t bw, RgrPhichNg ng, uint8_t cfi, uint8_t mPhich, +uint8_t rgSCHUtlCalcNCce ARGS((uint8_t bw, RgrPhichNg ng, uint8_t cfi, uint8_t mPhich, uint8_t numAntna, Bool isEcp)); #else -EXTERN uint8_t rgSCHUtlCalcNCce ARGS((uint8_t bw, RgrPhichNg ng, uint8_t cfi, uint8_t numAntna, Bool +uint8_t rgSCHUtlCalcNCce ARGS((uint8_t bw, RgrPhichNg ng, uint8_t cfi, uint8_t numAntna, Bool isEcp)); #endif #ifdef LTE_TDD /* Changes for passing iPhich at TFU interface*/ -EXTERN S16 rgSCHUtlGetPhichInfo ARGS((RgSchUlHqProcCb *hqProc, uint8_t *rbStartRef, +S16 rgSCHUtlGetPhichInfo ARGS((RgSchUlHqProcCb *hqProc, uint8_t *rbStartRef, uint8_t *nDmrsRef, uint8_t *iPhich)); #else -EXTERN S16 rgSCHUtlGetPhichInfo ARGS((RgSchUlHqProcCb *hqProc, uint8_t *rbStartRef, +S16 rgSCHUtlGetPhichInfo ARGS((RgSchUlHqProcCb *hqProc, uint8_t *rbStartRef, uint8_t *nDmrsRef)); #endif /* Added changes of TFU_UPGRADE */ #ifndef TFU_UPGRADE /* To include the length and ModOrder in DataRecp Req. */ /* Updating NDI and HARQ proc Id */ -EXTERN S16 rgSCHUtlAllocRcptInfo ARGS((RgSchUlAlloc *alloc, CmLteRnti *rnti, +S16 rgSCHUtlAllocRcptInfo ARGS((RgSchUlAlloc *alloc, CmLteRnti *rnti, uint8_t *iMcsRef, uint8_t *rbStartRef, uint8_t *numRbRef, uint8_t *rvRef, uint16_t *size, TfuModScheme *modType,Bool *isRtx, uint8_t *nDmrs, Bool *ndi, uint8_t *hqPId)); #else -EXTERN S16 rgSCHUtlAllocRcptInfo ARGS(( +S16 rgSCHUtlAllocRcptInfo ARGS(( RgSchCellCb *cell, RgSchUlAlloc *alloc, CmLteTimingInfo *timeInfo, @@ -4881,31 +4881,31 @@ EXTERN S16 rgSCHUtlAllocRcptInfo ARGS(( )); #endif /* TFU_UPGRADE */ -EXTERN S16 rgSCHUtlRgrCellCfg ARGS((RgSchCellCb *cell, RgrCellCfg *cellCfg, +S16 rgSCHUtlRgrCellCfg ARGS((RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHUtlRgrCellRecfg ARGS((RgSchCellCb *cell, RgrCellRecfg *recfg, +S16 rgSCHUtlRgrCellRecfg ARGS((RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHUtlFreeCell ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHUtlRgrUeCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlFreeCell ARGS((RgSchCellCb *cell)); +S16 rgSCHUtlRgrUeCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *cfg, RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlRgrLcCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlRgrLcCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dl, RgrLchCfg *cfg,RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHUtlRgrLcDel ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlRgrLcDel ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteLcId lcId, uint8_t lcgId)); -EXTERN S16 rgSCHUtlRgrLcRecfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, +S16 rgSCHUtlRgrLcRecfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, RgSchDlLcCb *dlLc,RgrLchRecfg *recfg,RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlRgrLcgCfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, +S16 rgSCHUtlRgrLcgCfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, RgrLcgCfg *cfg,RgSchErrInfo *errInfo)); -EXTERN S16 rgSCHUtlRgrLcgRecfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, +S16 rgSCHUtlRgrLcgRecfg ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, RgrLcgRecfg *recfg,RgSchErrInfo *err)); -EXTERN Void rgSCHUtlRgrLcgDel ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, +Void rgSCHUtlRgrLcgDel ARGS ((RgSchCellCb *cell,RgSchUeCb *ue, uint8_t lcgId)); -EXTERN Void rgSCHUtlDlCqiInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlDlCqiInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiRpt *dlCqiInd, CmLteTimingInfo timingInfo)); /* Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN Void rgSCHUtlRawCqiInd ARGS +Void rgSCHUtlRawCqiInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4913,14 +4913,14 @@ TfuRawCqiRpt* rawCqiRpt, CmLteTimingInfo timingInfo )); -EXTERN Void rgSCHUtlSrsInd ARGS +Void rgSCHUtlSrsInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuSrsRpt* srsRpt, CmLteTimingInfo timingInfo )); -EXTERN S16 rgSCHUtlGetCfgPerOff ARGS +S16 rgSCHUtlGetCfgPerOff ARGS (( RgSchPerTbl tbl, uint16_t cfgIdx, @@ -4929,219 +4929,219 @@ uint16_t *offset )); #endif -EXTERN Void rgSCHUtlDoaInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlDoaInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, TfuDoaRpt *doaInd)); -EXTERN Void rgSCHUtlDlTARpt ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +Void rgSCHUtlDlTARpt ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); /* Changes for MIMO feature addition */ -EXTERN Void rgSCHUtlDlRlsSubFrm ARGS((RgSchCellCb *cell, CmLteTimingInfo subFrm)); -EXTERN Void rgSCHUtlDlProcAddToRetx ARGS((RgSchCellCb *cell, +Void rgSCHUtlDlRlsSubFrm ARGS((RgSchCellCb *cell, CmLteTimingInfo subFrm)); +Void rgSCHUtlDlProcAddToRetx ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); -EXTERN S16 rgSCHUtlRegSch ARGS((uint8_t schIdx, RgSchdApis *apis)); -EXTERN Void rgSCHUtlDlHqProcAddToTx ARGS((RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP)); +S16 rgSCHUtlRegSch ARGS((uint8_t schIdx, RgSchdApis *apis)); +Void rgSCHUtlDlHqProcAddToTx ARGS((RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP)); /* Changes for MIMO feature addition */ -EXTERN Void rgSCHUtlDlHqPTbRmvFrmTx ARGS((RgSchDlSf *subFrm, +Void rgSCHUtlDlHqPTbRmvFrmTx ARGS((RgSchDlSf *subFrm, RgSchDlHqProcCb *hqP, uint8_t tbIdx, Bool isRepeating)); -EXTERN S16 rgSCHUtlRgrUeRecfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlRgrUeRecfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *recfg, RgSchErrInfo *err)); -EXTERN Void rgSCHUtlFreeDlLc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlFreeDlLc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc)); -EXTERN Void rgSCHUtlFreeUlLc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlFreeUlLc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchUlLcCb *ulLc)); -EXTERN Void rgSCHUtlFreeUe ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN Void rgSCHUtlDlDedBoUpd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlFreeUe ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +Void rgSCHUtlDlDedBoUpd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc)); #ifdef RG_UNUSED -EXTERN S16 rgSCHUtlUpdUlHqProc ARGS((RgSchCellCb *cell, RgSchUlHqProcCb *curProc, +S16 rgSCHUtlUpdUlHqProc ARGS((RgSchCellCb *cell, RgSchUlHqProcCb *curProc, RgSchUlHqProcCb *oldProc)); #endif /* PHR handling for MSG3 */ -EXTERN Void rgSCHUtlRecMsg3Alloc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlRecMsg3Alloc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb)); -EXTERN S16 rgSCHUtlContResUlGrant ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlContResUlGrant ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlSrRcvd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlSrRcvd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo, RgSchErrInfo *err)); -EXTERN Void rgSCHUtlUpdBsrShort ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t lcgId, +Void rgSCHUtlUpdBsrShort ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t lcgId, uint8_t bsr, RgSchErrInfo *err)); -EXTERN Void rgSCHUtlUpdBsrTrunc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t lcgId, +Void rgSCHUtlUpdBsrTrunc ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t lcgId, uint8_t bsr, RgSchErrInfo *err)); -EXTERN Void rgSCHUtlUpdBsrLong ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlUpdBsrLong ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t bsr1,uint8_t bsr2,uint8_t bsr3,uint8_t bsr4, RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlUpdPhr ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlUpdPhr ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t phr, RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlUpdExtPhr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlUpdExtPhr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgInfExtPhrCEInfo * extPhr, RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlDataRcvd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numLc, +S16 rgSCHUtlDataRcvd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numLc, RgSchUlLcCb *lcArr[], uint16_t bytesArr[], RgSchErrInfo *err)); -EXTERN Void rgSCHUtlUlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlUlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, TfuUlCqiRpt *ulCqiInfo)); -EXTERN Void rgSCHUtlPucchDeltaPwrInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, +Void rgSCHUtlPucchDeltaPwrInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta)); -EXTERN Void rgSCHUtlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN Void rgSCHUtlUlHqProcForUe ARGS((RgSchCellCb *cell, CmLteTimingInfo frm, +Void rgSCHUtlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); +Void rgSCHUtlUlHqProcForUe ARGS((RgSchCellCb *cell, CmLteTimingInfo frm, RgSchUeCb *ue, RgSchUlHqProcCb **procRef)); -EXTERN RgSchUlAlloc *rgSCHUtlFirstRcptnReq ARGS((RgSchCellCb *cell)); -EXTERN RgSchUlAlloc *rgSCHUtlNextRcptnReq ARGS((RgSchCellCb *cell, +RgSchUlAlloc *rgSCHUtlFirstRcptnReq ARGS((RgSchCellCb *cell)); +RgSchUlAlloc *rgSCHUtlNextRcptnReq ARGS((RgSchCellCb *cell, RgSchUlAlloc *alloc)); -EXTERN RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc ARGS((RgSchCellCb *cell, uint8_t idx)); -EXTERN RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc ARGS((RgSchCellCb *cell, +RgSchUlAlloc *rgSCHUtlFirstHqFdbkAlloc ARGS((RgSchCellCb *cell, uint8_t idx)); +RgSchUlAlloc *rgSCHUtlNextHqFdbkAlloc ARGS((RgSchCellCb *cell, RgSchUlAlloc *alloc, uint8_t idx)); -EXTERN S16 rgSCHUtlTfuBndReq ARGS((Inst inst, SuId suId, SpId spId)); -EXTERN S16 rgSCHUtlTfuUBndReq ARGS((Inst inst, RgSchLowSapCfgInfo sapCfg, Reason reason)); +S16 rgSCHUtlTfuBndReq ARGS((Inst inst, SuId suId, SpId spId)); +S16 rgSCHUtlTfuUBndReq ARGS((Inst inst, RgSchLowSapCfgInfo sapCfg, Reason reason)); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHEmtcUtlResetSfAlloc ARGS((RgInfSfAlloc *sfAlloc, +S16 rgSCHEmtcUtlResetSfAlloc ARGS((RgInfSfAlloc *sfAlloc, Bool resetCmnLcInfo, Bool restAlloc)); #endif -EXTERN S16 rgSCHUtlResetSfAlloc ARGS((RgInfSfAlloc *sfAlloc, +S16 rgSCHUtlResetSfAlloc ARGS((RgInfSfAlloc *sfAlloc, Bool resetCmnLcInfo, Bool restAlloc)); -EXTERN S16 rgSCHUtlGetSfAlloc ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHUtlPutSfAlloc ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHUtlAllocSBuf ARGS((Inst inst, Data **pData, Size size)); +S16 rgSCHUtlGetSfAlloc ARGS((RgSchCellCb *cell)); +S16 rgSCHUtlPutSfAlloc ARGS((RgSchCellCb *cell)); +S16 rgSCHUtlAllocSBuf ARGS((Inst inst, Data **pData, Size size)); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ -EXTERN Void rgSCHUtlFreeSBuf ARGS((Inst inst, Data **data, Size size)); -EXTERN Void rgSCHUtlFillDgnParams ARGS((Inst inst, RgUstaDgn *dgn,uint8_t dgnType)); -EXTERN Void rgSCHUtlGetPstToLyr ARGS((Pst *pst,RgSchCb *schCb,Inst macInst)); -EXTERN S16 rgSCHUtlFillRgInfCmnLcInfo ARGS((RgSchDlSf *sf,RgInfSfAlloc *sfAlloc, +Void rgSCHUtlFreeSBuf ARGS((Inst inst, Data **data, Size size)); +Void rgSCHUtlFillDgnParams ARGS((Inst inst, RgUstaDgn *dgn,uint8_t dgnType)); +Void rgSCHUtlGetPstToLyr ARGS((Pst *pst,RgSchCb *schCb,Inst macInst)); +S16 rgSCHUtlFillRgInfCmnLcInfo ARGS((RgSchDlSf *sf,RgInfSfAlloc *sfAlloc, CmLteLcId lcId, Bool sendInd)); -EXTERN S16 rgSCHUtlFillRgInfRarInfo ARGS((RgSchDlSf *sf,RgInfSfAlloc *sfAlloc,RgSchCellCb *cell)); -EXTERN S16 rgSCHUtlFillPdschDciInfo ARGS((TfuPdschDciInfo *pdschDci,TfuDciInfo +S16 rgSCHUtlFillRgInfRarInfo ARGS((RgSchDlSf *sf,RgInfSfAlloc *sfAlloc,RgSchCellCb *cell)); +S16 rgSCHUtlFillPdschDciInfo ARGS((TfuPdschDciInfo *pdschDci,TfuDciInfo *pdcchDci)); /* CA dev Start */ -EXTERN Void rgSCHUtlFillRgInfUeInfo ARGS((RgSchDlSf*, RgSchCellCb *cell, CmLListCp *dlDrxInactvTmrLst, +Void rgSCHUtlFillRgInfUeInfo ARGS((RgSchDlSf*, RgSchCellCb *cell, CmLListCp *dlDrxInactvTmrLst, CmLListCp *dlInActvLst, CmLListCp *ulInActvLst)); /* CA dev End */ -EXTERN S16 rgSCHUtlUpdSch ARGS((RgInfSfDatInd *subfrmInfo, RgSchCellCb *cellCb, +S16 rgSCHUtlUpdSch ARGS((RgInfSfDatInd *subfrmInfo, RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgInfUeDatInd *pdu,RgSchErrInfo *err)); -EXTERN S16 rgSCHUtlHndlCcchBoUpdt ARGS((RgSchCellCb *cell,RgInfCmnBoRpt *boRpt)); -EXTERN S16 rgSCHUtlHndlBcchPcchBoUpdt ARGS((RgSchCellCb *cell,RgInfCmnBoRpt +S16 rgSCHUtlHndlCcchBoUpdt ARGS((RgSchCellCb *cell,RgInfCmnBoRpt *boRpt)); +S16 rgSCHUtlHndlBcchPcchBoUpdt ARGS((RgSchCellCb *cell,RgInfCmnBoRpt *boUpdt)); -EXTERN S16 rgSCHUtlRgrBndCfm ARGS ((Inst inst, SuId suId,uint8_t status)); +S16 rgSCHUtlRgrBndCfm ARGS ((Inst inst, SuId suId,uint8_t status)); /* Added for sending TTI tick to RRM */ #ifdef RGR_RRM_TICK -EXTERN S16 rgSCHUtlRgrTtiInd ARGS ((RgSchCellCb *cell, RgrTtiIndInfo *ttiInd)); +S16 rgSCHUtlRgrTtiInd ARGS ((RgSchCellCb *cell, RgrTtiIndInfo *ttiInd)); #endif -EXTERN S16 schSendCfgCfm ARGS ((Region reg, Pool pool, \ +S16 schSendCfgCfm ARGS ((Region reg, Pool pool, \ RgrCfgTransId transId, uint8_t status)); -EXTERN S16 rgSCHUtlProcMsg3 ARGS((RgInfSfDatInd *subfrmInfo, RgSchCellCb *cellCb, +S16 rgSCHUtlProcMsg3 ARGS((RgInfSfDatInd *subfrmInfo, RgSchCellCb *cellCb, RgSchUeCb *ueCb, CmLteRnti rnti,RgInfUeDatInd *pdu, RgSchErrInfo *err )); #ifdef RG_PHASE_2 -EXTERN S16 rgSCHUtlTfuGrpPwrCntrlReq ARGS((Inst inst,S16 sapId, +S16 rgSCHUtlTfuGrpPwrCntrlReq ARGS((Inst inst,S16 sapId, TfuGrpPwrCntrlReqInfo *grpPwrCntrlReq)); #endif -EXTERN S16 rgSCHUtlTfuCntrlReq ARGS((Inst inst, S16 sapId, +S16 rgSCHUtlTfuCntrlReq ARGS((Inst inst, S16 sapId, TfuCntrlReqInfo *cntrlReq)); -EXTERN S16 rgSCHUtlTfuRecpReq ARGS((Inst inst, S16 sapId, +S16 rgSCHUtlTfuRecpReq ARGS((Inst inst, S16 sapId, TfuRecpReqInfo *recpReq)); -EXTERN S16 rgSCHUtlValidateTfuSap ARGS((Inst inst,SuId suId)); -EXTERN S16 rgSCHUtlAllocEventMem ARGS((Inst inst,Ptr *memPtr,Size memSize)); -EXTERN S16 rgSCHUtlGetEventMem ARGS((Ptr *ptr,Size len,Ptr memCpa)); -EXTERN S16 rgSCHUtlGetRlsHqAlloc ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHUtlPutRlsHqAlloc ARGS((RgSchCellCb *cell)); - -EXTERN S16 rgSCHUtlDlActvtUe ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN S16 rgSCHUtlUlActvtUe ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN Void rgSCHUtlHdlUlTransInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHUtlValidateTfuSap ARGS((Inst inst,SuId suId)); +S16 rgSCHUtlAllocEventMem ARGS((Inst inst,Ptr *memPtr,Size memSize)); +S16 rgSCHUtlGetEventMem ARGS((Ptr *ptr,Size len,Ptr memCpa)); +S16 rgSCHUtlGetRlsHqAlloc ARGS((RgSchCellCb *cell)); +S16 rgSCHUtlPutRlsHqAlloc ARGS((RgSchCellCb *cell)); + +S16 rgSCHUtlDlActvtUe ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +S16 rgSCHUtlUlActvtUe ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +Void rgSCHUtlHdlUlTransInd ARGS((RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo)); #ifdef TFU_UPGRADE -EXTERN Void rgSCHUtlUpdACqiTrigWt ARGS((RgSchUeCb *ue,RgSchUeCellInfo *sCellInfo, uint8_t isAck)); +Void rgSCHUtlUpdACqiTrigWt ARGS((RgSchUeCb *ue,RgSchUeCellInfo *sCellInfo, uint8_t isAck)); #endif /* Nprb indication at PHY for common Ch */ /* Corrected allocation for common channels */ -EXTERN S32 rgSCHUtlGetAllwdCchTbSz ARGS((uint32_t bo, uint8_t *nPrb, uint8_t *mcs +S32 rgSCHUtlGetAllwdCchTbSz ARGS((uint32_t bo, uint8_t *nPrb, uint8_t *mcs )); /* CR timer changes*/ -EXTERN S16 rgSCHUtlUpdtBo ARGS((RgSchCellCb *cell, +S16 rgSCHUtlUpdtBo ARGS((RgSchCellCb *cell, RgInfCmnBoRpt *staRsp)); -EXTERN S16 rgSCHUtlAddUeToCcchSduLst ARGS( +S16 rgSCHUtlAddUeToCcchSduLst ARGS( (RgSchCellCb *cell, RgSchUeCb *ueCb)); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHUtlAddUeToEmtcCcchSduLst ARGS( +S16 rgSCHUtlAddUeToEmtcCcchSduLst ARGS( (RgSchCellCb *cell, RgSchUeCb *ueCb)); -EXTERN S16 rgSCHRamRmvFrmEmtcRaInfoSchdLst ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); -EXTERN Void rgSCHRamEmtcDelRaCb ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); -EXTERN S16 rgSCHRamEmtcUpdtBo ARGS((RgSchCellCb *cell, RgSchRaCb *raCb, +S16 rgSCHRamRmvFrmEmtcRaInfoSchdLst ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +Void rgSCHRamEmtcDelRaCb ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +S16 rgSCHRamEmtcUpdtBo ARGS((RgSchCellCb *cell, RgSchRaCb *raCb, RgInfCmnBoRpt *staRsp)); #endif /* Added for SI Enhancement*/ #ifdef RGR_SI_SCH -EXTERN Void rgSCHUtlPutSiInfo ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHUtlFreeWarningSiSeg ARGS((Region reg,Pool pool, +Void rgSCHUtlPutSiInfo ARGS((RgSchCellCb *cell)); +Void rgSCHUtlFreeWarningSiSeg ARGS((Region reg,Pool pool, CmLListCp *siPduLst)); -EXTERN Void rgSCHUtlFreeWarningSiPdu ARGS((RgSchCellCb *cell)); -EXTERN Buffer *rgSCHUtlGetWarningSiPdu ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHUtlGetMcsAndNPrb ARGS((RgSchCellCb *cell, uint8_t *nPrb, uint8_t *mcs, MsgLen *msgLen)); -EXTERN S16 rgSCHUtlCalMcsAndNPrb ARGS((RgSchCellCb *cell, uint8_t cfgType, MsgLen msgLen, uint8_t siId)); +Void rgSCHUtlFreeWarningSiPdu ARGS((RgSchCellCb *cell)); +Buffer *rgSCHUtlGetWarningSiPdu ARGS((RgSchCellCb *cell)); +S16 rgSCHUtlGetMcsAndNPrb ARGS((RgSchCellCb *cell, uint8_t *nPrb, uint8_t *mcs, MsgLen *msgLen)); +S16 rgSCHUtlCalMcsAndNPrb ARGS((RgSchCellCb *cell, uint8_t cfgType, MsgLen msgLen, uint8_t siId)); #endif/*RGR_SI_SCH*/ #ifdef LTE_TDD -EXTERN S16 rgSCHUtlAllocUeANFdbkInfo ARGS((RgSchUeCb *ue,uint8_t servCellIdx)); -EXTERN Void rgSCHUtlDelUeANFdbkInfo ARGS((RgSchUeCb *ue,uint8_t servCellIdx)); -EXTERN S16 rgSCHUtlInitUeANFdbkInfo ARGS((RgSchTddANInfo *anInfo)); -EXTERN RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo ARGS((RgSchUeCb *ueCb, CmLteTimingInfo *timeInfo,uint8_t servCellIdx)); -EXTERN uint8_t rgSCHUtlGetDlSfIdx ARGS((RgSchCellCb *cell, CmLteTimingInfo *timeInfo)); -EXTERN Void rgSCHUtlPrachCfgInit ARGS((RgSchCellCb *cell, RgrCellCfg *cellCfg )); -EXTERN Void rgSCHUtlGetNxtDlSfInfo ARGS((CmLteTimingInfo curDlTime, RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlSf **nxtDlsf, CmLteTimingInfo *nxtDlTime)); -EXTERN Void rgSCHUtlGetPrevDlSfInfo ARGS((RgSchCellCb * cell, CmLteTimingInfo curDlTime, CmLteTimingInfo *prevDlTime, uint8_t *numSubfrm)); -#endif -EXTERN Void rgSCHCmnDlSch ARGS +S16 rgSCHUtlAllocUeANFdbkInfo ARGS((RgSchUeCb *ue,uint8_t servCellIdx)); +Void rgSCHUtlDelUeANFdbkInfo ARGS((RgSchUeCb *ue,uint8_t servCellIdx)); +S16 rgSCHUtlInitUeANFdbkInfo ARGS((RgSchTddANInfo *anInfo)); +RgSchTddANInfo* rgSCHUtlGetUeANFdbkInfo ARGS((RgSchUeCb *ueCb, CmLteTimingInfo *timeInfo,uint8_t servCellIdx)); +uint8_t rgSCHUtlGetDlSfIdx ARGS((RgSchCellCb *cell, CmLteTimingInfo *timeInfo)); +Void rgSCHUtlPrachCfgInit ARGS((RgSchCellCb *cell, RgrCellCfg *cellCfg )); +Void rgSCHUtlGetNxtDlSfInfo ARGS((CmLteTimingInfo curDlTime, RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlSf **nxtDlsf, CmLteTimingInfo *nxtDlTime)); +Void rgSCHUtlGetPrevDlSfInfo ARGS((RgSchCellCb * cell, CmLteTimingInfo curDlTime, CmLteTimingInfo *prevDlTime, uint8_t *numSubfrm)); +#endif +Void rgSCHCmnDlSch ARGS (( RgSchCellCb *cell )); -EXTERN Void rgSCHCmnSndCnsldtInfo ARGS +Void rgSCHCmnSndCnsldtInfo ARGS (( RgSchCellCb *cell )); -EXTERN Void rgSCHCmnCnsldtSfAlloc ARGS +Void rgSCHCmnCnsldtSfAlloc ARGS (( RgSchCellCb *cell )); /* Added support for SPS*/ -EXTERN Void rgSCHCmnDlAllocFnlz ARGS +Void rgSCHCmnDlAllocFnlz ARGS (( RgSchCellCb *cell )); #ifdef LTEMAC_SPS -EXTERN Void rgSCHUtlDlRelPdcchFbk ARGS(( +Void rgSCHUtlDlRelPdcchFbk ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isAck )); -EXTERN Void rgSCHUtlDlProcAck ARGS(( +Void rgSCHUtlDlProcAck ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN S16 rgSCHUtlSpsRelInd ARGS(( +S16 rgSCHUtlSpsRelInd ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, Bool isExplRel )); -EXTERN Void rgSCHCmnDlSch ARGS +Void rgSCHCmnDlSch ARGS (( RgSchCellCb *cell )); -EXTERN S16 rgSCHUtlSpsActInd ARGS(( +S16 rgSCHUtlSpsActInd ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, uint16_t spsSduSize )); -EXTERN Void rgSCHUtlHdlCrcFailInd ARGS(( +Void rgSCHUtlHdlCrcFailInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo )); -EXTERN Void rgSCHUtlHdlCrntiCE ARGS(( +Void rgSCHUtlHdlCrntiCE ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); @@ -5149,144 +5149,144 @@ RgSchUeCb *ue #endif /* LTEMAC_SPS*/ /******* : START *****/ -EXTERN S16 rgSCHUtlUlSfInit ARGS(( +S16 rgSCHUtlUlSfInit ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, uint8_t idx, uint8_t maxUePerSf )); -EXTERN Void rgSCHUtlUlSfDeinit ARGS(( +Void rgSCHUtlUlSfDeinit ARGS(( RgSchCellCb *cell, RgSchUlSf *sf )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocGetHole ARGS(( - RgSchUlSf *sf, - uint8_t numRb, +RgSchUlAlloc *rgSCHUtlUlAllocGetHole ARGS(( + RgSchUlSf *sf, + uint8_t numRb, RgSchUlHole *hole )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole ARGS(( - RgSchUlSf *sf, +RgSchUlAlloc *rgSCHUtlUlAllocGetCompHole ARGS(( + RgSchUlSf *sf, RgSchUlHole *hole )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole ARGS(( - RgSchUlSf *sf, - uint8_t numRb, +RgSchUlAlloc *rgSCHUtlUlAllocGetPartHole ARGS(( + RgSchUlSf *sf, + uint8_t numRb, RgSchUlHole *hole )); -EXTERN Void rgSCHUtlUlAllocRls ARGS(( +Void rgSCHUtlUlAllocRls ARGS(( RgSchUlSf *sf, RgSchUlAlloc *alloc )); /* UL_ALLOC_ENHANCEMENT */ -EXTERN Void rgSCHUtlUlAllocRelease ARGS(( +Void rgSCHUtlUlAllocRelease ARGS(( RgSchUlAlloc *alloc )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocFirst ARGS(( +RgSchUlAlloc *rgSCHUtlUlAllocFirst ARGS(( RgSchUlSf *sf )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocNxt ARGS(( +RgSchUlAlloc *rgSCHUtlUlAllocNxt ARGS(( RgSchUlSf *sf, RgSchUlAlloc *alloc )); -EXTERN RgSchUlHole *rgSCHUtlUlHoleFirst ARGS(( +RgSchUlHole *rgSCHUtlUlHoleFirst ARGS(( RgSchUlSf *sf )); -EXTERN RgSchUlHole *rgSCHUtlUlHoleNxt ARGS(( +RgSchUlHole *rgSCHUtlUlHoleNxt ARGS(( RgSchUlSf *sf, RgSchUlHole *hole )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt ARGS(( +RgSchUlAlloc *rgSCHUtlUlAllocGetAdjNxt ARGS(( RgSchUlAllocDb *db, RgSchUlAlloc *prv )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocGetFirst ARGS(( +RgSchUlAlloc *rgSCHUtlUlAllocGetFirst ARGS(( RgSchUlAllocDb *db )); -EXTERN Void rgSCHUtlUlHoleAddAlloc ARGS(( +Void rgSCHUtlUlHoleAddAlloc ARGS(( RgSchUlSf *sf, RgSchUlAlloc *alloc )); /* UL_ALLOC_ENHANCEMENT */ -EXTERN Void rgSCHUtlUlHoleAddAllocation ARGS(( +Void rgSCHUtlUlHoleAddAllocation ARGS(( RgSchUlAlloc *alloc )); -EXTERN Void rgSCHUtlUlHoleJoin ARGS(( +Void rgSCHUtlUlHoleJoin ARGS(( RgSchUlHoleDb *db, RgSchUlHole *prv, RgSchUlHole *nxt, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHUtlUlHoleExtndRight ARGS(( +Void rgSCHUtlUlHoleExtndRight ARGS(( RgSchUlHoleDb *db, RgSchUlHole *prv, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHUtlUlHoleExtndLeft ARGS(( +Void rgSCHUtlUlHoleExtndLeft ARGS(( RgSchUlHoleDb *db, RgSchUlHole *nxt, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHUtlUlHoleNew ARGS(( +Void rgSCHUtlUlHoleNew ARGS(( RgSchUlHoleDb *db, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHUtlUlHoleUpdAllocLnks ARGS(( +Void rgSCHUtlUlHoleUpdAllocLnks ARGS(( RgSchUlHole *hole, RgSchUlAlloc *prvAlloc, RgSchUlAlloc *nxtAlloc )); -EXTERN Void rgSCHUtlUlHoleIns ARGS(( +Void rgSCHUtlUlHoleIns ARGS(( RgSchUlHoleDb *db, RgSchUlHole *hole )); -EXTERN Void rgSCHUtlUlHoleIncr ARGS(( +Void rgSCHUtlUlHoleIncr ARGS(( RgSchUlHoleDb *db, RgSchUlHole *hole )); -EXTERN Void rgSCHUtlUlHoleDecr ARGS(( +Void rgSCHUtlUlHoleDecr ARGS(( RgSchUlHoleDb *db, RgSchUlHole *hole )); -EXTERN Void rgSCHUtlUlHoleRls ARGS(( +Void rgSCHUtlUlHoleRls ARGS(( RgSchUlHoleDb *db, RgSchUlHole *hole )); -EXTERN S16 rgSCHUtlUlAllocMemInit ARGS(( +S16 rgSCHUtlUlAllocMemInit ARGS(( RgSchCellCb *cell, RgSchUlAllocMem *mem, uint8_t maxAllocs )); -EXTERN Void rgSCHUtlUlAllocMemDeinit ARGS(( +Void rgSCHUtlUlAllocMemDeinit ARGS(( RgSchCellCb *cell, RgSchUlAllocMem *mem )); -EXTERN S16 rgSCHUtlUlHoleMemInit ARGS(( +S16 rgSCHUtlUlHoleMemInit ARGS(( RgSchCellCb *cell, RgSchUlHoleMem *mem, uint8_t maxHoles, RgSchUlHole **holeRef )); -EXTERN Void rgSCHUtlUlHoleMemDeinit ARGS(( +Void rgSCHUtlUlHoleMemDeinit ARGS(( RgSchCellCb *cell, RgSchUlHoleMem *mem )); -EXTERN RgSchUlAlloc *rgSCHUtlUlAllocMemGet ARGS(( +RgSchUlAlloc *rgSCHUtlUlAllocMemGet ARGS(( RgSchUlAllocMem *mem )); -EXTERN Void rgSCHUtlUlAllocMemRls ARGS(( +Void rgSCHUtlUlAllocMemRls ARGS(( RgSchUlAllocMem *mem, RgSchUlAlloc *alloc )); -EXTERN RgSchUlHole *rgSCHUtlUlHoleMemGet ARGS(( +RgSchUlHole *rgSCHUtlUlHoleMemGet ARGS(( RgSchUlHoleMem *mem )); -EXTERN Void rgSCHUtlUlHoleMemRls ARGS(( +Void rgSCHUtlUlHoleMemRls ARGS(( RgSchUlHoleMem *mem, RgSchUlHole *hole )); -EXTERN RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc ARGS(( +RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc ARGS(( RgSchUlSf *sf, uint8_t startSb, uint8_t numSb @@ -5294,80 +5294,80 @@ EXTERN RgSchUlAlloc *rgSCHUtlUlGetSpfcAlloc ARGS(( /******* : END *****/ /* DRX function declarations */ -EXTERN S16 rgSCHDrxCellCfg ARGS((RgSchCellCb *cell, RgrCellCfg *cellCfg)); -EXTERN Void rgSCHDrxCellDel ARGS((RgSchCellCb *cell)); -EXTERN S16 rgSCHDrxUeCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHDrxCellCfg ARGS((RgSchCellCb *cell, RgrCellCfg *cellCfg)); +Void rgSCHDrxCellDel ARGS((RgSchCellCb *cell)); +S16 rgSCHDrxUeCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg)); #ifdef RGR_V2 -EXTERN S16 rgSCHDrxUeReCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +S16 rgSCHDrxUeReCfg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueCfg)); #endif -EXTERN S16 rgSCHDrxUeDel ARGS((RgSchCellCb *cell,RgSchUeCb *ue)); -EXTERN Void rgSCHDrxTtiInd ARGS ((RgSchCellCb *cell)); +S16 rgSCHDrxUeDel ARGS((RgSchCellCb *cell,RgSchUeCb *ue)); +Void rgSCHDrxTtiInd ARGS ((RgSchCellCb *cell)); -EXTERN S16 rgSCHDrxSfAlloc ARGS ((RgSchCellCb *cellCb, RgSchDlSf +S16 rgSCHDrxSfAlloc ARGS ((RgSchCellCb *cellCb, RgSchDlSf *dlSf)); -EXTERN S16 rgSCHDrxDlTrnsFail ARGS((RgSchCellCb *cell, RgSchDlHqProcCb +S16 rgSCHDrxDlTrnsFail ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *dlHq)); -EXTERN Void rgSCHDrxDedRa ARGS((RgSchCellCb *cellCb, RgSchUeCb* ueCb)); -EXTERN S16 rgSCHDrxSrInd ARGS((RgSchCellCb *cell,RgSchUeCb *ue)); +Void rgSCHDrxDedRa ARGS((RgSchCellCb *cellCb, RgSchUeCb* ueCb)); +S16 rgSCHDrxSrInd ARGS((RgSchCellCb *cell,RgSchUeCb *ue)); -EXTERN Void rgSCHDrxStrtInActvTmr ARGS((RgSchCellCb *cell, +Void rgSCHDrxStrtInActvTmr ARGS((RgSchCellCb *cell, CmLListCp *ueLst, uint8_t direction)); -EXTERN S16 rgSCHUtlGetDrxSchdUesInDl ARGS((RgSchCellCb *cellCb, +S16 rgSCHUtlGetDrxSchdUesInDl ARGS((RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgSchDlHqProcCb *dlHq, RgInfUeAlloc *allocInfo, CmLListCp *dlDrxInactvTmrLst, CmLListCp *dlInActvLst, CmLListCp *ulInActvLst)); -EXTERN Void rgSCHDrxStartHarqRTTTmr ARGS((RgSchCellCb *cell, +Void rgSCHDrxStartHarqRTTTmr ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP, - uint8_t tbCnt)); -EXTERN Void rgSCHDrxUeHqReset ARGS((RgSchCellCb *cell, + uint8_t tbCnt)); +Void rgSCHDrxUeHqReset ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqEnt *hqE, uint8_t cellIdx)); #ifdef TFU_UPGRADE #ifdef LTE_TDD -EXTERN CONSTANT RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl; +const RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl; #else -EXTERN CONSTANT RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl; +const RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl; #endif #endif #ifdef LTEMAC_HDFDD -EXTERN S16 rgSCHHdFddUeCfg ARGS(( +S16 rgSCHHdFddUeCfg ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, Bool hdFdd)); -EXTERN S16 rgSCHHdFddUeDel ARGS(( +S16 rgSCHHdFddUeDel ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -EXTERN Void rgSCHCmnHdFddPtUlMrk ARGS(( +Void rgSCHCmnHdFddPtUlMrk ARGS(( RgSchCellCb *cellCb)); -EXTERN Void rgSCHCmnHdFddChkUlAllow ARGS(( +Void rgSCHCmnHdFddChkUlAllow ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, uint8_t *flag)); -EXTERN Void rgSCHCmnHdFddChkDlAllow ARGS(( +Void rgSCHCmnHdFddChkDlAllow ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, Bool *flag)); -EXTERN Void rgSCHCmnHdFddChkNackAllow ARGS(( +Void rgSCHCmnHdFddChkNackAllow ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, CmLteTimingInfo timInfo, Bool *flag)); -EXTERN Void rgSCHCmnHdFddUpdULMark ARGS(( +Void rgSCHCmnHdFddUpdULMark ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -EXTERN Void rgSCHCmnHdFddUpdDLMark ARGS(( +Void rgSCHCmnHdFddUpdDLMark ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -EXTERN Void rgSCHHdFddGetSfn ARGS(( +Void rgSCHHdFddGetSfn ARGS(( uint16_t *sfn, CmLteTimingInfo timeInfo, S16 offset)); @@ -5412,7 +5412,7 @@ TfuAckNackMode rgSchUtlGetFdbkMode ARGS(( RgrSchFrmt1b3TypEnum fdbkType )); -EXTERN TfuAckNackMode rgSchUtlGetFdbkMode ARGS(( +TfuAckNackMode rgSchUtlGetFdbkMode ARGS(( RgrSchFrmt1b3TypEnum fdbkType )); @@ -5460,95 +5460,95 @@ CmLteTimingInfo phichTime, uint8_t hqFdbkIdx )); -EXTERN S16 rgSCHUtlBuildNSendLcgReg ARGS(( +S16 rgSCHUtlBuildNSendLcgReg ARGS(( RgSchCellCb *cell, CmLteRnti crnti, uint8_t lcgId, Bool isGbr )); -EXTERN Void rgSCHUtlPdcchInit ARGS(( +Void rgSCHUtlPdcchInit ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, - uint16_t nCce)); -EXTERN Void rgSCHDynCfiReCfg ARGS(( + uint16_t nCce)); +Void rgSCHDynCfiReCfg ARGS(( RgSchCellCb *cell, Bool isDynCfiEnb )); Void rgSchUtlCalcTotalPrbReq ARGS((RgSchCellCb *cell, RgSchUeCb *ue, - uint32_t bo, - uint32_t *prbReqrd)); -EXTERN uint8_t rgSchUtlGetNumSbs ARGS(( + uint32_t bo, + uint32_t *prbReqrd)); +uint8_t rgSchUtlGetNumSbs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t *numSbs )); -EXTERN uint8_t rgSchUtlSortInsUeLst ARGS(( -RgSchCellCb *cell, +uint8_t rgSchUtlSortInsUeLst ARGS(( +RgSchCellCb *cell, CmLListCp *ueLst, CmLList *node, uint8_t subbandRequired )); -EXTERN S16 rgSCHUtlResetCpuOvrLdState ARGS(( +S16 rgSCHUtlResetCpuOvrLdState ARGS(( RgSchCellCb *cell, uint8_t cnrtCpuOvrLdIns )); -EXTERN Void rgSCHUtlCpuOvrLdAdjItbsCap ARGS(( +Void rgSCHUtlCpuOvrLdAdjItbsCap ARGS(( RgSchCellCb *cell )); #ifdef TFU_UPGRADE -EXTERN S16 rgSCHTomUtlPcqiSbCalcBpIdx ARGS(( +S16 rgSCHTomUtlPcqiSbCalcBpIdx ARGS(( CmLteTimingInfo crntTimInfo, RgSchUeCb *ueCb, RgSchUePCqiCb *cqiCb )); #ifdef LTE_ADV -EXTERN S16 rgSCHUtlSCellHndlCqiCollsn ARGS(( +S16 rgSCHUtlSCellHndlCqiCollsn ARGS(( RgSchUePCqiCb *cqiCb )); -EXTERN S16 rgSCHUtlSCellHndlRiCollsn ARGS(( +S16 rgSCHUtlSCellHndlRiCollsn ARGS(( RgSchUePCqiCb *cqiCb )); #endif/*LTE_ADV*/ #endif/*TFU_UPGRADE*/ -EXTERN Void rgSCHTomUtlGetTrigSet ARGS(( +Void rgSCHTomUtlGetTrigSet ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t cqiReq, uint8_t *triggerSet )); -EXTERN Void rgSCHUtlUpdUeDciSize ARGS(( +Void rgSCHUtlUpdUeDciSize ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, Bool isCsi2Bit )); -EXTERN Void rgSCHUtlCalcDciSizes ARGS(( +Void rgSCHUtlCalcDciSizes ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSchCmnPreDlSch ARGS (( +Void rgSchCmnPreDlSch ARGS (( RgSchCellCb **cell, uint8_t nCell, RgSchCellCb **cellLst )); -EXTERN Void rgSchCmnPstDlSch ARGS (( +Void rgSchCmnPstDlSch ARGS (( RgSchCellCb *cell )); -EXTERN uint8_t rgSCHCmnGetBiIndex ARGS (( +uint8_t rgSCHCmnGetBiIndex ARGS (( RgSchCellCb *cell, uint32_t ueCount )); -EXTERN uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm); +uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm); #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/src/5gnrsch/rg_sch_cfg.c b/src/5gnrsch/rg_sch_cfg.c index dd7cd12ee..7b37b0137 100755 --- a/src/5gnrsch/rg_sch_cfg.c +++ b/src/5gnrsch/rg_sch_cfg.c @@ -70,21 +70,21 @@ RgSchUlAllocCntr rgSchUlAllocCntr; #endif #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcPOTrigger ARGS (( +Void rgSCHEmtcPOTrigger ARGS (( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSchEmtcUpdSiCfg ARGS (( +S16 rgSchEmtcUpdSiCfg ARGS (( RgSchCellCb *cell, RgrCellRecfg *cellRecfg )); -EXTERN S16 rgSCHEmtcCfgVldtDrxReTxCfg ARGS(( +S16 rgSCHEmtcCfgVldtDrxReTxCfg ARGS(( uint16_t reTxTmr )); -EXTERN S16 rgSCHEmtcCfgVldtDrxUlReTxCfg ARGS(( +S16 rgSCHEmtcCfgVldtDrxUlReTxCfg ARGS(( uint16_t reTxTmr )); #endif @@ -94,63 +94,63 @@ S16 rgSCHEnbPfsDlCfg ARGS(( RgSchErrInfo *err )); /* local defines */ -PRIVATE S16 rgSCHCfgRgrUeRecfgRntiChg ARGS (( RgSchCellCb *cell, +static S16 rgSCHCfgRgrUeRecfgRntiChg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtUePwrCfg ARGS((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUePwrCfg ARGS((RgSchCellCb *cell, RgrUeUlPwrCfg *pwrCfg)); -PRIVATE S16 rgSCHCfgVldtUeGrpPwrCfg ARGS((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeGrpPwrCfg ARGS((RgSchCellCb *cell, RgrUeGrpPwrCfg *grpPwrCfg)); #ifdef LTEMAC_SPS -PRIVATE S16 rgSCHCfgVldtUeDlSpsCfg ARGS((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeDlSpsCfg ARGS((RgSchCellCb *cell, RgrUeSpsDlCfg *dlSpsCfg)); -PRIVATE S16 rgSCHCfgVldtSpsReCfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtSpsReCfg ARGS ((RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg)); #endif /*LTEMAC_SPS*/ -PRIVATE S16 rgSCHCfgVldtUeCqiModeCfg ARGS((RgSchCellCb *cell,RgrUeDlCqiCfg *ueDlCqiCfg)); -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeCqiModeCfg ARGS((RgSchCellCb *cell,RgrUeDlCqiCfg *ueDlCqiCfg)); +static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg ARGS ((RgSchCellCb *cell, RgrUeCfg *ueCfg)); -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg ARGS ((RgSchCellCb *cell, RgrUeRecfg *ueRecfg)); -PRIVATE Void rgSCHCfgFreeDlDedLcCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +static Void rgSCHCfgFreeDlDedLcCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc)); -PRIVATE Void rgSCHCfgFreeDlCmnLcCb ARGS((RgSchClcDlLcCb *cmnDlLc)); -PRIVATE Void rgSCHCfgFreeUeCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -PRIVATE Void rgSCHCfgFreeRgrCfgLst ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHCfgFreeCmnLcLst ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHCfgFreeUeLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeDlCmnLcCb ARGS((RgSchClcDlLcCb *cmnDlLc)); +static Void rgSCHCfgFreeUeCb ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +static Void rgSCHCfgFreeRgrCfgLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeCmnLcLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeUeLst ARGS((RgSchCellCb *cell)); #ifdef LTEMAC_SPS -PRIVATE Void rgSCHCfgFreeSpsUeLst ARGS((RgSchCellCb *cell)); +static Void rgSCHCfgFreeSpsUeLst ARGS((RgSchCellCb *cell)); #endif -PRIVATE S16 rgSCHCfgVldtRgrCmnLcCfg ARGS((Inst inst, RgrCellCfg *cellCfg, +static S16 rgSCHCfgVldtRgrCmnLcCfg ARGS((Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtRgrCellPwrCfg ARGS((Inst inst, RgrCellCfg *cellCfg, +static S16 rgSCHCfgVldtRgrCellPwrCfg ARGS((Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtRgrCellSchCfg ARGS((Inst inst, RgrCellCfg *cellCfg)); -PRIVATE S16 rgSCHCfgVldtRgrSchCfg ARGS((Inst inst, RgrSchedEnbCfg *schedEnbCfg)); -PRIVATE S16 rgSCHCfgVldtRgrCellRACfg ARGS((Inst inst, RgrCellCfg *cellCfg)); -PRIVATE Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell, +static S16 rgSCHCfgVldtRgrCellSchCfg ARGS((Inst inst, RgrCellCfg *cellCfg)); +static S16 rgSCHCfgVldtRgrSchCfg ARGS((Inst inst, RgrSchedEnbCfg *schedEnbCfg)); +static S16 rgSCHCfgVldtRgrCellRACfg ARGS((Inst inst, RgrCellCfg *cellCfg)); +static Void rgSCHCfgRgrUePhrMsg3 ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb,RgSchUeCb *ue, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgRgrCmnLcCfg ARGS((RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, +static S16 rgSCHCfgRgrCmnLcCfg ARGS((RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, RgSchErrInfo *errInfo)); Void rgSCHSCellFreeBuf ARGS((Inst inst,RgSchUeCb *ue,RgrUeRecfg *ueRecfg,uint8_t idx)); #ifdef RGR_SI_SCH -PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg ARGS(( Inst inst, RgrSiCfg *siCfg)); +static S16 rgSCHCfgVldtRgrCellSiCfg ARGS(( Inst inst, RgrSiCfg *siCfg)); #endif/*RGR_SI_SCH */ /* LTE_ADV_FLAG_REMOVED_START */ -PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg ARGS(( Inst inst, +static S16 rgSCHCfgVldtRgrCellLteAdvCfg ARGS(( Inst inst, RgrLteAdvancedCellConfig *lteAdvCfg, uint8_t dlTotalBw)); /* LTE_ADV_FLAG_REMOVED_END */ -PRIVATE S16 rgSCHCfgVldtDrxUeCfg ARGS ((RgSchCellCb *cell, +static S16 rgSCHCfgVldtDrxUeCfg ARGS ((RgSchCellCb *cell, RgrUeDrxCfg *ueDrxCfg)); -PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg ARGS((uint8_t onDurTmr)); -PRIVATE S16 rgSCHCfgVldtDrxInActvCfg ARGS((uint16_t inActvTmr)); -PRIVATE S16 rgSCHCfgVldtDrxReTxCfg ARGS((uint8_t reTxTmr)); -PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg ARGS((RgrDrxLongCycleOffst lngCycleOffst)); -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs ARGS((uint16_t val)); -PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg ARGS((RgrDrxShortDrx shrtCycCfg)); -PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg ARGS((Inst inst, +static S16 rgSCHCfgVldtDrxOnDurCfg ARGS((uint8_t onDurTmr)); +static S16 rgSCHCfgVldtDrxInActvCfg ARGS((uint16_t inActvTmr)); +static S16 rgSCHCfgVldtDrxReTxCfg ARGS((uint8_t reTxTmr)); +static S16 rgSCHCfgVldtDrxLngCycCfg ARGS((RgrDrxLongCycleOffst lngCycleOffst)); +static S16 rgSCHCfgVldtDrxLngCyclTmrs ARGS((uint16_t val)); +static S16 rgSCHCfgVldtDrxShrtCycCfg ARGS((RgrDrxShortDrx shrtCycCfg)); +static S16 rgSCHCfgVldtRgrCellCsgParamCfg ARGS((Inst inst, RgrCellCsgParamCfg *csgParam)); #ifdef TFU_UPGRADE @@ -220,11 +220,11 @@ S16 rgSCHCfgVldtRgrUeSrCfg ARGS((RgSchCellCb *cellCb, CmLteRnti crnti, S16 rgSCHCfgVldtRgrUeSrCfg ARGS((RgSchCellCb *cellCb, CmLteRnti crnti, RgrUeSrCfg *srCfg, RgSchErrInfo *errInfo)); #endif -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg ARGS (( RgSchCellCb *cellCb, +static S16 rgSCHCfgVldtCqiSrSrsUeCfg ARGS (( RgSchCellCb *cellCb, RgrUeCfg *ueCfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb *cellCb, +static S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeRecfg *ueReCfg, RgSchErrInfo *errInfo )); @@ -232,18 +232,18 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg ARGS (( RgSchCellCb *cellCb, S16 rgSCHCfgPCqiSrsSrUeDel ARGS ((RgSchCellCb *cellCb, RgSchUeCb *ueCb)); -PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz ARGS (( RgSchUeACqiCb *acqiCb,uint8_t numTxAnt, +static Void rgSCHCfgUtlFetchAcqiBitSz ARGS (( RgSchUeACqiCb *acqiCb,uint8_t numTxAnt, uint8_t* cqiPmiSzR1,uint8_t* cqiPmiSzRn1 )); /* Added the function to be used instead of the * MACRO RG_SCH_GET_PERIODICITY_TBL */ -PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* rgSCHCfgUtlGetPcqiSrsSrRiTbl ARGS (( +static const RgSchUePCqiSrsSrCfgIdxTbl* rgSCHCfgUtlGetPcqiSrsSrRiTbl ARGS (( RgSchPerTbl tblType, uint8_t * min, uint8_t * max)); #endif /* TFU_UPGRADE */ -PRIVATE Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb *cellCb, +static Void rgSCHCfgUeTaRecfg ARGS (( RgSchCellCb *cellCb, RgSchUeCb *ueCb, RgrUeRecfg *ueReCfg, RgSchErrInfo *errInfo )); @@ -267,7 +267,7 @@ RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *errInfo )); -PRIVATE S16 rgSCHSCellCfgUeCfgRollBack ARGS(( +static S16 rgSCHSCellCfgUeCfgRollBack ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg @@ -277,20 +277,20 @@ RgrUeRecfg *ueRecfg /* ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #if ((defined (RGR_CQI_REPT)) && (defined (RGR_V2))) -PRIVATE S16 rgSCHCfgUeCqiReptReCfg ARGS (( +static S16 rgSCHCfgUeCqiReptReCfg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg )); -PRIVATE S16 rgSCHCfgVldtCqiReptReCfg ARGS (( +static S16 rgSCHCfgVldtCqiReptReCfg ARGS (( RgSchCellCb *cell, RgrUeRecfg *ueRecfg )); #endif /*LTE_L2_MEAS_PHASE2*/ #ifdef LTE_L2_MEAS -PRIVATE S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)); +static S16 rgSchAddToL2Meas ARGS ((RgSchCellCb *cellCb,RgSchDlLcCb *dlLc)); #endif #ifdef EMTC_ENABLE S16 rgSCHEmtcCfgVldtDrxOnDurCfg @@ -301,7 +301,7 @@ Void rgSCHUtlUpdEmtcY ( RgSchUeCb *ue ); -EXTERN Void rgSCHEmtcHqPAlloc +Void rgSCHEmtcHqPAlloc ( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt @@ -309,7 +309,7 @@ RgSchDlHqEnt *hqEnt #endif /* local typedefs */ -CONSTANT RgSchSrsTxOffst rgSrsTxOffstTbl[RGSCH_MAX_SRS_SFCFG_IDX+1]= +const RgSchSrsTxOffst rgSrsTxOffstTbl[RGSCH_MAX_SRS_SFCFG_IDX+1]= {{1,{0,0,0,0,0,0,0,0}}, {1,{0,0,0,0,0,0,0,0}}, {1,{1,0,0,0,0,0,0,0}}, @@ -331,7 +331,7 @@ CONSTANT RgSchSrsTxOffst rgSrsTxOffstTbl[RGSCH_MAX_SRS_SFCFG_IDX+1]= #ifdef TFU_UPGRADE /* SRSCfg Table: Ref 36.213, Table: 8.2.1 */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrsCfgIdxFddTbl[RG_SCH_SRS_ISRS_INDX_MAX_FDD]= { { 0,1, 2, 0 }, @@ -345,7 +345,7 @@ rgSchUeSrsCfgIdxFddTbl[RG_SCH_SRS_ISRS_INDX_MAX_FDD]= }; /* Reference : 36.213 Table 8.2-2 */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrsCfgIdxTddTbl[RG_SCH_SRS_ISRS_INDX_MAX_TDD]= { { 10,14, 5, 10 }, @@ -359,7 +359,7 @@ rgSchUeSrsCfgIdxTddTbl[RG_SCH_SRS_ISRS_INDX_MAX_TDD]= }; /*Reference: 36.213 Table:7.2.2-1A */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUePCqiCfgIdxFddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_FDD]= { { 0,1, 2, 0 }, @@ -376,7 +376,7 @@ rgSchUePCqiCfgIdxFddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_FDD]= }; /* Reference: 36.213 Table:7.2.2-1C */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeCqiPmiCfgIdxTddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_TDD]= { { 0,0, 1, 0 }, @@ -391,7 +391,7 @@ rgSchUeCqiPmiCfgIdxTddTbl[RG_SCH_CQIPMI_CFGIDX_MAX_TDD]= /* Note: RI table is same for FDD and TDD */ /*Reference: 36.213 Table:7.2.2-1B */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeRiCfgIdxTbl[RG_SCH_RI_CFGIDX_MAX]= { { 0,160, 1, 0 }, @@ -404,7 +404,7 @@ rgSchUeRiCfgIdxTbl[RG_SCH_RI_CFGIDX_MAX]= }; /*Reference: 36.213 Table:7.2.2-2 */ -CONSTANT RgSchUeBwSubSzBwParts +const RgSchUeBwSubSzBwParts rgSchUeBwSubSzBwPartsTbl[RG_SCH_BW_SUBSZ_BWPARTS_MAX]= { {6,7, 0, 0}, /*TODO: 6,7, NA, NA */ @@ -417,7 +417,7 @@ rgSchUeBwSubSzBwPartsTbl[RG_SCH_BW_SUBSZ_BWPARTS_MAX]= /* Reference : 36.213 Table 10.1-5 */ /* Note: SR is same table for TDD and FDD */ -CONSTANT RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrCfgIdxTbl[RG_SCH_ISR_INDX_MAX]= +const RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrCfgIdxTbl[RG_SCH_ISR_INDX_MAX]= { { 0,4, 5, 0 }, { 5,14, 10, 5 }, @@ -429,7 +429,7 @@ CONSTANT RgSchUePCqiSrsSrCfgIdxTbl rgSchUeSrCfgIdxTbl[RG_SCH_ISR_INDX_MAX]= /*Reference:36.213: Derived from Table: 7.2.1-5 for Label L. The Label L is CEIL(log2(BinCoe(N and M)))*/ -CONSTANT uint8_t RgSCHUeAcqi2022LBitWidth[6][28] ={ +const uint8_t RgSCHUeAcqi2022LBitWidth[6][28] ={ {0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5}, {0,0,2,3,4,4,5,5,6,6,6,7,7,7,7,7,8,8,8,8,8,8,8,9,9,9,9,9}, {0,0,0,2,4,5,6,6,7,7,8,8,9,9,9,10,10,10,10,11,11,11,11,11,12,12,12,12}, @@ -440,14 +440,14 @@ CONSTANT uint8_t RgSCHUeAcqi2022LBitWidth[6][28] ={ #endif -EXTERN uint8_t rgSchCmnHarqRtt[]; +extern uint8_t rgSchCmnHarqRtt[]; #ifdef EMTC_ENABLE -EXTERN S16 rgSCHEmtcCellAlloc ARGS((RgSchCellCb *cel)); -EXTERN Void rgSCHEmtcCellFree ARGS((RgSchCellCb *cel)); -EXTERN Void rgSCHEmtcUeInfoFree ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN uint8_t rgSchfillPucchSrRepNumCountemtc ARGS((RgSchUeCb *ueCb)); -EXTERN uint8_t rgSchfillPucchCqiRepNumCountemtc ARGS((RgSchUePCqiCb *cqiCb, RgSchUeCb *ueCb)); -EXTERN S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)); +S16 rgSCHEmtcCellAlloc ARGS((RgSchCellCb *cel)); +Void rgSCHEmtcCellFree ARGS((RgSchCellCb *cel)); +Void rgSCHEmtcUeInfoFree ARGS((RgSchCellCb *cell, RgSchUeCb *ue)); +uint8_t rgSchfillPucchSrRepNumCountemtc ARGS((RgSchUeCb *ueCb)); +uint8_t rgSchfillPucchCqiRepNumCountemtc ARGS((RgSchUePCqiCb *cqiCb, RgSchUeCb *ueCb)); +S16 rgEmtcvalidateSiCfg ARGS((RgrSiCfgReqInfo *siCfg,RgSchCellCb *cell)); #endif /* forward references */ @@ -1945,14 +1945,14 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellCfgUeCfgRollBack +static S16 rgSCHSCellCfgUeCfgRollBack ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) #else -PRIVATE S16 rgSCHSCellCfgUeCfgRollBack(cell, ue, ueRecfg) +static S16 rgSCHSCellCfgUeCfgRollBack(cell, ue, ueRecfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -2467,13 +2467,13 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHDynCfiCfg +static S16 rgSCHDynCfiCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg ) #else -PRIVATE S16 rgSCHDynCfiCfg(cell, cellCfg) +static S16 rgSCHDynCfiCfg(cell, cellCfg) RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif @@ -2686,8 +2686,8 @@ RgrCellCfg *cellCfg; #endif #ifdef XEON_LMT_ITBS -EXTERN uint16_t gWrMaxDlItbs; -EXTERN uint16_t gWrMaxUlItbs; +uint16_t gWrMaxDlItbs; +uint16_t gWrMaxUlItbs; #endif /** * @brief Handler for the cell configuration request from RRM to MAC. @@ -3491,7 +3491,7 @@ RgSchErrInfo *errInfo; * @param[out] RgSchErrInfo *errInfo **/ #ifdef ANSI -PRIVATE Void rgSCHCfgRgrUePhrMsg3 +static Void rgSCHCfgRgrUePhrMsg3 ( RgSchCellCb *cell, RgSchRaCb *raCb, @@ -3499,7 +3499,7 @@ RgSchUeCb *ue, RgSchErrInfo *errInfo ) #else -PRIVATE Void rgSCHCfgRgrUePhrMsg3(cell, raCb, ue, errInfo) +static Void rgSCHCfgRgrUePhrMsg3(cell, raCb, ue, errInfo) RgSchCellCb *cell; RgSchRaCb *raCb; RgSchUeCb *ue; @@ -3861,7 +3861,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHCfgRgrUeRecfgRntiChg +static S16 rgSCHCfgRgrUeRecfgRntiChg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3869,7 +3869,7 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHCfgRgrUeRecfgRntiChg(cell, ue, ueRecfg, errInfo) +static S16 rgSCHCfgRgrUeRecfgRntiChg(cell, ue, ueRecfg, errInfo) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -5106,14 +5106,14 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellPwrCfg +static S16 rgSCHCfgVldtRgrCellPwrCfg ( Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHCfgVldtRgrCellPwrCfg(inst, cellCfg, errInfo) +static S16 rgSCHCfgVldtRgrCellPwrCfg(inst, cellCfg, errInfo) Inst inst; RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; @@ -5151,14 +5151,14 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCmnLcCfg +static S16 rgSCHCfgVldtRgrCmnLcCfg ( Inst inst, RgrCellCfg *cellCfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHCfgVldtRgrCmnLcCfg(inst, cellCfg, errInfo) +static S16 rgSCHCfgVldtRgrCmnLcCfg(inst, cellCfg, errInfo) Inst inst; RgrCellCfg *cellCfg; RgSchErrInfo *errInfo; @@ -5286,13 +5286,13 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeCqiModeCfg +static S16 rgSCHCfgVldtUeCqiModeCfg ( RgSchCellCb *cell, RgrUeDlCqiCfg *ueDlCqiCfg ) #else -PRIVATE S16 rgSCHCfgVldtUeCqiModeCfg(cell, ueDlCqiCfg) +static S16 rgSCHCfgVldtUeCqiModeCfg(cell, ueDlCqiCfg) RgSchCellCb *cell; RgrUeDlCqiCfg *ueDlCqiCfg; #endif @@ -5368,13 +5368,13 @@ RgrUeDlCqiCfg *ueDlCqiCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg +static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg ( RgSchCellCb *cell, RgrUeCfg *ueCfg ) #else -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg(cell, ueCfg) +static S16 rgSCHCfgVldtUeMeasGapAckNakRepCfg(cell, ueCfg) RgSchCellCb *cell; RgrUeCfg *ueCfg; #endif @@ -5457,13 +5457,13 @@ RgrUeCfg *ueCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg +static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg ( RgSchCellCb *cell, RgrUeRecfg *ueRecfg ) #else -PRIVATE S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg(cell, ueRecfg) +static S16 rgSCHCfgVldtUeMeasGapAckNakRepRecfg(cell, ueRecfg) RgSchCellCb *cell; RgrUeRecfg *ueRecfg; #endif @@ -5536,13 +5536,13 @@ RgrUeRecfg *ueRecfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeDlSpsCfg +static S16 rgSCHCfgVldtUeDlSpsCfg ( RgSchCellCb *cell, RgrUeSpsDlCfg *dlSpsCfg ) #else -PRIVATE S16 rgSCHCfgVldtUeDlSpsCfg(cell, dlSpsCfg) +static S16 rgSCHCfgVldtUeDlSpsCfg(cell, dlSpsCfg) RgSchCellCb *cell; RgrUeSpsDlCfg *dlSpsCfg; #endif @@ -5603,13 +5603,13 @@ RgrUeSpsDlCfg *dlSpsCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUePwrCfg +static S16 rgSCHCfgVldtUePwrCfg ( RgSchCellCb *cell, RgrUeUlPwrCfg *pwrCfg ) #else -PRIVATE S16 rgSCHCfgVldtUePwrCfg(cell, pwrCfg) +static S16 rgSCHCfgVldtUePwrCfg(cell, pwrCfg) RgSchCellCb *cell; RgrUeUlPwrCfg *pwrCfg; #endif @@ -5660,13 +5660,13 @@ RgrUeUlPwrCfg *pwrCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtUeGrpPwrCfg +static S16 rgSCHCfgVldtUeGrpPwrCfg ( RgSchCellCb *cell, RgrUeGrpPwrCfg *grpPwrCfg ) #else -PRIVATE S16 rgSCHCfgVldtUeGrpPwrCfg(cell, grpPwrCfg) +static S16 rgSCHCfgVldtUeGrpPwrCfg(cell, grpPwrCfg) RgSchCellCb *cell; RgrUeGrpPwrCfg *grpPwrCfg; #endif @@ -5704,14 +5704,14 @@ RgrUeGrpPwrCfg *grpPwrCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtSpsReCfg +static S16 rgSCHCfgVldtSpsReCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) #else -PRIVATE S16 rgSCHCfgVldtSpsReCfg(cell, ue, ueRecfg) +static S16 rgSCHCfgVldtSpsReCfg(cell, ue, ueRecfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -5803,13 +5803,13 @@ RgrUeRecfg *ueRecfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtCqiReptReCfg +static S16 rgSCHCfgVldtCqiReptReCfg ( RgSchCellCb *cell, RgrUeRecfg *ueRecfg ) #else -PRIVATE S16 rgSCHCfgVldtCqiReptReCfg(cell, ueRecfg) +static S16 rgSCHCfgVldtCqiReptReCfg(cell, ueRecfg) RgSchCellCb *cell; RgrUeRecfg *ueRecfg; #endif @@ -6062,14 +6062,14 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgRgrCmnLcCfg +static S16 rgSCHCfgRgrCmnLcCfg ( RgSchCellCb *cell, RgrCmnLchCfg *lcCfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHCfgRgrCmnLcCfg(cell, lcCfg, errInfo) +static S16 rgSCHCfgRgrCmnLcCfg(cell, lcCfg, errInfo) RgSchCellCb *cell; RgrCmnLchCfg *lcCfg; RgSchErrInfo *errInfo; @@ -6139,14 +6139,14 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeDlDedLcCb +static Void rgSCHCfgFreeDlDedLcCb ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc ) #else -PRIVATE Void rgSCHCfgFreeDlDedLcCb(cell, ue, dlLc) +static Void rgSCHCfgFreeDlDedLcCb(cell, ue, dlLc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -6185,12 +6185,12 @@ RgSchDlLcCb *dlLc; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeDlCmnLcCb +static Void rgSCHCfgFreeDlCmnLcCb ( RgSchClcDlLcCb *cmnDlLc ) #else -PRIVATE Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc) +static Void rgSCHCfgFreeDlCmnLcCb(cmnDlLc) RgSchClcDlLcCb *cmnDlLc; #endif { @@ -6338,13 +6338,13 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeUeCb +static Void rgSCHCfgFreeUeCb ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCfgFreeUeCb(cell, ue) +static Void rgSCHCfgFreeUeCb(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -6465,12 +6465,12 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeRgrCfgLst +static Void rgSCHCfgFreeRgrCfgLst ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCfgFreeRgrCfgLst(cell) +static Void rgSCHCfgFreeRgrCfgLst(cell) RgSchCellCb *cell; #endif { @@ -6519,12 +6519,12 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeCmnLcLst +static Void rgSCHCfgFreeCmnLcLst ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCfgFreeCmnLcLst(cell) +static Void rgSCHCfgFreeCmnLcLst(cell) RgSchCellCb *cell; #endif { @@ -6572,12 +6572,12 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeUeLst +static Void rgSCHCfgFreeUeLst ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCfgFreeUeLst(cell) +static Void rgSCHCfgFreeUeLst(cell) RgSchCellCb *cell; #endif { @@ -6642,12 +6642,12 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgFreeSpsUeLst +static Void rgSCHCfgFreeSpsUeLst ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCfgFreeSpsUeLst(cell) +static Void rgSCHCfgFreeSpsUeLst(cell) RgSchCellCb *cell; #endif { @@ -6683,13 +6683,13 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg +static S16 rgSCHCfgVldtRgrCellSiCfg ( Inst inst, RgrSiCfg *siCfg ) #else -PRIVATE S16 rgSCHCfgVldtRgrCellSiCfg(inst, siCfg) +static S16 rgSCHCfgVldtRgrCellSiCfg(inst, siCfg) Inst inst; RgrSiCfg *siCfg; #endif @@ -6762,14 +6762,14 @@ RgrSiCfg *siCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg +static S16 rgSCHCfgVldtRgrCellLteAdvCfg ( Inst inst, RgrLteAdvancedCellConfig *lteAdvCfg, uint8_t dlTotalBw ) #else -PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) +static S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) Inst inst; RgrLteAdvancedCellConfig *lteAdvCfg; uint8_t dlTotalBw; @@ -6845,13 +6845,13 @@ PRIVATE S16 rgSCHCfgVldtRgrCellLteAdvCfg(inst, lteAdvCfg, dlTotalBw) * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg +static S16 rgSCHCfgVldtRgrCellCsgParamCfg ( Inst inst, RgrCellCsgParamCfg *csgParam ) #else -PRIVATE S16 rgSCHCfgVldtRgrCellCsgParamCfg(inst, csgParam) +static S16 rgSCHCfgVldtRgrCellCsgParamCfg(inst, csgParam) Inst inst; RgrCellCsgParamCfg *csgParam; #endif @@ -7801,14 +7801,14 @@ S16 rgSCHCfgVldtRgrUeSrCfg(cellCb, crnti, srCfg, errInfo) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg +static S16 rgSCHCfgVldtCqiSrSrsUeCfg ( RgSchCellCb *cellCb, RgrUeCfg *ueCfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) +static S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) RgSchCellCb *cellCb; RgrUeCfg *ueCfg; RgSchErrInfo *errInfo; @@ -7902,7 +7902,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeCfg(cellCb, ueCfg, errInfo) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg +static S16 rgSCHCfgVldtCqiSrSrsUeReCfg ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -7910,7 +7910,7 @@ PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) +static S16 rgSCHCfgVldtCqiSrSrsUeReCfg(cellCb, ueCb, ueReCfg, errInfo) RgSchCellCb *cellCb; RgSchUeCb *ueCb; RgrUeRecfg *ueReCfg; @@ -9297,7 +9297,7 @@ S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) uint8_t mid; uint8_t min = 0; uint8_t max = 0; - CONSTANT RgSchUePCqiSrsSrCfgIdxTbl* table; + const RgSchUePCqiSrsSrCfgIdxTbl* table; /* Added the function instead of the MACRO to get the * periodicity table */ @@ -9344,7 +9344,7 @@ S16 rgSCHUtlGetCfgPerOff ( tbl, cfgIdx, peri, offset) * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz +static Void rgSCHCfgUtlFetchAcqiBitSz ( RgSchUeACqiCb *acqiCb, uint8_t numTxAnt, @@ -9352,7 +9352,7 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz uint8_t* cqiPmiSzRn1 ) #else -PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn1) +static Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn1) RgSchUeACqiCb *acqiCb; uint8_t numTxAnt; uint8_t* cqiPmiSzR1; @@ -9447,20 +9447,20 @@ PRIVATE Void rgSCHCfgUtlFetchAcqiBitSz(acqiCb, numTxAnt, cqiPmiSzR1, cqiPmiSzRn **********************************************************/ #ifdef ANSI -PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl +static const RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl ( RgSchPerTbl tblType, uint8_t* min, uint8_t* max ) #else -PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblType, min, max) +static const RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblType, min, max) RgSchPerTbl tblType; uint8_t* min; uint8_t* max; #endif { - CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * table; + const RgSchUePCqiSrsSrCfgIdxTbl * table; switch (tblType) { @@ -9509,7 +9509,7 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy } default: { - table = (CONSTANT RgSchUePCqiSrsSrCfgIdxTbl *) 0; + table = (const RgSchUePCqiSrsSrCfgIdxTbl *) 0; * min = 0; * max = 0; break; @@ -9538,13 +9538,13 @@ PRIVATE CONSTANT RgSchUePCqiSrsSrCfgIdxTbl * rgSCHCfgUtlGetPcqiSrsSrRiTbl(tblTy * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxUeCfg +static S16 rgSCHCfgVldtDrxUeCfg ( RgSchCellCb *cell, RgrUeDrxCfg *ueDrxCfg ) #else -PRIVATE S16 rgSCHCfgVldtDrxUeCfg(cell, ueDrxCfg) +static S16 rgSCHCfgVldtDrxUeCfg(cell, ueDrxCfg) RgSchCellCb *cell; RgrUeDrxCfg *ueDrxCfg; #endif @@ -9737,12 +9737,12 @@ RgrUeDrxCfg *ueDrxCfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg +static S16 rgSCHCfgVldtDrxOnDurCfg ( uint8_t onDurTmr ) #else -PRIVATE S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr) +static S16 rgSCHCfgVldtDrxOnDurCfg(onDurTmr) uint8_t onDurTmr; #endif { @@ -9794,12 +9794,12 @@ uint8_t onDurTmr; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxInActvCfg +static S16 rgSCHCfgVldtDrxInActvCfg ( uint16_t inActvTmr ) #else -PRIVATE S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr) +static S16 rgSCHCfgVldtDrxInActvCfg(inActvTmr) uint16_t inActvTmr; #endif { @@ -9856,12 +9856,12 @@ uint16_t inActvTmr; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxReTxCfg +static S16 rgSCHCfgVldtDrxReTxCfg ( uint8_t reTxTmr ) #else -PRIVATE S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr) +static S16 rgSCHCfgVldtDrxReTxCfg(reTxTmr) uint8_t reTxTmr; #endif { @@ -9905,12 +9905,12 @@ uint8_t reTxTmr; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg +static S16 rgSCHCfgVldtDrxLngCycCfg ( RgrDrxLongCycleOffst lngCycleOffst ) #else -PRIVATE S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst) +static S16 rgSCHCfgVldtDrxLngCycCfg(lngCycleOffst) RgrDrxLongCycleOffst lngCycleOffst; #endif { @@ -9946,12 +9946,12 @@ RgrDrxLongCycleOffst lngCycleOffst; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs +static S16 rgSCHCfgVldtDrxLngCyclTmrs ( uint16_t val ) #else -PRIVATE S16 rgSCHCfgVldtDrxLngCyclTmrs(val) +static S16 rgSCHCfgVldtDrxLngCyclTmrs(val) uint16_t val; #endif { @@ -10004,12 +10004,12 @@ uint16_t val; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg +static S16 rgSCHCfgVldtDrxShrtCycCfg ( RgrDrxShortDrx shrtCycCfg ) #else -PRIVATE S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg) +static S16 rgSCHCfgVldtDrxShrtCycCfg(shrtCycCfg) RgrDrxShortDrx shrtCycCfg; #endif { @@ -10069,7 +10069,7 @@ RgrDrxShortDrx shrtCycCfg; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHCfgUeTaRecfg +static Void rgSCHCfgUeTaRecfg ( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -10077,7 +10077,7 @@ RgrUeRecfg *ueCfg, RgSchErrInfo *err ) #else -PRIVATE Void rgSCHCfgUeTaRecfg(cell, ueCb, ueCfg, err) +static Void rgSCHCfgUeTaRecfg(cell, ueCb, ueCfg, err) RgSchCellCb *cell; RgSchUeCb *ueCb; RgrUeRecfg *ueCfg; @@ -10131,14 +10131,14 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCfgUeCqiReptReCfg +static S16 rgSCHCfgUeCqiReptReCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) #else -PRIVATE S16 rgSCHCfgUeCqiReptReCfg(cell, ue, ueRecfg) +static S16 rgSCHCfgUeCqiReptReCfg(cell, ue, ueRecfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -10182,7 +10182,7 @@ RgrUeRecfg *ueRecfg; /*This function Added Ue in ongoing L2 Meas*/ /*LTE_L2_MEAS_PHASE2*/ #ifdef LTE_L2_MEAS -PRIVATE S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) +static S16 rgSchAddToL2Meas(RgSchCellCb *cellCb,RgSchDlLcCb *dlLc) { CmLList *lnk; uint16_t idx; diff --git a/src/5gnrsch/rg_sch_clist.x b/src/5gnrsch/rg_sch_clist.x index de6222b48..dcbab882d 100755 --- a/src/5gnrsch/rg_sch_clist.x +++ b/src/5gnrsch/rg_sch_clist.x @@ -55,16 +55,16 @@ struct rgSchRrCListCp uint32_t count; /* number of entries */ }; -EXTERN Void rgSCHRrCListInit ARGS ((RgSchRrCListCp *lList)); -EXTERN Void rgSCHRrCListAdd2Tail ARGS ((RgSchRrCListCp *lList, \ +Void rgSCHRrCListInit ARGS ((RgSchRrCListCp *lList)); +Void rgSCHRrCListAdd2Tail ARGS ((RgSchRrCListCp *lList, \ RgSchRrCList *node)); /* Renamed functions to start with rgSCH */ -EXTERN RgSchRrCList *rgSCHRrCListDelFrm ARGS ((RgSchRrCListCp *lList, \ +RgSchRrCList *rgSCHRrCListDelFrm ARGS ((RgSchRrCListCp *lList, \ RgSchRrCList *node)); -EXTERN Void rgSCHRrCListInsrtAtCrnt ARGS ((RgSchRrCListCp *lList, \ +Void rgSCHRrCListInsrtAtCrnt ARGS ((RgSchRrCListCp *lList, \ RgSchRrCList *node)); /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN Void rgSCHRrCListAdd2Crnt ARGS ((RgSchRrCListCp *lList, \ +Void rgSCHRrCListAdd2Crnt ARGS ((RgSchRrCListCp *lList, \ RgSchRrCList *node)); /* LTE_ADV_FLAG_REMOVED_END */ diff --git a/src/5gnrsch/rg_sch_cmn.c b/src/5gnrsch/rg_sch_cmn.c index 5ddf9b5b5..a290ad29b 100755 --- a/src/5gnrsch/rg_sch_cmn.c +++ b/src/5gnrsch/rg_sch_cmn.c @@ -66,42 +66,42 @@ extern "C" { #endif /* __cplusplus */ #ifdef EMTC_ENABLE -EXTERN uint32_t emtcStatsUlTomSrInd; -EXTERN uint32_t emtcStatsUlBsrTmrTxp; +uint32_t emtcStatsUlTomSrInd; +uint32_t emtcStatsUlBsrTmrTxp; #endif #define RG_ITBS_DIFF(_x, _y) ((_x) > (_y) ? (_x) - (_y) : (_y) - (_x)) -EXTERN Void rgSCHSc1UlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHSc1UlInit ARGS((RgUlSchdApis *apis)); #ifdef RG_PHASE2_SCHED -EXTERN Void rgSCHRrUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHRrUlInit ARGS((RgUlSchdApis *apis)); #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcHqInfoFree ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); -EXTERN Void rgSCHEmtcRrUlInit ARGS((RgUlSchdApis *apis)); -EXTERN Void rgSCHEmtcCmnDlInit ARGS((Void)); -EXTERN Void rgSCHEmtcCmnUlInit ARGS((Void)); -EXTERN Void rgSCHEmtcCmnUeNbReset ARGS((RgSchUeCb *ueCb)); -EXTERN RgSchCmnCqiToTbs *rgSchEmtcCmnCqiToTbs[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_CFI]; +Void rgSCHEmtcHqInfoFree ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); +Void rgSCHEmtcRrUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHEmtcCmnDlInit ARGS((Void)); +Void rgSCHEmtcCmnUlInit ARGS((Void)); +Void rgSCHEmtcCmnUeNbReset ARGS((RgSchUeCb *ueCb)); +RgSchCmnCqiToTbs *rgSchEmtcCmnCqiToTbs[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_CFI]; #endif -EXTERN Void rgSCHMaxciUlInit ARGS((RgUlSchdApis *apis)); -EXTERN Void rgSCHPfsUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHMaxciUlInit ARGS((RgUlSchdApis *apis)); +Void rgSCHPfsUlInit ARGS((RgUlSchdApis *apis)); #endif -EXTERN Void rgSCHSc1DlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHSc1DlInit ARGS((RgDlSchdApis *apis)); #ifdef RG_PHASE2_SCHED -EXTERN Void rgSCHRrDlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHRrDlInit ARGS((RgDlSchdApis *apis)); #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcRrDlInit ARGS((RgDlEmtcSchdApis *apis)); +Void rgSCHEmtcRrDlInit ARGS((RgDlEmtcSchdApis *apis)); #endif -EXTERN Void rgSCHMaxciDlInit ARGS((RgDlSchdApis *apis)); -EXTERN Void rgSCHPfsDlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHMaxciDlInit ARGS((RgDlSchdApis *apis)); +Void rgSCHPfsDlInit ARGS((RgDlSchdApis *apis)); #ifdef TFU_UPGRADE -EXTERN Void rgSCHDlfsInit ARGS((RgDlfsSchdApis *apis)); +Void rgSCHDlfsInit ARGS((RgDlfsSchdApis *apis)); #endif #endif #ifdef EMTC_ENABLE -EXTERN Void rgSCHCmnGetCqiEmtcDciFrmt2AggrLvl ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHCmnGetEmtcDciFrmtSizes ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHEmtcRrUlProcRmvFrmRetx ARGS((RgSchCellCb *cell, RgSchUlHqProcCb *proc)); -EXTERN S16 rgSCHCmnPrecompEmtcMsg3Vars +Void rgSCHCmnGetCqiEmtcDciFrmt2AggrLvl ARGS((RgSchCellCb *cell)); +Void rgSCHCmnGetEmtcDciFrmtSizes ARGS((RgSchCellCb *cell)); +Void rgSCHEmtcRrUlProcRmvFrmRetx ARGS((RgSchCellCb *cell, RgSchUlHqProcCb *proc)); +S16 rgSCHCmnPrecompEmtcMsg3Vars ARGS(( RgSchCmnUlCell *cellUl, uint8_t ccchCqi, @@ -114,16 +114,16 @@ Void rgSCHEmtcCmnUeCcchSduDel RgSchCellCb *cell, RgSchUeCb *ueCb ); -EXTERN Void rgSCHEmtcRmvFrmTaLst +Void rgSCHEmtcRmvFrmTaLst ( RgSchCmnDlCell *cellDl, RgSchUeCb *ue ); -EXTERN Void rgSCHEmtcInitTaLst +Void rgSCHEmtcInitTaLst ( RgSchCmnDlCell *cellDl ); -EXTERN Void rgSCHEmtcAddToTaLst +Void rgSCHEmtcAddToTaLst ( RgSchCmnDlCell *cellDl, RgSchUeCb *ue @@ -132,16 +132,16 @@ RgSchUeCb *ue #endif #ifdef RGR_SI_SCH -PRIVATE Void rgSCHDlSiSched ARGS((RgSchCellCb *cell, +static Void rgSCHDlSiSched ARGS((RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc)); -PRIVATE Void rgSCHChkNUpdSiCfg ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHSelectSi ARGS((RgSchCellCb *cell)); +static Void rgSCHChkNUpdSiCfg ARGS((RgSchCellCb *cell)); +static Void rgSCHSelectSi ARGS((RgSchCellCb *cell)); #endif /*RGR_SI_SCH*/ /* LTE_ADV_FLAG_REMOVED_START */ #ifdef UNUSED_FUNC #ifndef LTE_TDD -PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc +static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -149,7 +149,7 @@ RgSchDlSf *dlSf, uint8_t rbStrt, uint8_t numRb ); -PRIVATE S16 rgSCHCmnBuildRntpInfo ( +static S16 rgSCHCmnBuildRntpInfo ( RgSchCellCb *cell, uint8_t *rntpPtr, uint8_t startRb, @@ -157,26 +157,26 @@ uint8_t nmbRb, uint16_t bw ); #endif -PRIVATE Void rgSCHCmnNonDlfsType0Alloc +static Void rgSCHCmnNonDlfsType0Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo, RgSchUeCb *ue ); -PRIVATE uint8_t rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29}; -PRIVATE Void rgSCHCmnUlNonadapRetx ARGS(( +static uint8_t rgSchCmnUlRvIdxToIMcsTbl[4] = {32, 30, 31, 29}; +static Void rgSCHCmnUlNonadapRetx ARGS(( RgSchCmnUlCell *cellUl, RgSchUlAlloc *alloc, uint8_t idx )); -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs ARGS(( +static Void rgSCHCmnUlSfRlsRetxProcs ARGS(( RgSchCellCb *cell, RgSchUlSf *sf )); #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi ARGS(( +static S16 rgSCHCmnUlMdfyGrntForCqi ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t maxRb, @@ -187,35 +187,35 @@ uint32_t stepDownItbs, uint32_t effTgt )); #endif -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt1 ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt1A ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt1B ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt2 ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, RgSchPdcch *pdcch, uint8_t tpc )); -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS(( +static Void rgSCHCmnFillHqPPdcchDciFrmt2A ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP, @@ -231,19 +231,19 @@ Void rgSCHCmnDlSpsSch ); /* LTE_ADV_FLAG_REMOVED_END */ -PRIVATE Void rgSCHCmnNonDlfsBcchPcchRbAlloc ARGS(( +static Void rgSCHCmnNonDlfsBcchPcchRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHBcchPcchDlRbAlloc ARGS(( +static Void rgSCHBcchPcchDlRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnDlBcchPcchAlloc ARGS(( +static Void rgSCHCmnDlBcchPcchAlloc ARGS(( RgSchCellCb *cell )); #ifdef RGR_CQI_REPT -PRIVATE Void rgSCHCmnDlCqiOnPucchInd ARGS (( +static Void rgSCHCmnDlCqiOnPucchInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi, @@ -251,7 +251,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd ARGS (( Bool *isCqiAvail, Bool *is2ndCwCqiAvail )); -PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( +static Void rgSCHCmnDlCqiOnPuschInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPusch *puschCqi, @@ -260,12 +260,12 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( Bool *is2ndCwCqiAvail )); #else -PRIVATE Void rgSCHCmnDlCqiOnPucchInd ARGS (( +static Void rgSCHCmnDlCqiOnPucchInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi )); -PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( +static Void rgSCHCmnDlCqiOnPuschInd ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPusch *puschCqi @@ -274,17 +274,17 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd ARGS (( /* ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT -PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept ARGS(( +static S16 rgSCHCmnUeDlPwrCtColltCqiRept ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCqiRept *ueCqiRept)); #endif /* End of RGR_CQI_REPT */ /* Fix: syed align multiple UEs to refresh at same time */ -PRIVATE Void rgSCHCmnGetRefreshPer ARGS(( +static Void rgSCHCmnGetRefreshPer ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t *waitPer)); -PRIVATE S16 rgSCHCmnApplyUeRefresh ARGS(( +static S16 rgSCHCmnApplyUeRefresh ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); #ifdef DL_LA @@ -293,7 +293,7 @@ Void rgSCHCmnDlSetUeAllocLmtLa ARGS RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCheckAndSetTxScheme ARGS +static Void rgSCHCheckAndSetTxScheme ARGS (( RgSchCellCb *cell, RgSchUeCb *ue @@ -301,7 +301,7 @@ RgSchUeCb *ue #endif #ifdef LTE_TDD -PRIVATE uint32_t rgSCHCmnCalcDwPtsTbSz ARGS +static uint32_t rgSCHCmnCalcDwPtsTbSz ARGS (( RgSchCellCb *cell, uint32_t bo, @@ -311,7 +311,7 @@ uint8_t lyr, uint8_t cfi )); -PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw ARGS +static Void rgSCHCmnCalcDwPtsTbSz2Cw ARGS (( RgSchCellCb *cell, uint32_t bo, @@ -327,7 +327,7 @@ uint8_t cfi )); #endif -PRIVATE Void rgSCHCmnInitRbAlloc ARGS +static Void rgSCHCmnInitRbAlloc ARGS (( RgSchCellCb *cell )); @@ -338,23 +338,23 @@ RgSchCellCb *cell /* local defines */ RgSchdApis rgSchCmnApis; -PRIVATE RgUlSchdApis rgSchUlSchdTbl[RGSCH_NUM_SCHEDULERS]; -PRIVATE RgDlSchdApis rgSchDlSchdTbl[RGSCH_NUM_SCHEDULERS]; +static RgUlSchdApis rgSchUlSchdTbl[RGSCH_NUM_SCHEDULERS]; +static RgDlSchdApis rgSchDlSchdTbl[RGSCH_NUM_SCHEDULERS]; #ifdef EMTC_ENABLE -PRIVATE RgUlSchdApis rgSchEmtcUlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; -PRIVATE RgDlEmtcSchdApis rgSchEmtcDlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; +static RgUlSchdApis rgSchEmtcUlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; +static RgDlEmtcSchdApis rgSchEmtcDlSchdTbl[RGSCH_NUM_EMTC_SCHEDULERS]; #endif #ifdef RG_PHASE2_SCHED -PRIVATE RgDlfsSchdApis rgSchDlfsSchdTbl[RGSCH_NUM_DLFS_SCHEDULERS]; +static RgDlfsSchdApis rgSchDlfsSchdTbl[RGSCH_NUM_DLFS_SCHEDULERS]; #endif -PRIVATE RgUlSchdInits rgSchUlSchdInits = RGSCH_ULSCHED_INITS; -PRIVATE RgDlSchdInits rgSchDlSchdInits = RGSCH_DLSCHED_INITS; +RgUlSchdInits rgSchUlSchdInits = RGSCH_ULSCHED_INITS; +RgDlSchdInits rgSchDlSchdInits = RGSCH_DLSCHED_INITS; #ifdef EMTC_ENABLE -PRIVATE RgEmtcUlSchdInits rgSchEmtcUlSchdInits = RGSCH_EMTC_ULSCHED_INITS; -PRIVATE RgEmtcDlSchdInits rgSchEmtcDlSchdInits = RGSCH_EMTC_DLSCHED_INITS; +static RgEmtcUlSchdInits rgSchEmtcUlSchdInits = RGSCH_EMTC_ULSCHED_INITS; +static RgEmtcDlSchdInits rgSchEmtcDlSchdInits = RGSCH_EMTC_DLSCHED_INITS; #endif #if (defined (RG_PHASE2_SCHED) && defined (TFU_UPGRADE)) -PRIVATE RgDlfsSchdInits rgSchDlfsSchdInits = RGSCH_DLFSSCHED_INITS; +static RgDlfsSchdInits rgSchDlfsSchdInits = RGSCH_DLFSSCHED_INITS; #endif typedef Void (*RgSchCmnDlAllocRbFunc) ARGS((RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -362,7 +362,7 @@ RgSchUeCb *ue, uint32_t bo, uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo)); typedef uint8_t (*RgSchCmnDlGetPrecInfFunc) ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numLyrs, Bool bothCwEnbld)); -PRIVATE Void rgSCHCmnDlAllocTxRbTM1 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM1 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -371,7 +371,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM2 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM2 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -380,7 +380,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM3 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM3 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -389,7 +389,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM4 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM4 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -399,7 +399,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef RG_UNUSED -PRIVATE Void rgSCHCmnDlAllocTxRbTM5 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM5 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -409,7 +409,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #endif -PRIVATE Void rgSCHCmnDlAllocTxRbTM6 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM6 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -418,7 +418,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocTxRbTM7 ARGS(( +static Void rgSCHCmnDlAllocTxRbTM7 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -427,7 +427,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM1 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM1 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -436,7 +436,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM2 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM2 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -445,7 +445,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM3 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM3 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -454,7 +454,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM4 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM4 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -464,7 +464,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef RG_UNUSED -PRIVATE Void rgSCHCmnDlAllocRetxRbTM5 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM5 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -474,7 +474,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #endif -PRIVATE Void rgSCHCmnDlAllocRetxRbTM6 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM6 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -483,7 +483,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlAllocRetxRbTM7 ARGS(( +static Void rgSCHCmnDlAllocRetxRbTM7 ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -494,7 +494,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef LTE_ADV -PRIVATE uint8_t rgSchGetN1ResCount ARGS (( +static uint8_t rgSchGetN1ResCount ARGS (( RgSchUeCb *ue, uint16_t servCellId )); @@ -534,25 +534,25 @@ NULLP, rgSCHCmnDlAllocRetxRbTM6, rgSCHCmnDlAllocRetxRbTM7, NULLP, NULLP}; #endif -PRIVATE uint8_t rgSCHCmnDlTM3PrecInf2 ARGS(( +static uint8_t rgSCHCmnDlTM3PrecInf2 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numTxLyrs, Bool bothCwEnbld )); -PRIVATE uint8_t rgSCHCmnDlTM3PrecInf4 ARGS(( +static uint8_t rgSCHCmnDlTM3PrecInf4 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numTxLyrs, Bool bothCwEnbld )); -PRIVATE uint8_t rgSCHCmnDlTM4PrecInf2 ARGS(( +static uint8_t rgSCHCmnDlTM4PrecInf2 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numTxLyrs, Bool bothCwEnbld )); -PRIVATE uint8_t rgSCHCmnDlTM4PrecInf4 ARGS(( +static uint8_t rgSCHCmnDlTM4PrecInf4 ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numTxLyrs, @@ -564,7 +564,7 @@ RgSchCmnDlGetPrecInfFunc getPrecInfoFunc[2][2] = { {rgSCHCmnDlTM4PrecInf2, rgSCHCmnDlTM4PrecInf4} }; -PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb ARGS(( +static S16 rgSCHCmnDlAlloc1CwRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -573,7 +573,7 @@ uint8_t noLyr, uint8_t *numRb, uint32_t *effBo )); -PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb ARGS(( +static S16 rgSCHCmnDlAlloc2CwRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -582,7 +582,7 @@ uint8_t *numRb, Bool *swpFlg, uint32_t *effBo )); -PRIVATE Void rgSCHCmnDlTM3TxTx ARGS(( +static Void rgSCHCmnDlTM3TxTx ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -591,7 +591,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlTM3TxRetx ARGS(( +static Void rgSCHCmnDlTM3TxRetx ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -600,7 +600,7 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnDlTM3RetxRetx ARGS(( +static Void rgSCHCmnDlTM3RetxRetx ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -610,7 +610,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc ARGS(( +static Void rgSCHCmnNonDlfsUpdTyp2Alloc ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, uint8_t rbStrt, @@ -618,7 +618,7 @@ uint8_t numRb )); /* LTE_ADV_FLAG_REMOVED_START */ #ifndef LTE_TDD -PRIVATE Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ARGS(( +static Void rgSCHCmnNonDlfsSFRCmnChannelUpdTyp2Alloc ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, uint8_t rbStrt, @@ -626,24 +626,24 @@ uint8_t numRb )); #endif /* LTE_ADV_FLAG_REMOVED_END */ -PRIVATE Void rgSCHCmnDlRbInfoAddUeTx ARGS(( +static Void rgSCHCmnDlRbInfoAddUeTx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *proc )); -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetx ARGS(( +static Void rgSCHCmnDlRbInfoAddUeRetx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP )); -PRIVATE Void rgSCHCmnDlAdd2NonSchdRetxLst ARGS(( +static Void rgSCHCmnDlAdd2NonSchdRetxLst ARGS(( RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *proc )); -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb ARGS(( +static S16 rgSCHCmnDlAlloc2CwTxRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -652,7 +652,7 @@ RgSchDlHqTbCb *txTb, uint8_t *numRb, uint32_t *effBo )); -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb ARGS(( +static S16 rgSCHCmnDlAlloc2CwTxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -661,7 +661,7 @@ uint32_t bo, uint8_t *numRb, uint32_t *effBo )); -PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb ARGS(( +static S16 rgSCHCmnDlAlloc1CwTxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -671,7 +671,7 @@ uint8_t *numRb, uint32_t *effBo )); #ifndef LTEMAC_SPS -PRIVATE Void rgSCHCmnFillHqPTb ARGS(( +static Void rgSCHCmnFillHqPTb ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, uint8_t tbAllocIdx, @@ -679,7 +679,7 @@ RgSchPdcch *pdcch )); #endif #ifdef LTEMAC_SPS -PRIVATE Void rgSCHCmnDlGetBestFitHole ARGS(( +static Void rgSCHCmnDlGetBestFitHole ARGS(( uint32_t *allocMask, uint8_t numMaskRbs, uint32_t *crntAllocMask, @@ -689,17 +689,17 @@ uint8_t *allocNumRbs, Bool isPartialAlloc )); #ifdef RGSCH_SPS_UNUSED -PRIVATE uint32_t rgSCHCmnGetRaType1Mask ARGS(( +static uint32_t rgSCHCmnGetRaType1Mask ARGS(( uint8_t rbIdx, uint8_t rbgSize, uint8_t *type1Subset )); #endif -PRIVATE uint32_t rgSCHCmnGetRaType0Mask ARGS(( +static uint32_t rgSCHCmnGetRaType0Mask ARGS(( uint8_t rbIdx, uint8_t rbgSize )); -PRIVATE uint32_t rgSCHCmnGetRaType2Mask ARGS(( +static uint32_t rgSCHCmnGetRaType2Mask ARGS(( uint8_t rbIdx, uint8_t *maskIdx )); @@ -754,8 +754,8 @@ uint32_t rgSchCmnBetaRiOffstTbl[16] = {1250, 1625, 2000, S8 rgSchCmnDlCqiDiffOfst[8] = {0, 1, 2, 3, -4, -3, -2, -1}; /* Include CRS REs while calculating Efficiency */ -CONSTANT PRIVATE uint8_t rgSchCmnAntIdx[5] = {0,0,1,0,2}; -CONSTANT PRIVATE uint8_t rgSchCmnNumResForCrs[5] = {0,6,12,0,16}; +const static uint8_t rgSchCmnAntIdx[5] = {0,0,1,0,2}; +const static uint8_t rgSchCmnNumResForCrs[5] = {0,6,12,0,16}; uint32_t cfiSwitchCnt ; uint32_t cfiIncr ; uint32_t cfiDecr ; @@ -808,7 +808,7 @@ typedef struct rgSchCmnDlImcsTbl uint8_t iTbs; /* ITBS */ }RgSchCmnDlImcsTbl[29]; -CONSTANT struct rgSchCmnMult235Info +const struct rgSchCmnMult235Info { uint8_t match; /* Closest number satisfying 2^a.3^b.5^c, with a bias * towards the smaller number */ @@ -836,7 +836,7 @@ CONSTANT struct rgSchCmnMult235Info /* R8 Upgrade */ /* BI table from 36.321 Table 7.2.1 */ -CONSTANT PRIVATE S16 rgSchCmnBiTbl[RG_SCH_CMN_NUM_BI_VAL] = { +const static S16 rgSchCmnBiTbl[RG_SCH_CMN_NUM_BI_VAL] = { 0, 10, 20, 30,40,60,80,120,160,240,320,480,960}; RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = { { 0, 0 }, @@ -861,7 +861,7 @@ RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI] = { /* This table maps a (delta_offset * 2 + 2) to a (beta * 8) * where beta is 10^-(delta_offset/10) rounded off to nearest 1/8 */ -PRIVATE uint16_t rgSchCmnUlBeta8Tbl[29] = { +static uint16_t rgSchCmnUlBeta8Tbl[29] = { 6, RG_SCH_CMN_UL_INVALID_BETA8, 8, 9, 10, 11, 13, 14, 16, 18, 20, 23, 25, 28, 32, RG_SCH_CMN_UL_INVALID_BETA8, 40, RG_SCH_CMN_UL_INVALID_BETA8, 50, RG_SCH_CMN_UL_INVALID_BETA8, 64, RG_SCH_CMN_UL_INVALID_BETA8, 80, @@ -871,7 +871,7 @@ PRIVATE uint16_t rgSchCmnUlBeta8Tbl[29] = { #endif /* QCI to SVC priority mapping. Index specifies the Qci*/ -PRIVATE uint8_t rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO; +static uint8_t rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO; /* The configuration is efficiency measured per 1024 REs. */ /* The first element stands for when CQI is not known */ @@ -882,15 +882,15 @@ PRIVATE uint8_t rgSchCmnDlQciPrio[RG_SCH_CMN_MAX_QCI] = RG_SCH_CMN_QCI_TO_PRIO; /* ADD CQI to MCS mapping correction * single dimensional array is replaced by 2 dimensions for different CFI*/ -PRIVATE uint16_t rgSchCmnCqiPdschEff[4][16] = {RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI1, +static uint16_t rgSchCmnCqiPdschEff[4][16] = {RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI1, RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI2,RG_SCH_CMN_CQI_TO_PDSCH_EFF_CFI3}; -PRIVATE uint16_t rgSchCmn2LyrCqiPdschEff[4][16] = {RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI1, +static uint16_t rgSchCmn2LyrCqiPdschEff[4][16] = {RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI0 ,RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI1, RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI2, RG_SCH_CMN_2LYR_CQI_TO_PDSCH_EFF_CFI3}; /* This configuration determines the transalation of a UEs CQI to its */ /* PDCCH coding efficiency. This may be edited based on the installation */ -PRIVATE uint8_t rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/ +static uint8_t rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is corrected*/ /* Indexed by [DciFrmt]. * Considering the following definition in determining the dciFrmt index. @@ -908,10 +908,9 @@ PRIVATE uint8_t rgSchCmnDlRvTbl[4] = {0, 2, 3, 1}; /* RVIdx sequence is correcte TFU_DCI_FORMAT_3A } TfuDciFormat; */ -PRIVATE uint16_t rgSchCmnDciFrmtSizes[10]; +static uint16_t rgSchCmnDciFrmtSizes[10]; - -PRIVATE uint16_t rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF; +static uint16_t rgSchCmnCqiPdcchEff[16] = RG_SCH_CMN_CQI_TO_PDCCH_EFF; #ifdef LTE_TDD @@ -1083,7 +1082,7 @@ RgSchTddInvDlAscSetIdxTbl rgSchTddInvDlAscSetIdxTbl = { #endif /* (LTEMAC_SPS ) */ /* Number of Uplink subframes Table */ -PRIVATE uint8_t rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5}; +static uint8_t rgSchTddNumUlSf[] = {6, 4, 2, 3, 2, 1, 5}; /* Downlink HARQ processes Table */ RgSchTddUlNumHarqProcTbl rgSchTddUlNumHarqProcTbl = { 7, 4, 2, 3, 2, 1, 6}; @@ -1206,17 +1205,17 @@ RgSchTddMsg3SubfrmTbl rgSchTddMsg3SubfrmTbl = { /* DwPTS Scheduling Changes Start */ /* Provides the number of Cell Reference Signals in DwPTS * region per RB */ -PRIVATE uint8_t rgSchCmnDwptsCrs[2][3] = {/* [Spl Sf cfg][Ant Port] */ +static uint8_t rgSchCmnDwptsCrs[2][3] = {/* [Spl Sf cfg][Ant Port] */ {4, 8, 16}, /* Spl Sf cfg 1,2,3,6,7,8 */ {6, 12, 20}, /* Spl Sf cfg 4 */ }; -PRIVATE S8 rgSchCmnSplSfDeltaItbs[9] = RG_SCH_DWPTS_ITBS_ADJ; +static S8 rgSchCmnSplSfDeltaItbs[9] = RG_SCH_DWPTS_ITBS_ADJ; /* DwPTS Scheduling Changes End */ #endif -PRIVATE uint32_t rgSchCmnBsrTbl[64] = { +static uint32_t rgSchCmnBsrTbl[64] = { 0, 10, 12, 14, 17, 19, 22, 26, 31, 36, 42, 49, 57, 67, 78, 91, 107, 125, 146, 171, 200, 234, 274, 321, @@ -1227,7 +1226,7 @@ PRIVATE uint32_t rgSchCmnBsrTbl[64] = { 58255, 68201, 79846, 93479, 109439, 128125, 150000, 220000 }; -PRIVATE uint32_t rgSchCmnExtBsrTbl[64] = { +static uint32_t rgSchCmnExtBsrTbl[64] = { 0, 10, 13, 16, 19, 23, 29, 35, 43, 53, 65, 80, 98, 120, 147, 181, 223, 274, 337, 414, 509, 625, 769, 945, @@ -1365,16 +1364,16 @@ RgSchRaPrmblToRaFrmTbl rgRaPrmblToRaFrmTbl = {1, 2, 2, 3, 1}; RgSchRaPrmblToRaFrmTbl rgRaPrmblToRaFrmTbl = {1, 2, 2, 3}; #endif -EXTERN RgUlSchdInits rgSchUlSchdInits; -EXTERN RgDlSchdInits rgSchDlSchdInits; -EXTERN RgDlfsSchdInits rgSchDlfsSchdInits; + RgUlSchdInits rgSchUlSchdInits; + RgDlSchdInits rgSchDlSchdInits; + RgDlfsSchdInits rgSchDlfsSchdInits; #ifdef EMTC_ENABLE -EXTERN RgEmtcUlSchdInits rgSchEmtcUlSchdInits; -EXTERN RgEmtcDlSchdInits rgSchEmtcDlSchdInits; + RgEmtcUlSchdInits rgSchEmtcUlSchdInits; + RgEmtcDlSchdInits rgSchEmtcDlSchdInits; #endif /* RACHO : start */ -PRIVATE S16 rgSCHCmnUeIdleExdThrsld ARGS(( +static S16 rgSCHCmnUeIdleExdThrsld ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); @@ -1382,7 +1381,7 @@ RgSchUeCb* rgSCHCmnGetHoUe ARGS(( RgSchCellCb *cell, uint16_t rapId )); -PRIVATE Void rgSCHCmnDelDedPreamble ARGS(( +static Void rgSCHCmnDelDedPreamble ARGS(( RgSchCellCb *cell, uint8_t preambleId )); @@ -1391,49 +1390,49 @@ RgSchCellCb *cell, uint16_t rapId, CmLteTimingInfo timingInfo )); -PRIVATE Void rgSCHCmnDelRachInfo ARGS(( +static Void rgSCHCmnDelRachInfo ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe ARGS(( +static S16 rgSCHCmnUlRbAllocForPoHoUe ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUeCb *ue, uint8_t maxRb )); -PRIVATE Void rgSCHCmnHdlHoPo ARGS(( +static Void rgSCHCmnHdlHoPo ARGS(( RgSchCellCb *cell, CmLListCp *raRspLst, RgSchRaReqInfo *raReq )); -PRIVATE Void rgSCHCmnAllocPoHoGrnt ARGS(( +static Void rgSCHCmnAllocPoHoGrnt ARGS(( RgSchCellCb *cell, CmLListCp *raRspLst, RgSchUeCb *ue, RgSchRaReqInfo *raReq )); -PRIVATE Void rgSCHCmnFillPdcchOdr2Sf ARGS(( +static Void rgSCHCmnFillPdcchOdr2Sf ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchPdcch *pdcc, uint8_t rapId, uint8_t prachMskIdx )); -PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ ARGS(( +static Void rgSCHCmnDlAdd2PdcchOdrQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCmnDlRmvFrmPdcchOdrQ ARGS(( +static Void rgSCHCmnDlRmvFrmPdcchOdrQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCmnUpdNxtPrchMskIdx ARGS(( +static Void rgSCHCmnUpdNxtPrchMskIdx ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnUpdRachParam ARGS(( +static Void rgSCHCmnUpdRachParam ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnAllocPOParam ARGS(( +static S16 rgSCHCmnAllocPOParam ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchUeCb *ue, @@ -1441,82 +1440,82 @@ RgSchPdcch **pdcch, uint8_t *rapId, uint8_t *prachMskIdx )); -PRIVATE Void rgSCHCmnGenPdcchOrder ARGS(( +static Void rgSCHCmnGenPdcchOrder ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf )); -PRIVATE Void rgSCHCmnCfgRachDedPrm ARGS(( +static Void rgSCHCmnCfgRachDedPrm ARGS(( RgSchCellCb *cell )); /* RACHO : end */ -PRIVATE Void rgSCHCmnHdlUlInactUes ARGS(( +static Void rgSCHCmnHdlUlInactUes ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnHdlDlInactUes ARGS(( +static Void rgSCHCmnHdlDlInactUes ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnUlInit ARGS((Void +static Void rgSCHCmnUlInit ARGS((Void )); -PRIVATE Void rgSCHCmnDlInit ARGS((Void +static Void rgSCHCmnDlInit ARGS((Void )); -PRIVATE Void rgSCHCmnInitDlRbAllocInfo ARGS(( +static Void rgSCHCmnInitDlRbAllocInfo ARGS(( RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUpdUlCompEffBsr ARGS(( +static Void rgSCHCmnUpdUlCompEffBsr ARGS(( RgSchUeCb *ue )); #if RG_UNUSED -PRIVATE Void rgSCHCmnUlSetAllUnSched ARGS(( +static Void rgSCHCmnUlSetAllUnSched ARGS(( RgSchCmnUlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUlUpdSf ARGS(( +static Void rgSCHCmnUlUpdSf ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUlSf *sf )); -PRIVATE Void rgSCHCmnUlHndlAllocRetx ARGS(( +static Void rgSCHCmnUlHndlAllocRetx ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUlSf *sf, RgSchUlAlloc *alloc )); #endif -PRIVATE Void rgSCHCmnGrpPwrCntrlPucch ARGS(( +static Void rgSCHCmnGrpPwrCntrlPucch ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf )); -PRIVATE Void rgSCHCmnGrpPwrCntrlPusch ARGS(( +static Void rgSCHCmnGrpPwrCntrlPusch ARGS(( RgSchCellCb *cell, RgSchUlSf *ulSf )); -PRIVATE Void rgSCHCmnDelUeFrmRefreshQ ARGS(( +static Void rgSCHCmnDelUeFrmRefreshQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHCmnTmrExpiry ARGS(( +static S16 rgSCHCmnTmrExpiry ARGS(( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ )); -PRIVATE S16 rgSCHCmnTmrProc ARGS(( +static S16 rgSCHCmnTmrProc ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnAddUeToRefreshQ ARGS(( +static Void rgSCHCmnAddUeToRefreshQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t wait )); -PRIVATE Void rgSCHCmnDlCcchRetx ARGS(( +static Void rgSCHCmnDlCcchRetx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUpdUeMimoInfo ARGS(( +static Void rgSCHCmnUpdUeMimoInfo ARGS(( RgrUeCfg *ueCfg, RgSchCmnDlUe *ueDl, RgSchCellCb *cell, RgSchCmnCell *cellSchd )); -PRIVATE Void rgSCHCmnUpdUeUlCqiInfo ARGS(( +static Void rgSCHCmnUpdUeUlCqiInfo ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchCmnUlUe *ueUl, @@ -1525,35 +1524,35 @@ RgSchCmnCell *cellSchd, Bool isEcp )); #ifdef RGR_V1 -PRIVATE Void rgSCHCmnDlCcchSduRetx ARGS(( +static Void rgSCHCmnDlCcchSduRetx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnDlCcchSduTx ARGS(( +static Void rgSCHCmnDlCcchSduTx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnCcchSduAlloc ARGS(( +static S16 rgSCHCmnCcchSduAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnCcchSduDedAlloc ARGS(( +static S16 rgSCHCmnCcchSduDedAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb )); -PRIVATE S16 rgSCHCmnNonDlfsCcchSduRbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsCcchSduRbAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchDlSf *dlSf )); #endif -PRIVATE Void rgSCHCmnInitVars ARGS(( +static Void rgSCHCmnInitVars ARGS(( RgSchCellCb *cell )); /*ccpu00117180 - DEL - Moved rgSCHCmnUpdVars to .x as its access is now */ -PRIVATE Void rgSCHCmnUlRbAllocForLst ARGS(( +static Void rgSCHCmnUlRbAllocForLst ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, uint32_t count, @@ -1562,14 +1561,14 @@ PRIVATE Void rgSCHCmnUlRbAllocForLst ARGS(( CmLListCp *nonSchdLst, Bool isNewTx )); -PRIVATE S16 rgSCHCmnUlRbAllocForUe ARGS(( +static S16 rgSCHCmnUlRbAllocForUe ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUeCb *ue, uint8_t maxRb, RgSchUlHole *hole )); -PRIVATE Void rgSCHCmnMsg3GrntReq ARGS(( +static Void rgSCHCmnMsg3GrntReq ARGS(( RgSchCellCb *cell, CmLteRnti rnti, Bool preamGrpA, @@ -1577,14 +1576,14 @@ PRIVATE Void rgSCHCmnMsg3GrntReq ARGS(( RgSchUlAlloc **ulAllocRef, uint8_t *hqProcIdRef )); -PRIVATE Void rgSCHCmnDlCcchRarAlloc ARGS(( +static Void rgSCHCmnDlCcchRarAlloc ARGS(( RgSchCellCb *cell )); -PRIVATE Void rgSCHCmnDlCcchTx ARGS(( +static Void rgSCHCmnDlCcchTx ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnDlBcchPcch ARGS(( +static Void rgSCHCmnDlBcchPcch ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc @@ -1598,7 +1597,7 @@ Bool rgSCHCmnChkPastWin ARGS(( CmLteTimingInfo frm, CmLteTimingInfo end )); -PRIVATE Void rgSCHCmnClcAlloc ARGS(( +static Void rgSCHCmnClcAlloc ARGS(( RgSchCellCb *cell, RgSchDlSf *sf, RgSchClcDlLcCb *lch, @@ -1606,7 +1605,7 @@ uint16_t rnti, RgSchCmnDlRbAllocInfo *allocInfo )); #ifndef LTEMAC_SPS -PRIVATE Void rgSCHCmnClcRbAlloc ARGS(( +static Void rgSCHCmnClcRbAlloc ARGS(( RgSchCellCb *cell, uint32_t bo, uint8_t cqi, @@ -1617,20 +1616,20 @@ RgSchDlSf *sf )); #endif -PRIVATE S16 rgSCHCmnMsg4Alloc ARGS(( +static S16 rgSCHCmnMsg4Alloc ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnMsg4DedAlloc ARGS(( +static S16 rgSCHCmnMsg4DedAlloc ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb )); -PRIVATE Void rgSCHCmnDlRaRsp ARGS(( +static Void rgSCHCmnDlRaRsp ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnRaRspAlloc ARGS(( +static S16 rgSCHCmnRaRspAlloc ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, uint16_t rntiIdx, @@ -1638,35 +1637,35 @@ uint16_t rarnti, uint8_t noRaRnti, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnUlUeDelAllocs ARGS(( +static Void rgSCHCmnUlUeDelAllocs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHCmnDlSetUeAllocLmt ARGS(( +static Void rgSCHCmnDlSetUeAllocLmt ARGS(( RgSchCellCb *cell, RgSchCmnDlUe *ueDl, Bool isEmtcUe )); -PRIVATE S16 rgSCHCmnDlRgrCellCfg ARGS(( +static S16 rgSCHCmnDlRgrCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cfg, RgSchErrInfo *err )); -PRIVATE Void rgSCHCmnUlAdapRetx ARGS(( +static Void rgSCHCmnUlAdapRetx ARGS(( RgSchUlAlloc *alloc, RgSchUlHqProcCb *proc )); -PRIVATE Void rgSCHCmnUlUpdAllocRetx ARGS(( +static Void rgSCHCmnUlUpdAllocRetx ARGS(( RgSchCellCb *cell, RgSchUlAlloc *alloc )); -PRIVATE Void rgSCHCmnUlSfReTxAllocs ARGS(( +static Void rgSCHCmnUlSfReTxAllocs ARGS(( RgSchCellCb *cell, RgSchUlSf *sf )); /* Fix: syed Adaptive Msg3 Retx crash. */ #ifdef TFU_UPGRADE -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS +static Void rgSCHCmnDlHdlTxModeRecfg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1674,7 +1673,7 @@ RgrUeRecfg *ueRecfg, uint8_t numTxPorts )); #else -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg ARGS +static Void rgSCHCmnDlHdlTxModeRecfg ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1687,27 +1686,27 @@ RgrUeRecfg *ueRecfg * DL RB allocation specific functions */ -PRIVATE Void rgSCHCmnDlRbAlloc ARGS(( +static Void rgSCHCmnDlRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHCmnNonDlfsRbAlloc ARGS(( +static Void rgSCHCmnNonDlfsRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsCmnRbAlloc ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *cmnAllocInfo)); #ifndef LTE_TDD -PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj ARGS(( +static Void rgSCHCmnNonDlfsPbchRbAllocAdj ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *cmnAllocInfo, uint8_t pbchSsRsSym, Bool isBcchPcch )); /* Added function to adjust TBSize*/ -PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj ARGS(( +static Void rgSCHCmnNonDlfsPbchTbSizeAdj ARGS(( RgSchDlRbAlloc *allocInfo, uint8_t numOvrlapgPbchRb, uint8_t pbchSsRsSym, @@ -1716,21 +1715,21 @@ uint32_t bytesReq )); /* Added function to find num of overlapping PBCH rb*/ -PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs ARGS(( +static Void rgSCHCmnFindNumPbchOvrlapRbs ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo, uint8_t *numOvrlapgPbchRb )); -PRIVATE uint8_t rgSCHCmnFindNumAddtlRbsAvl ARGS(( +static uint8_t rgSCHCmnFindNumAddtlRbsAvl ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo )); #ifdef DEBUGP #ifdef UNUSED_FUNC -PRIVATE Void rgSCHCmnFindCodeRate ARGS(( +static Void rgSCHCmnFindCodeRate ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo, @@ -1739,102 +1738,102 @@ uint8_t idx #endif #endif #endif -PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc ARGS(( +static Void rgSCHCmnNonDlfsMsg4Alloc ARGS(( RgSchCellCb *cell, RgSchCmnMsg4RbAlloc *msg4AllocInfo, uint8_t isRetx )); -PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsMsg4RbAlloc ARGS(( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchDlSf *dlSf )); -PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc ARGS(( +static S16 rgSCHCmnNonDlfsUeRbAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *dlSf, uint8_t *isDlBwAvail )); #ifndef LTEMAC_SPS -PRIVATE uint32_t rgSCHCmnCalcRiv ARGS(( uint8_t bw, +static uint32_t rgSCHCmnCalcRiv ARGS(( uint8_t bw, uint8_t rbStart, uint8_t numRb)); #endif #ifdef LTE_TDD -PRIVATE Void rgSCHCmnUpdHqAndDai ARGS(( +static Void rgSCHCmnUpdHqAndDai ARGS(( RgSchDlHqProcCb *hqP, RgSchDlSf *subFrm, RgSchDlHqTbCb *tbCb, uint8_t tbAllocIdx )); -PRIVATE S16 rgSCHCmnUlCalcAvailBw ARGS(( +static S16 rgSCHCmnUlCalcAvailBw ARGS(( RgSchCellCb *cell, RgrCellCfg *cellCfg, uint8_t cfi, uint8_t *rbStartRef, uint8_t *bwAvailRef )); -PRIVATE S16 rgSCHCmnDlKdashUlAscInit ARGS(( +static S16 rgSCHCmnDlKdashUlAscInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlANFdbkInit ARGS(( +static S16 rgSCHCmnDlANFdbkInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlNpValInit ARGS(( +static S16 rgSCHCmnDlNpValInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlCreateRachPrmLst ARGS(( +static S16 rgSCHCmnDlCreateRachPrmLst ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlCpyRachInfo ARGS(( +static S16 rgSCHCmnDlCpyRachInfo ARGS(( RgSchCellCb *cell, RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES], uint8_t raArrSz )); -PRIVATE S16 rgSCHCmnDlRachInfoInit ARGS(( +static S16 rgSCHCmnDlRachInfoInit ARGS(( RgSchCellCb *cell )); -PRIVATE S16 rgSCHCmnDlPhichOffsetInit ARGS(( +static S16 rgSCHCmnDlPhichOffsetInit ARGS(( RgSchCellCb *cell )); #endif #ifdef TFU_UPGRADE -PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS +static Void rgSCHCmnFindUlCqiUlTxAnt ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t wideCqi )); - PRIVATE RgSchCmnRank rgSCHCmnComputeRank ARGS + static RgSchCmnRank rgSCHCmnComputeRank ARGS (( RgrTxMode txMode, uint32_t *pmiBitMap, uint8_t numTxPorts )); - PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3 ARGS + static RgSchCmnRank rgSCHCmnComp2TxMode3 ARGS (( uint32_t *pmiBitMap )); - PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3 ARGS + static RgSchCmnRank rgSCHCmnComp4TxMode3 ARGS (( uint32_t *pmiBitMap )); - PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4 ARGS + static RgSchCmnRank rgSCHCmnComp2TxMode4 ARGS (( uint32_t *pmiBitMap )); - PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4 ARGS + static RgSchCmnRank rgSCHCmnComp4TxMode4 ARGS (( uint32_t *pmiBitMap )); - PRIVATE uint8_t rgSCHCmnCalcWcqiFrmSnr ARGS + static uint8_t rgSCHCmnCalcWcqiFrmSnr ARGS (( RgSchCellCb *cell, TfuSrsRpt *srsRpt @@ -1863,19 +1862,19 @@ PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt ARGS * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnCompEff +static Void rgSCHCmnCompEff ( uint8_t noPdcchSym, uint8_t cpType, uint8_t txAntIdx, -RgSchCmnTbSzEff *effTbl +RgSchCmnTbSzEff *effTbl ) #else -PRIVATE Void rgSCHCmnCompEff(noPdcchSym, cpType, txAntIdx, effTbl) +static Void rgSCHCmnCompEff(noPdcchSym, cpType, txAntIdx, effTbl) uint8_t noPdcchSym; uint8_t cpType; uint8_t txAntIdx; -RgSchCmnTbSzEff *effTbl; +RgSchCmnTbSzEff *effTbl; #endif { uint8_t noResPerRb; @@ -1947,17 +1946,17 @@ RgSchCmnTbSzEff *effTbl; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnCompUlEff +static Void rgSCHCmnCompUlEff ( uint8_t noUlRsSym, uint8_t cpType, -RgSchCmnTbSzEff *effTbl +RgSchCmnTbSzEff *effTbl ) #else -PRIVATE Void rgSCHCmnCompUlEff(noUlRsSym, cpType, effTbl) +static Void rgSCHCmnCompUlEff(noUlRsSym, cpType, effTbl) uint8_t noUlRsSym; uint8_t cpType; -RgSchCmnTbSzEff *effTbl; +RgSchCmnTbSzEff *effTbl; #endif { uint8_t noResPerRb; @@ -2012,7 +2011,7 @@ RgSchCmnTbSzEff *effTbl; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmn2LyrCompEff +static Void rgSCHCmn2LyrCompEff ( uint8_t noPdcchSym, uint8_t cpType, @@ -2020,7 +2019,7 @@ uint8_t txAntIdx, RgSchCmnTbSzEff *effTbl2Lyr ) #else -PRIVATE Void rgSCHCmn2LyrCompEff(noPdcchSym, cpType, txAntIdx, effTbl2Lyr) +static Void rgSCHCmn2LyrCompEff(noPdcchSym, cpType, txAntIdx, effTbl2Lyr) uint8_t noPdcchSym; uint8_t cpType; uint8_t txAntIdx; @@ -2095,12 +2094,12 @@ RgSchCmnTbSzEff *effTbl2Lyr; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnGetDciFrmtSizes +static Void rgSCHCmnGetDciFrmtSizes ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnGetDciFrmtSizes(cell) +static Void rgSCHCmnGetDciFrmtSizes(cell) RgSchCellCb *cell; #endif { @@ -2240,12 +2239,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnGetCqiDciFrmt2AggrLvl +static Void rgSCHCmnGetCqiDciFrmt2AggrLvl ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnGetCqiDciFrmt2AggrLvl(cell) +static Void rgSCHCmnGetCqiDciFrmt2AggrLvl(cell) RgSchCellCb *cell; #endif { @@ -2300,11 +2299,11 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlInit +static Void rgSCHCmnDlInit ( ) #else -PRIVATE Void rgSCHCmnDlInit() +static Void rgSCHCmnDlInit() #endif { uint8_t i; @@ -2541,16 +2540,16 @@ PRIVATE Void rgSCHCmnDlInit() * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlInit +static Void rgSCHCmnUlInit ( ) #else -PRIVATE Void rgSCHCmnUlInit() +static Void rgSCHCmnUlInit() #endif { uint8_t *mapTbl = &rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_NOR_CP][0]; RgSchCmnTbSzEff *effTbl = &rgSchCmnNorUlEff[0]; - CONSTANT RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0]; + const RgSchCmnUlCqiInfo *cqiTbl = &rgSchCmnUlCqiTbl[0]; S16 i; S16 j; @@ -2782,12 +2781,12 @@ CmLteTimingInfo frm; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchRarAlloc +static Void rgSCHCmnDlCcchRarAlloc ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnDlCcchRarAlloc(cell) +static Void rgSCHCmnDlCcchRarAlloc(cell) RgSchCellCb *cell; #endif { @@ -2896,14 +2895,14 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnCcchSduAlloc +static S16 rgSCHCmnCcchSduAlloc ( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE S16 rgSCHCmnCcchSduAlloc(cell, ueCb, allocInfo) +static S16 rgSCHCmnCcchSduAlloc(cell, ueCb, allocInfo) RgSchCellCb *cell; RgSchUeCb *ueCb; RgSchCmnDlRbAllocInfo *allocInfo; @@ -2963,13 +2962,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduTx +static Void rgSCHCmnDlCcchSduTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchSduTx(cell, allocInfo) +static Void rgSCHCmnDlCcchSduTx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3036,13 +3035,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchTx +static Void rgSCHCmnDlCcchTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchTx(cell, allocInfo) +static Void rgSCHCmnDlCcchTx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3094,13 +3093,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduRetx +static Void rgSCHCmnDlCcchSduRetx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchSduRetx(cell, allocInfo) +static Void rgSCHCmnDlCcchSduRetx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3191,13 +3190,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchRetx +static Void rgSCHCmnDlCcchRetx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchRetx(cell, allocInfo) +static Void rgSCHCmnDlCcchRetx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3283,14 +3282,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlBcchPcch +static Void rgSCHCmnDlBcchPcch ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc ) #else -PRIVATE Void rgSCHCmnDlBcchPcch(cell, allocInfo, subfrmAlloc) +static Void rgSCHCmnDlBcchPcch(cell, allocInfo, subfrmAlloc) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgInfSfAlloc *subfrmAlloc; @@ -3572,7 +3571,7 @@ CmLteTimingInfo end; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnClcAlloc +static Void rgSCHCmnClcAlloc ( RgSchCellCb *cell, RgSchDlSf *sf, @@ -3581,7 +3580,7 @@ uint16_t rnti, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnClcAlloc(cell, sf, lch, rnti, allocInfo) +static Void rgSCHCmnClcAlloc(cell, sf, lch, rnti, allocInfo) RgSchCellCb *cell; RgSchDlSf *sf; RgSchClcDlLcCb *lch; @@ -3812,7 +3811,7 @@ RgSchDlSf *sf; #endif #else #ifdef ANSI -PRIVATE Void rgSCHCmnClcRbAlloc +static Void rgSCHCmnClcRbAlloc ( RgSchCellCb *cell, uint32_t bo, @@ -3823,7 +3822,7 @@ uint8_t *mcs, RgSchDlSf *sf ) #else -PRIVATE Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, sf) +static Void rgSCHCmnClcRbAlloc(cell, bo, cqi, rb, tbs, mcs, sf) RgSchCellCb *cell; uint32_t bo; uint8_t cqi; @@ -3894,14 +3893,14 @@ RgSchDlSf *sf; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnMsg4Alloc +static S16 rgSCHCmnMsg4Alloc ( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE S16 rgSCHCmnMsg4Alloc(cell, raCb, allocInfo) +static S16 rgSCHCmnMsg4Alloc(cell, raCb, allocInfo) RgSchCellCb *cell; RgSchRaCb *raCb; RgSchCmnDlRbAllocInfo *allocInfo; @@ -4127,13 +4126,13 @@ Bool isDtx; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnCcchSduDedAlloc +static S16 rgSCHCmnCcchSduDedAlloc ( RgSchCellCb *cell, RgSchUeCb *ueCb ) #else -PRIVATE S16 rgSCHCmnCcchSduDedAlloc(cell, ueCb) +static S16 rgSCHCmnCcchSduDedAlloc(cell, ueCb) RgSchCellCb *cell; RgSchUeCb *ueCb; #endif @@ -4227,13 +4226,13 @@ RgSchUeCb *ueCb; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnMsg4DedAlloc +static S16 rgSCHCmnMsg4DedAlloc ( RgSchCellCb *cell, RgSchRaCb *raCb ) #else -PRIVATE S16 rgSCHCmnMsg4DedAlloc(cell, raCb) +static S16 rgSCHCmnMsg4DedAlloc(cell, raCb) RgSchCellCb *cell; RgSchRaCb *raCb; #endif @@ -4323,13 +4322,13 @@ RgSchRaCb *raCb; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRaRsp +static Void rgSCHCmnDlRaRsp ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlRaRsp(cell, allocInfo) +static Void rgSCHCmnDlRaRsp(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -4418,13 +4417,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRaRsp //FDD +static Void rgSCHCmnDlRaRsp //FDD ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlRaRsp(cell, allocInfo) +static Void rgSCHCmnDlRaRsp(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -4512,7 +4511,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnRaRspAlloc +static S16 rgSCHCmnRaRspAlloc ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -4522,7 +4521,7 @@ uint8_t noRaRnti, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE S16 rgSCHCmnRaRspAlloc(cell,subFrm,raIndex,rarnti,noRaRnti,allocInfo) +static S16 rgSCHCmnRaRspAlloc(cell,subFrm,raIndex,rarnti,noRaRnti,allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; uint16_t raIndex; @@ -4730,7 +4729,7 @@ RgSchUlAlloc *alloc; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnMsg3GrntReq +static Void rgSCHCmnMsg3GrntReq ( RgSchCellCb *cell, CmLteRnti rnti, @@ -4740,7 +4739,7 @@ RgSchUlAlloc **ulAllocRef, uint8_t *hqProcIdRef ) #else -PRIVATE Void rgSCHCmnMsg3GrntReq(cell, rnti, preamGrpA, hqProc, +static Void rgSCHCmnMsg3GrntReq(cell, rnti, preamGrpA, hqProc, ulAllocRef, hqProcIdRef) RgSchCellCb *cell; CmLteRnti rnti; @@ -4861,14 +4860,14 @@ uint8_t *hqProcIdRef; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlSetUeAllocLmt +static Void rgSCHCmnDlSetUeAllocLmt ( RgSchCellCb *cell, RgSchCmnDlUe *ueDl, Bool isEmtcUe ) #else -PRIVATE Void rgSCHCmnDlSetUeAllocLmt(cell, ueDl, isEmtcUe) +static Void rgSCHCmnDlSetUeAllocLmt(cell, ueDl, isEmtcUe) RgSchCellCb *cell; RgSchCmnDlUe *ueDl; Bool isEmtcUe; @@ -5025,13 +5024,13 @@ Bool isEmtcUe; * **/ #ifdef ANSI -PRIVATE Void rgSCHCheckAndSetTxScheme +static Void rgSCHCheckAndSetTxScheme ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCheckAndSetTxScheme(cell, ue) +static Void rgSCHCheckAndSetTxScheme(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -5486,7 +5485,7 @@ RgSchDlRbAlloc *rbAllocInfo; * **/ #ifdef ANSI -PRIVATE Bool rgSCHCmnIsSplSubfrm +static Bool rgSCHCmnIsSplSubfrm ( uint8_t splfrmCnt, uint8_t curSubfrmIdx, @@ -5494,7 +5493,7 @@ uint8_t periodicity, RgSchTddSubfrmInfo *subfrmInfo ) #else -PRIVATE Bool rgSCHCmnIsSplSubfrm(splfrmCnt, curSubfrmIdx, periodicity, subfrmInfo) +static Bool rgSCHCmnIsSplSubfrm(splfrmCnt, curSubfrmIdx, periodicity, subfrmInfo) uint8_t splfrmCnt; uint8_t curSubfrmIdx; uint8_t periodicity; @@ -5561,7 +5560,7 @@ RgSchTddSubfrmInfo *subfrmInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdHqAndDai +static Void rgSCHCmnUpdHqAndDai ( RgSchDlHqProcCb *hqP, RgSchDlSf *subFrm, @@ -5569,7 +5568,7 @@ RgSchDlHqTbCb *tbCb, uint8_t tbAllocIdx ) #else -PRIVATE Void rgSCHCmnUpdHqAndDai(hqP, subFrm, tbCb,tbAllocIdx) +static Void rgSCHCmnUpdHqAndDai(hqP, subFrm, tbCb,tbAllocIdx) RgSchDlHqProcCb *hqP; RgSchDlSf *subFrm; RgSchDlHqTbCb *tbCb; @@ -5773,7 +5772,7 @@ RgSchPdcch *pdcch; #endif #else #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPTb +static Void rgSCHCmnFillHqPTb ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -5781,7 +5780,7 @@ uint8_t tbAllocIdx, RgSchPdcch *pdcch ) #else -PRIVATE Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch) +static Void rgSCHCmnFillHqPTb(cell, rbAllocInfo, tbAllocIdx, pdcch) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; uint8_t tbAllocIdx; @@ -5881,7 +5880,7 @@ RgSchPdcch *pdcch; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmtB1B2 +static Void rgSCHCmnFillHqPPdcchDciFrmtB1B2 ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -5890,7 +5889,7 @@ RgSchPdcch *pdcch, uint8_t tpc ) #else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmtB1B2(cell, rbAllocInfo, hqP, pdcch, tpc) +static Void rgSCHCmnFillHqPPdcchDciFrmtB1B2(cell, rbAllocInfo, hqP, pdcch, tpc) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -5970,10 +5969,10 @@ uint8_t tpc; return; } -extern uint32_t totPcellSCell; -extern uint32_t addedForScell; -extern uint32_t addedForScell1; -extern uint32_t addedForScell2; +uint32_t totPcellSCell; +uint32_t addedForScell; +uint32_t addedForScell1; +uint32_t addedForScell2; /** * @brief This function fills the PDCCH information from dlProc. * @@ -6156,7 +6155,7 @@ RgSchDlHqProcCb *hqP; **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1 +static Void rgSCHCmnFillHqPPdcchDciFrmt1 ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -6165,7 +6164,7 @@ RgSchPdcch *pdcch, uint8_t tpc ) #else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1(cell, rbAllocInfo, hqP, pdcch, tpc) +static Void rgSCHCmnFillHqPPdcchDciFrmt1(cell, rbAllocInfo, hqP, pdcch, tpc) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -6293,7 +6292,7 @@ uint8_t tpc; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A +static Void rgSCHCmnFillHqPPdcchDciFrmt1A ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -6302,7 +6301,7 @@ RgSchPdcch *pdcch, uint8_t tpc ) #else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1A(cell, rbAllocInfo, hqP, pdcch, tpc) +static Void rgSCHCmnFillHqPPdcchDciFrmt1A(cell, rbAllocInfo, hqP, pdcch, tpc) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -6425,7 +6424,7 @@ uint8_t tpc; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B +static Void rgSCHCmnFillHqPPdcchDciFrmt1B ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -6434,7 +6433,7 @@ RgSchPdcch *pdcch, uint8_t tpc ) #else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt1B(cell, rbAllocInfo, hqP, pdcch, tpc) +static Void rgSCHCmnFillHqPPdcchDciFrmt1B(cell, rbAllocInfo, hqP, pdcch, tpc) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -6546,7 +6545,7 @@ uint8_t tpc; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2 +static Void rgSCHCmnFillHqPPdcchDciFrmt2 ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -6555,7 +6554,7 @@ RgSchPdcch *pdcch, uint8_t tpc ) #else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2(cell, rbAllocInfo, hqP, pdcch, tpc) +static Void rgSCHCmnFillHqPPdcchDciFrmt2(cell, rbAllocInfo, hqP, pdcch, tpc) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -6702,7 +6701,7 @@ uint8_t tpc; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A +static Void rgSCHCmnFillHqPPdcchDciFrmt2A ( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, @@ -6711,7 +6710,7 @@ RgSchPdcch *pdcch, uint8_t tpc ) #else -PRIVATE Void rgSCHCmnFillHqPPdcchDciFrmt2A(cell, rbAllocInfo, hqP, pdcch, tpc) +static Void rgSCHCmnFillHqPPdcchDciFrmt2A(cell, rbAllocInfo, hqP, pdcch, tpc) RgSchCellCb *cell; RgSchDlRbAlloc *rbAllocInfo; RgSchDlHqProcCb *hqP; @@ -6850,12 +6849,12 @@ uint8_t tpc; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnInitVars +static Void rgSCHCmnInitVars ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnInitVars(cell) +static Void rgSCHCmnInitVars(cell) RgSchCellCb *cell; #endif { @@ -7564,14 +7563,14 @@ RgSchUlAlloc *alloc; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnAddUeToRefreshQ +static Void rgSCHCmnAddUeToRefreshQ ( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t wait ) #else -PRIVATE Void rgSCHCmnAddUeToRefreshQ(cell, ue, wait) +static Void rgSCHCmnAddUeToRefreshQ(cell, ue, wait) RgSchCellCb *cell; RgSchUeCb *ue; uint32_t wait; @@ -7612,13 +7611,13 @@ uint32_t wait; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlUeReset +static Void rgSCHCmnUlUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnUlUeReset(cell, ue) +static Void rgSCHCmnUlUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -7678,13 +7677,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnResetRiCqi +static Void rgSCHCmnResetRiCqi ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnResetRiCqi(cell, ue) +static Void rgSCHCmnResetRiCqi(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -7744,13 +7743,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlUeReset +static Void rgSCHCmnDlUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnDlUeReset(cell, ue) +static Void rgSCHCmnDlUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -7988,12 +7987,12 @@ CmLteTimingInfo timingInfo; * @return RgSchCmnRank **/ #ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4 +static RgSchCmnRank rgSCHCmnComp4TxMode4 ( uint32_t *pmiBitMap ) #else -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) +static RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) uint32_t *pmiBitMap; #endif { @@ -8039,12 +8038,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode4(pmiBitMap) * @return RgSchCmnRank **/ #ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4 +static RgSchCmnRank rgSCHCmnComp2TxMode4 ( uint32_t *pmiBitMap ) #else -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) +static RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) uint32_t *pmiBitMap; #endif { @@ -8080,12 +8079,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode4(pmiBitMap) * @return RgSchCmnRank **/ #ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3 +static RgSchCmnRank rgSCHCmnComp4TxMode3 ( uint32_t *pmiBitMap ) #else -PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) +static RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) uint32_t *pmiBitMap; #endif { @@ -8129,12 +8128,12 @@ PRIVATE RgSchCmnRank rgSCHCmnComp4TxMode3(pmiBitMap) * @return RgSchCmnRank **/ #ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3 +static RgSchCmnRank rgSCHCmnComp2TxMode3 ( uint32_t *pmiBitMap ) #else -PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) +static RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) uint32_t *pmiBitMap; #endif { @@ -8172,14 +8171,14 @@ PRIVATE RgSchCmnRank rgSCHCmnComp2TxMode3(pmiBitMap) * @return RgSchCmnRank **/ #ifdef ANSI -PRIVATE RgSchCmnRank rgSCHCmnComputeRank +static RgSchCmnRank rgSCHCmnComputeRank ( RgrTxMode txMode, uint32_t *pmiBitMap, uint8_t numTxPorts ) #else -PRIVATE RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) +static RgSchCmnRank rgSCHCmnComputeRank(txMode, pmiBitMap, numTxPorts) RgrTxMode txMode; uint32_t *pmiBitMap; uint8_t numTxPorts; @@ -8345,13 +8344,13 @@ RgSchDlHqEnt *hqEnt; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnGetRefreshDist +static uint8_t rgSCHCmnGetRefreshDist ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE uint8_t rgSCHCmnGetRefreshDist(cell, ue) +static uint8_t rgSCHCmnGetRefreshDist(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -8398,14 +8397,14 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnGetRefreshPer +static Void rgSCHCmnGetRefreshPer ( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t *waitPer ) #else -PRIVATE Void rgSCHCmnGetRefreshPer(cell, ue, waitPer) +static Void rgSCHCmnGetRefreshPer(cell, ue, waitPer) RgSchCellCb *cell; RgSchUeCb *ue; uint32_t *waitPer; @@ -9082,7 +9081,7 @@ RgSchErrInfo *err; **/ #ifdef TFU_UPGRADE #ifdef ANSI -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg +static Void rgSCHCmnDlHdlTxModeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -9090,7 +9089,7 @@ RgrUeRecfg *ueRecfg, uint8_t numTxPorts ) #else -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg, numTxPorts) +static Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg, numTxPorts) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -9098,14 +9097,14 @@ uint8_t numTxPorts; #endif #else #ifdef ANSI -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg +static Void rgSCHCmnDlHdlTxModeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) #else -PRIVATE Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg) +static Void rgSCHCmnDlHdlTxModeRecfg(cell, ue, ueRecfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -9201,7 +9200,7 @@ RgrUeRecfg *ueRecfg; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdUeMimoInfo +static Void rgSCHCmnUpdUeMimoInfo ( RgrUeCfg *ueCfg, RgSchCmnDlUe *ueDl, @@ -9209,7 +9208,7 @@ RgSchCellCb *cell, RgSchCmnCell *cellSchd ) #else -PRIVATE Void rgSCHCmnUpdUeMimoInfo(ueCfg, ueDl, cell, cellSchd) +static Void rgSCHCmnUpdUeMimoInfo(ueCfg, ueDl, cell, cellSchd) RgrUeCfg *ueCfg; RgSchCmnDlUe *ueDl; RgSchCellCb *cell; @@ -9265,7 +9264,7 @@ RgSchCmnCell *cellSchd; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdUeUlCqiInfo +static Void rgSCHCmnUpdUeUlCqiInfo ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -9275,7 +9274,7 @@ RgSchCmnCell *cellSchd, Bool isEcp ) #else -PRIVATE Void rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, isEcp) +static Void rgSCHCmnUpdUeUlCqiInfo(cell, ue, ueUl, ueSchCmn, cellSchd, isEcp) RgSchCellCb *cell; RgSchUeCb *ue; RgSchCmnUlUe *ueUl; @@ -9341,13 +9340,13 @@ Bool isEcp; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdUeCatCfg +static Void rgSCHCmnUpdUeCatCfg ( RgSchUeCb *ue, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnUpdUeCatCfg(ue, cell) +static Void rgSCHCmnUpdUeCatCfg(ue, cell) RgSchUeCb *ue; RgSchCellCb *cell; #endif @@ -9572,13 +9571,13 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlUeDelAllocs +static Void rgSCHCmnUlUeDelAllocs ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnUlUeDelAllocs(cell, ue) +static Void rgSCHCmnUlUeDelAllocs(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -9653,13 +9652,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnDelUeFrmRefreshQ +static Void rgSCHCmnDelUeFrmRefreshQ ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnDelUeFrmRefreshQ(cell, ue) +static Void rgSCHCmnDelUeFrmRefreshQ(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -9707,13 +9706,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUeCcchSduDel +static Void rgSCHCmnUeCcchSduDel ( RgSchCellCb *cell, RgSchUeCb *ueCb ) #else -PRIVATE Void rgSCHCmnUeCcchSduDel(cell, ueCb) +static Void rgSCHCmnUeCcchSduDel(cell, ueCb) RgSchCellCb *cell; RgSchUeCb *ueCb; #endif @@ -9922,13 +9921,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlCnsdrCmnRt +static S16 rgSCHCmnDlCnsdrCmnRt ( RgSchCellCb *cell, RgrDlCmnCodeRateCfg *dlCmnCodeRate ) #else -PRIVATE S16 rgSCHCmnDlCnsdrCmnRt(cell, dlCmnCodeRate) +static S16 rgSCHCmnDlCnsdrCmnRt(cell, dlCmnCodeRate) RgSchCellCb *cell; RgrDlCmnCodeRateCfg *dlCmnCodeRate; #endif @@ -10044,14 +10043,14 @@ RgrDlCmnCodeRateCfg *dlCmnCodeRate; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlRgrCellCfg +static S16 rgSCHCmnDlRgrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cfg, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err) +static S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err) RgSchCellCb *cell; RgrCellCfg *cfg; RgSchErrInfo *err; @@ -10453,14 +10452,14 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlRgrCellCfg +static S16 rgSCHCmnDlRgrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cfg, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err) +static S16 rgSCHCmnDlRgrCellCfg(cell, cfg, err) RgSchCellCb *cell; RgrCellCfg *cfg; RgSchErrInfo *err; @@ -10706,7 +10705,7 @@ RgSchCmnUlCell *cellUl; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnPrecompMsg3Vars +static S16 rgSCHCmnPrecompMsg3Vars ( RgSchCmnUlCell *cellUl, uint8_t ccchCqi, @@ -10715,7 +10714,7 @@ uint8_t sbSize, Bool isEcp ) #else -PRIVATE S16 rgSCHCmnPrecompMsg3Vars(cellUl, ccchCqi, msgSzA, sbSize, isEcp) +static S16 rgSCHCmnPrecompMsg3Vars(cellUl, ccchCqi, msgSzA, sbSize, isEcp) RgSchCmnUlCell *cellUl; uint8_t ccchCqi; uint16_t msgSzA; @@ -10822,7 +10821,7 @@ uint32_t gPrntPucchDet=0; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUlCalcAvailBw +static S16 rgSCHCmnUlCalcAvailBw ( RgSchCellCb *cell, RgrCellCfg *cellCfg, @@ -10831,7 +10830,7 @@ uint8_t *rbStartRef, uint8_t *bwAvailRef ) #else -PRIVATE S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef) +static S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef) RgSchCellCb *cell; RgrCellCfg *cellCfg; uint8_t cfi; @@ -10938,7 +10937,7 @@ uint8_t *bwAvailRef; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUlCalcAvailBw +static S16 rgSCHCmnUlCalcAvailBw ( RgSchCellCb *cell, RgrCellCfg *cellCfg, @@ -10947,7 +10946,7 @@ uint8_t *rbStartRef, uint8_t *bwAvailRef ) #else -PRIVATE S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef) +static S16 rgSCHCmnUlCalcAvailBw(cell, cellCfg, cfi, rbStartRef, bwAvailRef) RgSchCellCb *cell; RgrCellCfg *cellCfg; uint8_t cfi; @@ -11058,13 +11057,13 @@ uint8_t *bwAvailRef; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUlCellInit +static S16 rgSCHCmnUlCellInit ( RgSchCellCb *cell, RgrCellCfg *cellCfg ) #else -PRIVATE S16 rgSCHCmnUlCellInit(cell, cellCfg) +static S16 rgSCHCmnUlCellInit(cell, cellCfg) RgSchCellCb *cell; RgrCellCfg *cellCfg; #endif @@ -11648,12 +11647,12 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlCellDeinit +static Void rgSCHCmnUlCellDeinit ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnUlCellDeinit(cell) +static Void rgSCHCmnUlCellDeinit(cell) RgSchCellCb *cell; #endif { @@ -11827,12 +11826,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnValidateDlQos +static S16 rgSCHCmnValidateDlQos ( RgrLchQosCfg *dlQos ) #else -PRIVATE S16 rgSCHCmnValidateDlQos(dlQos) +static S16 rgSCHCmnValidateDlQos(dlQos) RgrLchQosCfg *dlQos; #endif { @@ -12484,13 +12483,13 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduRetxFnlz +static Void rgSCHCmnDlCcchSduRetxFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchSduRetxFnlz(cell, allocInfo) +static Void rgSCHCmnDlCcchSduRetxFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -12557,13 +12556,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchRetxFnlz +static Void rgSCHCmnDlCcchRetxFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchRetxFnlz(cell, allocInfo) +static Void rgSCHCmnDlCcchRetxFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -12631,13 +12630,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchSduTxFnlz +static Void rgSCHCmnDlCcchSduTxFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchSduTxFnlz(cell, allocInfo) +static Void rgSCHCmnDlCcchSduTxFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -12722,13 +12721,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlCcchTxFnlz +static Void rgSCHCmnDlCcchTxFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlCcchTxFnlz(cell, allocInfo) +static Void rgSCHCmnDlCcchTxFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -12902,13 +12901,13 @@ uint32_t ueCount; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRaRspFnlz +static Void rgSCHCmnDlRaRspFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlRaRspFnlz(cell, allocInfo) +static Void rgSCHCmnDlRaRspFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -13114,17 +13113,17 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnDlCalcRvForBcch +static uint8_t rgSCHCmnDlCalcRvForBcch ( RgSchCellCb *cell, Bool si, -uint16_t i +uint16_t i ) #else -PRIVATE uint8_t rgSCHCmnDlCalcRvForBcch(cell, si, i) +static uint8_t rgSCHCmnDlCalcRvForBcch(cell, si, i) RgSchCellCb *cell; Bool si; -uint16_t i; +uint16_t i; #endif { uint8_t k, rv; @@ -13167,13 +13166,13 @@ uint16_t i; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlBcchPcchFnlz +static Void rgSCHCmnDlBcchPcchFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlBcchPcchFnlz(cell, allocInfo) +static Void rgSCHCmnDlBcchPcchFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -13376,12 +13375,12 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlSetAllUnSched +static Void rgSCHCmnUlSetAllUnSched ( RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnUlSetAllUnSched(allocInfo) +static Void rgSCHCmnUlSetAllUnSched(allocInfo) RgSchCmnUlRbAllocInfo *allocInfo; #endif { @@ -13534,7 +13533,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlRbAllocForLst +static Void rgSCHCmnUlRbAllocForLst ( RgSchCellCb *cell, RgSchUlSf *sf, @@ -13545,7 +13544,7 @@ CmLListCp *nonSchdLst, Bool isNewTx ) #else -PRIVATE Void rgSCHCmnUlRbAllocForLst(cell, sf, count, reqLst, schdLst, +static Void rgSCHCmnUlRbAllocForLst(cell, sf, count, reqLst, schdLst, nonSchdLst, isNewTx) RgSchCellCb *cell; RgSchUlSf *sf; @@ -13664,7 +13663,7 @@ Bool isNewTx; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi +static S16 rgSCHCmnUlMdfyGrntForCqi ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -13676,7 +13675,7 @@ uint32_t stepDownItbs, uint32_t effTgt ) #else -PRIVATE S16 rgSCHCmnUlMdfyGrntForCqi(cell, ue, maxRb, numSb, iTbs, hqSz, stepDownItbs, effTgt) +static S16 rgSCHCmnUlMdfyGrntForCqi(cell, ue, maxRb, numSb, iTbs, hqSz, stepDownItbs, effTgt) RgSchCellCb *cell; RgSchUeCb *ue; uint32_t maxRb; @@ -13790,7 +13789,7 @@ uint32_t effTgt; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUlRbAllocForUe +static S16 rgSCHCmnUlRbAllocForUe ( RgSchCellCb *cell, RgSchUlSf *sf, @@ -13799,7 +13798,7 @@ uint8_t maxRb, RgSchUlHole *hole ) #else -PRIVATE S16 rgSCHCmnUlRbAllocForUe(cell, sf, ue, maxRb, hole) +static S16 rgSCHCmnUlRbAllocForUe(cell, sf, ue, maxRb, hole) RgSchCellCb *cell; RgSchUlSf *sf; RgSchUeCb *ue; @@ -14010,13 +14009,13 @@ CmLListCp *lst; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlAllocFnlz +static Void rgSCHCmnUlAllocFnlz ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnUlAllocFnlz(cell, allocInfo) +static Void rgSCHCmnUlAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif @@ -14095,14 +14094,14 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlUpdSf +static Void rgSCHCmnUlUpdSf ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUlSf *sf ) #else -PRIVATE Void rgSCHCmnUlUpdSf(cell, allocInfo, sf) +static Void rgSCHCmnUlUpdSf(cell, allocInfo, sf) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; RgSchUlSf *sf; @@ -14166,7 +14165,7 @@ RgSchUlSf *sf; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlHndlAllocRetx +static Void rgSCHCmnUlHndlAllocRetx ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, @@ -14174,7 +14173,7 @@ RgSchUlSf *sf, RgSchUlAlloc *alloc ) #else -PRIVATE Void rgSCHCmnUlHndlAllocRetx(cell, allocInfo, sf, alloc) +static Void rgSCHCmnUlHndlAllocRetx(cell, allocInfo, sf, alloc) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; RgSchUlSf *sf; @@ -14237,12 +14236,12 @@ RgSchUlAlloc *alloc; **/ /* ccpu00132653- The definition of this function made common for TDD and FDD*/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlAlloc +static Void rgSCHCmnUlAlloc ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnUlAlloc(cell) +static Void rgSCHCmnUlAlloc(cell) RgSchCellCb *cell; #endif { @@ -14496,12 +14495,12 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnInitDlRbAllocInfo +static Void rgSCHCmnInitDlRbAllocInfo ( RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnInitDlRbAllocInfo(allocInfo) +static Void rgSCHCmnInitDlRbAllocInfo(allocInfo) RgSchCmnDlRbAllocInfo *allocInfo; #endif { @@ -14606,13 +14605,13 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnGrpPwrCntrlPucch +static Void rgSCHCmnGrpPwrCntrlPucch ( RgSchCellCb *cell, RgSchDlSf *dlSf ) #else -PRIVATE Void rgSCHCmnGrpPwrCntrlPucch(cell, dlSf) +static Void rgSCHCmnGrpPwrCntrlPucch(cell, dlSf) RgSchCellCb *cell; RgSchDlSf *dlSf; #endif @@ -14639,13 +14638,13 @@ RgSchDlSf *dlSf; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnGrpPwrCntrlPusch +static Void rgSCHCmnGrpPwrCntrlPusch ( RgSchCellCb *cell, RgSchUlSf *ulSf ) #else -PRIVATE Void rgSCHCmnGrpPwrCntrlPusch(cell, ulSf) +static Void rgSCHCmnGrpPwrCntrlPusch(cell, ulSf) RgSchCellCb *cell; RgSchUlSf *ulSf; #endif @@ -14695,13 +14694,13 @@ RgSchUlSf *ulSf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnApplyUeRefresh +static S16 rgSCHCmnApplyUeRefresh ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSCHCmnApplyUeRefresh(cell, ue) +static S16 rgSCHCmnApplyUeRefresh(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -14768,13 +14767,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnTmrExpiry +static S16 rgSCHCmnTmrExpiry ( PTR cb, /* Pointer to timer control block */ S16 tmrEvnt /* Timer Event */ ) #else -PRIVATE S16 rgSCHCmnTmrExpiry(cb, tmrEvnt) +static S16 rgSCHCmnTmrExpiry(cb, tmrEvnt) PTR cb; /* Pointer to timer control block */ S16 tmrEvnt; /* Timer Event */ #endif @@ -14819,12 +14818,12 @@ S16 tmrEvnt; /* Timer Event */ * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnTmrProc +static S16 rgSCHCmnTmrProc ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnTmrProc(cell) +static S16 rgSCHCmnTmrProc(cell) RgSchCellCb *cell; #endif { @@ -14877,13 +14876,13 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSchCmnUpdCfiVal +static Void rgSchCmnUpdCfiVal ( RgSchCellCb *cell, uint8_t delta ) #else -PRIVATE Void rgSchCmnUpdCfiVal(cell, delta) +static Void rgSchCmnUpdCfiVal(cell, delta) RgSchCellCb *cell; uint8_t delta; #endif @@ -14978,27 +14977,27 @@ uint8_t delta; **********************************************************/ #ifdef LTE_TDD #ifdef ANSI -PRIVATE Void rgSchCmnUpdtPdcchSfIdx +static Void rgSchCmnUpdtPdcchSfIdx ( RgSchCellCb *cell, uint8_t dlIdx, uint8_t sfNum ) #else -PRIVATE Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx, sfNum) +static Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx, sfNum) RgSchCellCb *cell; uint8_t dlIdx; uint8_t sfNum; #endif #else #ifdef ANSI -PRIVATE Void rgSchCmnUpdtPdcchSfIdx +static Void rgSchCmnUpdtPdcchSfIdx ( RgSchCellCb *cell, uint8_t dlIdx ) #else -PRIVATE Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx) +static Void rgSchCmnUpdtPdcchSfIdx(cell, dlIdx) RgSchCellCb *cell; uint8_t dlIdx; #endif @@ -15633,7 +15632,7 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlSetUeRi +static Void rgSCHCmnDlSetUeRi ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -15641,7 +15640,7 @@ uint8_t ri, Bool isPer ) #else -PRIVATE Void rgSCHCmnDlSetUeRi(cell, ue, ri, isPer) +static Void rgSCHCmnDlSetUeRi(cell, ue, ri, isPer) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t ri; @@ -15749,14 +15748,14 @@ Bool isPer; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlSetUePmi +static S16 rgSCHCmnDlSetUePmi ( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t pmi ) #else -PRIVATE S16 rgSCHCmnDlSetUePmi(cell, ue, pmi) +static S16 rgSCHCmnDlSetUePmi(cell, ue, pmi) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t pmi; @@ -15825,7 +15824,7 @@ uint8_t pmi; **/ #ifdef RGR_CQI_REPT #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10 +static inline Void rgSCHCmnDlProcCqiMode10 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -15833,7 +15832,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10 Bool *isCqiAvail ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi, isCqiAvail) +static inline Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi, isCqiAvail) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -15841,14 +15840,14 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi, isCqiAvail) #endif #else #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10 +static inline Void rgSCHCmnDlProcCqiMode10 ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) +static inline Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -15916,7 +15915,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode10(cell, ue, pucchCqi) **/ #ifdef RGR_CQI_REPT #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11 +static inline Void rgSCHCmnDlProcCqiMode11 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -15925,7 +15924,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11 Bool *is2ndCwCqiAvail ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail) +static inline Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -15934,14 +15933,14 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi, isCqiAvail, is2n #endif #else #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11 +static inline Void rgSCHCmnDlProcCqiMode11 ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) +static inline Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16021,7 +16020,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode11(cell, ue, pucchCqi) **/ #ifdef RGR_CQI_REPT #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20 +static inline Void rgSCHCmnDlProcCqiMode20 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -16029,7 +16028,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20 Bool *isCqiAvail ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi, isCqiAvail ) +static inline Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi, isCqiAvail ) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16037,14 +16036,14 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi, isCqiAvail ) #endif #else #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20 +static inline Void rgSCHCmnDlProcCqiMode20 ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) +static inline Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16116,7 +16115,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode20(cell, ue, pucchCqi) **/ #ifdef RGR_CQI_REPT #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21 +static inline Void rgSCHCmnDlProcCqiMode21 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -16125,7 +16124,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21 Bool *is2ndCwCqiAvail ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail) +static inline Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi, isCqiAvail, is2ndCwCqiAvail) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16135,14 +16134,14 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi, isCqiAvail, is2n #endif #else #ifdef ANSI -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21 +static inline Void rgSCHCmnDlProcCqiMode21 ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi ) #else -PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) +static inline Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16229,7 +16228,7 @@ PRIVATE INLINE Void rgSCHCmnDlProcCqiMode21(cell, ue, pucchCqi) **/ #ifdef RGR_CQI_REPT #ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPucchInd +static Void rgSCHCmnDlCqiOnPucchInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -16239,7 +16238,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd Bool *is2ndCwCqiAvail ) #else -PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail) +static Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16249,14 +16248,14 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi, ueCqiRept, isCqiAvail, #endif #else #ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPucchInd +static Void rgSCHCmnDlCqiOnPucchInd ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPucch *pucchCqi ) #else -PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) +static Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPucch *pucchCqi; @@ -16349,7 +16348,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPucchInd(cell, ue, pucchCqi) **/ #ifdef RGR_CQI_REPT #ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPuschInd +static Void rgSCHCmnDlCqiOnPuschInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -16359,7 +16358,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd Bool *is2ndCwCqiAvail ) #else -PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail) +static Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi, ueCqiRept, isCqiAvail, is2ndCwCqiAvail) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPusch *puschCqi; @@ -16369,14 +16368,14 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi, ueCqiRept, isCqiAvail, #endif #else #ifdef ANSI -PRIVATE Void rgSCHCmnDlCqiOnPuschInd +static Void rgSCHCmnDlCqiOnPuschInd ( RgSchCellCb *cell, RgSchUeCb *ue, TfuDlCqiPusch *puschCqi ) #else -PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) +static Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) RgSchCellCb *cell; RgSchUeCb *ue; TfuDlCqiPusch *puschCqi; @@ -16448,7 +16447,7 @@ PRIVATE Void rgSCHCmnDlCqiOnPuschInd(cell, ue, puschCqi) #endif #ifdef CA_DBG { - extern uint32_t gACqiRcvdCount; + uint32_t gACqiRcvdCount; gACqiRcvdCount++; } @@ -16803,13 +16802,13 @@ CmLteTimingInfo timingInfo; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnCalcWcqiFrmSnr +static uint8_t rgSCHCmnCalcWcqiFrmSnr ( RgSchCellCb *cell, TfuSrsRpt *srsRpt ) #else -PRIVATE uint8_t rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) +static uint8_t rgSCHCmnCalcWcqiFrmSnr(cell,srsRpt) RgSchCellCb *cell; TfuSrsRpt *srsRpt; #endif @@ -17004,14 +17003,14 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt +static Void rgSCHCmnFindUlCqiUlTxAnt ( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t wideCqi ) #else -PRIVATE Void rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi) +static Void rgSCHCmnFindUlCqiUlTxAnt(cell, ue, wideCqi) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t wideCqi; @@ -18573,12 +18572,12 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdUlCompEffBsr +static Void rgSCHCmnUpdUlCompEffBsr ( RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnUpdUlCompEffBsr(ue) +static Void rgSCHCmnUpdUlCompEffBsr(ue) RgSchUeCb *ue; #endif { @@ -18962,7 +18961,7 @@ Bool isEcp; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRbInfoAddUeTx +static Void rgSCHCmnDlRbInfoAddUeTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, @@ -18970,7 +18969,7 @@ RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHCmnDlRbInfoAddUeTx(cell, allocInfo, ue, hqP) +static Void rgSCHCmnDlRbInfoAddUeTx(cell, allocInfo, ue, hqP) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; @@ -19015,7 +19014,7 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetx +static Void rgSCHCmnDlRbInfoAddUeRetx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, @@ -19023,7 +19022,7 @@ RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetx(cell, allocInfo, ue, hqP) +static Void rgSCHCmnDlRbInfoAddUeRetx(cell, allocInfo, ue, hqP) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; @@ -19064,7 +19063,7 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetxTx +static Void rgSCHCmnDlRbInfoAddUeRetxTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, @@ -19072,7 +19071,7 @@ RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHCmnDlRbInfoAddUeRetxTx(allocInfo, ue, hqP) +static Void rgSCHCmnDlRbInfoAddUeRetxTx(allocInfo, ue, hqP) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; @@ -19115,14 +19114,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAdd2NonSchdRetxLst +static Void rgSCHCmnDlAdd2NonSchdRetxLst ( RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHCmnDlAdd2NonSchdRetxLst(allocInfo, ue, hqP) +static Void rgSCHCmnDlAdd2NonSchdRetxLst(allocInfo, ue, hqP) RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; @@ -19188,12 +19187,12 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlANFdbkInit +static S16 rgSCHCmnDlANFdbkInit ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnDlANFdbkInit(cell) +static S16 rgSCHCmnDlANFdbkInit(cell) RgSchCellCb *cell; #endif { @@ -19297,12 +19296,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlKdashUlAscInit +static S16 rgSCHCmnDlKdashUlAscInit ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnDlKdashUlAscInit(cell) +static S16 rgSCHCmnDlKdashUlAscInit(cell) RgSchCellCb *cell; #endif { @@ -19413,12 +19412,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlNpValInit +static S16 rgSCHCmnDlNpValInit ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnDlNpValInit(cell) +static S16 rgSCHCmnDlNpValInit(cell) RgSchCellCb *cell; #endif { @@ -19456,12 +19455,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlCreateRachPrmLst +static S16 rgSCHCmnDlCreateRachPrmLst ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnDlCreateRachPrmLst(cell) +static S16 rgSCHCmnDlCreateRachPrmLst(cell) RgSchCellCb *cell; #endif { @@ -19506,12 +19505,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlRachInfoInit +static S16 rgSCHCmnDlRachInfoInit ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnDlRachInfoInit(cell) +static S16 rgSCHCmnDlRachInfoInit(cell) RgSchCellCb *cell; #endif { @@ -19671,12 +19670,12 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlPhichOffsetInit +static S16 rgSCHCmnDlPhichOffsetInit ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHCmnDlPhichOffsetInit(cell) +static S16 rgSCHCmnDlPhichOffsetInit(cell) RgSchCellCb *cell; #endif { @@ -19946,13 +19945,13 @@ uint8_t cce; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlAdapRetx +static Void rgSCHCmnUlAdapRetx ( RgSchUlAlloc *alloc, RgSchUlHqProcCb *proc ) #else -PRIVATE Void rgSCHCmnUlAdapRetx(alloc, proc) +static Void rgSCHCmnUlAdapRetx(alloc, proc) RgSchUlAlloc *alloc; RgSchUlHqProcCb *proc; #endif @@ -19986,12 +19985,12 @@ RgSchUlHqProcCb *proc; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnHdlUlInactUes +static Void rgSCHCmnHdlUlInactUes ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnHdlUlInactUes(cell) +static Void rgSCHCmnHdlUlInactUes(cell) RgSchCellCb *cell; #endif { @@ -20022,12 +20021,12 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnHdlDlInactUes +static Void rgSCHCmnHdlDlInactUes ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnHdlDlInactUes(cell) +static Void rgSCHCmnHdlDlInactUes(cell) RgSchCellCb *cell; #endif { @@ -20059,13 +20058,13 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUeIdleExdThrsld +static S16 rgSCHCmnUeIdleExdThrsld ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSCHCmnUeIdleExdThrsld(cell, ue) +static S16 rgSCHCmnUeIdleExdThrsld(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -20100,12 +20099,12 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnCfgRachDedPrm +static Void rgSCHCmnCfgRachDedPrm ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnCfgRachDedPrm(cell) +static Void rgSCHCmnCfgRachDedPrm(cell) RgSchCellCb *cell; #endif { @@ -20221,12 +20220,12 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdNxtPrchMskIdx +static Void rgSCHCmnUpdNxtPrchMskIdx ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnUpdNxtPrchMskIdx(cell) +static Void rgSCHCmnUpdNxtPrchMskIdx(cell) RgSchCellCb *cell; #endif { @@ -20283,12 +20282,12 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUpdRachParam +static Void rgSCHCmnUpdRachParam ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnUpdRachParam(cell) +static Void rgSCHCmnUpdRachParam(cell) RgSchCellCb *cell; #endif { @@ -20335,7 +20334,7 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnAllocPOParam +static S16 rgSCHCmnAllocPOParam ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -20345,7 +20344,7 @@ uint8_t *rapId, uint8_t *prachMskIdx ) #else -PRIVATE S16 rgSCHCmnAllocPOParam(cell, dlSf, ue, pdcch, rapId, prachMskIdx) +static S16 rgSCHCmnAllocPOParam(cell, dlSf, ue, pdcch, rapId, prachMskIdx) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchUeCb *ue; @@ -20417,13 +20416,13 @@ uint8_t *prachMskIdx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnGenPdcchOrder +static Void rgSCHCmnGenPdcchOrder ( RgSchCellCb *cell, RgSchDlSf *dlSf ) #else -PRIVATE Void rgSCHCmnGenPdcchOrder(cell, dlSf) +static Void rgSCHCmnGenPdcchOrder(cell, dlSf) RgSchCellCb *cell; RgSchDlSf *dlSf; #endif @@ -20493,13 +20492,13 @@ RgSchDlSf *dlSf; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ +static Void rgSCHCmnDlAdd2PdcchOdrQ ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnDlAdd2PdcchOdrQ(cell, ue) +static Void rgSCHCmnDlAdd2PdcchOdrQ(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -20533,13 +20532,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRmvFrmPdcchOdrQ +static Void rgSCHCmnDlRmvFrmPdcchOdrQ ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnDlRmvFrmPdcchOdrQ(cell, ue) +static Void rgSCHCmnDlRmvFrmPdcchOdrQ(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -20570,7 +20569,7 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFillPdcchOdr2Sf +static Void rgSCHCmnFillPdcchOdr2Sf ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -20579,7 +20578,7 @@ uint8_t rapId, uint8_t prachMskIdx ) #else -PRIVATE Void rgSCHCmnFillPdcchOdr2Sf(ue, pdcch, rapId, prachMskIdx) +static Void rgSCHCmnFillPdcchOdr2Sf(ue, pdcch, rapId, prachMskIdx) RgSchCellCb *cell; RgSchUeCb *ue; RgSchPdcch *pdcch; @@ -20625,13 +20624,13 @@ uint8_t prachMskIdx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDelRachInfo +static Void rgSCHCmnDelRachInfo ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnDelRachInfo(cell, ue) +static Void rgSCHCmnDelRachInfo(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -20682,14 +20681,14 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnHdlHoPo +static Void rgSCHCmnHdlHoPo ( RgSchCellCb *cell, CmLListCp *raRspLst, RgSchRaReqInfo *raReq ) #else -PRIVATE Void rgSCHCmnHdlHoPo(cell, raRspLst, raReq) +static Void rgSCHCmnHdlHoPo(cell, raRspLst, raReq) RgSchCellCb *cell; CmLListCp *raRspLst; RgSchRaReqInfo *raReq; @@ -20757,13 +20756,13 @@ uint16_t rapId } #ifdef ANSI -PRIVATE Void rgSCHCmnDelDedPreamble +static Void rgSCHCmnDelDedPreamble ( RgSchCellCb *cell, uint8_t preambleId ) #else -PRIVATE rgSCHCmnDelDedPreamble(cell, preambleId) +static rgSCHCmnDelDedPreamble(cell, preambleId) RgSchCellCb *cell; uint8_t preambleId; #endif @@ -20917,7 +20916,7 @@ CmLteUeCategory ueCtgy; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe +static S16 rgSCHCmnUlRbAllocForPoHoUe ( RgSchCellCb *cell, RgSchUlSf *sf, @@ -20925,7 +20924,7 @@ RgSchUeCb *ue, uint8_t maxRb ) #else -PRIVATE S16 rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, maxRb) +static S16 rgSCHCmnUlRbAllocForPoHoUe(cell, sf, ue, maxRb) RgSchCellCb *cell; RgSchUlSf *sf; RgSchUeCb *ue; @@ -21074,7 +21073,7 @@ uint8_t maxRb; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnAllocPoHoGrnt +static Void rgSCHCmnAllocPoHoGrnt ( RgSchCellCb *cell, CmLListCp *raRspLst, @@ -21082,7 +21081,7 @@ RgSchUeCb *ue, RgSchRaReqInfo *raReq ) #else -PRIVATE Void rgSCHCmnAllocPoHoGrnt(cell, raRspLst, ue, raReq) +static Void rgSCHCmnAllocPoHoGrnt(cell, raRspLst, ue, raReq) RgSchCellCb *cell; CmLListCp *raRspLst; RgSchUeCb *ue; @@ -21176,14 +21175,14 @@ RgSchRaReqInfo *raReq; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Void rgSCHCmnUlNonadapRetx +static Void rgSCHCmnUlNonadapRetx ( RgSchCmnUlCell *cellUl, RgSchUlAlloc *alloc, uint8_t idx ) #else -PRIVATE Void rgSCHCmnUlNonadapRetx(cellUl, alloc, idx) +static Void rgSCHCmnUlNonadapRetx(cellUl, alloc, idx) RgSchCmnUlCell *cellUl; RgSchUlAlloc *alloc; uint8_t idx; @@ -21221,13 +21220,13 @@ uint8_t idx; * @return Bool **/ #ifdef ANSI -PRIVATE Bool rgSCHCmnUlAllocsOvrLap +static Bool rgSCHCmnUlAllocsOvrLap ( RgSchUlAlloc *alloc1, RgSchUlAlloc *alloc2 ) #else -PRIVATE Bool rgSCHCmnUlAllocsOvrLap(alloc1, alloc2) +static Bool rgSCHCmnUlAllocsOvrLap(alloc1, alloc2) RgSchUlAlloc *alloc1; RgSchUlAlloc *alloc2; #endif @@ -21257,14 +21256,14 @@ RgSchUlAlloc *alloc2; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlCpyAllocInfo +static Void rgSCHCmnUlCpyAllocInfo ( RgSchCellCb *cell, RgSchUlAlloc *srcAlloc, RgSchUlAlloc *dstAlloc ) #else -PRIVATE Void rgSCHCmnUlCpyAllocInfo(cell, srcAlloc, dstAlloc) +static Void rgSCHCmnUlCpyAllocInfo(cell, srcAlloc, dstAlloc) RgSchCellCb *cell; RgSchUlAlloc *srcAlloc; RgSchUlAlloc *dstAlloc; @@ -21332,7 +21331,7 @@ RgSchUlAlloc *dstAlloc; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlInsAllocFrmNewSf2OldSf +static Void rgSCHCmnUlInsAllocFrmNewSf2OldSf ( RgSchCellCb *cell, RgSchUlSf *newSf, @@ -21340,7 +21339,7 @@ RgSchUlSf *oldSf, RgSchUlAlloc *srcAlloc ) #else -PRIVATE Void rgSCHCmnUlInsAllocFrmNewSf2OldSf(cell, newSf, oldSf, srcAlloc) +static Void rgSCHCmnUlInsAllocFrmNewSf2OldSf(cell, newSf, oldSf, srcAlloc) RgSchCellCb *cell; RgSchUlSf *newSf; RgSchUlSf *oldSf; @@ -21443,14 +21442,14 @@ RgSchUlAlloc *srcAlloc; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlMergeSfAllocs +static Void rgSCHCmnUlMergeSfAllocs ( RgSchCellCb *cell, RgSchUlSf *oldSf, RgSchUlSf *newSf ) #else -PRIVATE Void rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf) +static Void rgSCHCmnUlMergeSfAllocs(cell, oldSf, newSf) RgSchCellCb *cell; RgSchUlSf *oldSf; RgSchUlSf *newSf; @@ -21487,14 +21486,14 @@ RgSchUlSf *newSf; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlSwapSfAllocs +static Void rgSCHCmnUlSwapSfAllocs ( RgSchCellCb *cell, RgSchUlSf *oldSf, RgSchUlSf *newSf ) #else -PRIVATE Void rgSCHCmnUlSwapSfAllocs(cell, oldSf, newSf) +static Void rgSCHCmnUlSwapSfAllocs(cell, oldSf, newSf) RgSchCellCb *cell; RgSchUlSf *oldSf; RgSchUlSf *newSf; @@ -21534,14 +21533,14 @@ RgSchUlSf *newSf; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlPrcNonAdptRetx +static Void rgSCHCmnUlPrcNonAdptRetx ( RgSchCellCb *cell, RgSchUlSf *newSf, uint8_t idx ) #else -PRIVATE Void rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx) +static Void rgSCHCmnUlPrcNonAdptRetx(cell, newSf, idx) RgSchCellCb *cell; RgSchUlSf *newSf; uint8_t idx; @@ -21594,7 +21593,7 @@ uint8_t idx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlPrfmSfMerge +static Void rgSCHCmnUlPrfmSfMerge ( RgSchCellCb *cell, RgSchUlSf *oldSf, @@ -21602,7 +21601,7 @@ RgSchUlSf *newSf, uint8_t idx ) #else -PRIVATE Void rgSCHCmnUlPrfmSfMerge(cell, oldSf, newSf, idx) +static Void rgSCHCmnUlPrfmSfMerge(cell, oldSf, newSf, idx) RgSchCellCb *cell; RgSchUlSf *oldSf; RgSchUlSf *newSf; @@ -21639,13 +21638,13 @@ uint8_t idx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlRmvCmpltdAllocs +static Void rgSCHCmnUlRmvCmpltdAllocs ( RgSchCellCb *cell, RgSchUlSf *sf ) #else -PRIVATE Void rgSCHCmnUlRmvCmpltdAllocs(cell, sf) +static Void rgSCHCmnUlRmvCmpltdAllocs(cell, sf) RgSchCellCb *cell; RgSchUlSf *sf; #endif @@ -21788,13 +21787,13 @@ uint8_t idx; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlUpdAllocRetx +static Void rgSCHCmnUlUpdAllocRetx ( RgSchCellCb *cell, RgSchUlAlloc *alloc ) #else -PRIVATE Void rgSCHCmnUlUpdAllocRetx(cell, alloc) +static Void rgSCHCmnUlUpdAllocRetx(cell, alloc) RgSchCellCb *cell; RgSchUlAlloc *alloc; #endif @@ -21851,7 +21850,7 @@ RgSchUlAlloc *alloc; * @return uint8_t **/ #ifdef ANSI -PRIVATE Bool rgSCHCmnUlAdapRetxAlloc +static Bool rgSCHCmnUlAdapRetxAlloc ( RgSchCellCb *cell, RgSchUlSf *sf, @@ -21859,7 +21858,7 @@ RgSchUlHqProcCb *proc, RgSchUlHole *hole ) #else -PRIVATE Bool rgSCHCmnUlAdapRetxAlloc(cell, sf, proc, hole) +static Bool rgSCHCmnUlAdapRetxAlloc(cell, sf, proc, hole) RgSchCellCb *cell; RgSchUlSf *sf; RgSchUlHqProcCb *proc; @@ -22021,13 +22020,13 @@ RgSchUlHole *hole; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs +static Void rgSCHCmnUlSfRlsRetxProcs ( RgSchCellCb *cell, RgSchUlSf *sf ) #else -PRIVATE Void rgSCHCmnUlSfRlsRetxProcs(cell, sf) +static Void rgSCHCmnUlSfRlsRetxProcs(cell, sf) RgSchCellCb *cell; RgSchUlSf *sf; #endif @@ -22068,13 +22067,13 @@ RgSchUlSf *sf; * @return uint8_t **/ #ifdef ANSI -PRIVATE Void rgSCHCmnUlSfReTxAllocs +static Void rgSCHCmnUlSfReTxAllocs ( RgSchCellCb *cell, RgSchUlSf *sf ) #else -PRIVATE Void rgSCHCmnUlSfReTxAllocs(cell, sf) +static Void rgSCHCmnUlSfReTxAllocs(cell, sf) RgSchCellCb *cell; RgSchUlSf *sf; #endif @@ -22145,13 +22144,13 @@ RgSchUlSf *sf; **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlRbAlloc +static Void rgSCHCmnDlRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnDlRbAlloc(cell, allocInfo) +static Void rgSCHCmnDlRbAlloc(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -22692,13 +22691,13 @@ Bool isPartialAlloc; * @return uint32_t RA type 0 mask **/ #ifdef ANSI -PRIVATE uint32_t rgSCHCmnGetRaType0Mask +static uint32_t rgSCHCmnGetRaType0Mask ( uint8_t rbIdx, uint8_t rbgSize ) #else -PRIVATE uint32_t rgSCHCmnGetRaType0Mask(rbIdx, rbgSize) +static uint32_t rgSCHCmnGetRaType0Mask(rbIdx, rbgSize) uint8_t rbIdx; uint8_t rbgSize; #endif @@ -22730,14 +22729,14 @@ uint8_t rbgSize; * @return uint32_t RA type 1 mask **/ #ifdef ANSI -PRIVATE uint32_t rgSCHCmnGetRaType1Mask +static uint32_t rgSCHCmnGetRaType1Mask ( uint8_t rbIdx, uint8_t rbgSize, uint8_t *type1Subset ) #else -PRIVATE uint32_t rgSCHCmnGetRaType1Mask(rbIdx, rbgSize, type1Subset) +static uint32_t rgSCHCmnGetRaType1Mask(rbIdx, rbgSize, type1Subset) uint8_t rbIdx; uint8_t rbgSize; uint8_t *type1Subset; @@ -22773,13 +22772,13 @@ uint8_t *type1Subset; * @return uint32_t RA type 2 mask **/ #ifdef ANSI -PRIVATE uint32_t rgSCHCmnGetRaType2Mask +static uint32_t rgSCHCmnGetRaType2Mask ( uint8_t rbIdx, uint8_t *maskIdx ) #else -PRIVATE uint32_t rgSCHCmnGetRaType2Mask(rbIdx, maskIdx) +static uint32_t rgSCHCmnGetRaType2Mask(rbIdx, maskIdx) uint8_t rbIdx; uint8_t *maskIdx; #endif @@ -22988,7 +22987,7 @@ Bool isPartialAlloc; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlGetBestFitHole +static Void rgSCHCmnDlGetBestFitHole ( uint32_t *allocMask, uint8_t numMaskRbs, @@ -22999,7 +22998,7 @@ uint8_t *allocNumRbs, Bool isPartialAlloc ) #else -PRIVATE Void rgSCHCmnDlGetBestFitHole (allocMask, numMaskRbs, +static Void rgSCHCmnDlGetBestFitHole (allocMask, numMaskRbs, crntAllocMask, rbsReq, allocStart, allocNumRbs, isPartialAlloc) uint32_t *allocMask; uint8_t numMaskRbs; @@ -23114,7 +23113,7 @@ Bool isPartialAlloc; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Void rgSCHCmnFindCodeRate +static Void rgSCHCmnFindCodeRate ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -23122,7 +23121,7 @@ RgSchDlRbAlloc *allocInfo, uint8_t idx ) #else -PRIVATE Void rgSCHCmnFindCodeRate(cell,dlSf,allocInfo,idx) +static Void rgSCHCmnFindCodeRate(cell,dlSf,allocInfo,idx) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; @@ -23152,7 +23151,7 @@ uint8_t idx; * @return void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsPbchTbImcsAdj +static Void rgSCHCmnNonDlfsPbchTbImcsAdj ( RgSchCellCb *cell, RgSchDlRbAlloc *allocInfo, @@ -23160,7 +23159,7 @@ uint8_t idx, uint8_t rbsReq ) #else -PRIVATE Void rgSCHCmnNonDlfsPbchTbImcsAdj(cell,allocInfo, idx, rbsReq) +static Void rgSCHCmnNonDlfsPbchTbImcsAdj(cell,allocInfo, idx, rbsReq) RgSchCellCb *cell; RgSchDlRbAlloc *allocInfo; uint8_t idx; @@ -23235,7 +23234,7 @@ uint8_t rbsReq; * @return void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj +static Void rgSCHCmnNonDlfsPbchTbSizeAdj ( RgSchDlRbAlloc *allocInfo, uint8_t numOvrlapgPbchRb, @@ -23244,7 +23243,7 @@ uint8_t idx, uint32_t bytesReq ) #else -PRIVATE Void rgSCHCmnNonDlfsPbchTbSizeAdj(allocInfo,numOvrlapgPbchRb,pbchSsRsSym,idx,bytesReq) +static Void rgSCHCmnNonDlfsPbchTbSizeAdj(allocInfo,numOvrlapgPbchRb,pbchSsRsSym,idx,bytesReq) RgSchDlRbAlloc *allocInfo; uint8_t numOvrlapgPbchRb; uint8_t pbchSsRsSym; @@ -23301,14 +23300,14 @@ uint32_t bytesReq; * @return void **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnFindNumAddtlRbsAvl +static uint8_t rgSCHCmnFindNumAddtlRbsAvl ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo ) #else -PRIVATE uint8_t rgSCHCmnFindNumAddtlRbsAvl(cell,dlSf,allocInfo) +static uint8_t rgSCHCmnFindNumAddtlRbsAvl(cell,dlSf,allocInfo) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; @@ -23348,7 +23347,7 @@ RgSchDlRbAlloc *allocInfo; * @return void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs +static Void rgSCHCmnFindNumPbchOvrlapRbs ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -23356,7 +23355,7 @@ RgSchDlRbAlloc *allocInfo, uint8_t *numOvrlapgPbchRb ) #else -PRIVATE Void rgSCHCmnFindNumPbchOvrlapRbs(cell,dlSf,allocInfo,numOvrlapgPbchRb) +static Void rgSCHCmnFindNumPbchOvrlapRbs(cell,dlSf,allocInfo,numOvrlapgPbchRb) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; @@ -23419,7 +23418,7 @@ uint8_t *numOvrlapgPbchRb; * @return void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj +static Void rgSCHCmnNonDlfsPbchRbAllocAdj ( RgSchCellCb *cell, RgSchDlRbAlloc *allocInfo, @@ -23427,7 +23426,7 @@ uint8_t pbchSsRsSym, Bool isBcchPcch ) #else -PRIVATE Void rgSCHCmnNonDlfsPbchRbAllocAdj(cell, allocInfo,pbchSsRsSym) +static Void rgSCHCmnNonDlfsPbchRbAllocAdj(cell, allocInfo,pbchSsRsSym) RgSchCellCb *cell; RgSchDlRbAlloc *allocInfo; uint8_t pbchSsRsSym; @@ -23611,13 +23610,13 @@ Bool isBcchPcch; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc +static S16 rgSCHCmnNonDlfsCmnRbAlloc ( RgSchCellCb *cell, RgSchDlRbAlloc *allocInfo ) #else -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) +static S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) RgSchCellCb *cell; RgSchDlRbAlloc *allocInfo; #endif @@ -23838,13 +23837,13 @@ RgSchDlRbAlloc *allocInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAllocRar +static S16 rgSCHCmnNonDlfsCmnRbAllocRar ( RgSchCellCb *cell, RgSchDlRbAlloc *allocInfo ) #else -PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) +static S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) RgSchCellCb *cell; RgSchDlRbAlloc *allocInfo; #endif @@ -23939,7 +23938,7 @@ PRIVATE S16 rgSCHCmnNonDlfsCmnRbAlloc(cell, allocInfo) **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl +static Bool rgSCHCmnNonDlfsSFRBwAvlbl ( RgSchCellCb *cell, RgSchSFRPoolInfo **sfrpoolInfo, @@ -23948,7 +23947,7 @@ RgSchDlRbAlloc *allocInfo, Bool isUeCellEdge ) #else -PRIVATE Bool rgSCHCmnNonDlfsSFRBwAvlbl(cell, sfrpoolInfo, dlSf, allocInfo, isUeCellEdge) +static Bool rgSCHCmnNonDlfsSFRBwAvlbl(cell, sfrpoolInfo, dlSf, allocInfo, isUeCellEdge) RgSchCellCb *cell; RgSchSFRPoolInfo **sfrpoolInfo; RgSchDlSf *dlSf; @@ -24339,14 +24338,14 @@ Bool isUeCellEdge; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl +static Bool rgSCHCmnNonDlfsBwAvlbl ( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchDlRbAlloc *allocInfo ) #else -PRIVATE Bool rgSCHCmnNonDlfsBwAvlbl(cell, dlSf, allocInfo) +static Bool rgSCHCmnNonDlfsBwAvlbl(cell, dlSf, allocInfo) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; @@ -24619,7 +24618,7 @@ uint8_t numRb; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc +static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -24628,7 +24627,7 @@ uint8_t rbStrt, uint8_t numRb ) #else -PRIVATE S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc(cell, ue, dlSf, rbStrt, numRb) +static S16 rgSCHCmnNonDlfsUpdDSFRTyp2Alloc(cell, ue, dlSf, rbStrt, numRb) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlSf *dlSf; @@ -24730,7 +24729,7 @@ uint8_t numRb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc +static Void rgSCHCmnNonDlfsUpdTyp2Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -24738,7 +24737,7 @@ uint8_t rbStrt, uint8_t numRb ) #else -PRIVATE Void rgSCHCmnNonDlfsUpdTyp2Alloc(cell, dlSf, rbStrt, numRb) +static Void rgSCHCmnNonDlfsUpdTyp2Alloc(cell, dlSf, rbStrt, numRb) RgSchCellCb *cell; RgSchDlSf *dlSf; uint8_t rbStrt; @@ -24776,7 +24775,7 @@ uint8_t numRb; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsType0Alloc +static Void rgSCHCmnNonDlfsType0Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -24784,7 +24783,7 @@ RgSchDlRbAlloc *allocInfo, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHCmnNonDlfsType0Alloc(cell, dlSf, allocInfo, dlUe) +static Void rgSCHCmnNonDlfsType0Alloc(cell, dlSf, allocInfo, dlUe) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchDlRbAlloc *allocInfo; @@ -24953,7 +24952,7 @@ RgSchUeCb *ue; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHCmnBuildRntpInfo +static S16 rgSCHCmnBuildRntpInfo ( RgSchCellCb *cell, uint8_t *rntpPtr, @@ -24962,7 +24961,7 @@ uint8_t nmbRb, uint16_t bw ) #else -PRIVATE S16 rgSCHCmnBuildRntpInfo(cell, rntpPtr, startRb, nmbRb, bw) +static S16 rgSCHCmnBuildRntpInfo(cell, rntpPtr, startRb, nmbRb, bw) RgSchCellCb *cell; uint8_t *rntpPtr; uint8_t startRb; @@ -25035,7 +25034,7 @@ uint16_t bw; * @return Void **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc +static S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -25045,7 +25044,7 @@ uint8_t rbStrt, uint8_t numRb ) #else -PRIVATE S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc(cell, ue, dlSf, sfrPool, rbStrt, numRb) +static S16 rgSCHCmnNonDlfsUpdSFRPoolTyp2Alloc(cell, ue, dlSf, sfrPool, rbStrt, numRb) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlSf *dlSf; @@ -25123,7 +25122,7 @@ uint8_t numRb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsSFRPoolType0Alloc +static Void rgSCHCmnNonDlfsSFRPoolType0Alloc ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -25131,7 +25130,7 @@ RgSchSFRPoolInfo *poolInfo, RgSchDlRbAlloc *allocInfo ) #else -PRIVATE Void rgSCHCmnNonDlfsSFRPoolType0Alloc(cell, dlSf, poolInfo, allocInfo) +static Void rgSCHCmnNonDlfsSFRPoolType0Alloc(cell, dlSf, poolInfo, allocInfo) RgSchCellCb *cell; RgSchDlSf *dlSf; RgSchSFRPoolInfo *poolInfo; @@ -25247,18 +25246,18 @@ RgSchDlRbAlloc *allocInfo; **/ #ifdef ANSI -PRIVATE void rgSCHCmnNonDlfsDsfrRntpComp +static void rgSCHCmnNonDlfsDsfrRntpComp ( RgSchCellCb *cell, RgSchDlSf *dlSf ) #else -PRIVATE void rgSCHCmnNonDlfsDsfrRntpComp(cell, dlSf) +static void rgSCHCmnNonDlfsDsfrRntpComp(cell, dlSf) RgSchCellCb *cell; RgSchDlSf *dlSf; #endif { - PRIVATE uint16_t samples = 0; + static uint16_t samples = 0; uint16_t i; uint16_t bwBytes = (dlSf->bw-1)/8; RgrLoadInfIndInfo *rgrLoadInf; @@ -25335,7 +25334,7 @@ RgSchDlSf *dlSf; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc +static S16 rgSCHCmnSFRNonDlfsUeRbAlloc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -25343,7 +25342,7 @@ RgSchDlSf *dlSf, uint8_t *isDlBwAvail ) #else -PRIVATE S16 rgSCHCmnSFRNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail) +static S16 rgSCHCmnSFRNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlSf *dlSf; @@ -25457,7 +25456,7 @@ uint8_t *isDlBwAvail; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc +static S16 rgSCHCmnNonDlfsUeRbAlloc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -25465,7 +25464,7 @@ RgSchDlSf *dlSf, uint8_t *isDlBwAvail ) #else -PRIVATE S16 rgSCHCmnNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail) +static S16 rgSCHCmnNonDlfsUeRbAlloc(cell, ue, dlSf, isDlBwAvail) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlSf *dlSf; @@ -25560,14 +25559,14 @@ uint8_t *isDlBwAvail; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsCcchSduAlloc +static Void rgSCHCmnNonDlfsCcchSduAlloc ( RgSchCellCb *cell, RgSchCmnCcchSduRbAlloc *allocInfo, uint8_t isRetx ) #else -PRIVATE Void rgSCHCmnNonDlfsCcchSduAlloc(cell, allocInfo, isRetx) +static Void rgSCHCmnNonDlfsCcchSduAlloc(cell, allocInfo, isRetx) RgSchCellCb *cell; RgSchCmnCcchSduRbAlloc *allocInfo; uint8_t isRetx; @@ -25650,14 +25649,14 @@ uint8_t isRetx; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsCcchSduRbAlloc +static S16 rgSCHCmnNonDlfsCcchSduRbAlloc ( RgSchCellCb *cell, RgSchUeCb *ueCb, RgSchDlSf *dlSf ) #else -PRIVATE S16 rgSCHCmnNonDlfsCcchSduRbAlloc(cell, ueCb, dlSf) +static S16 rgSCHCmnNonDlfsCcchSduRbAlloc(cell, ueCb, dlSf) RgSchCellCb *cell; RgSchUeCb *ueCb; RgSchDlSf *dlSf; @@ -25756,14 +25755,14 @@ RgSchDlSf *dlSf; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc +static S16 rgSCHCmnNonDlfsMsg4RbAlloc ( RgSchCellCb *cell, RgSchRaCb *raCb, RgSchDlSf *dlSf ) #else -PRIVATE S16 rgSCHCmnNonDlfsMsg4RbAlloc(cell, raCb, dlSf) +static S16 rgSCHCmnNonDlfsMsg4RbAlloc(cell, raCb, dlSf) RgSchCellCb *cell; RgSchRaCb *raCb; RgSchDlSf *dlSf; @@ -25891,14 +25890,14 @@ RgSchDlSf *dlSf; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc +static Void rgSCHCmnNonDlfsMsg4Alloc ( RgSchCellCb *cell, RgSchCmnMsg4RbAlloc *allocInfo, uint8_t isRetx ) #else -PRIVATE Void rgSCHCmnNonDlfsMsg4Alloc(cell, allocInfo, isRetx) +static Void rgSCHCmnNonDlfsMsg4Alloc(cell, allocInfo, isRetx) RgSchCellCb *cell; RgSchCmnMsg4RbAlloc *allocInfo; uint8_t isRetx; @@ -26294,14 +26293,14 @@ uint8_t numRb; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlCpyRachInfo +static S16 rgSCHCmnDlCpyRachInfo ( RgSchCellCb *cell, RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES], uint8_t raArrSz ) #else -PRIVATE S16 rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz) +static S16 rgSCHCmnDlCpyRachInfo(cell, rachRspLst, raArrSz) RgSchCellCb *cell; RgSchTddRachRspLst rachRspLst[][RGSCH_NUM_SUB_FRAMES]; uint8_t raArrSz; @@ -26400,7 +26399,7 @@ uint8_t raArrSz; **/ #ifdef LTE_TDD #ifdef ANSI -PRIVATE S32 rgSchCmnFetchItbs +static S32 rgSchCmnFetchItbs ( RgSchCellCb *cell, RgSchCmnDlUe *ueDl, @@ -26411,7 +26410,7 @@ uint8_t cwIdx, uint8_t noLyr ) #else -PRIVATE S32 rgSchCmnFetchItbs (cell, ueDl, subFrm, cqi, cfi, cwIdx, noLyr) +static S32 rgSchCmnFetchItbs (cell, ueDl, subFrm, cqi, cfi, cwIdx, noLyr) RgSchCellCb *cell; RgSchCmnDlUe *ueDl; RgSchDlSf *subFrm; @@ -26422,7 +26421,7 @@ uint8_t noLyr; #endif #else #ifdef ANSI -PRIVATE S32 rgSchCmnFetchItbs +static S32 rgSchCmnFetchItbs ( RgSchCellCb *cell, RgSchCmnDlUe *ueDl, @@ -26432,7 +26431,7 @@ uint8_t cwIdx, uint8_t noLyr ) #else -PRIVATE S32 rgSchCmnFetchItbs (cell, ueDl, cqi, cfi, cwIdx, noLyr) +static S32 rgSchCmnFetchItbs (cell, ueDl, cqi, cfi, cwIdx, noLyr) RgSchCellCb *cell; RgSchCmnDlUe *ueDl; uint8_t cqi; @@ -26512,7 +26511,7 @@ uint8_t noLyr; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRb1Tb1Cw +static Void rgSCHCmnDlAllocTxRb1Tb1Cw ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26523,7 +26522,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26597,7 +26596,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRb1Tb1Cw +static Void rgSCHCmnDlAllocRetxRb1Tb1Cw ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26608,7 +26607,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRb1Tb1Cw(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26681,7 +26680,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM1 +static Void rgSCHCmnDlAllocTxRbTM1 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26692,7 +26691,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26732,7 +26731,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM1 +static Void rgSCHCmnDlAllocRetxRbTM1 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26743,7 +26742,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM1(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26783,7 +26782,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM2 +static Void rgSCHCmnDlAllocTxRbTM2 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26794,7 +26793,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26834,7 +26833,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM2 +static Void rgSCHCmnDlAllocRetxRbTM2 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26845,7 +26844,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM2(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26885,7 +26884,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM3 +static Void rgSCHCmnDlAllocTxRbTM3 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26896,7 +26895,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -26941,7 +26940,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM3 +static Void rgSCHCmnDlAllocRetxRbTM3 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -26952,7 +26951,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM3(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -27075,7 +27074,7 @@ uint8_t *raType; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlTM3RetxRetx +static Void rgSCHCmnDlTM3RetxRetx ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -27086,7 +27085,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlTM3RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlTM3RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -27185,7 +27184,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlTM4RetxRetx +static Void rgSCHCmnDlTM4RetxRetx ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -27196,7 +27195,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlTM4RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlTM4RetxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -27293,7 +27292,7 @@ precInfo = (getPrecInfoFunc[1][precInfoAntIdx])(cell, ue, noTxLyrs, TRUE); * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlSMGetAttrForTxRetx +static Void rgSCHCmnDlSMGetAttrForTxRetx ( RgSchUeCb *ue, RgSchDlHqProcCb *proc, @@ -27303,7 +27302,7 @@ Bool *frthrScp, Bool *swpFlg ) #else -PRIVATE Void rgSCHCmnDlSMGetAttrForTxRetx(ue, proc, retxTb, txTb, frthrScp,\ +static Void rgSCHCmnDlSMGetAttrForTxRetx(ue, proc, retxTb, txTb, frthrScp,\ swpFlg) RgSchUeCb *ue; RgSchDlHqProcCb *proc; @@ -27372,7 +27371,7 @@ Bool *swpFlg; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnDlTM3PrecInf2 +static uint8_t rgSCHCmnDlTM3PrecInf2 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -27380,7 +27379,7 @@ uint8_t numTxLyrs, Bool bothCwEnbld ) #else -PRIVATE uint8_t rgSCHCmnDlTM3PrecInf2(ue, numTxLyrs, bothCwEnbld) +static uint8_t rgSCHCmnDlTM3PrecInf2(ue, numTxLyrs, bothCwEnbld) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t numTxLyrs; @@ -27410,7 +27409,7 @@ Bool bothCwEnbld; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnDlTM4PrecInf2 +static uint8_t rgSCHCmnDlTM4PrecInf2 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -27418,7 +27417,7 @@ uint8_t numTxLyrs, Bool bothCwEnbld ) #else -PRIVATE uint8_t rgSCHCmnDlTM4PrecInf2(ue, numTxLyrs, bothCwEnbld) +static uint8_t rgSCHCmnDlTM4PrecInf2(ue, numTxLyrs, bothCwEnbld) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t numTxLyrs; @@ -27498,7 +27497,7 @@ Bool bothCwEnbld; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnDlTM3PrecInf4 +static uint8_t rgSCHCmnDlTM3PrecInf4 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -27506,7 +27505,7 @@ uint8_t numTxLyrs, Bool bothCwEnbld ) #else -PRIVATE uint8_t rgSCHCmnDlTM3PrecInf4(ue, numTxLyrs, bothCwEnbld) +static uint8_t rgSCHCmnDlTM3PrecInf4(ue, numTxLyrs, bothCwEnbld) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t numTxLyrs; @@ -27546,7 +27545,7 @@ Bool bothCwEnbld; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHCmnDlTM4PrecInf4 +static uint8_t rgSCHCmnDlTM4PrecInf4 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -27554,7 +27553,7 @@ uint8_t numTxLyrs, Bool bothCwEnbld ) #else -PRIVATE uint8_t rgSCHCmnDlTM4PrecInf4(cell, ue, numTxLyrs, bothCwEnbld) +static uint8_t rgSCHCmnDlTM4PrecInf4(cell, ue, numTxLyrs, bothCwEnbld) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t numTxLyrs; @@ -27615,7 +27614,7 @@ Bool bothCwEnbld; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlGetAttrForTM3 +static Void rgSCHCmnDlGetAttrForTM3 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -27630,7 +27629,7 @@ Bool *swpFlg, uint8_t *raType ) #else -PRIVATE Void rgSCHCmnDlGetAttrForTM3(cell, ue, proc, numTxLyrs, dciFrmt,\ +static Void rgSCHCmnDlGetAttrForTM3(cell, ue, proc, numTxLyrs, dciFrmt,\ prcdngInf, retxTb, txTb, frthrScp, swpFlg, raType) RgSchCellCb *cell; RgSchUeCb *ue; @@ -27815,7 +27814,7 @@ uint8_t *raType; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlGetAttrForTM4 +static Void rgSCHCmnDlGetAttrForTM4 ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -27830,7 +27829,7 @@ Bool *swpFlg, uint8_t *raType ) #else -PRIVATE Void rgSCHCmnDlGetAttrForTM4(cell, ue, proc, numTxLyrs, dciFrmt,\ +static Void rgSCHCmnDlGetAttrForTM4(cell, ue, proc, numTxLyrs, dciFrmt,\ prcdngInf, retxTb, txTb, frthrScp, swpFlg, raType) RgSchCellCb *cell; RgSchUeCb *ue; @@ -27997,7 +27996,7 @@ uint8_t *raType; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlTM3TxRetx +static Void rgSCHCmnDlTM3TxRetx ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28008,7 +28007,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlTM3TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlTM3TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28111,7 +28110,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlTM4TxRetx +static Void rgSCHCmnDlTM4TxRetx ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28122,7 +28121,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlTM4TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlTM4TxRetx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28228,7 +28227,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlTM3TxTx +static Void rgSCHCmnDlTM3TxTx ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28239,7 +28238,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlTM3TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28361,7 +28360,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlTM4TxTx +static Void rgSCHCmnDlTM4TxTx ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28372,7 +28371,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlTM4TxTx(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28497,7 +28496,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM4 +static Void rgSCHCmnDlAllocTxRbTM4 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28508,7 +28507,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28553,7 +28552,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM4 +static Void rgSCHCmnDlAllocRetxRbTM4 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28564,7 +28563,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM4(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28620,7 +28619,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM5 +static Void rgSCHCmnDlAllocTxRbTM5 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28631,7 +28630,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28673,7 +28672,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM5 +static Void rgSCHCmnDlAllocRetxRbTM5 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28684,7 +28683,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM5(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28727,7 +28726,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM6 +static Void rgSCHCmnDlAllocTxRbTM6 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28738,7 +28737,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28821,7 +28820,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM6 +static Void rgSCHCmnDlAllocRetxRbTM6 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28832,7 +28831,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM6(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28913,7 +28912,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocTxRbTM7 +static Void rgSCHCmnDlAllocTxRbTM7 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28924,7 +28923,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocTxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocTxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -28964,7 +28963,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlAllocRetxRbTM7 +static Void rgSCHCmnDlAllocRetxRbTM7 ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -28975,7 +28974,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo ) #else -PRIVATE Void rgSCHCmnDlAllocRetxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) +static Void rgSCHCmnDlAllocRetxRbTM7(cell, subFrm, ue, bo, effBo, proc, cellWdAllocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -29330,7 +29329,7 @@ RgSchCmnDlRbAllocInfo *cellWdAllocInfo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb +static S16 rgSCHCmnDlAlloc1CwTxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -29341,7 +29340,7 @@ uint8_t *numRb, uint32_t *effBo ) #else -PRIVATE S16 rgSCHCmnDlAlloc1CwTxRb(cell, subFrm, ue, tbInfo, bo, numRb, effBo) +static S16 rgSCHCmnDlAlloc1CwTxRb(cell, subFrm, ue, tbInfo, bo, numRb, effBo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -29501,7 +29500,7 @@ uint32_t cnsmdBytes; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb +static S16 rgSCHCmnDlAlloc2CwTxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -29512,7 +29511,7 @@ uint8_t *numRbRef, uint32_t *effBo ) #else -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRb(cell, subFrm, ue, proc, bo, numRbRef, effBo) +static S16 rgSCHCmnDlAlloc2CwTxRb(cell, subFrm, ue, proc, bo, numRbRef, effBo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchUeCb *ue; @@ -29764,7 +29763,7 @@ uint32_t *effBo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb +static S16 rgSCHCmnDlAlloc2CwTxRetxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -29775,7 +29774,7 @@ uint8_t *numRb, uint32_t *effBo ) #else -PRIVATE S16 rgSCHCmnDlAlloc2CwTxRetxRb(cell, subFrm, ue, reTxTb, txTb, numRb,\ +static S16 rgSCHCmnDlAlloc2CwTxRetxRb(cell, subFrm, ue, reTxTb, txTb, numRb,\ effBo) RgSchCellCb *cell; RgSchDlSf *subFrm; @@ -29893,7 +29892,7 @@ uint32_t *effBo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb +static S16 rgSCHCmnDlAlloc2CwRetxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -29904,7 +29903,7 @@ Bool *swpFlg, uint32_t *effBo ) #else -PRIVATE S16 rgSCHCmnDlAlloc2CwRetxRb(cell, subFrm, ue, proc,\ +static S16 rgSCHCmnDlAlloc2CwRetxRb(cell, subFrm, ue, proc,\ numRb, swpFlg, effBo) RgSchCellCb *cell; RgSchDlSf *subFrm; @@ -29998,7 +29997,7 @@ uint32_t *effBo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb +static S16 rgSCHCmnDlAlloc1CwRetxRb ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -30009,7 +30008,7 @@ uint8_t *numRb, uint32_t *effBo ) #else -PRIVATE S16 rgSCHCmnDlAlloc1CwRetxRb(cell, subFrm, ue, tbInfo, noLyr,\ +static S16 rgSCHCmnDlAlloc1CwRetxRb(cell, subFrm, ue, tbInfo, noLyr,\ numRb, effBo) RgSchCellCb *cell; RgSchDlSf *subFrm; @@ -30123,7 +30122,7 @@ RgSchDlHqProcCb *hqP; return; } #ifdef RGSCH_SPS_STATS -extern uint32_t rgSchStatCrntiCeRcvCnt; +uint32_t rgSchStatCrntiCeRcvCnt; #endif /** * @brief This function is invoked to handle CRNTI CE reception for an UE @@ -30359,12 +30358,12 @@ CmLteTimingInfo crcTime; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnDlBcchPcchAlloc +static Void rgSCHCmnDlBcchPcchAlloc ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnDlBcchPcchAlloc(cell) +static Void rgSCHCmnDlBcchPcchAlloc(cell) RgSchCellCb *cell; #endif { @@ -30425,13 +30424,13 @@ RgSchCellCb *cell; **/ #ifdef ANSI -PRIVATE Void rgSCHBcchPcchDlRbAlloc +static Void rgSCHBcchPcchDlRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHBcchPcchDlRbAlloc(cell, allocInfo) +static Void rgSCHBcchPcchDlRbAlloc(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -30475,13 +30474,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; **/ #ifdef ANSI -PRIVATE Void rgSCHCmnNonDlfsBcchPcchRbAlloc +static Void rgSCHCmnNonDlfsBcchPcchRbAlloc ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHCmnNonDlfsBcchPcchRbAlloc(cell, allocInfo) +static Void rgSCHCmnNonDlfsBcchPcchRbAlloc(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -30525,12 +30524,12 @@ RgSchCmnDlRbAllocInfo *allocInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHChkNUpdSiCfg +static Void rgSCHChkNUpdSiCfg ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHChkNUpdSiCfg(cell) +static Void rgSCHChkNUpdSiCfg(cell) RgSchCellCb *cell; #endif { @@ -30690,12 +30689,12 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHSelectSi +static Void rgSCHSelectSi ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHSelectSi(cell) +static Void rgSCHSelectSi(cell) RgSchCellCb *cell; #endif { @@ -30806,14 +30805,14 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHDlSiSched +static Void rgSCHDlSiSched ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgInfSfAlloc *subfrmAlloc ) #else -PRIVATE Void rgSCHDlSiSched(cell, allocInfo, subfrmAlloc) +static Void rgSCHDlSiSched(cell, allocInfo, subfrmAlloc) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgInfSfAlloc *subfrmAlloc; @@ -31092,14 +31091,14 @@ RgInfSfAlloc *subfrmAlloc; * **/ #ifdef ANSI -PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept +static S16 rgSCHCmnUeDlPwrCtColltCqiRept ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCqiRept *ueCqiRpt ) #else -PRIVATE S16 rgSCHCmnUeDlPwrCtColltCqiRept(cell, ue, ueCqiRpt) +static S16 rgSCHCmnUeDlPwrCtColltCqiRept(cell, ue, ueCqiRpt) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCqiRept *ueCqiRpt; @@ -31133,7 +31132,7 @@ RgrUeCqiRept *ueCqiRpt; /* Step 4.1: Fill StaInd for sending collated N CQI rpeorts */ #ifdef CA_DBG { - extern uint32_t gCqiReptToAppCount; + uint32_t gCqiReptToAppCount; gCqiReptToAppCount++; } @@ -31246,7 +31245,7 @@ uint16_t minPeriodicity; * @return uint32_t tbSz **/ #ifdef ANSI -PRIVATE uint32_t rgSCHCmnCalcDwPtsTbSz +static uint32_t rgSCHCmnCalcDwPtsTbSz ( RgSchCellCb *cell, uint32_t bo, @@ -31256,7 +31255,7 @@ uint8_t lyr, uint8_t cfi ) #else -PRIVATE uint32_t rgSCHCmnCalcDwPtsTbSz(cell, bo, rb, iTbs, lyr, cfi) +static uint32_t rgSCHCmnCalcDwPtsTbSz(cell, bo, rb, iTbs, lyr, cfi) RgSchCellCb *cell; uint32_t bo; uint8_t *rb; @@ -31319,7 +31318,7 @@ uint8_t cfi; * @param[in] uint8_t cfi **/ #ifdef ANSI -PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw +static Void rgSCHCmnCalcDwPtsTbSz2Cw ( RgSchCellCb *cell, uint32_t bo, @@ -31334,7 +31333,7 @@ uint32_t *tb2Sz, uint8_t cfi ) #else -PRIVATE Void rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, rb, maxRb, iTbs1, iTbs2, +static Void rgSCHCmnCalcDwPtsTbSz2Cw(cell, bo, rb, maxRb, iTbs1, iTbs2, lyr1, lyr2, tb1Sz, tb2Sz, cfi) RgSchCellCb *cell; uint32_t bo; @@ -31498,12 +31497,12 @@ RgInfUeDatInd *datInd; * */ #ifdef ANSI -PRIVATE Void rgSCHCmnInitRbAlloc +static Void rgSCHCmnInitRbAlloc ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHCmnInitRbAlloc (cell) +static Void rgSCHCmnInitRbAlloc (cell) RgSchCellCb *cell; #endif { @@ -31582,14 +31581,14 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHCmnSendTxModeInd +static Void rgSCHCmnSendTxModeInd ( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t newTxMode ) #else -PRIVATE Void rgSCHCmnSendTxModeInd(cell, ue, newTxMode) +static Void rgSCHCmnSendTxModeInd(cell, ue, newTxMode) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t newTxMode; diff --git a/src/5gnrsch/rg_sch_cmn.x b/src/5gnrsch/rg_sch_cmn.x index f82d89b54..ef53ab293 100755 --- a/src/5gnrsch/rg_sch_cmn.x +++ b/src/5gnrsch/rg_sch_cmn.x @@ -282,22 +282,22 @@ typedef struct rgSchCmnUlCqiInfo uint16_t eff; /* Efficiency in terms of bits/RE */ } RgSchCmnUlCqiInfo; -EXTERN RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI]; -EXTERN S8 rgSchCmnDlCqiDiffOfst[8]; +RgSchCmnUlCqiInfo rgSchCmnUlCqiTbl[RG_SCH_CMN_UL_NUM_CQI]; +S8 rgSchCmnDlCqiDiffOfst[8]; /* Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN S8 rgSchCmnApUeSelDiffCqi[4]; -EXTERN S8 rgSchCmnApEnbConfDiffCqi[4]; +S8 rgSchCmnApUeSelDiffCqi[4]; +S8 rgSchCmnApEnbConfDiffCqi[4]; #endif -EXTERN uint8_t rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; +uint8_t rgSchCmnUlCqiToTbsTbl[RG_SCH_CMN_MAX_CP][RG_SCH_CMN_UL_NUM_CQI]; #if (LTEMAC_SPS & LTE_TDD) /* subframe offset values to be used when twoIntervalsConfig is enabled in UL * SPS for a UE */ typedef S8 RgSchTddSfOffTbl[RGSCH_MAX_TDD_UL_DL_CFG][RGSCH_NUM_SUB_FRAMES]; -EXTERN RgSchTddSfOffTbl rgSchTddSfOffTbl; +RgSchTddSfOffTbl rgSchTddSfOffTbl; #endif /* LTEMAC_SPS & LTE_TDD */ @@ -1242,174 +1242,174 @@ typedef uint32_t RgSchCmnTbSzEff[RG_SCH_CMN_NUM_TBS]; /* Inappropriate name of CQI to ITbs table for DL. */ /* Changes for MIMO feature addition */ -EXTERN RgSchCmnTbSzEff rgSchCmnNorCfi1Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi2Eff[RGSCH_MAX_NUM_LYR_PERCW]; -EXTERN RgSchCmnTbSzEff rgSchCmnNorCfi3Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi4Eff[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnTbSzEff rgSchCmnNorCfi1Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi2Eff[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnTbSzEff rgSchCmnNorCfi3Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi4Eff[RGSCH_MAX_NUM_LYR_PERCW]; /* Added new variable for Ul eff */ -EXTERN RgSchCmnTbSzEff rgSchCmnNorUlEff[1],rgSchCmnExtUlEff[1]; -EXTERN RgSchCmnCqiToTbs rgSchCmnNorCfi1CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi2CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; -EXTERN RgSchCmnCqiToTbs rgSchCmnNorCfi3CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi4CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; -EXTERN RgSchCmnCqiToTbs *rgSchCmnCqiToTbs[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_CFI]; -EXTERN RgSchCmnTbSzEff rgSchCmnExtCfi1Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi2Eff[RGSCH_MAX_NUM_LYR_PERCW]; -EXTERN RgSchCmnTbSzEff rgSchCmnExtCfi3Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi4Eff[RGSCH_MAX_NUM_LYR_PERCW]; -EXTERN RgSchCmnCqiToTbs rgSchCmnExtCfi1CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi2CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; -EXTERN RgSchCmnCqiToTbs rgSchCmnExtCfi3CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi4CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnTbSzEff rgSchCmnNorUlEff[1],rgSchCmnExtUlEff[1]; +RgSchCmnCqiToTbs rgSchCmnNorCfi1CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi2CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnCqiToTbs rgSchCmnNorCfi3CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnNorCfi4CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnCqiToTbs *rgSchCmnCqiToTbs[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_CFI]; +RgSchCmnTbSzEff rgSchCmnExtCfi1Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi2Eff[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnTbSzEff rgSchCmnExtCfi3Eff[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi4Eff[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnCqiToTbs rgSchCmnExtCfi1CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi2CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; +RgSchCmnCqiToTbs rgSchCmnExtCfi3CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW], rgSchCmnExtCfi4CqiToTbs[RGSCH_MAX_NUM_LYR_PERCW]; /* Include CRS REs while calculating Efficiency */ -EXTERN RgSchCmnTbSzEff +RgSchCmnTbSzEff *rgSchCmnEffTbl[RGSCH_MAX_NUM_LYR_PERCW][RG_SCH_CMN_MAX_CP][RG_SCH_CMN_MAX_ANT_CONF][RG_SCH_CMN_MAX_CFI]; /* Added new variable for Ul eff */ -EXTERN RgSchCmnTbSzEff *rgSchCmnUlEffTbl[RG_SCH_CMN_MAX_CP]; +RgSchCmnTbSzEff *rgSchCmnUlEffTbl[RG_SCH_CMN_MAX_CP]; -EXTERN RgSchTbSzTbl rgTbSzTbl; +RgSchTbSzTbl rgTbSzTbl; -EXTERN Void rgSCHCmnInit ARGS((Void +Void rgSCHCmnInit ARGS((Void )); -EXTERN S16 rgSCHCmnRgrCellCfg ARGS(( +S16 rgSCHCmnRgrCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnRgrCellRecfg ARGS(( +S16 rgSCHCmnRgrCellRecfg ARGS(( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnFreeDlLc ARGS(( +Void rgSCHCmnFreeDlLc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -EXTERN Void rgSCHCmnCellDel ARGS(( +Void rgSCHCmnCellDel ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSCHCmnDlRlsSubFrm ARGS(( +Void rgSCHCmnDlRlsSubFrm ARGS(( RgSchCellCb *cell, CmLteTimingInfo frm )); #ifdef LTE_ADV -EXTERN S16 rgSCHCmnRgrSCellUeCfg ARGS(( +S16 rgSCHCmnRgrSCellUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeSecCellCfg *sCellInfoCfg, RgSchErrInfo *err )); -EXTERN Void rgSchFreeTpcIdxForSCell ARGS(( +Void rgSchFreeTpcIdxForSCell ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *proc, RgSchDlSf *dlsf )); -EXTERN Bool rgSchIsN1PucchResAvail ARGS(( +Bool rgSchIsN1PucchResAvail ARGS(( CmLListCp *lst, RgSchUeCb *ue, uint8_t n1Idx, uint8_t resCount )); -EXTERN Bool rgSchIsN3PucchResAvail ARGS(( +Bool rgSchIsN3PucchResAvail ARGS(( CmLListCp *lst, RgSchUeCb *ue, uint8_t n1Idx )); -EXTERN S16 rgSchGetAvlTpcIdx ARGS(( +S16 rgSchGetAvlTpcIdx ARGS(( RgSchUeCb *ue, uint8_t *tpcIdx, RgSchDlSf *dlsf, RgSchCellCb *cell )); -EXTERN Void rgSCHSCellDelUeSCell ARGS(( +Void rgSCHSCellDelUeSCell ARGS(( RgSchCellCb *cellCb, RgSchUeCb *ueCb, uint8_t sCellIdx )); -EXTERN S16 rgSCHCmnRgrSCellUeDel ARGS(( +S16 rgSCHCmnRgrSCellUeDel ARGS(( RgSchUeCellInfo *sCellInfo, RgSchUeCb *ue )); #endif /* LTE_ADV */ -EXTERN S16 rgSCHCmnRgrUeCfg ARGS(( +S16 rgSCHCmnRgrUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnRgrUeRecfg ARGS(( +S16 rgSCHCmnRgrUeRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnUeDel ARGS(( +Void rgSCHCmnUeDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnUeReset ARGS(( +Void rgSCHCmnUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHCmnRgrLcgRecfg ARGS(( +S16 rgSCHCmnRgrLcgRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, RgrLcgRecfg *reCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnRgrLcgCfg ARGS(( +S16 rgSCHCmnRgrLcgCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, RgrLcgCfg *lcgCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnRgrLchCfg ARGS(( +S16 rgSCHCmnRgrLchCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchCfg *lcCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnRgrLchDel ARGS(( +S16 rgSCHCmnRgrLchDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteLcId lcId, uint8_t lcgId )); -EXTERN S16 rgSCHCmnRgrLchRecfg ARGS(( +S16 rgSCHCmnRgrLchRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchRecfg *lcRecfg, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnLcgDel ARGS(( +Void rgSCHCmnLcgDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg )); -EXTERN S16 rgSCHCmnUpdBsrShort ARGS(( +S16 rgSCHCmnUpdBsrShort ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *ulLcg, uint8_t bsr, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnUpdBsrTrunc ARGS(( +S16 rgSCHCmnUpdBsrTrunc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *ulLcg, uint8_t bsr, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnUpdBsrLong ARGS(( +S16 rgSCHCmnUpdBsrLong ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t bsArr[], RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnDataRcvd ARGS(( +S16 rgSCHCmnDataRcvd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numLc, @@ -1417,84 +1417,84 @@ RgSchUlLcCb *lcArr[], uint16_t bytesArr[], RgSchErrInfo *err )); -EXTERN Void rgSCHCmnUlCqiInd ARGS(( +Void rgSCHCmnUlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, TfuUlCqiRpt *ulCqiInfo )); -EXTERN S16 rgSCHCmnUpdExtPhr ARGS(( +S16 rgSCHCmnUpdExtPhr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgInfExtPhrCEInfo *extPhr, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnUpdPhr ARGS(( +S16 rgSCHCmnUpdPhr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t phr, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnUpdUlHqProc ARGS(( +S16 rgSCHCmnUpdUlHqProc ARGS(( RgSchCellCb *cell, RgSchUlHqProcCb *curProc, RgSchUlHqProcCb *oldProc )); -EXTERN S16 rgSCHCmnContResUlGrant ARGS(( +S16 rgSCHCmnContResUlGrant ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnActvtUlUe ARGS(( +Void rgSCHCmnActvtUlUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnActvtDlUe ARGS(( +Void rgSCHCmnActvtDlUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnHdlUlTransInd ARGS(( +Void rgSCHCmnHdlUlTransInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo )); -EXTERN S16 rgSCHCmnSrRcvd ARGS(( +S16 rgSCHCmnSrRcvd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo frm, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnUlRbAllocAddUeToLst ARGS(( +Void rgSCHCmnUlRbAllocAddUeToLst ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLListCp *lst )); -EXTERN S16 rgSCHCmnTti ARGS(( +S16 rgSCHCmnTti ARGS(( RgSchCellCb *cell, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnUlHqProcForUe ARGS(( +Void rgSCHCmnUlHqProcForUe ARGS(( RgSchCellCb *cell, CmLteTimingInfo frm, RgSchUeCb *ue, RgSchUlHqProcCb **procRef )); -EXTERN RgSchUlAlloc *rgSCHCmnFirstRcptnReq ARGS(( +RgSchUlAlloc *rgSCHCmnFirstRcptnReq ARGS(( RgSchCellCb *cell )); -EXTERN RgSchUlAlloc *rgSCHCmnNextRcptnReq ARGS(( +RgSchUlAlloc *rgSCHCmnNextRcptnReq ARGS(( RgSchCellCb *cell, RgSchUlAlloc *alloc )); -EXTERN RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc ARGS(( +RgSchUlAlloc *rgSCHCmnFirstHqFdbkAlloc ARGS(( RgSchCellCb *cell, uint8_t idx )); -EXTERN RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc ARGS(( +RgSchUlAlloc *rgSCHCmnNextHqFdbkAlloc ARGS(( RgSchCellCb *cell, RgSchUlAlloc *alloc, uint8_t idx )); -EXTERN Void rgSCHCmnDlDedBoUpd ARGS(( +Void rgSCHCmnDlDedBoUpd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc @@ -1503,23 +1503,23 @@ RgSchDlLcCb *svc * msg4Retx Queue. I have used CMN scheduler function * directly. Please define a new API and call this * function through that. */ -EXTERN Void rgSCHCmnDlMsg4ProcRmvFrmRetx ARGS(( +Void rgSCHCmnDlMsg4ProcRmvFrmRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN Void rgSCHCmnDlProcAddToRetx ARGS(( +Void rgSCHCmnDlProcAddToRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); #ifdef EMTC_ENABLE -EXTERN Void rgSCHCmnEmtcUlProcAddToRetx ARGS(( +Void rgSCHCmnEmtcUlProcAddToRetx ARGS(( RgSchCellCb *cell, RgSchUlHqProcCb *hqP )); #endif -EXTERN Void rgSCHCmnDlCqiInd ARGS(( +Void rgSCHCmnDlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isPucchInfo, @@ -1528,7 +1528,7 @@ CmLteTimingInfo timingInfo )); /* Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN Void rgSCHCmnRawCqiInd ARGS + Void rgSCHCmnRawCqiInd ARGS (( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -1536,7 +1536,7 @@ TfuRawCqiRpt *rawCqiRpt, CmLteTimingInfo timingInfo )); -EXTERN Void rgSCHCmnSrsInd ARGS + Void rgSCHCmnSrsInd ARGS (( RgSchCellCb *cellCb, RgSchUeCb *ueCb, @@ -1545,26 +1545,26 @@ CmLteTimingInfo timingInfo )); #endif /* TFU_UPGRADE */ -EXTERN Void rgSCHCmnDlTARpt ARGS(( +Void rgSCHCmnDlTARpt ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN RgSchPdcch *rgSCHCmnCmnPdcchAlloc ARGS(( +RgSchPdcch *rgSCHCmnCmnPdcchAlloc ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm )); -EXTERN RgSchUlAlloc *rgSCHCmnUlSbAlloc ARGS(( +RgSchUlAlloc *rgSCHCmnUlSbAlloc ARGS(( RgSchUlSf *sf, uint8_t numSb, RgSchUlHole *hole )); -EXTERN Void rgSCHCmnRlsUlSf ARGS(( +Void rgSCHCmnRlsUlSf ARGS(( RgSchCellCb *cell, uint8_t idx )); /* PHR handling for MSG3 */ -EXTERN Void rgSCHCmnUlRecMsg3Alloc ARGS(( +Void rgSCHCmnUlRecMsg3Alloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb @@ -1578,34 +1578,34 @@ RgSchCellCb *cell )); #ifdef LTEMAC_SPS -EXTERN Void rgSCHCmnFillHqPTb ARGS(( +Void rgSCHCmnFillHqPTb ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, uint8_t tbAllocIdx, RgSchPdcch *pdcch )); -EXTERN Void rgSCHCmnDlProcAck ARGS(( +Void rgSCHCmnDlProcAck ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN Void rgSCHCmnHdlCrntiCE ARGS(( +Void rgSCHCmnHdlCrntiCE ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnDlRelPdcchFbk ARGS(( +Void rgSCHCmnDlRelPdcchFbk ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isAck )); -EXTERN Void rgSCHCmnDlGetRbgInfo ARGS(( +Void rgSCHCmnDlGetRbgInfo ARGS(( uint8_t dlTotalBw, uint8_t dlSubsetBw, uint8_t maxRaType1SubsetBw, uint8_t rbgSize, RgSchBwRbgInfo *rbgInfo )); -EXTERN uint8_t rgSCHCmnDlRaType0Alloc ARGS(( +uint8_t rgSCHCmnDlRaType0Alloc ARGS(( RgSchDlSfAllocInfo *allocedInfo, uint8_t rbsReq, RgSchBwRbgInfo *rbgInfo, @@ -1614,7 +1614,7 @@ RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc )); #ifdef RGSCH_SPS_UNUSED -EXTERN uint8_t rgSCHCmnDlRaType1Alloc ARGS(( +uint8_t rgSCHCmnDlRaType1Alloc ARGS(( RgSchDlSfAllocInfo *allocedInfo, uint8_t rbsReq, RgSchBwRbgInfo *rbgInfo, @@ -1624,7 +1624,7 @@ RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc )); #endif -EXTERN uint8_t rgSCHCmnDlRaType2Alloc ARGS(( +uint8_t rgSCHCmnDlRaType2Alloc ARGS(( RgSchDlSfAllocInfo *allocedInfo, uint8_t rbsReq, RgSchBwRbgInfo *rbgInfo, @@ -1632,7 +1632,7 @@ uint8_t *rbStart, RgSchDlSfAllocInfo *resAllocInfo, Bool isPartialAlloc )); -EXTERN Bool rgSCHCmnAllocUeInSpsBw ARGS(( +Bool rgSCHCmnAllocUeInSpsBw ARGS(( RgSchDlSf *dlSf, RgSchCellCb *cell, RgSchUeCb *ue, @@ -1640,16 +1640,16 @@ RgSchDlRbAlloc *rbAllocInfo, Bool isPartialAlloc )); #endif -EXTERN Void rgSCHCmnDrxStrtInActvTmrInUl ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHCmnUpdUeDataIndLcg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgInfUeDatInd *datInd)); +Void rgSCHCmnDrxStrtInActvTmrInUl ARGS((RgSchCellCb *cell)); +Void rgSCHCmnUpdUeDataIndLcg ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgInfUeDatInd *datInd)); #ifdef LTE_TDD -EXTERN uint8_t rgSCHCmnGetPhichUlSfIdx ARGS((CmLteTimingInfo *timeInfo, RgSchCellCb *cell)); -EXTERN uint8_t rgSCHCmnGetUlSfIdx ARGS((CmLteTimingInfo *timeInfo, RgSchCellCb *cell)); -EXTERN uint8_t rgSCHCmnGetPValFrmCCE ARGS((RgSchCellCb *cell, uint8_t cce)); +uint8_t rgSCHCmnGetPhichUlSfIdx ARGS((CmLteTimingInfo *timeInfo, RgSchCellCb *cell)); +uint8_t rgSCHCmnGetUlSfIdx ARGS((CmLteTimingInfo *timeInfo, RgSchCellCb *cell)); +uint8_t rgSCHCmnGetPValFrmCCE ARGS((RgSchCellCb *cell, uint8_t cce)); #endif -EXTERN uint8_t rgSCHCmnGetUlHqProcIdx ARGS((CmLteTimingInfo *timeInfo, RgSchCellCb *cell)); +uint8_t rgSCHCmnGetUlHqProcIdx ARGS((CmLteTimingInfo *timeInfo, RgSchCellCb *cell)); -EXTERN Void rgSchCmnSetCqiReqField ARGS(( +Void rgSchCmnSetCqiReqField ARGS(( RgSchUeCellInfo *cellInfo, RgSchUeCb *ue, RgSchCqiReqField *cqiReq @@ -1658,18 +1658,18 @@ EXTERN Void rgSchCmnSetCqiReqField ARGS(( /* APIs exposed by COMMON SCHEDULER to * SPECIFIC SCHEDULER */ /* UL_ALLOC_CHANGES */ -EXTERN Void rgSCHCmnUlFreeAlloc ARGS(( +Void rgSCHCmnUlFreeAlloc ARGS(( RgSchCellCb *cell, RgSchUlAlloc *alloc )); #ifndef EMTC_ENABLE -EXTERN Void rgSCHCmnUlFreeAllocation ARGS(( +Void rgSCHCmnUlFreeAllocation ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUlAlloc *alloc )); #else -EXTERN Void rgSCHCmnUlFreeAllocation ARGS(( +Void rgSCHCmnUlFreeAllocation ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUlAlloc *alloc, @@ -1677,47 +1677,47 @@ Bool isEmtcUe )); #endif /* APIs exposed by DL RB allocation module */ -EXTERN S16 rgSCHCmnAllocDlRb ARGS(( +S16 rgSCHCmnAllocDlRb ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *dlRbAllocInfo )); /* APIs exposed by UL RB allocation module */ -EXTERN Void rgSCHCmnAllocUlRb ARGS(( +Void rgSCHCmnAllocUlRb ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *ulRbAllocInfo )); /* APIs Exposed to Specific Scheduler */ -EXTERN RgSchPdcch *rgSCHCmnPdcchAllocCrntSf ARGS(( +RgSchPdcch *rgSCHCmnPdcchAllocCrntSf ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnPdcchRlsCrntSf ARGS(( +Void rgSCHCmnPdcchRlsCrntSf ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); -EXTERN Void rgSCHCmnUlFillPdcchWithAlloc ARGS(( +Void rgSCHCmnUlFillPdcchWithAlloc ARGS(( RgSchPdcch *pdcch, RgSchUlAlloc *alloc, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnUlAllocFillTpc ARGS(( +Void rgSCHCmnUlAllocFillTpc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHCmnUlAllocFillNdmrs ARGS(( +Void rgSCHCmnUlAllocFillNdmrs ARGS(( RgSchCmnUlCell *cellUl, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHCmnUlAllocLnkHqProc ARGS(( +Void rgSCHCmnUlAllocLnkHqProc ARGS(( RgSchUeCb *ue, RgSchUlAlloc *alloc, RgSchUlHqProcCb *proc, Bool isReTx )); -EXTERN RgSchPdcch *rgSCHCmnPdcchAlloc ARGS(( +RgSchPdcch *rgSCHCmnPdcchAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *subFrm, @@ -1725,17 +1725,17 @@ uint8_t cqi, TfuDciFormat dciFrmt, Bool isDtx )); -EXTERN Void rgSCHCmnRdcImcsTxTb ARGS(( +Void rgSCHCmnRdcImcsTxTb ARGS(( RgSchDlRbAlloc *allocInfo, uint8_t tbInfoIdx, uint32_t cnsmdBytes )); -EXTERN Void rgSCHCmnFillPdcch ARGS(( +Void rgSCHCmnFillPdcch ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch, RgSchDlRbAlloc *rbAllocInfo )); -EXTERN uint8_t rgSCHCmnUpdDai ARGS(( +uint8_t rgSCHCmnUpdDai ARGS(( RgSchUeCb *ue, CmLteTimingInfo *fdbkTime, uint8_t m, @@ -1744,12 +1744,12 @@ RgSchDlHqProcCb *hqP, uint8_t *ulDai )); -EXTERN Void rgSCHCmnFillHqPPdcch ARGS(( +Void rgSCHCmnFillHqPPdcch ARGS(( RgSchCellCb *cell, RgSchDlRbAlloc *rbAllocInfo, RgSchDlHqProcCb *hqP )); -EXTERN S16 rgSCHCmnDlChkResAvl ARGS(( +S16 rgSCHCmnDlChkResAvl ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -1758,7 +1758,7 @@ uint32_t *bo, uint8_t *iTbs, uint32_t *maxRb )); -EXTERN S16 rgSCHCmnDlDedAlloc ARGS(( +S16 rgSCHCmnDlDedAlloc ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -1768,44 +1768,44 @@ uint8_t iTbs, uint32_t maxRb, uint32_t *bytes )); -EXTERN Void rgSCHCmnUlUeFillAllocInfo ARGS(( +Void rgSCHCmnUlUeFillAllocInfo ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); /* Fixing incorrect Imcs derivation */ -EXTERN uint8_t rgSCHCmnUlGetITbsFrmIMcs ARGS(( +uint8_t rgSCHCmnUlGetITbsFrmIMcs ARGS(( uint8_t iMcs )); /* Adding ueCtg to argument list */ -EXTERN uint8_t rgSCHCmnUlGetIMcsFrmITbs ARGS(( +uint8_t rgSCHCmnUlGetIMcsFrmITbs ARGS(( uint8_t iTbs, CmLteUeCategory ueCtg )); -EXTERN uint32_t rgSCHCmnUlMinTbBitsForITbs ARGS(( +uint32_t rgSCHCmnUlMinTbBitsForITbs ARGS(( RgSchCmnUlCell *cellUl, uint8_t iTbs )); -EXTERN uint8_t rgSCHCmnUlGetITbs ARGS(( +uint8_t rgSCHCmnUlGetITbs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isEcp )); -EXTERN Void rgSCHCmnUlAllocFillRbInfo ARGS(( +Void rgSCHCmnUlAllocFillRbInfo ARGS(( RgSchCellCb *cell, RgSchUlSf *sf, RgSchUlAlloc *alloc )); -EXTERN Void rgSCHCmnDlUeResetTemp ARGS(( +Void rgSCHCmnDlUeResetTemp ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *hqP )); -EXTERN Void rgSCHCmnUlUeResetTemp ARGS(( +Void rgSCHCmnUlUeResetTemp ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); /* proc is added for DTX support */ /* DL per UE RB allocation API */ -EXTERN S16 rgSCHCmnDlAllocTxRb ARGS(( +S16 rgSCHCmnDlAllocTxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -1814,13 +1814,13 @@ uint32_t *effBo, RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); -EXTERN Bool rgSCHCmnIsDlCsgPrio ARGS(( +Bool rgSCHCmnIsDlCsgPrio ARGS(( RgSchCellCb *cell )); -EXTERN Bool rgSCHCmnIsUlCsgPrio ARGS(( +Bool rgSCHCmnIsUlCsgPrio ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHCmnDlAllocRetxRb ARGS(( +S16 rgSCHCmnDlAllocRetxRb ARGS(( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchUeCb *ue, @@ -1830,7 +1830,7 @@ RgSchDlHqProcCb *proc, RgSchCmnDlRbAllocInfo *cellWdAllocInfo )); #ifdef LTEMAC_SPS -EXTERN Void rgSCHCmnClcRbAlloc ARGS(( +Void rgSCHCmnClcRbAlloc ARGS(( RgSchCellCb *cell, uint32_t bo, uint8_t cqi, @@ -1850,27 +1850,27 @@ uint8_t numRb /* end: Apis to add Ues in to DlRbAllocInfo Lists */ /* start: Apis to add Ues in to UlRbAllocInfo Lists */ -EXTERN Void rgSCHCmnUlAdd2UeLst ARGS(( +Void rgSCHCmnUlAdd2UeLst ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnUlAdd2CntResLst ARGS(( +Void rgSCHCmnUlAdd2CntResLst ARGS(( RgSchCmnUlRbAllocInfo *allocInfo, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnRmvFrmTaLst ARGS(( +Void rgSCHCmnRmvFrmTaLst ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); /* end: Apis to add Ues in to UlRbAllocInfo Lists */ -EXTERN Void rgSCHCmnUlUpdOutStndAlloc ARGS(( +Void rgSCHCmnUlUpdOutStndAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint32_t alloc )); -EXTERN Void rgSCHCmnUlRecordUeAlloc ARGS(( +Void rgSCHCmnUlRecordUeAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); @@ -1878,178 +1878,178 @@ RgSchUeCb *ue /* APIs exposed by common power module */ -EXTERN Void rgSCHPwrInit ARGS(( +Void rgSCHPwrInit ARGS(( Void)); -EXTERN uint8_t rgSCHPwrPuschTpcForUe ARGS(( +uint8_t rgSCHPwrPuschTpcForUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN uint8_t rgSCHPwrGetMaxUlRb ARGS(( +uint8_t rgSCHPwrGetMaxUlRb ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN uint8_t rgSCHPwrPucchTpcForUe ARGS(( +uint8_t rgSCHPwrPucchTpcForUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN Void rgSCHPwrGrpCntrlPucch ARGS(( +Void rgSCHPwrGrpCntrlPucch ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf)); -EXTERN Void rgSCHPwrGrpCntrlPusch ARGS(( +Void rgSCHPwrGrpCntrlPusch ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, RgSchUlSf *ulSf)); -EXTERN Void rgSCHPwrPucchDeltaInd ARGS(( +Void rgSCHPwrPucchDeltaInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, S8 pwrDelta)); -EXTERN Void rgSCHPwrUpdExtPhr ARGS(( +Void rgSCHPwrUpdExtPhr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgInfExtPhrCEInfo *extPhr, RgSchCmnAllocRecord *allocInfo)); -EXTERN Void rgSCHPwrUpdPhr ARGS(( +Void rgSCHPwrUpdPhr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t phr, RgSchCmnAllocRecord *allocInfo, S8 maxUePwr)); -EXTERN Void rgSCHPwrUlCqiInd ARGS(( +Void rgSCHPwrUlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHPwrRecordRbAlloc ARGS(( +Void rgSCHPwrRecordRbAlloc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t numRb )); -EXTERN S16 rgSCHPwrCellCfg ARGS(( +S16 rgSCHPwrCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cfg)); -EXTERN S16 rgSCHPwrCellRecfg ARGS(( +S16 rgSCHPwrCellRecfg ARGS(( RgSchCellCb *cell, RgrCellRecfg *recfg)); -EXTERN Void rgSCHPwrCellDel ARGS(( +Void rgSCHPwrCellDel ARGS(( RgSchCellCb *cell)); #ifdef LTE_ADV -EXTERN S16 rgSCHPwrUeSCellCfg ARGS(( +S16 rgSCHPwrUeSCellCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeSecCellCfg *sCellInfoCfg)); #endif -EXTERN S16 rgSCHPwrUeCfg ARGS(( +S16 rgSCHPwrUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *cfg)); -EXTERN S16 rgSCHPwrUeRecfg ARGS(( +S16 rgSCHPwrUeRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *recfg)); -EXTERN Void rgSCHPwrUeDel ARGS(( +Void rgSCHPwrUeDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -EXTERN Void rgSCHPwrUeReset ARGS(( +Void rgSCHPwrUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); #ifdef LTEMAC_SPS -EXTERN S16 rgSCHCmnSpsUlProcCrcInd ARGS(( +S16 rgSCHCmnSpsUlProcCrcInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime )); -EXTERN Void rgSCHCmnSpsInit ARGS((Void)); +Void rgSCHCmnSpsInit ARGS((Void)); -EXTERN Void rgSCHCmnSpsRelDlSpsActHqP ARGS(( +Void rgSCHCmnSpsRelDlSpsActHqP ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); -EXTERN S16 rgSCHCmnSpsCellCfg ARGS(( +S16 rgSCHCmnSpsCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err)); -EXTERN Void rgSCHCmnSpsCellDel ARGS(( +Void rgSCHCmnSpsCellDel ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHCmnSpsUeCfg ARGS(( +S16 rgSCHCmnSpsUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnSpsUeRecfg ARGS(( +S16 rgSCHCmnSpsUeRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnSpsUeDel ARGS(( +Void rgSCHCmnSpsUeDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHCmnSpsDlLcRecfg ARGS(( +S16 rgSCHCmnSpsDlLcRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchRecfg *lcRecfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHCmnSpsDlLcCfg ARGS(( +S16 rgSCHCmnSpsDlLcCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchCfg *lcCfg, RgSchErrInfo *err )); -EXTERN Void rgSCHCmnSpsDlLcDel ARGS(( +Void rgSCHCmnSpsDlLcDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc )); -EXTERN Void rgSCHCmnSpsDlCqiIndHndlr ARGS(( +Void rgSCHCmnSpsDlCqiIndHndlr ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo )); -EXTERN Void rgSCHCmnSpsDlDedBoUpd ARGS(( +Void rgSCHCmnSpsDlDedBoUpd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc )); -EXTERN Void rgSCHCmnSpsDlUeReset ARGS(( +Void rgSCHCmnSpsDlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnSpsDlProcAddToRetx ARGS(( +Void rgSCHCmnSpsDlProcAddToRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN Void rgSCHCmnSpsDlProcAck ARGS(( +Void rgSCHCmnSpsDlProcAck ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN Void rgSCHCmnSpsDlRelPdcchFbk ARGS(( +Void rgSCHCmnSpsDlRelPdcchFbk ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isAck )); -EXTERN Void rgSCHCmnSpsDlSched ARGS(( +Void rgSCHCmnSpsDlSched ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); #ifdef RG_UNUSED -EXTERN S16 rgSCHCmnSpsGetDlActvUe ARGS(( +S16 rgSCHCmnSpsGetDlActvUe ARGS(( RgSchCellCb *cell, CmLteTimingInfo *timingInfo, CmLListCp *dlSpsActvUeLst )); #endif -EXTERN Void rgSCHCmnSpsDlAllocFnlz ARGS(( +Void rgSCHCmnSpsDlAllocFnlz ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -EXTERN Void rgSCHCmnSpsDlUpdDlSfAllocWithSps ARGS(( +Void rgSCHCmnSpsDlUpdDlSfAllocWithSps ARGS(( RgSchCellCb *cell, CmLteTimingInfo schdTime, RgSchDlSf *dlSf @@ -2057,78 +2057,78 @@ RgSchDlSf *dlSf /* APIs exposed by UL SPS */ -EXTERN Void rgSCHCmnSpsUlLcgDel ARGS(( +Void rgSCHCmnSpsUlLcgDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg )); -EXTERN Void rgSCHCmnSpsUlUeReset ARGS(( +Void rgSCHCmnSpsUlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHCmnSpsUlProcRelInd ARGS(( +Void rgSCHCmnSpsUlProcRelInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isExplRel )); -EXTERN Void rgSCHCmnSpsUlProcActInd ARGS(( +Void rgSCHCmnSpsUlProcActInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint16_t spsSduSize )); -EXTERN Void rgSCHCmnSpsPhrInd ARGS(( +Void rgSCHCmnSpsPhrInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHCmnSpsBsrRpt ARGS(( +S16 rgSCHCmnSpsBsrRpt ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *ulLcg )); -EXTERN S16 rgSCHCmnSpsUlCqiInd ARGS(( +S16 rgSCHCmnSpsUlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHCmnSpsUlProcDtxInd ARGS(( +S16 rgSCHCmnSpsUlProcDtxInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo dtxTime )); -EXTERN S16 rgSCHCmnSpsUlTti ARGS(( +S16 rgSCHCmnSpsUlTti ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo )); #ifdef RG_UNUSED -EXTERN S16 rgSCHCmnSpsUlGetActvUeLst ARGS(( +S16 rgSCHCmnSpsUlGetActvUeLst ARGS(( RgSchCellCb *cell, CmLteTimingInfo timingInfo, CmLListCp *ulSpsActvUeLst )); #endif -EXTERN Void rgSCHCmnUlSpsRelInd ARGS(( +Void rgSCHCmnUlSpsRelInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isExplRel )); -EXTERN Void rgSCHCmnUlSpsActInd ARGS(( +Void rgSCHCmnUlSpsActInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint16_t spsSduSize )); -EXTERN Void rgSCHCmnUlCrcFailInd ARGS(( +Void rgSCHCmnUlCrcFailInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime )); -EXTERN Void rgSCHCmnUlCrcInd ARGS(( +Void rgSCHCmnUlCrcInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo crcTime @@ -2136,12 +2136,12 @@ CmLteTimingInfo crcTime /* Added handling to retrnasmit RelPDCCH in case no feedback is received */ -EXTERN Void rgSCHCmnSpsDlReTxRelPdcch ARGS(( +Void rgSCHCmnSpsDlReTxRelPdcch ARGS(( RgSchCellCb *cell )); #endif -EXTERN Void rgSCHCmnChkRetxAllowDtx +Void rgSCHCmnChkRetxAllowDtx ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -2149,78 +2149,78 @@ RgSchDlHqProcCb *proc, Bool *reTxAllwd )); -EXTERN S16 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); +S16 PtUiRgmBndCfm ARGS((Pst* pst, SuId suId, uint8_t status)); -EXTERN S16 rgSCHCmnDlInitHqEnt + S16 rgSCHCmnDlInitHqEnt ARGS(( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt )); -EXTERN Void rgSchCmnDlSfHqDel +Void rgSchCmnDlSfHqDel ARGS(( RgSchUeCb *ue, RgSchCellCb *cell )); -EXTERN Void rgSCHCmnDlDeInitHqEnt +Void rgSCHCmnDlDeInitHqEnt ARGS(( RgSchCellCb *cell, RgSchDlHqEnt *hqE )); -EXTERN uint8_t rgSCHCmnUlGetCqi +uint8_t rgSCHCmnUlGetCqi ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, CmLteUeCategory ueCtgy )); #ifdef DL_LA -EXTERN S16 rgSCHDhmUpdBlerBasediTbsEff ARGS(( +S16 rgSCHDhmUpdBlerBasediTbsEff ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t tbCnt )); #endif -EXTERN Void rgSchCmnUpdCfiDb ARGS(( +Void rgSchCmnUpdCfiDb ARGS(( RgSchCellCb *cell, uint8_t delta )); -EXTERN S16 RgUiRgmChangeTransModeInd ARGS(( +S16 RgUiRgmChangeTransModeInd ARGS(( Pst *pst, SuId suId, RgmTransModeInd *transModeInd)); -EXTERN Void rgSchCheckAndTriggerModeChange ARGS(( +Void rgSchCheckAndTriggerModeChange ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t reportediTbs, uint8_t previTbs, uint8_t maxiTbs )); -EXTERN Void rgSCHRrDlProcRmvFrmRetx ARGS(( +Void rgSCHRrDlProcRmvFrmRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN uint8_t rgSchUtlGetServCellIdx ARGS(( +uint8_t rgSchUtlGetServCellIdx ARGS(( Inst inst, uint16_t cellId, RgSchUeCb *ue )); -EXTERN S16 rgSchUtlVldtCellId ARGS (( +S16 rgSchUtlVldtCellId ARGS (( Inst inst, uint16_t cellId )); -EXTERN Void rgSCHCmnInitUlRbAllocInfo ARGS(( +Void rgSCHCmnInitUlRbAllocInfo ARGS(( RgSchCmnUlRbAllocInfo *allocInfo )); -EXTERN TfuDciFormat rgSCHCmnSlctPdcchFrmt ARGS(( +TfuDciFormat rgSCHCmnSlctPdcchFrmt ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t *raType )); -EXTERN Void rgSCHCmnNonDlfsDedRbAlloc ARGS(( +Void rgSCHCmnNonDlfsDedRbAlloc ARGS(( RgSchCellCb *cell, RgSchCmnUeRbAlloc *allocInfo, CmLListCp *ueLst, @@ -2228,7 +2228,7 @@ CmLListCp *schdUeLst, CmLListCp *nonSchdUeLst )); -EXTERN Bool rgSCHCmnRetxAvoidTdd ARGS +Bool rgSCHCmnRetxAvoidTdd ARGS (( RgSchDlSf *curSf, RgSchCellCb *cell, diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c index 212a49dd3..efae2ee5c 100755 --- a/src/5gnrsch/rg_sch_dbm.c +++ b/src/5gnrsch/rg_sch_dbm.c @@ -58,22 +58,22 @@ static int RLOG_MODULE_ID=4096; /* local defines */ -PRIVATE S16 rgSCHDbmInitUeCbLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins)); +static S16 rgSCHDbmInitUeCbLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins)); #ifdef LTE_TDD -PRIVATE S16 rgSCHDbmInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins)); +static S16 rgSCHDbmInitUeTfuPendLst ARGS(( RgSchCellCb *cellCb, uint16_t numBins)); #endif -PRIVATE Void rgSCHDbmInitDedLcLst ARGS((RgSchUeCb *ueCb)); -PRIVATE Void rgSCHDbmInitCmnLcLst ARGS((RgSchCellCb *cellCb)); +static Void rgSCHDbmInitDedLcLst ARGS((RgSchUeCb *ueCb)); +static Void rgSCHDbmInitCmnLcLst ARGS((RgSchCellCb *cellCb)); #ifdef LTEMAC_SPS -PRIVATE S16 rgSCHDbmInitSpsUeCbLst ARGS((RgSchCellCb *cellCb, +static S16 rgSCHDbmInitSpsUeCbLst ARGS((RgSchCellCb *cellCb, uint16_t numBins)); #endif -PRIVATE Void rgSCHDbmInitRaCbLst ARGS(( RgSchCellCb *cellCb)); +static Void rgSCHDbmInitRaCbLst ARGS(( RgSchCellCb *cellCb)); #ifndef LTE_TDD -PRIVATE Void rgSCHDbmInitRaReqLst ARGS(( RgSchCellCb *cellCb)); +static Void rgSCHDbmInitRaReqLst ARGS(( RgSchCellCb *cellCb)); #endif -PRIVATE Void rgSCHDbmInitCrntRgrCfgLst ARGS(( RgSchCellCb *cellCb)); -PRIVATE Void rgSCHDbmInitPndngRgrCfgLst ARGS(( RgSchCellCb *cellCb)); +static Void rgSCHDbmInitCrntRgrCfgLst ARGS(( RgSchCellCb *cellCb)); +static Void rgSCHDbmInitPndngRgrCfgLst ARGS(( RgSchCellCb *cellCb)); #ifdef EMTC_ENABLE S16 rgSCHDbmPutEmtcRnti ARGS((RgSchCellCb *cellCb,RgSchRntiLnk *rntiLnk)); @@ -166,13 +166,13 @@ RgSchCellCb *cellCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHDbmInitUeCbLst +static S16 rgSCHDbmInitUeCbLst ( RgSchCellCb *cellCb, uint16_t numBins ) #else -PRIVATE S16 rgSCHDbmInitUeCbLst(cellCb, numBins) +static S16 rgSCHDbmInitUeCbLst(cellCb, numBins) RgSchCellCb *cellCb; uint16_t numBins; #endif @@ -232,13 +232,13 @@ RgSchCellCb *cellCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHDbmInitSpsUeCbLst +static S16 rgSCHDbmInitSpsUeCbLst ( RgSchCellCb *cellCb, uint16_t numBins ) #else -PRIVATE S16 rgSCHDbmInitSpsUeCbLst(cellCb, numBins) +static S16 rgSCHDbmInitSpsUeCbLst(cellCb, numBins) RgSchCellCb *cellCb; uint16_t numBins; #endif @@ -666,12 +666,12 @@ RgSchUeCb *ueCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHDbmInitDedLcLst +static Void rgSCHDbmInitDedLcLst ( RgSchUeCb *ueCb ) #else -PRIVATE Void rgSCHDbmInitDedLcLst(ueCb) +static Void rgSCHDbmInitDedLcLst(ueCb) RgSchUeCb *ueCb; #endif { @@ -706,12 +706,12 @@ RgSchUeCb *ueCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHDbmInitCmnLcLst +static Void rgSCHDbmInitCmnLcLst ( RgSchCellCb *cellCb ) #else -PRIVATE Void rgSCHDbmInitCmnLcLst(cellCb) +static Void rgSCHDbmInitCmnLcLst(cellCb) RgSchCellCb *cellCb; #endif { @@ -1244,12 +1244,12 @@ RgSchClcBoRpt *cmnBoRpt; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHDbmInitRaCbLst +static Void rgSCHDbmInitRaCbLst ( RgSchCellCb *cellCb ) #else -PRIVATE Void rgSCHDbmInitRaCbLst(cellCb) +static Void rgSCHDbmInitRaCbLst(cellCb) RgSchCellCb *cellCb; #endif { @@ -1310,12 +1310,12 @@ CmLteRnti key; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHDbmInitRaReqLst +static Void rgSCHDbmInitRaReqLst ( RgSchCellCb *cellCb ) #else -PRIVATE Void rgSCHDbmInitRaReqLst(cellCb) +static Void rgSCHDbmInitRaReqLst(cellCb) RgSchCellCb *cellCb; #endif { @@ -1343,12 +1343,12 @@ RgSchCellCb *cellCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHDbmInitCrntRgrCfgLst +static Void rgSCHDbmInitCrntRgrCfgLst ( RgSchCellCb *cellCb ) #else -PRIVATE Void rgSCHDbmInitCrntRgrCfgLst(cellCb) +static Void rgSCHDbmInitCrntRgrCfgLst(cellCb) RgSchCellCb *cellCb; #endif { @@ -1369,12 +1369,12 @@ RgSchCellCb *cellCb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHDbmInitPndngRgrCfgLst +static Void rgSCHDbmInitPndngRgrCfgLst ( RgSchCellCb *cellCb ) #else -PRIVATE Void rgSCHDbmInitPndngRgrCfgLst(cellCb) +static Void rgSCHDbmInitPndngRgrCfgLst(cellCb) RgSchCellCb *cellCb; #endif { @@ -1841,13 +1841,13 @@ return; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHDbmInitUeTfuPendLst +static S16 rgSCHDbmInitUeTfuPendLst ( RgSchCellCb *cellCb, uint16_t numBins ) #else -PRIVATE S16 rgSCHDbmInitUeTfuPendLst(cellCb, numBins) +static S16 rgSCHDbmInitUeTfuPendLst(cellCb, numBins) RgSchCellCb *cellCb; uint16_t numBins; #endif diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c index 6926c3905..377e6b190 100755 --- a/src/5gnrsch/rg_sch_dhm.c +++ b/src/5gnrsch/rg_sch_dhm.c @@ -60,8 +60,8 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch_cmn.x" #ifdef RGSCH_SPS_STATS -extern uint32_t rgNumSPSSchedDropMaxRetx; -extern uint32_t rgNumActDtx; +uint32_t rgNumSPSSchedDropMaxRetx; +uint32_t rgNumActDtx; #endif uint32_t nackSf[10]; @@ -101,11 +101,11 @@ uint8_t rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VA /* local externs */ -PRIVATE Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, uint8_t tbIdx, uint8_t fdbk, +static Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, uint8_t tbIdx, uint8_t fdbk, Bool maxHqRetxReached)); void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP)); #ifndef LTE_TDD -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep ARGS(( +static S16 rgSCHDhmProcHqFdbkAckNackRep ARGS(( RgSchDlHqProcCb *hqP, RgSchDlSf *sf, uint8_t tbCnt, @@ -113,7 +113,7 @@ uint8_t *isAck )); #endif #ifdef DL_LA -PRIVATE S16 rgSCHDhmUpdateAckNackHistory ARGS(( +static S16 rgSCHDhmUpdateAckNackHistory ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t hqfdbk, @@ -121,13 +121,13 @@ PRIVATE S16 rgSCHDhmUpdateAckNackHistory ARGS(( )); #endif #ifdef LTE_TDD -PRIVATE Void rgSCHDhmPrcSplBundlFdbk ARGS(( +static Void rgSCHDhmPrcSplBundlFdbk ARGS(( RgSchCellCb *cell, TfuHqInfo *fdbk, uint8_t hqCnt )); #ifdef LTE_ADV -PRIVATE Void rgSchGetHqFdbkPosForM1 ARGS(( +static Void rgSchGetHqFdbkPosForM1 ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, uint8_t *isAck, @@ -135,7 +135,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1 ARGS(( uint8_t tbIdx, RgSchTddANInfo *anInfo )); -PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS(( +static Void rgSchGetHqFdbkPosForM234 ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, uint8_t *isAck, @@ -156,33 +156,33 @@ RgSchDlHqProcCb *proc )); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHDhmEmtcRgrCellCfg ARGS(( +S16 rgSCHDhmEmtcRgrCellCfg ARGS(( RgSchCellCb *cell )); #endif #ifdef CA_DBG -extern uint32_t gPCellTb1AckCount,gPCellTb2AckCount,gPCellTb1NackCount,gPCellTb2NackCount; -extern uint32_t gSCellSchedCount,gPrimarySchedCount; -extern uint32_t gSCellTb1AckCount,gSCellTb2AckCount,gSCellTb1NackCount,gSCellTb2NackCount; -extern uint32_t gPCellTb1DtxCount, gPCellTb2DtxCount, gSCellTb1DtxCount, gSCellTb2DtxCount; -extern uint32_t gHqFdbkCount; +uint32_t gPCellTb1AckCount,gPCellTb2AckCount,gPCellTb1NackCount,gPCellTb2NackCount; +uint32_t gSCellSchedCount,gPrimarySchedCount; +uint32_t gSCellTb1AckCount,gSCellTb2AckCount,gSCellTb1NackCount,gSCellTb2NackCount; +uint32_t gPCellTb1DtxCount, gPCellTb2DtxCount, gSCellTb1DtxCount, gSCellTb2DtxCount; +uint32_t gHqFdbkCount; #endif #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcUtlDlHqPTbRmvFrmTx +Void rgSCHEmtcUtlDlHqPTbRmvFrmTx ( RgSchEmtcDlSf *subFrm, RgSchDlHqProcCb *hqP, uint8_t tbIdx, Bool isRepeting ); -EXTERN RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet +RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet ( RgSchCellCb *cell, CmLteTimingInfo frm ); -EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); +Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); #endif /* forward references */ @@ -1224,7 +1224,7 @@ CmLteTimingInfo timingInfo; * -# None. **/ #ifdef ANSI -PRIVATE Void rgSCHDhmFdbkIndHndlTa +static Void rgSCHDhmFdbkIndHndlTa ( RgSchDlHqProcCb *hqP, uint8_t tbIdx, @@ -1232,7 +1232,7 @@ uint8_t fdbk, Bool maxHqRetxReached ) #else -PRIVATE Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached) +static Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached) RgSchDlHqProcCb *hqP; uint8_t tbIdx; uint8_t fdbk; @@ -1355,7 +1355,7 @@ RgSchDlHqTbCb *tbInfo; * @return S16 **/ #ifdef ANSI -PRIVATE S16 rgSCHDhmHqProcByFdbkTime +static S16 rgSCHDhmHqProcByFdbkTime ( RgSchDlHqEnt *hqE, CmLteTimingInfo timeInfo, @@ -1367,7 +1367,7 @@ uint8_t *cntHqPrcs, RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs, +static S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs, numTbs, tbStrtIdx, cntHqPrcs) RgSchDlHqEnt *hqE; CmLteTimingInfo timeInfo; @@ -1741,7 +1741,7 @@ uint32_t rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, * @return void **/ #ifdef ANSI -PRIVATE Void rgSchGetHqFdbkPosForM1 +static Void rgSchGetHqFdbkPosForM1 ( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, @@ -1751,7 +1751,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1 RgSchTddANInfo *anInfo ) #else -PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) +static Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) RgSchUeCb *ue; RgSchDlHqProcCb *hqP; uint8_t *isAck; @@ -1859,7 +1859,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) * @return void **/ #ifdef ANSI -PRIVATE Void rgSchGetHqFdbkPosForM234 +static Void rgSchGetHqFdbkPosForM234 ( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, @@ -1871,7 +1871,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234 CmLteTimingInfo timeInfo ) #else -PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) +static Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) RgSchUeCb *ue; RgSchDlHqProcCb *hqP; uint8_t *isAck; @@ -4573,7 +4573,7 @@ uint8_t idx; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep +static S16 rgSCHDhmProcHqFdbkAckNackRep ( RgSchDlHqProcCb *hqP, RgSchDlSf *sf, @@ -4581,7 +4581,7 @@ uint8_t tbCnt, uint8_t *isAck ) #else -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck) +static S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck) RgSchDlHqProcCb *hqP; RgSchDlSf *sf; uint8_t tbCnt; @@ -4760,7 +4760,7 @@ RgSchDlHqProcCb *hqP; #ifdef DL_LA #ifdef ANSI -PRIVATE S16 rgSCHDhmUpdateAckNackHistory +static S16 rgSCHDhmUpdateAckNackHistory ( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -4768,7 +4768,7 @@ uint8_t hqfdbk, uint8_t tbCnt ) #else -PRIVATE S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt) +static S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt) ( RgSchCellCb *cell; RgSchUeCb *ueCb; @@ -4888,14 +4888,14 @@ uint8_t tbCnt; * **/ #ifdef ANSI -PRIVATE Void rgSCHDhmPrcSplBundlFdbk +static Void rgSCHDhmPrcSplBundlFdbk ( RgSchCellCb *cell, TfuHqInfo *fdbk, uint8_t hqCnt ) #else -PRIVATE Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt) +static Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt) ( RgSchCellCb *cell; TfuHqInfo *fdbk; diff --git a/src/5gnrsch/rg_sch_drx.c b/src/5gnrsch/rg_sch_drx.c index b6e7f7fc5..93d6d46f7 100755 --- a/src/5gnrsch/rg_sch_drx.c +++ b/src/5gnrsch/rg_sch_drx.c @@ -109,7 +109,7 @@ static int RLOG_FILE_ID=163; * in TDD config 2 where no DwPTS exits. */ -PRIVATE uint8_t rgSchDrxDlSfTddCfg[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] = +static uint8_t rgSchDrxDlSfTddCfg[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] = { {2,4,6,6,7,8,3}, {4,6,8,7,8,9,5} @@ -124,7 +124,7 @@ PRIVATE uint8_t rgSchDrxDlSfTddCfg[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] = * */ -PRIVATE uint8_t rgSchDrxDLSfTillNxtSFN[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] +static uint8_t rgSchDrxDLSfTillNxtSFN[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] [RGSCH_NUM_SUB_FRAMES]= { { @@ -157,7 +157,7 @@ PRIVATE uint8_t rgSchDrxDLSfTillNxtSFN[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] * */ -PRIVATE uint8_t rgSchDrxDLSftoDLSfIdx[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] +static uint8_t rgSchDrxDLSftoDLSfIdx[RGSCH_MAX_SFCFG][RGSCH_MAX_TDD_CFG] [RGSCH_NUM_SUB_FRAMES]= { { @@ -197,66 +197,66 @@ uint8_t rgSchDrxHarqRetxFirstPsf[RGSCH_MAX_TDD_CFG][RGSCH_NUM_SUB_FRAMES] = { /****************************************************************************** * Start of Function declarations * ******************************************************************************/ -PRIVATE Void rgSCHDrxTtiHdlOnDurUl ARGS(( +static Void rgSCHDrxTtiHdlOnDurUl ARGS(( RgSchCellCb *cell, uint16_t ulIndex )); -PRIVATE Void rgSCHDrxTtiHdlOnDurDl ARGS(( +static Void rgSCHDrxTtiHdlOnDurDl ARGS(( RgSchCellCb *cell, uint16_t dlIndex )); -PRIVATE Void rgSCHDrxTtiHdlDlHarqRTT ARGS(( +static Void rgSCHDrxTtiHdlDlHarqRTT ARGS(( RgSchCellCb *cell, uint16_t dlIndex )); -PRIVATE Void rgSCHDrxTtiHdlUlHarqRTT ARGS(( +static Void rgSCHDrxTtiHdlUlHarqRTT ARGS(( RgSchCellCb *cell, uint16_t ulIndex )); - PRIVATE S16 rgSCHDrxTtiHdlOnDur ARGS((RgSchCellCb *cellCb, uint16_t dlIndex, +static S16 rgSCHDrxTtiHdlOnDur ARGS((RgSchCellCb *cellCb, uint16_t dlIndex, uint16_t ulIndex)); - PRIVATE S16 rgSCHDrxTtiHdlInActv ARGS((RgSchCellCb *cellCb, uint16_t dlIndex, +static S16 rgSCHDrxTtiHdlInActv ARGS((RgSchCellCb *cellCb, uint16_t dlIndex, uint16_t ulIndex)); - PRIVATE S16 rgSCHDrxTtiHdlShortCycle ARGS((RgSchCellCb *cell, uint16_t dlIndex, +static S16 rgSCHDrxTtiHdlShortCycle ARGS((RgSchCellCb *cell, uint16_t dlIndex, uint16_t ulIndex)); - PRIVATE S16 rgSCHDrxTtiHdlDlHarq ARGS((RgSchCellCb *cellCb, uint16_t dlIndex, +static S16 rgSCHDrxTtiHdlDlHarq ARGS((RgSchCellCb *cellCb, uint16_t dlIndex, uint16_t ulIndex)); - PRIVATE S16 rgSCHDrxCpyUeCfg ARGS((RgSchDrxUeCb *drxCb, +static S16 rgSCHDrxCpyUeCfg ARGS((RgSchDrxUeCb *drxCb, RgrUeDrxCfg* ueDrxCfg)); - PRIVATE S16 rgSCHDrxGetNxtOnDur ARGS((RgSchCellCb* cell,RgSchDrxUeCb* drxCb, +static S16 rgSCHDrxGetNxtOnDur ARGS((RgSchCellCb* cell,RgSchDrxUeCb* drxCb, CmLteTimingInfo* nxtOnDur, uint8_t delta)); -PRIVATE Void rgSCHDrxMvToNxtOnDurOcc ARGS((RgSchCellCb* cell, +static Void rgSCHDrxMvToNxtOnDurOcc ARGS((RgSchCellCb* cell, RgSchUeCb* ue, uint16_t idx, Bool calcFrmOffst)); #ifdef LTE_TDD -PRIVATE Void rgSCHDrxCalcNxtTmrExpry ARGS((RgSchCellCb *cell, +static Void rgSCHDrxCalcNxtTmrExpry ARGS((RgSchCellCb *cell, RgSchUeCb *ue, uint16_t delta, uint32_t tmrLen, S16 *distance, uint16_t *idx )); -PRIVATE S16 rgSCHDrxGetNxtTmrExpry ARGS((RgSchCellCb *cell,uint16_t curTime, +static S16 rgSCHDrxGetNxtTmrExpry ARGS((RgSchCellCb *cell,uint16_t curTime, uint32_t duration, CmLteTimingInfo* tmrExpryIdx)); #endif /* LTE_TDD */ #ifdef EMTC_ENABLE -EXTERN S16 rgSCHEmtcDrxCpyUeCfg +S16 rgSCHEmtcDrxCpyUeCfg ( RgSchUeCb *ueCb, RgrUeDrxCfg *drxCfg ); -EXTERN S16 rgSCHDrxTtiHdlUlHarq +S16 rgSCHDrxTtiHdlUlHarq ( RgSchCellCb *cell, uint16_t dlIndex, uint16_t ulIndex ); -EXTERN Void rgSCHDrxUeUlHqReset +Void rgSCHDrxUeUlHqReset ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -383,14 +383,14 @@ RgSchCellCb *cell; */ #ifdef ANSI -PRIVATE S16 rgSCHDrxTtiHdlOnDur +static S16 rgSCHDrxTtiHdlOnDur ( RgSchCellCb* cell, uint16_t dlIndex, uint16_t ulIndex ) #else -PRIVATE S16 rgSCHDrxTtiHdlOnDur(cell, dlIndex, ulIndex) +static S16 rgSCHDrxTtiHdlOnDur(cell, dlIndex, ulIndex) RgSchCellCb* cell; uint16_t dlIndex; uint16_t ulIndex; @@ -769,14 +769,14 @@ uint16_t ulIndex; */ #ifdef ANSI -PRIVATE S16 rgSCHDrxTtiHdlDlHarq +static S16 rgSCHDrxTtiHdlDlHarq ( RgSchCellCb *cell, uint16_t dlIndex, uint16_t ulIndex ) #else /* ANSI */ -PRIVATE S16 rgSCHDrxTtiHdlDlHarq (cell, dlIndex, ulIndex) +static S16 rgSCHDrxTtiHdlDlHarq (cell, dlIndex, ulIndex) RgSchCellCb *cell; uint16_t dlIndex; uint16_t ulIndex; @@ -1300,7 +1300,7 @@ S16 rgSCHDrxUeCfg (cell, ue, ueCfg) * @return ROK/RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHDrxGetNxtOnDur +static S16 rgSCHDrxGetNxtOnDur ( RgSchCellCb *cell, RgSchDrxUeCb *drxCb, @@ -1308,7 +1308,7 @@ PRIVATE S16 rgSCHDrxGetNxtOnDur uint8_t delta ) #else -PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) +static S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) RgSchCellCb *cell; RgSchDrxUeCb *drxCb; CmLteTimingInfo *nxtOnDur; @@ -1413,13 +1413,13 @@ PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta) * @return ROK/RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHDrxCpyUeCfg +static S16 rgSCHDrxCpyUeCfg ( RgSchDrxUeCb *ueCb, RgrUeDrxCfg *drxCfg ) #else -PRIVATE S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg) +static S16 rgSCHDrxCpyUeCfg (ueCb, drxCfg) RgSchDrxUeCb *ueCb; RgrUeDrxCfg *drxCfg; #endif @@ -2129,7 +2129,7 @@ RgSchUeCb *ueCb; * @return Void */ #ifdef ANSI -PRIVATE Void rgSCHDrxMvToNxtOnDurOcc +static Void rgSCHDrxMvToNxtOnDurOcc ( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -2137,7 +2137,7 @@ uint16_t idx, Bool calcFrmOffst ) #else -PRIVATE Void rgSCHDrxMvToNxtOnDurOcc (cell, ueCb, idx, calcFrmOffst) +static Void rgSCHDrxMvToNxtOnDurOcc (cell, ueCb, idx, calcFrmOffst) RgSchCellCb *cell; RgSchUeCb *ueCb; uint16_t idx; @@ -2244,7 +2244,7 @@ Bool calcFrmOffst; * @return ROK/RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHDrxGetNxtTmrExpry +static S16 rgSCHDrxGetNxtTmrExpry ( RgSchCellCb *cell, uint16_t curTime, @@ -2252,7 +2252,7 @@ PRIVATE S16 rgSCHDrxGetNxtTmrExpry CmLteTimingInfo *tmrExpryIdx ) #else -PRIVATE S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx) +static S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx) RgSchCellCb *cell; uint16_t curTime; uint32_t duration; @@ -2391,7 +2391,7 @@ PRIVATE S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx) * @return ROK/RFAILED */ #ifdef ANSI -PRIVATE Void rgSCHDrxCalcNxtTmrExpry +static Void rgSCHDrxCalcNxtTmrExpry ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2401,7 +2401,7 @@ PRIVATE Void rgSCHDrxCalcNxtTmrExpry uint16_t *idx ) #else -PRIVATE Void rgSCHDrxCalcNxtTmrExpry (cell,ue,delta,tmrLen,distance,idx) +static Void rgSCHDrxCalcNxtTmrExpry (cell,ue,delta,tmrLen,distance,idx) RgSchCellCb *cell; RgSchUeCb *ue; uint16_t delta; @@ -2544,13 +2544,13 @@ uint16_t offSet; */ #ifdef ANSI -PRIVATE Void rgSCHDrxTtiHdlOnDurUl +static Void rgSCHDrxTtiHdlOnDurUl ( RgSchCellCb *cell, uint16_t ulIndex ) #else -PRIVATE Void rgSCHDrxTtiHdlOnDurUl(cell, ulIndex) +static Void rgSCHDrxTtiHdlOnDurUl(cell, ulIndex) RgSchCellCb *cell; uint16_t ulIndex; #endif @@ -2684,13 +2684,13 @@ uint16_t ulIndex; */ #ifdef ANSI -PRIVATE Void rgSCHDrxTtiHdlOnDurDl +static Void rgSCHDrxTtiHdlOnDurDl ( RgSchCellCb *cell, uint16_t dlIndex ) #else -PRIVATE Void rgSCHDrxTtiHdlOnDurDl(cell, dlIndex) +static Void rgSCHDrxTtiHdlOnDurDl(cell, dlIndex) RgSchCellCb *cell; uint16_t dlIndex; #endif @@ -2870,13 +2870,13 @@ uint16_t dlIndex; */ #ifdef ANSI -PRIVATE Void rgSCHDrxTtiHdlDlHarqRTT +static Void rgSCHDrxTtiHdlDlHarqRTT ( RgSchCellCb *cell, uint16_t dlIndex ) #else /* ANSI */ -PRIVATE Void rgSCHDrxTtiHdlDlHarqRTT(cell, dlIndex) +static Void rgSCHDrxTtiHdlDlHarqRTT(cell, dlIndex) RgSchCellCb *cell; uint16_t dlIndex; #endif /* ANSI */ @@ -3057,13 +3057,13 @@ uint16_t dlIndex; */ #ifdef ANSI -PRIVATE Void rgSCHDrxTtiHdlUlHarqRTT +static Void rgSCHDrxTtiHdlUlHarqRTT ( RgSchCellCb *cell, uint16_t ulIndex ) #else /* ANSI */ -PRIVATE Void rgSCHDrxTtiHdlUlHarqRTT(cell, ulIndex) +static Void rgSCHDrxTtiHdlUlHarqRTT(cell, ulIndex) RgSchCellCb *cell; uint16_t ulIndex; #endif /* ANSI */ diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c index af6fba3f1..7a19658b1 100755 --- a/src/5gnrsch/rg_sch_gom.c +++ b/src/5gnrsch/rg_sch_gom.c @@ -57,26 +57,26 @@ static int RLOG_FILE_ID=164; #include "rg_sch.x" /* local defines */ -PRIVATE S16 rgSCHGomHndlCfgReq ARGS((RgSchCb *instCb, SpId spId, +static S16 rgSCHGomHndlCfgReq ARGS((RgSchCb *instCb, SpId spId, RgrCfg *cfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHGomHndlRecfgReq ARGS((RgSchCb *instCb, SpId spId, +static S16 rgSCHGomHndlRecfgReq ARGS((RgSchCb *instCb, SpId spId, RgrRecfg *recfg, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHGomHndlResetReq ARGS((RgSchCb *instCb,SpId spId,RgrRst *reset, +static S16 rgSCHGomHndlResetReq ARGS((RgSchCb *instCb,SpId spId,RgrRst *reset, RgSchErrInfo *errInfo)); -PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq ARGS((RgrCfgReqInfo *rgrCfgReq, +static S16 rgSCHGomGetCellIdFrmCfgReq ARGS((RgrCfgReqInfo *rgrCfgReq, CmLteCellId *cellId)); -PRIVATE S16 rgSCHGomCfgReq ARGS((Region reg, Pool pool, RgSchCb *instCb, +static S16 rgSCHGomCfgReq ARGS((Region reg, Pool pool, RgSchCb *instCb, RgrCfgTransId transId, RgrCfgReqInfo *cfgReqInfo)); -PRIVATE S16 rgSCHGomEnqCfgReq ARGS((Region reg, Pool pool, RgSchCellCb *cell, +static S16 rgSCHGomEnqCfgReq ARGS((Region reg, Pool pool, RgSchCellCb *cell, RgrCfgTransId transId, RgrCfgReqInfo *rgrCfgReq)); -PRIVATE S16 rgSCHGomHndlDelReq ARGS((RgSchCb *instCb,SpId spId, +static S16 rgSCHGomHndlDelReq ARGS((RgSchCb *instCb,SpId spId, RgrDel *del,RgSchErrInfo *errInfo)); #ifdef LTE_ADV -PRIVATE S16 rgSCHGomHndlSCellActDeactReq ARGS((RgSchCb *instCb, SpId spId, +static S16 rgSCHGomHndlSCellActDeactReq ARGS((RgSchCb *instCb, SpId spId, RgrSCellActDeactEvnt *sCellActDeactEvnt, RgSchErrInfo *errInfo, uint8_t action)); #endif /* LTE_ADV */ #ifdef EMTC_ENABLE -EXTERN S16 rgSchEmtcGetSiWinPerd ARGS(( +S16 rgSchEmtcGetSiWinPerd ARGS(( RgSchCellCb *cell, uint16_t *siWinSize, uint16_t *minPeriod @@ -89,12 +89,12 @@ extern S16 rgSCHEmtcUtlCalMcsAndNPrb uint8_t siId ); -EXTERN S32 rgSCHEmtcUtlGetAllwdCchTbSzForSI ARGS( +S32 rgSCHEmtcUtlGetAllwdCchTbSzForSI ARGS( ( uint32_t bo )); -EXTERN Void rgSCHEmtcWarningSiCfg ARGS( +Void rgSCHEmtcWarningSiCfg ARGS( ( RgSchCellCb *cell, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo, @@ -245,7 +245,7 @@ RgrCfgReqInfo *cfgReqInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomCfgReq +static S16 rgSCHGomCfgReq ( Region reg, Pool pool, @@ -254,7 +254,7 @@ RgrCfgTransId transId, RgrCfgReqInfo *cfgReqInfo ) #else -PRIVATE S16 rgSCHGomCfgReq(reg, pool, instCb, transId, cfgReqInfo) +static S16 rgSCHGomCfgReq(reg, pool, instCb, transId, cfgReqInfo) Region reg; Pool pool; RgSchCb *instCb; @@ -369,7 +369,7 @@ printf("\n AT MAC RGR cfg cfm sent\n"); * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomEnqCfgReq +static S16 rgSCHGomEnqCfgReq ( Region reg, Pool pool, @@ -378,7 +378,7 @@ RgrCfgTransId transId, RgrCfgReqInfo *rgrCfgReq ) #else -PRIVATE S16 rgSCHGomEnqCfgReq(reg, pool, cell, transId, rgrCfgReq) +static S16 rgSCHGomEnqCfgReq(reg, pool, cell, transId, rgrCfgReq) Region reg; Pool pool; RgSchCellCb *cell; @@ -552,7 +552,7 @@ SpId spId; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomHndlCfgReq +static S16 rgSCHGomHndlCfgReq ( RgSchCb *instCb, SpId spId, @@ -560,7 +560,7 @@ RgrCfg *cfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHGomHndlCfgReq(instCb, spId, cfg, errInfo) +static S16 rgSCHGomHndlCfgReq(instCb, spId, cfg, errInfo) RgSchCb *instCb; SpId spId; RgrCfg *cfg; @@ -676,7 +676,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomHndlSCellActDeactReq +static S16 rgSCHGomHndlSCellActDeactReq ( RgSchCb *instCb, SpId spId, @@ -685,7 +685,7 @@ RgSchErrInfo *errInfo, uint8_t action ) #else -PRIVATE S16 rgSCHGomHndlSCellActDeactReq(instCb, spId, sCellActDeactEvnt, errInfo, action) +static S16 rgSCHGomHndlSCellActDeactReq(instCb, spId, sCellActDeactEvnt, errInfo, action) RgSchCb *instCb; SpId spId; RgrSCellActDeactEvnt *sCellActDeactEvnt; @@ -755,7 +755,7 @@ uint8_t action; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomHndlRecfgReq +static S16 rgSCHGomHndlRecfgReq ( RgSchCb *instCb, SpId spId, @@ -763,7 +763,7 @@ RgrRecfg *recfg, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHGomHndlRecfgReq(instCb, spId, recfg, errInfo) +static S16 rgSCHGomHndlRecfgReq(instCb, spId, recfg, errInfo) RgSchCb *instCb; SpId spId; RgrRecfg *recfg; @@ -867,7 +867,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomHndlResetReq +static S16 rgSCHGomHndlResetReq ( RgSchCb *instCb, SpId spId, @@ -875,7 +875,7 @@ RgrRst *reset, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHGomHndlResetReq(instCb, spId, reset, errInfo) +static S16 rgSCHGomHndlResetReq(instCb, spId, reset, errInfo) RgSchCb *instCb; SpId spId; RgrRst *reset; @@ -933,7 +933,7 @@ RgSchErrInfo *errInfo; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHGomHndlDelReq +static S16 rgSCHGomHndlDelReq ( RgSchCb *instCb, SpId spId, @@ -941,7 +941,7 @@ RgrDel *del, RgSchErrInfo *errInfo ) #else -PRIVATE S16 rgSCHGomHndlDelReq(instCb, spId, del, errInfo) +static S16 rgSCHGomHndlDelReq(instCb, spId, del, errInfo) RgSchCb *instCb; SpId spId; RgrDel *del; @@ -953,7 +953,7 @@ RgSchErrInfo *errInfo; #ifdef DEBUGP Inst inst = (instCb->rgSchInit.inst); #endif - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; errInfo->errType = RGSCHERR_GOM_DEL_REQ; @@ -1039,13 +1039,13 @@ RgSchErrInfo *errInfo; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq +static S16 rgSCHGomGetCellIdFrmCfgReq ( RgrCfgReqInfo *rgrCfgReq, CmLteCellId *cellId ) #else -PRIVATE S16 rgSCHGomGetCellIdFrmCfgReq(rgrCfgReq, cellId) +static S16 rgSCHGomGetCellIdFrmCfgReq(rgrCfgReq, cellId) RgrCfgReqInfo *rgrCfgReq; CmLteCellId *cellId; #endif @@ -1693,7 +1693,7 @@ S16 rgSchUpdtRNTPInfo RgrLoadInfReqInfo *loadInfReq ) #else -PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) +static Void rgSchUpdtRNTPInfo(cell, sf) RgSchCellCb *cell; RgSchDlSf *sf; RgrLoadInfReqInfo *loadInfReq; diff --git a/src/5gnrsch/rg_sch_inf.x b/src/5gnrsch/rg_sch_inf.x index d2926355e..d395376c2 100755 --- a/src/5gnrsch/rg_sch_inf.x +++ b/src/5gnrsch/rg_sch_inf.x @@ -778,7 +778,7 @@ typedef struct rgInfL2MeasCfm * This API carries a transId to uniquely identify the confirm received for * this request from LTEMAC. * */ -EXTERN S16 RgSchMacL2MeasReq ARGS(( +S16 RgSchMacL2MeasReq ARGS(( Pst* pst, RgInfL2MeasReq* l2MeasReq )); @@ -788,7 +788,7 @@ EXTERN S16 RgSchMacL2MeasReq ARGS(( * it sends L2 measurement to layer manager. * */ -EXTERN S16 RgSchMacL2MeasSendReq ARGS(( +S16 RgSchMacL2MeasSendReq ARGS(( Pst* pst, RgInfL2MeasSndReq* l2MeasReq )); @@ -797,7 +797,7 @@ EXTERN S16 RgSchMacL2MeasSendReq ARGS(( * When Scheduler receives a measurement stop request from stack manager, * it stops L2 Measurement */ -EXTERN S16 RgSchMacL2MeasStopReq ARGS(( +S16 RgSchMacL2MeasStopReq ARGS(( Pst* pst, RgInfL2MeasStopReq* l2MeasReq )); @@ -808,7 +808,7 @@ EXTERN S16 RgSchMacL2MeasStopReq ARGS(( * period, It invokes this API to indicate result back to scheduler. LTE * MAC sends the same transId received in measurement request from Scheduler. * */ -EXTERN S16 RgMacSchL2MeasCfm ARGS(( +S16 RgMacSchL2MeasCfm ARGS(( Pst* pst, RgInfL2MeasCfm* l2MeasCfm )); @@ -817,12 +817,12 @@ EXTERN S16 RgMacSchL2MeasCfm ARGS(( * stops L2 measurement, it sends L2 measurement cfm. * */ -EXTERN S16 RgMacSchL2MeasStopCfm ARGS(( +S16 RgMacSchL2MeasStopCfm ARGS(( Pst* pst, RgInfL2MeasCfm* l2MeasCfm )); -EXTERN S16 RgMacSchL2MeasStop ARGS +S16 RgMacSchL2MeasStop ARGS (( Pst* pst, RgInfL2MeasCfm *measInfo @@ -897,7 +897,7 @@ typedef struct rgInfSpsRelInfo * @brief Request from Scheduler to MAC to register a cell. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacCellRegReq ARGS(( +S16 cmPkSchMacCellRegReq ARGS(( Pst* pst, RgInfCellReg* regReq )); @@ -914,7 +914,7 @@ typedef S16 (*CellRegReq) ARGS(( * creates a mapping of the cell which is uniquely idetified by cell ID and * scheduler instance that is serving the cell. */ -EXTERN S16 RgSchMacCellRegReq ARGS(( +S16 RgSchMacCellRegReq ARGS(( Pst* pst, RgInfCellReg* regReq )); @@ -922,7 +922,7 @@ EXTERN S16 RgSchMacCellRegReq ARGS(( * @brief Request from Scheduler to MAC to register a cell. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkSchMacCellRegReq ARGS(( +S16 cmUnpkSchMacCellRegReq ARGS(( CellRegReq func, Pst* pst, Buffer *mBuf @@ -931,7 +931,7 @@ EXTERN S16 cmUnpkSchMacCellRegReq ARGS(( * @brief Request from MAC to scheduler to update dedicated BO. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkMacSchDedBoUpdtReq ARGS(( +S16 cmPkMacSchDedBoUpdtReq ARGS(( Pst* pst, RgInfDedBoRpt* boRpt )); @@ -948,7 +948,7 @@ typedef S16 (*DedBoUpdtReq) ARGS(( * takes the buffer occupancy information into consideration while taking * scheduling decisons. */ -EXTERN S16 RgMacSchDedBoUpdtReq ARGS(( +S16 RgMacSchDedBoUpdtReq ARGS(( Pst* pst, RgInfDedBoRpt* boRpt )); @@ -956,7 +956,7 @@ EXTERN S16 RgMacSchDedBoUpdtReq ARGS(( * @brief Request from MAC to scheduler to update dedicated BO. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkMacSchDedBoUpdtReq ARGS(( +S16 cmUnpkMacSchDedBoUpdtReq ARGS(( DedBoUpdtReq func, Pst* pst, Buffer *mBuf @@ -965,7 +965,7 @@ EXTERN S16 cmUnpkMacSchDedBoUpdtReq ARGS(( * @brief Request from MAC to scheduler to update common channel BO. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkMacSchCmnBoUpdtReq ARGS(( +S16 cmPkMacSchCmnBoUpdtReq ARGS(( Pst* pst, RgInfCmnBoRpt* boRpt )); @@ -982,7 +982,7 @@ typedef S16 (*CmnBoUpdtReq) ARGS(( * takes the buffer occupancy information into consideration while taking * scheduling decisons. */ -EXTERN S16 RgMacSchCmnBoUpdtReq ARGS(( +S16 RgMacSchCmnBoUpdtReq ARGS(( Pst* pst, RgInfCmnBoRpt* boRpt )); @@ -990,7 +990,7 @@ EXTERN S16 RgMacSchCmnBoUpdtReq ARGS(( * @brief Request from MAC to scheduler to update common channel BO. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkMacSchCmnBoUpdtReq ARGS(( +S16 cmUnpkMacSchCmnBoUpdtReq ARGS(( CmnBoUpdtReq func, Pst* pst, Buffer *mBuf @@ -1001,7 +1001,7 @@ EXTERN S16 cmUnpkMacSchCmnBoUpdtReq ARGS(( * @brief UE delete indication from MAC to scheduler. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkMacSchUeDelInd ARGS(( +S16 cmPkMacSchUeDelInd ARGS(( Pst* pst, RgInfUeDelInd* ueDelInd )); @@ -1017,7 +1017,7 @@ typedef S16 (*UeDelInd) ARGS(( * receives UE delete Request. As the UE is now deleted at MAC, it should * not be scheduled. */ -EXTERN S16 RgMacSchUeDelInd ARGS(( +S16 RgMacSchUeDelInd ARGS(( Pst* pst, RgInfUeDelInd* ueDelInd )); @@ -1025,7 +1025,7 @@ EXTERN S16 RgMacSchUeDelInd ARGS(( * @brief UE delete Indication Request from MAC to scheduler. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkMacSchUeDelInd ARGS(( +S16 cmUnpkMacSchUeDelInd ARGS(( UeDelInd func, Pst* pst, Buffer *mBuf @@ -1035,7 +1035,7 @@ EXTERN S16 cmUnpkMacSchUeDelInd ARGS(( * @brief Data Indication Request from MAC to scheduler. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkMacSchSfRecpInd ARGS(( +S16 cmPkMacSchSfRecpInd ARGS(( Pst* pst, RgInfSfDatInd* datInd )); @@ -1052,7 +1052,7 @@ typedef S16 (*SfRecpInd) ARGS(( * takes these control elements into consideration while taking scheduling * decisons for the uplink. */ -EXTERN S16 RgMacSchSfRecpInd ARGS(( +S16 RgMacSchSfRecpInd ARGS(( Pst* pst, RgInfSfDatInd* datInd )); @@ -1060,7 +1060,7 @@ EXTERN S16 RgMacSchSfRecpInd ARGS(( * @brief Data Indication Request from MAC to scheduler. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkMacSchSfRecpInd ARGS(( +S16 cmUnpkMacSchSfRecpInd ARGS(( SfRecpInd func, Pst* pst, Buffer *mBuf @@ -1069,7 +1069,7 @@ EXTERN S16 cmUnpkMacSchSfRecpInd ARGS(( * @brief Resource Allocation Request from Scheduler to MAC. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacSfAllocReq ARGS(( +S16 cmPkSchMacSfAllocReq ARGS(( Pst* pst, RgInfSfAlloc* resAllocReq )); @@ -1085,7 +1085,7 @@ typedef S16 (*SfAllocReq) ARGS(( * inform the scheduling decisions taken for uplink grants, common channels * and list of UEs to be scheduling during this TTI. */ -EXTERN S16 RgSchMacSfAllocReq ARGS(( +S16 RgSchMacSfAllocReq ARGS(( Pst* pst, RgInfSfAlloc* resAllocReq )); @@ -1093,7 +1093,7 @@ EXTERN S16 RgSchMacSfAllocReq ARGS(( * @brief Resource Allocation Request from Scheduler to MAC. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkSchMacSfAllocReq ARGS(( +S16 cmUnpkSchMacSfAllocReq ARGS(( SfAllocReq func, Pst* pst, Buffer *mBuf @@ -1102,7 +1102,7 @@ EXTERN S16 cmUnpkSchMacSfAllocReq ARGS(( * @brief Request from Scheduler to release HARQ processes at MAC. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacRlsHqReq ARGS(( +S16 cmPkSchMacRlsHqReq ARGS(( Pst* pst, RgInfRlsHqInfo* sfHqInfo )); @@ -1119,7 +1119,7 @@ typedef S16 (*RlsHqReq) ARGS(( * primitive when a positive acknowledgement is received for the TB transmitted * or a TB is retransmitted for the allowed maximum number of retransmissions. */ -EXTERN S16 RgSchMacRlsHqReq ARGS(( +S16 RgSchMacRlsHqReq ARGS(( Pst* pst, RgInfRlsHqInfo* sfHqInfo )); @@ -1128,7 +1128,7 @@ EXTERN S16 RgSchMacRlsHqReq ARGS(( * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkSchMacRlsHqReq ARGS(( +S16 cmUnpkSchMacRlsHqReq ARGS(( RlsHqReq func, Pst* pst, Buffer *mBuf @@ -1138,7 +1138,7 @@ EXTERN S16 cmUnpkSchMacRlsHqReq ARGS(( * @brief Request from Scheduler to reset HARQ Entity at MAC. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacRstHqEntReq ARGS(( +S16 cmPkSchMacRstHqEntReq ARGS(( Pst* pst, RgInfResetHqEnt* hqEntInfo )); @@ -1152,7 +1152,7 @@ typedef S16 (*RstHqEntReq) ARGS(( * @brief Request from Scheduler to reset HARQ entity at MAC for a scell of an ue. * This is triggered upon deactivation of a scell */ -EXTERN S16 RgSchMacRstHqEntReq ARGS(( +S16 RgSchMacRstHqEntReq ARGS(( Pst* pst, RgInfResetHqEnt* hqEntInfo )); @@ -1161,7 +1161,7 @@ EXTERN S16 RgSchMacRstHqEntReq ARGS(( * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkSchMacRstHqEntReq ARGS(( +S16 cmUnpkSchMacRstHqEntReq ARGS(( RstHqEntReq func, Pst* pst, Buffer *mBuf @@ -1170,7 +1170,7 @@ EXTERN S16 cmUnpkSchMacRstHqEntReq ARGS(( * @brief Request from Scheduler to release RNTI at MAC. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacRlsRntiReq ARGS(( +S16 cmPkSchMacRlsRntiReq ARGS(( Pst* pst, RgInfRlsRnti* rlsRnti )); @@ -1185,7 +1185,7 @@ typedef S16 (*RlsRntiReq) ARGS(( * @details The Scheduler calls this primitive to send the list of RNTIs for * which the RRC Connection is being rejected. */ -EXTERN S16 RgSchMacRlsRntiReq ARGS(( +S16 RgSchMacRlsRntiReq ARGS(( Pst* pst, RgInfRlsRnti* rlsRnt )); @@ -1193,7 +1193,7 @@ EXTERN S16 RgSchMacRlsRntiReq ARGS(( * @brief Request from Scheduler to release RNTI at MAC. * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmUnpkSchMacRlsRntiReq ARGS(( +S16 cmUnpkSchMacRlsRntiReq ARGS(( RlsRntiReq func, Pst* pst, Buffer *mBuf @@ -1205,20 +1205,20 @@ typedef S16 (*LcgReg) ARGS(( RgInfLcgRegReq *lcgRegReq )); -EXTERN S16 cmPkSchMacLcgRegReq ARGS(( +S16 cmPkSchMacLcgRegReq ARGS(( Pst* pst, RgInfLcgRegReq *lcgRegReq )); -EXTERN S16 RgSchMacLcgRegReq ARGS((Pst *pst, RgInfLcgRegReq *lcgRegReq)); +S16 RgSchMacLcgRegReq ARGS((Pst *pst, RgInfLcgRegReq *lcgRegReq)); -EXTERN S16 cmUnpkSchMacLcgRegReq ARGS(( +S16 cmUnpkSchMacLcgRegReq ARGS(( LcgReg func, Pst *pst, Buffer *mBuf )); -EXTERN S16 RgSchMacLcgReg ARGS((Pst* pst, RgInfLcgRegReq *lcgRegReq)); +S16 RgSchMacLcgReg ARGS((Pst* pst, RgInfLcgRegReq *lcgRegReq)); #ifdef LTEMAC_SPS /** @@ -1226,7 +1226,7 @@ EXTERN S16 RgSchMacLcgReg ARGS((Pst* pst, RgInfLcgRegReq *lcgRegReq)); * a SPS UE * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacSpsLcRegReq ARGS(( +S16 cmPkSchMacSpsLcRegReq ARGS(( Pst* pst, RgInfSpsLcInfo *lcInfo )); @@ -1241,9 +1241,9 @@ typedef S16 (*SpsLcReg) ARGS(( * @details Scheduler calls this primitive to send the list of logical channels * that belong to the SPS logical channel group. */ -EXTERN S16 RgSchMacSpsLcRegReq ARGS((Pst *pst, RgInfSpsLcInfo *lcInfo)); +S16 RgSchMacSpsLcRegReq ARGS((Pst *pst, RgInfSpsLcInfo *lcInfo)); -EXTERN S16 cmUnpkSchMacSpsLcRegReq ARGS(( +S16 cmUnpkSchMacSpsLcRegReq ARGS(( SpsLcReg func, Pst *pst, Buffer *mBuf @@ -1254,7 +1254,7 @@ EXTERN S16 cmUnpkSchMacSpsLcRegReq ARGS(( * @brief Primitive from Scheduler to MAC to Reset UL SPS related Params * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacUlSpsResetReq ARGS(( +S16 cmPkSchMacUlSpsResetReq ARGS(( Pst* pst, RgInfUlSpsReset *ulSpsResetInfo )); @@ -1269,9 +1269,9 @@ typedef S16 (*UlSpsReset) ARGS(( * @details Scheduler calls this primitive to reset implicit and explicit * release counters for the UE */ -EXTERN S16 RgSchMacUlSpsResetReq ARGS((Pst *pst, RgInfUlSpsReset *ulSpsResetInfo)); +S16 RgSchMacUlSpsResetReq ARGS((Pst *pst, RgInfUlSpsReset *ulSpsResetInfo)); -EXTERN S16 cmUnpkSchMacUlSpsResetReq ARGS(( +S16 cmUnpkSchMacUlSpsResetReq ARGS(( UlSpsReset func, Pst *pst, Buffer *mBuf @@ -1284,7 +1284,7 @@ EXTERN S16 cmUnpkSchMacUlSpsResetReq ARGS(( * a SPS UE * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkSchMacSpsLcDeregReq ARGS(( +S16 cmPkSchMacSpsLcDeregReq ARGS(( Pst* pst, CmLteCellId cellId, CmLteRnti crnti @@ -1301,10 +1301,10 @@ typedef S16 (*SpsLcDereg) ARGS(( * @details Scheduler calls this primitive to send the deregistration request * for a UE once SPS is released for it */ -EXTERN S16 RgSchMacSpsLcDeregReq ARGS((Pst *pst, CmLteCellId cellId, CmLteRnti +S16 RgSchMacSpsLcDeregReq ARGS((Pst *pst, CmLteCellId cellId, CmLteRnti crnti)); -EXTERN S16 cmUnpkSchMacSpsLcDeregReq ARGS(( +S16 cmUnpkSchMacSpsLcDeregReq ARGS(( SpsLcDereg func, Pst* pst, Buffer *mBuf @@ -1314,7 +1314,7 @@ EXTERN S16 cmUnpkSchMacSpsLcDeregReq ARGS(( * @brief Primitive from MAC to Scheduler to indicate release of UL SPS for a UE * @details This primitive is used for light-weight loose coupling. */ -EXTERN S16 cmPkMacSchSpsRelInd ARGS(( +S16 cmPkMacSchSpsRelInd ARGS(( Pst* pst, RgInfSpsRelInfo* relInfo )); @@ -1329,9 +1329,9 @@ typedef S16 (*SpsRelInd) ARGS(( * @details MAC calls this primitive to inform the scheduler that UL SPS needs * to be released for a UE */ -EXTERN S16 RgMacSchSpsRelInd ARGS((Pst *pst, RgInfSpsRelInfo *relInfo)); +S16 RgMacSchSpsRelInd ARGS((Pst *pst, RgInfSpsRelInfo *relInfo)); -EXTERN S16 cmUnpkMacSchSpsRelInd ARGS(( +S16 cmUnpkMacSchSpsRelInd ARGS(( SpsRelInd func, Pst* pst, Buffer *mBuf @@ -1339,28 +1339,28 @@ EXTERN S16 cmUnpkMacSchSpsRelInd ARGS(( #endif #ifdef LTE_L2_MEAS -EXTERN S16 cmPkMacSchL2MeasCfm ARGS(( +S16 cmPkMacSchL2MeasCfm ARGS(( Pst* pst, RgInfL2MeasCfm *measCfm )); -EXTERN S16 cmPkMacSchL2MeasStopCfm ARGS(( +S16 cmPkMacSchL2MeasStopCfm ARGS(( Pst* pst, RgInfL2MeasCfm *measCfm )); -EXTERN S16 cmPkSchMacL2MeasReq ARGS(( +S16 cmPkSchMacL2MeasReq ARGS(( Pst* pst, RgInfL2MeasReq *measInfo )); -EXTERN S16 cmPkSchMacL2MeasStopReq ARGS(( +S16 cmPkSchMacL2MeasStopReq ARGS(( Pst* pst, RgInfL2MeasStopReq *measInfo )); -EXTERN S16 cmPkSchMacL2MeasSendReq ARGS(( +S16 cmPkSchMacL2MeasSendReq ARGS(( Pst* pst, RgInfL2MeasSndReq *measInfo )); @@ -1387,57 +1387,57 @@ typedef S16 (*L2MeasCfm) ARGS(( Pst *pst, RgInfL2MeasCfm *measCfm )); -EXTERN S16 cmUnpkMacSchL2MeasCfm ARGS +S16 cmUnpkMacSchL2MeasCfm ARGS (( L2MeasCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkSchMacL2MeasReq ARGS(( +S16 cmUnpkSchMacL2MeasReq ARGS(( L2MeasReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkSchMacL2MeasSendReq ARGS(( +S16 cmUnpkSchMacL2MeasSendReq ARGS(( L2MeasSendReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkSchMacL2MeasStopReq ARGS(( +S16 cmUnpkSchMacL2MeasStopReq ARGS(( L2MeasStopReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkMacSchL2MeasStopCfm ARGS(( +S16 cmUnpkMacSchL2MeasStopCfm ARGS(( L2MeasCfm func, Pst *pst, Buffer *mBuf )); #endif -EXTERN S16 RgSchMacRlsRnti ARGS((Pst* pst, RgInfRlsRnti* rlsRnti)); -EXTERN S16 RgSchMacRlsHq ARGS((Pst* pst, RgInfRlsHqInfo* sfHqInfo)); -EXTERN S16 RgSchMacSfAlloc ARGS((Pst* pst, RgInfSfAlloc* resAllocReq)); -EXTERN S16 RgSchMacRstHqEnt ARGS((Pst* pst, RgInfResetHqEnt* hqEntInfo)); -EXTERN S16 RgMacSchSfRecp ARGS((Pst* pst, RgInfSfDatInd* datInd)); -EXTERN S16 RgMacSchCmnBoUpdt ARGS(( Pst* pst, RgInfCmnBoRpt* boRpt)); -EXTERN S16 RgMacSchDedBoUpdt ARGS(( Pst* pst, RgInfDedBoRpt* boRpt)); -EXTERN S16 RgSchMacCellReg ARGS((Pst* pst,RgInfCellReg* regReq)); +S16 RgSchMacRlsRnti ARGS((Pst* pst, RgInfRlsRnti* rlsRnti)); +S16 RgSchMacRlsHq ARGS((Pst* pst, RgInfRlsHqInfo* sfHqInfo)); +S16 RgSchMacSfAlloc ARGS((Pst* pst, RgInfSfAlloc* resAllocReq)); +S16 RgSchMacRstHqEnt ARGS((Pst* pst, RgInfResetHqEnt* hqEntInfo)); +S16 RgMacSchSfRecp ARGS((Pst* pst, RgInfSfDatInd* datInd)); +S16 RgMacSchCmnBoUpdt ARGS(( Pst* pst, RgInfCmnBoRpt* boRpt)); +S16 RgMacSchDedBoUpdt ARGS(( Pst* pst, RgInfDedBoRpt* boRpt)); +S16 RgSchMacCellReg ARGS((Pst* pst,RgInfCellReg* regReq)); #ifdef LTE_L2_MEAS -EXTERN S16 RgSchMacL2Meas ARGS((Pst* pst, RgInfL2MeasReq* l2MeasReq)); -EXTERN S16 RgMacSchL2Meas ARGS((Pst* pst, RgInfL2MeasCfm* l2MeasCfm)); -EXTERN S16 RgSchMacL2MeasStop ARGS((Pst* pst, RgInfL2MeasStopReq *measInfo)); -EXTERN S16 RgSchMacL2MeasSend ARGS((Pst* pst, RgInfL2MeasSndReq *measInfo)); +S16 RgSchMacL2Meas ARGS((Pst* pst, RgInfL2MeasReq* l2MeasReq)); +S16 RgMacSchL2Meas ARGS((Pst* pst, RgInfL2MeasCfm* l2MeasCfm)); +S16 RgSchMacL2MeasStop ARGS((Pst* pst, RgInfL2MeasStopReq *measInfo)); +S16 RgSchMacL2MeasSend ARGS((Pst* pst, RgInfL2MeasSndReq *measInfo)); #endif /* LTE_L2_MEAS */ /* Added support for SPS*/ #ifdef LTEMAC_SPS -EXTERN S16 RgSchMacSpsLcReg ARGS((Pst *pst, RgInfSpsLcInfo *lcInfo)); -EXTERN S16 RgSchMacUlSpsReset ARGS((Pst *pst, RgInfUlSpsReset *lcInfo)); -EXTERN S16 RgSchMacSpsLcDereg ARGS((Pst *pst, CmLteCellId cellId, CmLteRnti +S16 RgSchMacSpsLcReg ARGS((Pst *pst, RgInfSpsLcInfo *lcInfo)); +S16 RgSchMacUlSpsReset ARGS((Pst *pst, RgInfUlSpsReset *lcInfo)); +S16 RgSchMacSpsLcDereg ARGS((Pst *pst, CmLteCellId cellId, CmLteRnti crnti)); -EXTERN S16 RgMacSchSpsRel ARGS((Pst *pst, RgInfSpsRelInfo* relInfo)); +S16 RgMacSchSpsRel ARGS((Pst *pst, RgInfSpsRelInfo* relInfo)); #endif -EXTERN S16 RgMacSchUeDel ARGS((Pst* pst, RgInfUeDelInd* ueDelInd)); +S16 RgMacSchUeDel ARGS((Pst* pst, RgInfUeDelInd* ueDelInd)); #ifdef __cplusplus } #endif diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c index e9cab73a5..289b2afae 100755 --- a/src/5gnrsch/rg_sch_l2m.c +++ b/src/5gnrsch/rg_sch_l2m.c @@ -62,12 +62,12 @@ static const char* RLOG_MODULE_NAME="MAC"; static int RLOG_MODULE_ID=4096; static int RLOG_FILE_ID=166; -PRIVATE S16 rgSchL2mInsertMeasCb ARGS(( +static S16 rgSchL2mInsertMeasCb ARGS(( RgSchCellCb *cell, RgSchL2MeasCb *measCb, LrgSchMeasReqInfo *measInfo )); -PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS(( +static RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS(( RgSchCellCb *cell, LrgSchMeasReqInfo *measInfo, RgSchErrInfo err)); @@ -406,14 +406,14 @@ LrgSchMeasReqInfo *measInfo; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSchL2mInsertMeasCb +static S16 rgSchL2mInsertMeasCb ( RgSchCellCb *cell, RgSchL2MeasCb *measCb, LrgSchMeasReqInfo *measInfo ) #else -PRIVATE S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo) +static S16 rgSchL2mInsertMeasCb(cell, measCb, measInfo) RgSchCellCb *cell; RgSchL2MeasCb *measCb; LrgSchMeasReqInfo *measInfo; @@ -467,12 +467,12 @@ LrgSchMeasReqInfo *measInfo; * @param [in] RgSchCellCb *cell */ #ifdef ANSI -PRIVATE Void rgSchL2CalDlPrbCount +static Void rgSchL2CalDlPrbCount ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchL2CalDlPrbCount(cell) +static Void rgSchL2CalDlPrbCount(cell) RgSchCellCb *cell; #endif { @@ -509,12 +509,12 @@ RgSchCellCb *cell; * @param [in] RgSchCellCb *cell */ #ifdef ANSI -PRIVATE Void rgSchL2CalUlPrbCount +static Void rgSchL2CalUlPrbCount ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchL2CalUlPrbCount(cell) +static Void rgSchL2CalUlPrbCount(cell) RgSchCellCb *cell; #endif { @@ -549,14 +549,14 @@ RgSchCellCb *cell; * @return RgSchL2MeasCb * */ #ifdef ANSI -PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb +static RgSchL2MeasCb * rgSchL2mAllocMeasCb ( RgSchCellCb *cell, LrgSchMeasReqInfo *measInfo, RgSchErrInfo err ) #else -PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err) +static RgSchL2MeasCb * rgSchL2mAllocMeasCb(cell, measInfo, err) RgSchCellCb *cell; LrgSchMeasReqInfo *measInfo; RgSchErrInfo err; diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index 098ca20e7..c1504c597 100755 --- a/src/5gnrsch/rg_sch_lmm.c +++ b/src/5gnrsch/rg_sch_lmm.c @@ -70,14 +70,14 @@ Void rgSCHCmnInit ARGS((Void)); /* forward references */ extern int schActvInit(Ent entity, Inst instId, Region region, Reason reason); #ifdef UNUSE_FUN -PRIVATE uint16_t rgSCHLmmSapCfg ARGS(( +static uint16_t rgSCHLmmSapCfg ARGS(( Inst inst, RgCfg *cfg, uint8_t sapIdx, Elmnt sapType )); #endif -PRIVATE Void rgSCHLmmShutdown ARGS(( +static Void rgSCHLmmShutdown ARGS(( Inst inst )); @@ -119,7 +119,7 @@ void printSchCellInfo(void) **/ #ifdef UNUSE_FUN #ifdef ANSI -PRIVATE uint16_t rgSCHLmmSapCfg +static uint16_t rgSCHLmmSapCfg ( Inst dInst, RgCfg *cfg, /* Configuaration information */ @@ -127,7 +127,7 @@ uint8_t sapIdx, /* SAP index */ Elmnt sapType /* SAP Type */ ) #else -PRIVATE uint16_t rgSCHLmmSapCfg(dInst, cfg, sapIdx, sapType) +static uint16_t rgSCHLmmSapCfg(dInst, cfg, sapIdx, sapType) Inst dInst; RgCfg *cfg; /* Configuaration information */ uint8_t sapIdx; /* SAP index */ @@ -276,12 +276,12 @@ Elmnt sapType; /* SAP Type */ * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHLmmShutdown +static Void rgSCHLmmShutdown ( Inst inst ) #else -PRIVATE Void rgSCHLmmShutdown(inst) +static Void rgSCHLmmShutdown(inst) Inst inst; #endif { diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c index 26886675d..8b363354c 100755 --- a/src/5gnrsch/rg_sch_mga.c +++ b/src/5gnrsch/rg_sch_mga.c @@ -56,33 +56,33 @@ static int RLOG_FILE_ID=169; #include "rg_sch.x" /* typedefs for Scheduler */ /* local defines */ -PRIVATE S16 rgSCHMeasGapANRepUtlAddUe ARGS(( +static S16 rgSCHMeasGapANRepUtlAddUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeMeasGapCfg *cfg)); -PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe ARGS(( +static S16 rgSCHMeasGapANRepUtlRmvUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -PRIVATE S16 rgSchAckNackRepUtlRmvUe ARGS(( +static S16 rgSchAckNackRepUtlRmvUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -PRIVATE Void rgSchAckNackRepUtlHdlTti ARGS(( +static Void rgSchAckNackRepUtlHdlTti ARGS(( RgSchCellCb *cell, CmLListCp *ackNackRepQ)); -PRIVATE Void rgSCHMeasGapANRepUtlHdlTti ARGS(( +static Void rgSCHMeasGapANRepUtlHdlTti ARGS(( RgSchCellCb *cell, CmLListCp *measGapQ)); #ifdef LTE_TDD -PRIVATE uint8_t rgSCHAckNakRepFindUlDuration ARGS(( +static uint8_t rgSCHAckNakRepFindUlDuration ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, CmLteTimingInfo repTime, uint8_t repCnt)); -PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS(( +static Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS(( RgSchDlSf *dlSf, CmLteTimingInfo crntDlTime, uint8_t *noSubfrms)); @@ -302,14 +302,14 @@ RgrUeRecfg *ueRecfg; * @return */ #ifdef ANSI -PRIVATE S16 rgSCHMeasGapANRepUtlAddUe +static S16 rgSCHMeasGapANRepUtlAddUe ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeMeasGapCfg *cfg ) #else -PRIVATE S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg) +static S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeMeasGapCfg *cfg; @@ -354,13 +354,13 @@ RgrUeMeasGapCfg *cfg; * @return */ #ifdef ANSI -PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe +static S16 rgSCHMeasGapANRepUtlRmvUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue) +static S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -492,13 +492,13 @@ Bool isUeDel; * @return */ #ifdef ANSI -PRIVATE S16 rgSchAckNackRepUtlRmvUe +static S16 rgSchAckNackRepUtlRmvUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue) +static S16 rgSchAckNackRepUtlRmvUe (cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -683,13 +683,13 @@ RgSchCellCb *cell; * @return Void */ #ifdef ANSI -PRIVATE Void rgSchAckNackRepUtlHdlTti +static Void rgSchAckNackRepUtlHdlTti ( RgSchCellCb *cell, CmLListCp *ackNackRepQ ) #else -PRIVATE Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ) +static Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ) RgSchCellCb *cell; CmLListCp *ackNackRepQ; #endif @@ -728,13 +728,13 @@ CmLListCp *ackNackRepQ; * @return */ #ifdef ANSI -PRIVATE Void rgSCHMeasGapANRepUtlHdlTti +static Void rgSCHMeasGapANRepUtlHdlTti ( RgSchCellCb *cell, CmLListCp *measGapQ ) #else -PRIVATE Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ) +static Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ) RgSchCellCb *cell; CmLListCp *measGapQ; #endif @@ -1450,7 +1450,7 @@ RgSchDlSf *crntDlSf; **/ #ifdef ANSI -PRIVATE uint8_t rgSCHAckNakRepFindUlDuration +static uint8_t rgSCHAckNakRepFindUlDuration ( RgSchCellCb *cell, RgSchDlSf *dlSf, @@ -1458,7 +1458,7 @@ CmLteTimingInfo repTime, uint8_t repCnt ) #else -PRIVATE uint8_t rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt) +static uint8_t rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt) RgSchCellCb *cell; RgSchDlSf *dlSf; CmLteTimingInfo repTime; @@ -1511,14 +1511,14 @@ uint8_t repCnt; **/ #ifdef ANSI -PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl +static Void rgSCHAckNakRepGetUlOffsetFrmDl ( RgSchDlSf *dlSf, CmLteTimingInfo crntDlTime, uint8_t *noSubfrms ) #else -PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms) +static Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms) RgSchDlSf *dlSf; CmLteTimingInfo crntDlTime; uint8_t *noSubfrms; diff --git a/src/5gnrsch/rg_sch_pt.c b/src/5gnrsch/rg_sch_pt.c index b8ff43b77..007cd9558 100755 --- a/src/5gnrsch/rg_sch_pt.c +++ b/src/5gnrsch/rg_sch_pt.c @@ -61,7 +61,7 @@ #define RG_MAX_SCH 1 -PRIVATE CONSTANT CellRegReq RgSchMacCellRegReqMt[RG_MAX_SCH] = +static const CellRegReq RgSchMacCellRegReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacCellRegReq, @@ -70,7 +70,7 @@ PRIVATE CONSTANT CellRegReq RgSchMacCellRegReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT DedBoUpdtReq RgMacSchDedBoUpdtReqMt[RG_MAX_SCH] = +static const DedBoUpdtReq RgMacSchDedBoUpdtReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchDedBoUpdtReq, @@ -79,7 +79,7 @@ PRIVATE CONSTANT DedBoUpdtReq RgMacSchDedBoUpdtReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT CmnBoUpdtReq RgMacSchCmnBoUpdtReqMt[RG_MAX_SCH] = +static const CmnBoUpdtReq RgMacSchCmnBoUpdtReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchCmnBoUpdtReq, @@ -88,7 +88,7 @@ PRIVATE CONSTANT CmnBoUpdtReq RgMacSchCmnBoUpdtReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT SfRecpInd RgMacSchSfRecpIndMt[RG_MAX_SCH] = +static const SfRecpInd RgMacSchSfRecpIndMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchSfRecpInd @@ -97,7 +97,7 @@ PRIVATE CONSTANT SfRecpInd RgMacSchSfRecpIndMt[RG_MAX_SCH] = #endif }; /*Fix: start: Inform UE delete to scheduler*/ -PRIVATE CONSTANT UeDelInd RgMacSchUeDelIndMt[RG_MAX_SCH] = +static const UeDelInd RgMacSchUeDelIndMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchUeDelInd @@ -106,7 +106,7 @@ PRIVATE CONSTANT UeDelInd RgMacSchUeDelIndMt[RG_MAX_SCH] = #endif }; /*Fix: end: Inform UE delete to scheduler*/ -PRIVATE CONSTANT SfAllocReq RgSchMacSfAllocReqMt[RG_MAX_SCH] = +static const SfAllocReq RgSchMacSfAllocReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacSfAllocReq, @@ -115,7 +115,7 @@ PRIVATE CONSTANT SfAllocReq RgSchMacSfAllocReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT RstHqEntReq RgSchMacRstHqEntReqMt[RG_MAX_SCH] = +static const RstHqEntReq RgSchMacRstHqEntReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacRstHqEntReq, @@ -123,7 +123,7 @@ PRIVATE CONSTANT RstHqEntReq RgSchMacRstHqEntReqMt[RG_MAX_SCH] = RgSchMacRstHqEntReq #endif }; -PRIVATE CONSTANT RlsHqReq RgSchMacRlsHqReqMt[RG_MAX_SCH] = +static const RlsHqReq RgSchMacRlsHqReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacRlsHqReq, @@ -132,7 +132,7 @@ PRIVATE CONSTANT RlsHqReq RgSchMacRlsHqReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT RlsRntiReq RgSchMacRlsRntiReqMt[RG_MAX_SCH] = +static const RlsRntiReq RgSchMacRlsRntiReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacRlsRntiReq, @@ -141,7 +141,7 @@ PRIVATE CONSTANT RlsRntiReq RgSchMacRlsRntiReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT LcgReg RgSchMacLcgRegReqMt[RG_MAX_SCH] = +static const LcgReg RgSchMacLcgRegReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacLcgRegReq, @@ -151,7 +151,7 @@ PRIVATE CONSTANT LcgReg RgSchMacLcgRegReqMt[RG_MAX_SCH] = }; #ifdef LTEMAC_SPS -PRIVATE CONSTANT SpsLcReg RgSchMacSpsLcRegReqMt[RG_MAX_SCH] = +static const SpsLcReg RgSchMacSpsLcRegReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacSpsLcRegReq, @@ -160,7 +160,7 @@ PRIVATE CONSTANT SpsLcReg RgSchMacSpsLcRegReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT UlSpsReset RgSchMacUlSpsResetMt[RG_MAX_SCH] = +static const UlSpsReset RgSchMacUlSpsResetMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacUlSpsReset, @@ -171,7 +171,7 @@ PRIVATE CONSTANT UlSpsReset RgSchMacUlSpsResetMt[RG_MAX_SCH] = -PRIVATE CONSTANT SpsLcDereg RgSchMacSpsLcDeregReqMt[RG_MAX_SCH] = +static const SpsLcDereg RgSchMacSpsLcDeregReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacSpsLcDeregReq, @@ -180,7 +180,7 @@ PRIVATE CONSTANT SpsLcDereg RgSchMacSpsLcDeregReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT SpsRelInd RgMacSchSpsRelIndMt[RG_MAX_SCH] = +static const SpsRelInd RgMacSchSpsRelIndMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchSpsRelInd, @@ -192,7 +192,7 @@ PRIVATE CONSTANT SpsRelInd RgMacSchSpsRelIndMt[RG_MAX_SCH] = #endif /* LTEMAC_SPS */ #ifdef LTE_L2_MEAS -PRIVATE CONSTANT L2MeasReq RgSchMacL2MeasReqMt[RG_MAX_SCH] = +static const L2MeasReq RgSchMacL2MeasReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacL2MeasReq @@ -201,7 +201,7 @@ PRIVATE CONSTANT L2MeasReq RgSchMacL2MeasReqMt[RG_MAX_SCH] = #endif }; /*Added for Rsys oam*/ -PRIVATE CONSTANT L2MeasStopReq RgSchMacL2MeasStopReqMt[RG_MAX_SCH] = +static const L2MeasStopReq RgSchMacL2MeasStopReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacL2MeasStopReq @@ -210,7 +210,7 @@ PRIVATE CONSTANT L2MeasStopReq RgSchMacL2MeasStopReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT L2MeasSendReq RgSchMacL2MeasSendReqMt[RG_MAX_SCH] = +static const L2MeasSendReq RgSchMacL2MeasSendReqMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkSchMacL2MeasSendReq @@ -219,7 +219,7 @@ PRIVATE CONSTANT L2MeasSendReq RgSchMacL2MeasSendReqMt[RG_MAX_SCH] = #endif }; -PRIVATE CONSTANT L2MeasCfm RgMacSchL2MeasCfmMt[RG_MAX_SCH] = +static const L2MeasCfm RgMacSchL2MeasCfmMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchL2MeasCfm @@ -227,7 +227,7 @@ PRIVATE CONSTANT L2MeasCfm RgMacSchL2MeasCfmMt[RG_MAX_SCH] = RgMacSchL2MeasCfm #endif }; -PRIVATE CONSTANT L2MeasStopCfm RgMacSchL2MeasStopCfmMt[RG_MAX_SCH] = +static const L2MeasStopCfm RgMacSchL2MeasStopCfmMt[RG_MAX_SCH] = { #ifdef LCSCH cmPkMacSchL2MeasStopCfm diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c index d973fd6ce..ba9e13a52 100755 --- a/src/5gnrsch/rg_sch_pwr.c +++ b/src/5gnrsch/rg_sch_pwr.c @@ -73,11 +73,11 @@ static int RLOG_FILE_ID=188; typedef S8 RgSchCmnUlPwrCqiToPwrTbl[RG_SCH_CMN_UL_NUM_CQI]; -PRIVATE RgSchCmnUlPwrCqiToPwrTbl rgSchPwrCqiToPwrTbl; +static RgSchCmnUlPwrCqiToPwrTbl rgSchPwrCqiToPwrTbl; /* This table maps a given number of RBs (given by array index) * to the power in dB that these many RBs map to. */ -CONSTANT uint8_t rgSchPwrRbToPwrTbl[111] = { 0, /* First entry is dummy */ +const uint8_t rgSchPwrRbToPwrTbl[111] = { 0, /* First entry is dummy */ 0, 3, 4, 6, 7, 7, 8, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, @@ -94,260 +94,260 @@ CONSTANT uint8_t rgSchPwrRbToPwrTbl[111] = { 0, /* First entry is dummy */ /* This table maps power (in dB) to number of RBs */ /* The array size comes from max power in rgSchPwrRbToPwrTbl */ -CONSTANT uint8_t rgSchPwrToRbTbl[20+1] = { +const uint8_t rgSchPwrToRbTbl[20+1] = { 1, 1, 2, 2, 3, 4, 5, 6, 7, 9, 11, 13, 17, 21, 26, 33, 41, 52, 65, 82, 103 }; -PRIVATE S8 rgSCHPwrGetCqiPwr ARGS(( +static S8 rgSCHPwrGetCqiPwr ARGS(( uint8_t cqi )); -PRIVATE S8 rgSCHPwrGetCqiPwrForUe ARGS(( +static S8 rgSCHPwrGetCqiPwrForUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t cqi )); -PRIVATE S8 rgSCHPwrCalcEfficncyPwr ARGS(( +static S8 rgSCHPwrCalcEfficncyPwr ARGS(( uint32_t eff )); -PRIVATE S8 rgSCHPwrGetDelta2FrmCqi ARGS(( +static S8 rgSCHPwrGetDelta2FrmCqi ARGS(( uint8_t crntCqi, uint8_t trgCqi, RgSchUeCb *ue, RgSchCellCb *cell )); -PRIVATE Void rgSCHPwrGetPuschTpc ARGS(( +static Void rgSCHPwrGetPuschTpc ARGS(( uint8_t isAcc, S8 delta, S8 availPwr, uint8_t *tpc, S8 *tpcDelta )); -PRIVATE uint8_t rgSCHPwrGetMaxRb ARGS(( +static uint8_t rgSCHPwrGetMaxRb ARGS(( RgSchCellCb *cell, S8 pwr )); -PRIVATE uint8_t rgSCHPwrRbToPwr ARGS(( +static uint8_t rgSCHPwrRbToPwr ARGS(( RgSchCellCb *cell, uint8_t numRb )); -PRIVATE Void rgSCHPwrSchedPucchRnti ARGS(( +static Void rgSCHPwrSchedPucchRnti ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchPdcch *pdcch, RgSchDlSf *dlSf, Bool *sched )); -PRIVATE Void rgSCHPwrPuschCntrl ARGS(( +static Void rgSCHPwrPuschCntrl ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrPucchCntrl ARGS(( +static Void rgSCHPwrPucchCntrl ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrSchedPuschRnti ARGS(( +static Void rgSCHPwrSchedPuschRnti ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchPdcch *pdcch, RgSchUlSf *ulSf, Bool *sched )); -PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe ARGS(( +static Void rgSCHPwrGetPucchFmt3TpcForUe ARGS(( RgSchUeCb *ue, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe ARGS(( +static Void rgSCHPwrGetPucchFmt3aTpcForUe ARGS(( RgSchUeCb *ue, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe ARGS(( +static Void rgSCHPwrGetPuschFmt3TpcForUe ARGS(( RgSchUeCb *ue, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe ARGS(( +static Void rgSCHPwrGetPuschFmt3aTpcForUe ARGS(( RgSchUeCb *ue, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrGetAcc1bitTpc ARGS(( +static Void rgSCHPwrGetAcc1bitTpc ARGS(( S8 remPwr, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrGetAcc2bitTpc ARGS(( +static Void rgSCHPwrGetAcc2bitTpc ARGS(( S8 remPwr, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrGetAbsTpc ARGS(( +static Void rgSCHPwrGetAbsTpc ARGS(( S8 remPwr, uint8_t *tpc, S8 *delta )); -PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe ARGS(( +static Void rgSCHPwrOnPucchGrpPwrForUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta )); -PRIVATE Void rgSCHPwrOnPuschGrpPwrForUe ARGS(( +static Void rgSCHPwrOnPuschGrpPwrForUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta )); -PRIVATE Bool rgSCHPwrIsDlUeSched ARGS(( +static Bool rgSCHPwrIsDlUeSched ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *sf )); -PRIVATE Bool rgSCHPwrIsUlUeSched ARGS(( +static Bool rgSCHPwrIsUlUeSched ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUlSf *sf )); -PRIVATE Void rgSCHPwrOnSchedPucchTpc ARGS(( +static Void rgSCHPwrOnSchedPucchTpc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta )); -PRIVATE Void rgSCHPwrOnSchedPuschTpc ARGS(( +static Void rgSCHPwrOnSchedPuschTpc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHPwrApplyUePwrCfg ARGS(( +static S16 rgSCHPwrApplyUePwrCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeUlPwrCfg *pwrCfg )); -PRIVATE Void rgSCHPwrUeResetPucch ARGS(( +static Void rgSCHPwrUeResetPucch ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrUeResetPusch ARGS(( +static Void rgSCHPwrUeResetPusch ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrOnPuschPwrUpd ARGS(( +static Void rgSCHPwrOnPuschPwrUpd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrAddRntiToPucchRntiLst ARGS(( +static Void rgSCHPwrAddRntiToPucchRntiLst ARGS(( RgSchCellCb *cell, CmLteRnti rnti, Bool isFmt3a )); -PRIVATE Void rgSCHPwrAddRntiToPuschRntiLst ARGS(( +static Void rgSCHPwrAddRntiToPuschRntiLst ARGS(( RgSchCellCb *cell, CmLteRnti rnti, Bool isFmt3a )); -PRIVATE Void rgSCHPwrInitTpcRntiCb ARGS(( +static Void rgSCHPwrInitTpcRntiCb ARGS(( RgSchCmnTpcRntiCb *cb, CmLteRnti rnti, Bool isFmt3a )); -PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb ARGS(( +static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb ARGS(( RgSchCellCb *cell, CmLteRnti tpcRnti )); -PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb ARGS(( +static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb ARGS(( RgSchCellCb *cell, CmLteRnti tpcRnti )); -PRIVATE Void rgSCHPwrAddUeToPucchTpcRntiCb ARGS(( +static Void rgSCHPwrAddUeToPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrDelUeFrmPucchTpcRntiCb ARGS(( +static Void rgSCHPwrDelUeFrmPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb ARGS(( +static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb ARGS(( +static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrRmvSchdPucchTpcRntiCb ARGS(( +static Void rgSCHPwrRmvSchdPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb )); -PRIVATE Void rgSCHPwrAddSchdUeToPucchTpcRntiCb ARGS(( +static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrAddSchdPucchTpcRntiCb ARGS(( +static Void rgSCHPwrAddSchdPucchTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb )); -PRIVATE Void rgSCHPwrAddUeToPuschTpcRntiCb ARGS(( +static Void rgSCHPwrAddUeToPuschTpcRntiCb ARGS(( RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrAddSchdUeToPuschTpcRntiCb ARGS(( +static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrDelUeFrmPuschTpcRntiCb ARGS(( +static Void rgSCHPwrDelUeFrmPuschTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb ARGS(( +static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb ARGS(( +static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue )); -PRIVATE Void rgSCHPwrAddSchdPuschTpcRntiCb ARGS(( +static Void rgSCHPwrAddSchdPuschTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb )); -PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb ARGS(( +static Void rgSCHPwrRmvSchdPuschTpcRntiCb ARGS(( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb )); -PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx ARGS(( +static S16 rgSCHPwrChkPucchTpcRntiIdx ARGS(( RgSchCmnTpcRntiCb *cb, uint8_t idx )); -PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx ARGS(( +static S16 rgSCHPwrChkPuschTpcRntiIdx ARGS(( RgSchCmnTpcRntiCb *cb, uint8_t idx )); -PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx ARGS(( +static S16 rgSCHPwrChkUniqPucchTpcRntiIdx ARGS(( RgSchCmnTpcRntiCb *cb, uint8_t idx )); -PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx ARGS(( +static S16 rgSCHPwrChkUniqPuschTpcRntiIdx ARGS(( RgSchCmnTpcRntiCb *cb, uint8_t idx )); -PRIVATE S16 rgSCHPwrChkTpcRntiIdx ARGS(( +static S16 rgSCHPwrChkTpcRntiIdx ARGS(( RgSchCmnTpcRntiCb *cb, uint8_t idx )); -PRIVATE S8 rgSCHPwrGetPhValFromPhr ARGS(( +static S8 rgSCHPwrGetPhValFromPhr ARGS(( uint8_t phr )); -PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax ARGS(( +static S8 rgSCHPwrGetPCMaxValFromPCMax ARGS(( uint8_t pCMax )); @@ -402,12 +402,12 @@ Void rgSCHPwrInit() * **********************************************************/ #ifdef ANSI -PRIVATE S8 rgSCHPwrGetCqiPwr +static S8 rgSCHPwrGetCqiPwr ( uint8_t cqi ) #else -PRIVATE S8 rgSCHPwrGetCqiPwr(cqi) +static S8 rgSCHPwrGetCqiPwr(cqi) uint8_t cqi; #endif { @@ -430,14 +430,14 @@ uint8_t cqi; * **********************************************************/ #ifdef ANSI -PRIVATE S8 rgSCHPwrGetCqiPwrForUe +static S8 rgSCHPwrGetCqiPwrForUe ( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t cqi ) #else -PRIVATE S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi) +static S8 rgSCHPwrGetCqiPwrForUe(cell, ue, cqi) RgSchCellCb *cell; RgSchUeCb *ue; uint8_t cqi; @@ -467,12 +467,12 @@ uint8_t cqi; * **********************************************************/ #ifdef ANSI -PRIVATE S8 rgSCHPwrCalcEfficncyPwr +static S8 rgSCHPwrCalcEfficncyPwr ( uint32_t eff ) #else -PRIVATE S8 rgSCHPwrCalcEfficncyPwr(eff) +static S8 rgSCHPwrCalcEfficncyPwr(eff) uint32_t eff; #endif { @@ -600,13 +600,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHPwrPuschCntrl +static Void rgSCHPwrPuschCntrl ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrPuschCntrl(cell, ue) +static Void rgSCHPwrPuschCntrl(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -731,20 +731,20 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE S8 rgSCHPwrGetDelta2FrmCqi +static S8 rgSCHPwrGetDelta2FrmCqi ( uint8_t crntCqi, uint8_t trgCqi, -RgSchUeCb *ue, -RgSchCellCb *cell +RgSchUeCb *ue, +RgSchCellCb *cell ) #else -PRIVATE S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi) +static S8 rgSCHPwrGetDelta2FrmCqi(crntCqi, trgCqi) uint8_t crntCqi; uint8_t trgCqi; -RgSchUeCb *ue; -RgSchCellCb *cell; +RgSchUeCb *ue; +RgSchCellCb *cell; #endif { RgSchCmnUeUlPwrCb *uePwr = RG_SCH_PWR_GETUEPWR(ue, cell); @@ -784,7 +784,7 @@ RgSchCellCb *cell; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetPuschTpc +static Void rgSCHPwrGetPuschTpc ( uint8_t isAcc, S8 delta, @@ -793,7 +793,7 @@ uint8_t *tpc, S8 *tpcDelta ) #else -PRIVATE Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta) +static Void rgSCHPwrGetPuschTpc(isAcc, delta, availPwr, tpc, tpcDelta) uint8_t isAcc; S8 delta; S8 availPwr; @@ -833,13 +833,13 @@ S8 *tpcDelta; * **********************************************************/ #ifdef ANSI -PRIVATE uint8_t rgSCHPwrGetMaxRb +static uint8_t rgSCHPwrGetMaxRb ( RgSchCellCb *cell, S8 pwr ) #else -PRIVATE uint8_t rgSCHPwrGetMaxRb(cell, pwr) +static uint8_t rgSCHPwrGetMaxRb(cell, pwr) RgSchCellCb *cell; S8 pwr; #endif @@ -875,13 +875,13 @@ S8 pwr; * **********************************************************/ #ifdef ANSI -PRIVATE uint8_t rgSCHPwrRbToPwr +static uint8_t rgSCHPwrRbToPwr ( RgSchCellCb *cell, uint8_t numRb ) #else -PRIVATE uint8_t rgSCHPwrRbToPwr(cell,numRb) +static uint8_t rgSCHPwrRbToPwr(cell,numRb) RgSchCellCb *cell; uint8_t numRb; #endif @@ -916,13 +916,13 @@ uint8_t numRb; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHPwrPucchCntrl +static Void rgSCHPwrPucchCntrl ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrPucchCntrl(cell, ue) +static Void rgSCHPwrPucchCntrl(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -1117,7 +1117,7 @@ RgSchUlSf *ulSf; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrSchedPucchRnti +static Void rgSCHPwrSchedPucchRnti ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, @@ -1126,7 +1126,7 @@ RgSchDlSf *dlSf, Bool *sched ) #else -PRIVATE Void rgSCHPwrSchedPucchRnti(cell, cb, pdcch, dlSf, sched) +static Void rgSCHPwrSchedPucchRnti(cell, cb, pdcch, dlSf, sched) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchPdcch *pdcch; @@ -1247,7 +1247,7 @@ Bool *sched; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrSchedPuschRnti +static Void rgSCHPwrSchedPuschRnti ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, @@ -1256,7 +1256,7 @@ RgSchUlSf *ulSf, Bool *sched ) #else -PRIVATE Void rgSCHPwrSchedPuschRnti(cell, cb, pdcch, ulSf, sched) +static Void rgSCHPwrSchedPuschRnti(cell, cb, pdcch, ulSf, sched) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchPdcch *pdcch; @@ -1376,14 +1376,14 @@ Bool *sched; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe +static Void rgSCHPwrGetPucchFmt3TpcForUe ( RgSchUeCb *ue, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta) +static Void rgSCHPwrGetPucchFmt3TpcForUe(ue, tpc, delta) RgSchUeCb *ue; uint8_t *tpc; S8 *delta; @@ -1409,14 +1409,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe +static Void rgSCHPwrGetPucchFmt3aTpcForUe ( RgSchUeCb *ue, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta) +static Void rgSCHPwrGetPucchFmt3aTpcForUe(ue, tpc, delta) RgSchUeCb *ue; uint8_t *tpc; S8 *delta; @@ -1442,14 +1442,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe +static Void rgSCHPwrGetPuschFmt3TpcForUe ( RgSchUeCb *ue, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta) +static Void rgSCHPwrGetPuschFmt3TpcForUe(ue, tpc, delta) RgSchUeCb *ue; uint8_t *tpc; S8 *delta; @@ -1476,14 +1476,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe +static Void rgSCHPwrGetPuschFmt3aTpcForUe ( RgSchUeCb *ue, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta) +static Void rgSCHPwrGetPuschFmt3aTpcForUe(ue, tpc, delta) RgSchUeCb *ue; uint8_t *tpc; S8 *delta; @@ -1511,14 +1511,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetAcc1bitTpc +static Void rgSCHPwrGetAcc1bitTpc ( S8 remPwr, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta) +static Void rgSCHPwrGetAcc1bitTpc(remPwr, tpc, delta) S8 remPwr; uint8_t *tpc; S8 *delta; @@ -1556,14 +1556,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetAcc2bitTpc +static Void rgSCHPwrGetAcc2bitTpc ( S8 remPwr, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta) +static Void rgSCHPwrGetAcc2bitTpc(remPwr, tpc, delta) S8 remPwr; uint8_t *tpc; S8 *delta; @@ -1610,14 +1610,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrGetAbsTpc +static Void rgSCHPwrGetAbsTpc ( S8 remPwr, uint8_t *tpc, S8 *delta ) #else -PRIVATE Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta) +static Void rgSCHPwrGetAbsTpc(remPwr, tpc, delta) S8 remPwr; uint8_t *tpc; S8 *delta; @@ -1675,14 +1675,14 @@ S8 *delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe +static Void rgSCHPwrOnPucchGrpPwrForUe ( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta ) #else -PRIVATE Void rgSCHPwrOnPucchGrpPwrForUe(cell, ue, delta) +static Void rgSCHPwrOnPucchGrpPwrForUe(cell, ue, delta) RgSchCellCb *cell; RgSchUeCb *ue; S8 delta; @@ -1737,14 +1737,14 @@ S8 delta; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrOnPuschGrpPwrForUe +static Void rgSCHPwrOnPuschGrpPwrForUe ( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta ) #else -PRIVATE Void rgSCHPwrOnPuschGrpPwrForUe(cell, ue, delta) +static Void rgSCHPwrOnPuschGrpPwrForUe(cell, ue, delta) RgSchCellCb *cell; RgSchUeCb *ue; S8 delta; @@ -1799,14 +1799,14 @@ S8 delta; * **********************************************************/ #ifdef ANSI -PRIVATE Bool rgSCHPwrIsDlUeSched +static Bool rgSCHPwrIsDlUeSched ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlSf *sf ) #else -PRIVATE Bool rgSCHPwrIsDlUeSched(cell, ue, sf) +static Bool rgSCHPwrIsDlUeSched(cell, ue, sf) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlSf *sf; @@ -1864,14 +1864,14 @@ RgSchDlSf *sf; * **********************************************************/ #ifdef ANSI -PRIVATE Bool rgSCHPwrIsUlUeSched +static Bool rgSCHPwrIsUlUeSched ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUlSf *sf ) #else -PRIVATE Bool rgSCHPwrIsUlUeSched(cell, ue, sf) +static Bool rgSCHPwrIsUlUeSched(cell, ue, sf) RgSchCellCb *cell; RgSchUeCb *ue; RgSchUlSf *sf; @@ -2001,14 +2001,14 @@ S8 pwrDelta; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHPwrOnSchedPucchTpc +static Void rgSCHPwrOnSchedPucchTpc ( RgSchCellCb *cell, RgSchUeCb *ue, S8 delta ) #else -PRIVATE Void rgSCHPwrOnSchedPucchTpc(cell, ue, delta) +static Void rgSCHPwrOnSchedPucchTpc(cell, ue, delta) RgSchCellCb *cell; RgSchUeCb *ue; S8 delta; @@ -2064,13 +2064,13 @@ S8 delta; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHPwrOnSchedPuschTpc +static Void rgSCHPwrOnSchedPuschTpc ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrOnSchedPuschTpc(cell, ue) +static Void rgSCHPwrOnSchedPuschTpc(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2760,14 +2760,14 @@ RgrUeRecfg *recfg; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHPwrApplyUePwrCfg +static S16 rgSCHPwrApplyUePwrCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeUlPwrCfg *pwrCfg ) #else -PRIVATE S16 rgSCHPwrApplyUePwrCfg(cell, ue, pwrCfg) +static S16 rgSCHPwrApplyUePwrCfg(cell, ue, pwrCfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeUlPwrCfg *pwrCfg; @@ -2999,13 +2999,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrUeResetPucch +static Void rgSCHPwrUeResetPucch ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrUeResetPucch(cell, ue) +static Void rgSCHPwrUeResetPucch(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -3039,13 +3039,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrUeResetPusch +static Void rgSCHPwrUeResetPusch ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrUeResetPusch(cell, ue) +static Void rgSCHPwrUeResetPusch(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -3080,13 +3080,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrOnPuschPwrUpd +static Void rgSCHPwrOnPuschPwrUpd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrOnPuschPwrUpd(cell, ue) +static Void rgSCHPwrOnPuschPwrUpd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -3141,14 +3141,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddRntiToPucchRntiLst +static Void rgSCHPwrAddRntiToPucchRntiLst ( RgSchCellCb *cell, CmLteRnti rnti, Bool isFmt3a ) #else -PRIVATE Void rgSCHPwrAddRntiToPucchRntiLst(cell, rnti, isFmt3a) +static Void rgSCHPwrAddRntiToPucchRntiLst(cell, rnti, isFmt3a) RgSchCellCb *cell; CmLteRnti rnti; Bool isFmt3a; @@ -3178,14 +3178,14 @@ Bool isFmt3a; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddRntiToPuschRntiLst +static Void rgSCHPwrAddRntiToPuschRntiLst ( RgSchCellCb *cell, CmLteRnti rnti, Bool isFmt3a ) #else -PRIVATE Void rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a) +static Void rgSCHPwrAddRntiToPuschRntiLst(cell, rnti, isFmt3a) RgSchCellCb *cell; CmLteRnti rnti; Bool isFmt3a; @@ -3213,14 +3213,14 @@ Bool isFmt3a; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrInitTpcRntiCb +static Void rgSCHPwrInitTpcRntiCb ( RgSchCmnTpcRntiCb *cb, CmLteRnti rnti, Bool isFmt3a ) #else -PRIVATE Void rgSCHPwrInitTpcRntiCb(cb, rnti, isFmt3a) +static Void rgSCHPwrInitTpcRntiCb(cb, rnti, isFmt3a) RgSchCmnTpcRntiCb *cb; CmLteRnti rnti; Bool isFmt3a; @@ -3251,13 +3251,13 @@ Bool isFmt3a; * **********************************************************/ #ifdef ANSI -PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb +static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb ( RgSchCellCb *cell, CmLteRnti tpcRnti ) #else -PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb(cell, tpcRnti) +static RgSchCmnTpcRntiCb* rgSCHPwrGetPucchRntiCb(cell, tpcRnti) RgSchCellCb *cell; CmLteRnti tpcRnti; #endif @@ -3295,13 +3295,13 @@ CmLteRnti tpcRnti; * **********************************************************/ #ifdef ANSI -PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb +static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb ( RgSchCellCb *cell, CmLteRnti tpcRnti ) #else -PRIVATE RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb(cell, tpcRnti) +static RgSchCmnTpcRntiCb* rgSCHPwrGetPuschRntiCb(cell, tpcRnti) RgSchCellCb *cell; CmLteRnti tpcRnti; #endif @@ -3339,14 +3339,14 @@ CmLteRnti tpcRnti; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddUeToPucchTpcRntiCb +static Void rgSCHPwrAddUeToPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrAddUeToPucchTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrAddUeToPucchTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3375,14 +3375,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrDelUeFrmPucchTpcRntiCb +static Void rgSCHPwrDelUeFrmPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrDelUeFrmPucchTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrDelUeFrmPucchTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3412,14 +3412,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb +static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrRmvSchdUeFrmPucchTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3456,14 +3456,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb +static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrRmvSchdUeOnlyFrmPucchTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3494,13 +3494,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrRmvSchdPucchTpcRntiCb +static Void rgSCHPwrRmvSchdPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb ) #else -PRIVATE Void rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb) +static Void rgSCHPwrRmvSchdPucchTpcRntiCb(cell, cb) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; #endif @@ -3531,14 +3531,14 @@ RgSchCmnTpcRntiCb *cb; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddSchdUeToPucchTpcRntiCb +static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrAddSchdUeToPucchTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrAddSchdUeToPucchTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3577,13 +3577,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddSchdPucchTpcRntiCb +static Void rgSCHPwrAddSchdPucchTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb ) #else -PRIVATE Void rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb) +static Void rgSCHPwrAddSchdPucchTpcRntiCb(cell, cb) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; #endif @@ -3611,13 +3611,13 @@ RgSchCmnTpcRntiCb *cb; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddUeToPuschTpcRntiCb +static Void rgSCHPwrAddUeToPuschTpcRntiCb ( RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrAddUeToPuschTpcRntiCb(cb, ue) +static Void rgSCHPwrAddUeToPuschTpcRntiCb(cb, ue) RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; #endif @@ -3644,14 +3644,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddSchdUeToPuschTpcRntiCb +static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrAddSchdUeToPuschTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrAddSchdUeToPuschTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3690,14 +3690,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrDelUeFrmPuschTpcRntiCb +static Void rgSCHPwrDelUeFrmPuschTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrDelUeFrmPuschTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3726,14 +3726,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb +static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrRmvSchdUeFrmPuschTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3770,14 +3770,14 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb +static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue) +static Void rgSCHPwrRmvSchdUeOnlyFrmPuschTpcRntiCb(cell, cb, ue) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; RgSchUeCb *ue; @@ -3808,13 +3808,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrAddSchdPuschTpcRntiCb +static Void rgSCHPwrAddSchdPuschTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb ) #else -PRIVATE Void rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb) +static Void rgSCHPwrAddSchdPuschTpcRntiCb(cell, cb) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; #endif @@ -3841,13 +3841,13 @@ RgSchCmnTpcRntiCb *cb; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb +static Void rgSCHPwrRmvSchdPuschTpcRntiCb ( RgSchCellCb *cell, RgSchCmnTpcRntiCb *cb ) #else -PRIVATE Void rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb) +static Void rgSCHPwrRmvSchdPuschTpcRntiCb(cell, cb) RgSchCellCb *cell; RgSchCmnTpcRntiCb *cb; #endif @@ -3879,13 +3879,13 @@ RgSchCmnTpcRntiCb *cb; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx +static S16 rgSCHPwrChkPucchTpcRntiIdx ( RgSchCmnTpcRntiCb *cb, uint8_t idx ) #else -PRIVATE S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx) +static S16 rgSCHPwrChkPucchTpcRntiIdx(cb, idx) RgSchCmnTpcRntiCb *cb; uint8_t idx; #endif @@ -3918,13 +3918,13 @@ uint8_t idx; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx +static S16 rgSCHPwrChkPuschTpcRntiIdx ( RgSchCmnTpcRntiCb *cb, uint8_t idx ) #else -PRIVATE S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx) +static S16 rgSCHPwrChkPuschTpcRntiIdx(cb, idx) RgSchCmnTpcRntiCb *cb; uint8_t idx; #endif @@ -3955,13 +3955,13 @@ uint8_t idx; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx +static S16 rgSCHPwrChkUniqPucchTpcRntiIdx ( RgSchCmnTpcRntiCb *cb, uint8_t idx ) #else -PRIVATE S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx) +static S16 rgSCHPwrChkUniqPucchTpcRntiIdx(cb, idx) RgSchCmnTpcRntiCb *cb; uint8_t idx; #endif @@ -3994,13 +3994,13 @@ uint8_t idx; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx +static S16 rgSCHPwrChkUniqPuschTpcRntiIdx ( RgSchCmnTpcRntiCb *cb, uint8_t idx ) #else -PRIVATE S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx) +static S16 rgSCHPwrChkUniqPuschTpcRntiIdx(cb, idx) RgSchCmnTpcRntiCb *cb; uint8_t idx; #endif @@ -4033,13 +4033,13 @@ uint8_t idx; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHPwrChkTpcRntiIdx +static S16 rgSCHPwrChkTpcRntiIdx ( RgSchCmnTpcRntiCb *cb, uint8_t idx ) #else -PRIVATE S16 rgSCHPwrChkTpcRntiIdx(cb, idx) +static S16 rgSCHPwrChkTpcRntiIdx(cb, idx) RgSchCmnTpcRntiCb *cb; uint8_t idx; #endif @@ -4078,12 +4078,12 @@ uint8_t idx; * **********************************************************/ #ifdef ANSI -PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax +static S8 rgSCHPwrGetPCMaxValFromPCMax ( uint8_t pCMax ) #else -PRIVATE S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax) +static S8 rgSCHPwrGetPCMaxValFromPCMax(pCMax) uint8_t pCMax; #endif { @@ -4108,12 +4108,12 @@ uint8_t pCMax; * **********************************************************/ #ifdef ANSI -PRIVATE S8 rgSCHPwrGetPhValFromPhr +static S8 rgSCHPwrGetPhValFromPhr ( uint8_t phr ) #else -PRIVATE S8 rgSCHPwrGetPhValFromPhr(phr) +static S8 rgSCHPwrGetPhValFromPhr(phr) uint8_t phr; #endif { diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c index 703b4e846..a5b5f7da5 100755 --- a/src/5gnrsch/rg_sch_ram.c +++ b/src/5gnrsch/rg_sch_ram.c @@ -63,20 +63,20 @@ static int RLOG_FILE_ID=171; #include "rg_sch.x" /* Scheduler includes */ #include "rg_sch_cmn.x" #ifdef EMTC_ENABLE -EXTERN Bool rgSCHRamVldtRgrEmtcUeCfg ARGS(( +Bool rgSCHRamVldtRgrEmtcUeCfg ARGS(( RgSchCellCb *cell, RgrUeCfg *ueCfg )); -EXTERN S16 rgSCHRamRmvAllFrmEmtcRaInfoSchdLst +S16 rgSCHRamRmvAllFrmEmtcRaInfoSchdLst ( RgSchCellCb *cell ); -EXTERN Void rgSCHEmtcUtlUpdCmnNb +Void rgSCHEmtcUtlUpdCmnNb ( RgSchRaCb *raCb ); -EXTERN Void rgSCHEmtcHqPAlloc +Void rgSCHEmtcHqPAlloc ( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt @@ -84,30 +84,30 @@ RgSchDlHqEnt *hqEnt #endif /* local defines */ /* local typedefs */ -PRIVATE Void rgSCHRamUlFreeAllocation ARGS((RgSchUlSf *sf,RgSchUlAlloc *alloc, +static Void rgSCHRamUlFreeAllocation ARGS((RgSchUlSf *sf,RgSchUlAlloc *alloc, RgSchCellCb *cell,Bool isEmtc)); -PRIVATE S16 rgSCHRamContResCrnti ARGS((RgSchCellCb *cell, RgSchUeCb *ue, +static S16 rgSCHRamContResCrnti ARGS((RgSchCellCb *cell, RgSchUeCb *ue, RgSchRaCb *raCb, RgSchErrInfo *err)); -PRIVATE S16 rgSCHRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +static S16 rgSCHRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHEmtcRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); -EXTERN S16 rgSCHRamEmtcContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); -EXTERN Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHEmtcRaInfoFree ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +S16 rgSCHEmtcRamContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +S16 rgSCHRamEmtcContResCcchsdu ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); +Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb *cell)); +Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb *cell)); +Void rgSCHEmtcRaInfoFree ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); #endif #ifdef RGR_V1 -PRIVATE Void rgSCHChkContResGrdTmrExp ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHChkContResTmrExp ARGS((RgSchCellCb *cell)); -PRIVATE Void rgSCHRamProcContResExp ARGS((RgSchCellCb *cell, +static Void rgSCHChkContResGrdTmrExp ARGS((RgSchCellCb *cell)); +static Void rgSCHChkContResTmrExp ARGS((RgSchCellCb *cell)); +static Void rgSCHRamProcContResExp ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); -PRIVATE Void rgSCHRamProcContResGrdExp ARGS((RgSchCellCb *cell, +static Void rgSCHRamProcContResGrdExp ARGS((RgSchCellCb *cell, RgSchRaCb *raCb)); #ifdef EMTC_ENABLE -EXTERN Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb *cell)); -EXTERN Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb *cell)); +Void rgSCHChkEmtcContResGrdTmrExp ARGS((RgSchCellCb *cell)); +Void rgSCHChkEmtcContResTmrExp ARGS((RgSchCellCb *cell)); #endif #endif /* forward references */ @@ -496,7 +496,7 @@ RgSchErrInfo *err; * -# ROK **/ #ifdef ANSI -PRIVATE S16 rgSCHRamContResCrnti +static S16 rgSCHRamContResCrnti ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -504,7 +504,7 @@ RgSchRaCb *raCb, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHRamContResCrnti(cell, ue, raCb, err) +static S16 rgSCHRamContResCrnti(cell, ue, raCb, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchRaCb *raCb; @@ -562,13 +562,13 @@ RgSchErrInfo *err; * -# ROK **/ #ifdef ANSI -PRIVATE S16 rgSCHRamContResCcchsdu +static S16 rgSCHRamContResCcchsdu ( RgSchCellCb *cell, RgSchRaCb *raCb ) #else -PRIVATE S16 rgSCHRamContResCcchsdu(cell, raCb) +static S16 rgSCHRamContResCcchsdu(cell, raCb) RgSchCellCb *cell; RgSchRaCb *raCb; #endif @@ -1271,13 +1271,13 @@ RgSchCellCb *cell; } /* rgSCHRamFreeCell */ #ifdef RGR_V1 #ifdef ANSI -PRIVATE Void rgSCHRamProcContResExp +static Void rgSCHRamProcContResExp ( RgSchCellCb *cell, RgSchRaCb *raCb ) #else -PRIVATE Void rgSCHRamProcContResExp (cell, raCb) +static Void rgSCHRamProcContResExp (cell, raCb) RgSchCellCb *cell; RgSchRaCb *raCb; #endif @@ -1300,13 +1300,13 @@ RgSchRaCb *raCb; } #ifdef ANSI -PRIVATE Void rgSCHRamProcContResGrdExp +static Void rgSCHRamProcContResGrdExp ( RgSchCellCb *cell, RgSchRaCb *raCb ) #else -PRIVATE Void rgSCHRamProcContResGrdExp (cell, raCb) +static Void rgSCHRamProcContResGrdExp (cell, raCb) RgSchCellCb *cell; RgSchRaCb *raCb; #endif @@ -1349,12 +1349,12 @@ RgSchRaCb *raCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHChkContResTmrExp +static Void rgSCHChkContResTmrExp ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHChkContResTmrExp(cell) +static Void rgSCHChkContResTmrExp(cell) RgSchCellCb *cell; #endif { @@ -1395,12 +1395,12 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PRIVATE Void rgSCHChkContResGrdTmrExp +static Void rgSCHChkContResGrdTmrExp ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHChkContResGrdTmrExp(cell) +static Void rgSCHChkContResGrdTmrExp(cell) RgSchCellCb *cell; #endif { @@ -1585,7 +1585,7 @@ RgSchRaCb *raCb; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHRamUlFreeAllocation +static Void rgSCHRamUlFreeAllocation ( RgSchUlSf *sf, RgSchUlAlloc *alloc, @@ -1594,7 +1594,7 @@ Bool isEmtc ) #else -PRIVATE Void rgSCHRamUlFreeAllocation(sf, alloc, cell,isEmtc) +static Void rgSCHRamUlFreeAllocation(sf, alloc, cell,isEmtc) RgSchUlSf *sf; RgSchUlAlloc *alloc; RgSchCellCb *cell; diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c index 4dcb5f7a3..c06896ab1 100755 --- a/src/5gnrsch/rg_sch_sc1.c +++ b/src/5gnrsch/rg_sch_sc1.c @@ -69,7 +69,7 @@ extern "C" { #endif /* __cplusplus */ /* Functions called from outside */ -PRIVATE S16 rgSCHSc1RgrDlCellRecfg ARGS(( +static S16 rgSCHSc1RgrDlCellRecfg ARGS(( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err @@ -78,76 +78,76 @@ RgSchErrInfo *err /*--------------------------* * DL SCHED STATIC declarations START *---------------------------*/ -PRIVATE Void rgSCHSc1DlSvcAddToSchd ARGS(( +static Void rgSCHSc1DlSvcAddToSchd ARGS(( RgSchCellCb *cell, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlAdd2UeSchdSvcs ARGS(( +static Void rgSCHSc1DlAdd2UeSchdSvcs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlRmvUeFrmPrioQs ARGS(( +static Void rgSCHSc1DlRmvUeFrmPrioQs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlSuspendUe ARGS(( +static Void rgSCHSc1DlSuspendUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlInactvtUe ARGS(( +static Void rgSCHSc1DlInactvtUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlProcRmvFrmCellRetx ARGS(( +static Void rgSCHSc1DlProcRmvFrmCellRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -PRIVATE Void rgSCHSc1DlProcRmvFrmUeRetx ARGS(( +static Void rgSCHSc1DlProcRmvFrmUeRetx ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP )); -PRIVATE Void rgSCHSc1DlMngPrio0SvcPosn ARGS(( +static Void rgSCHSc1DlMngPrio0SvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlMngGbrSvcPosn ARGS(( +static Void rgSCHSc1DlMngGbrSvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlMngAmbrSvcPosn ARGS(( +static Void rgSCHSc1DlMngAmbrSvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlMngSvcPosn ARGS(( +static Void rgSCHSc1DlMngSvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlUeAddToSchd ARGS(( +static Void rgSCHSc1DlUeAddToSchd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlTaCmd ARGS(( +static Void rgSCHSc1DlTaCmd ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHSc1DlInitQueues ARGS(( +static Void rgSCHSc1DlInitQueues ARGS(( RgSchSc1DlCell *cellDl )); -PRIVATE Void rgSCHSc1DlDeinitQueues ARGS(( +static Void rgSCHSc1DlDeinitQueues ARGS(( RgSchSc1DlCell *cellDl )); -PRIVATE Void rgSCHSc1DlAdd2UeLcsWithData ARGS(( +static Void rgSCHSc1DlAdd2UeLcsWithData ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlRmFrmUeLcsWithData ARGS(( +static Void rgSCHSc1DlRmFrmUeLcsWithData ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc @@ -155,17 +155,17 @@ RgSchDlLcCb *svc /*--------------------------* * UL SCHED STATIC declarations START *---------------------------*/ -PRIVATE Void rgSCHSc1UlPosnUeInQ ARGS(( +static Void rgSCHSc1UlPosnUeInQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1UlSchdUeTxLst ARGS(( +static Void rgSCHSc1UlSchdUeTxLst ARGS(( RgSchCellCb *cell, CmLListCp *ueTxLst, RgSchCmnUlRbAllocInfo *allocInfo, uint8_t *remUe )); -PRIVATE Void rgSCHSc1DlProcRmvFrmRetx ARGS(( +static Void rgSCHSc1DlProcRmvFrmRetx ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP @@ -178,10 +178,10 @@ RgSchCellCb *cell, RgInfSfAlloc *sfAlloc )); -PRIVATE Void rgSCHSc1DlPreSchd ARGS (( +static Void rgSCHSc1DlPreSchd ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSCHSc1DlPstSchd ARGS (( +static Void rgSCHSc1DlPstSchd ARGS (( Inst schInst )); #ifdef __cplusplus @@ -380,13 +380,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlProcRmvFrmCellRetx +static Void rgSCHSc1DlProcRmvFrmCellRetx ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP) +static Void rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif @@ -422,14 +422,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlProcRmvFrmUeRetx +static Void rgSCHSc1DlProcRmvFrmUeRetx ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP) +static Void rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; @@ -467,14 +467,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlProcAddToUeRetx +static Void rgSCHSc1DlProcAddToUeRetx ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHSc1DlProcAddToUeRetx(cell, ue, hqP) +static Void rgSCHSc1DlProcAddToUeRetx(cell, ue, hqP) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; @@ -554,14 +554,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRetxAlloc +static Void rgSCHSc1DlRetxAlloc ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo) +static Void rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchCmnDlRbAllocInfo *allocInfo; @@ -692,12 +692,12 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1RlsHqProc +static Void rgSCHSc1RlsHqProc ( RgSchDlHqProcCb *hqProc ) #else -PRIVATE Void rgSCHSc1RlsHqProc(hqProc) +static Void rgSCHSc1RlsHqProc(hqProc) RgSchDlHqProcCb *hqProc; #endif { @@ -725,7 +725,7 @@ RgSchDlHqProcCb *hqProc; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSc1DlDedSvcAlloc +static S16 rgSCHSc1DlDedSvcAlloc ( RgSchCellCb *cell, RgSchDlSf *subFrm, @@ -734,7 +734,7 @@ uint32_t bo, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo) +static S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchDlLcCb *svc; @@ -874,14 +874,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlAdd2UeSchdSvcs +static Void rgSCHSc1DlAdd2UeSchdSvcs ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc) +static Void rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -923,14 +923,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDedTx +static Void rgSCHSc1DlDedTx ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlDedTx(cell, subFrm, allocInfo) +static Void rgSCHSc1DlDedTx(cell, subFrm, allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchCmnDlRbAllocInfo *allocInfo; @@ -1020,7 +1020,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlPreSchd +static Void rgSCHSc1DlPreSchd ( RgSchCellCb *cell ) @@ -1046,7 +1046,7 @@ Void rgSCHSc1DlPreSchd(cell) * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlPstSchd +static Void rgSCHSc1DlPstSchd ( Inst schInst ) @@ -1077,13 +1077,13 @@ Void rgSCHSc1DlPstSchd(schInst) * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDedNewTx +static Void rgSCHSc1DlDedNewTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlDedNewTx(cell, allocInfo) +static Void rgSCHSc1DlDedNewTx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -1118,13 +1118,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDedRetx +static Void rgSCHSc1DlDedRetx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlDedRetx(cell, allocInfo) +static Void rgSCHSc1DlDedRetx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -1160,13 +1160,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcAddToSchd +static Void rgSCHSc1DlSvcAddToSchd ( RgSchCellCb *cell, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcAddToSchd(cell, svc) +static Void rgSCHSc1DlSvcAddToSchd(cell, svc) RgSchCellCb *cell; RgSchDlLcCb *svc; #endif @@ -1261,13 +1261,13 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlUeRmvFrmSchd +static Void rgSCHSc1DlUeRmvFrmSchd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlUeRmvFrmSchd(cell, ue) +static Void rgSCHSc1DlUeRmvFrmSchd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -1306,14 +1306,14 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcRmvFrmUeAmbrLst +static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(cell, ue, svc) +static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1349,14 +1349,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcAddToUeAmbrLst +static Void rgSCHSc1DlSvcAddToUeAmbrLst ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc) +static Void rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1415,13 +1415,13 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcRmvFrmSchd +static Void rgSCHSc1DlSvcRmvFrmSchd ( RgSchCellCb *cell, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcRmvFrmSchd(cell, svc) +static Void rgSCHSc1DlSvcRmvFrmSchd(cell, svc) RgSchCellCb *cell; RgSchDlLcCb *svc; #endif @@ -1463,7 +1463,7 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcAdd +static Void rgSCHSc1DlSvcAdd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1471,7 +1471,7 @@ RgSchDlLcCb *svc, RgrDlLchCfg *cfg ) #else -PRIVATE Void rgSCHSc1DlSvcAdd(cell, ue, svc, cfg) +static Void rgSCHSc1DlSvcAdd(cell, ue, svc, cfg) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1596,7 +1596,7 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcMod +static Void rgSCHSc1DlSvcMod ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1604,7 +1604,7 @@ RgSchDlLcCb *svc, RgrLchRecfg *recfg ) #else -PRIVATE Void rgSCHSc1DlSvcMod(cell,ue,svc, recfg) +static Void rgSCHSc1DlSvcMod(cell,ue,svc, recfg) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1640,13 +1640,13 @@ RgrLchRecfg *recfg; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlUeAddToSchd +static Void rgSCHSc1DlUeAddToSchd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlUeAddToSchd(cell, ue) +static Void rgSCHSc1DlUeAddToSchd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -1715,14 +1715,14 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngAmbrSvcPosn +static Void rgSCHSc1DlMngAmbrSvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngAmbrSvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngAmbrSvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1865,14 +1865,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngPrio0SvcPosn +static Void rgSCHSc1DlMngPrio0SvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngPrio0SvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngPrio0SvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1913,14 +1913,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngGbrSvcPosn +static Void rgSCHSc1DlMngGbrSvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1958,14 +1958,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngSvcPosn +static Void rgSCHSc1DlMngSvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngSvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngSvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -2050,12 +2050,12 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDeinitQueues +static Void rgSCHSc1DlDeinitQueues ( RgSchSc1DlCell *cellDl ) #else -PRIVATE Void rgSCHSc1DlDeinitQueues(cellDl) +static Void rgSCHSc1DlDeinitQueues(cellDl) RgSchSc1DlCell *cellDl; #endif { @@ -2375,13 +2375,13 @@ RgSchErrInfo *err; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRmvUeFrmPrioQs +static Void rgSCHSc1DlRmvUeFrmPrioQs ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlRmvUeFrmPrioQs(cell, ue) +static Void rgSCHSc1DlRmvUeFrmPrioQs(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2425,13 +2425,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlInactvtUe +static Void rgSCHSc1DlInactvtUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlInactvtUe(cell, ue) +static Void rgSCHSc1DlInactvtUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2491,13 +2491,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSuspendUe +static Void rgSCHSc1DlSuspendUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlSuspendUe(cell, ue) +static Void rgSCHSc1DlSuspendUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2781,14 +2781,14 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSc1RgrDlCellRecfg +static S16 rgSCHSc1RgrDlCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHSc1RgrDlCellRecfg(cell, recfg, err) +static S16 rgSCHSc1RgrDlCellRecfg(cell, recfg, err) RgSchCellCb *cell; RgrCellRecfg *recfg; RgSchErrInfo *err; @@ -2817,13 +2817,13 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlTaCmd +static Void rgSCHSc1DlTaCmd ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlTaCmd(cell, allocInfo) +static Void rgSCHSc1DlTaCmd(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3025,12 +3025,12 @@ RgDlSchdApis *rgSchDlApis; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlInitQueues +static Void rgSCHSc1DlInitQueues ( RgSchSc1DlCell *cellDl ) #else -PRIVATE Void rgSCHSc1DlInitQueues(cellDl) +static Void rgSCHSc1DlInitQueues(cellDl) RgSchSc1DlCell *cellDl; #endif { @@ -3086,13 +3086,13 @@ RgSchSc1DlCell *cellDl; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRetxAllocFnlz +static Void rgSCHSc1DlRetxAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlRetxAllocFnlz(cell, allocInfo) +static Void rgSCHSc1DlRetxAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3165,7 +3165,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSprTxTbDstn +static Void rgSCHSc1DlSprTxTbDstn ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3174,7 +3174,7 @@ uint32_t *effAlloc, CmLList **node ) #else -PRIVATE Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node) +static Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqTbCb *tbInfo; @@ -3298,7 +3298,7 @@ CmLList **node; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlNewTxTbDstn +static Void rgSCHSc1DlNewTxTbDstn ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3307,7 +3307,7 @@ uint32_t *effAlloc, CmLList **node ) #else -PRIVATE Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node) +static Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqTbCb *tbInfo; @@ -3451,14 +3451,14 @@ CmLList **node; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlNewTxUeFnlz +static Void rgSCHSc1DlNewTxUeFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlNewTxUeFnlz(cell, allocInfo, ue) +static Void rgSCHSc1DlNewTxUeFnlz(cell, allocInfo, ue) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; @@ -3554,13 +3554,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlNewTxAllocFnlz +static Void rgSCHSc1DlNewTxAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlNewTxAllocFnlz(cell, allocInfo) +static Void rgSCHSc1DlNewTxAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3635,13 +3635,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRetxNewTxAllocFnlz +static Void rgSCHSc1DlRetxNewTxAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *cellAllocInfo ) #else -PRIVATE Void rgSCHSc1DlRetxNewTxAllocFnlz(cell, cellAllocInfo) +static Void rgSCHSc1DlRetxNewTxAllocFnlz(cell, cellAllocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *cellAllocInfo; #endif @@ -3815,14 +3815,14 @@ Void *dlCqi; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlAdd2UeLcsWithData +static Void rgSCHSc1DlAdd2UeLcsWithData ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlAdd2UeLcsWithData(cell, ue, svc) +static Void rgSCHSc1DlAdd2UeLcsWithData(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -3885,14 +3885,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRmFrmUeLcsWithData +static Void rgSCHSc1DlRmFrmUeLcsWithData ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, svc) +static Void rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -4497,13 +4497,13 @@ RgSchLcgCb *lcg; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdUe +static Void rgSCHSc1UlSchdUe ( RgSchUeCb *ue, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHSc1UlSchdUe(ue,cell) +static Void rgSCHSc1UlSchdUe(ue,cell) RgSchUeCb *ue; RgSchCellCb *cell; #endif @@ -4542,14 +4542,14 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdForDataTrans +static Void rgSCHSc1UlSchdForDataTrans ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, uint8_t remUe ) #else -PRIVATE Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe) +static Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; uint8_t remUe; @@ -4592,7 +4592,7 @@ uint8_t remUe; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdUeTxLst +static Void rgSCHSc1UlSchdUeTxLst ( RgSchCellCb *cell, CmLListCp *ueTxLst, @@ -4600,7 +4600,7 @@ RgSchCmnUlRbAllocInfo *allocInfo, uint8_t *remUe ) #else -PRIVATE Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe) +static Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe) RgSchCellCb *cell; CmLListCp *ueTxLst; RgSchCmnUlRbAllocInfo *allocInfo; @@ -4672,14 +4672,14 @@ uint8_t *remUe; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdForContRes +static Void rgSCHSc1UlSchdForContRes ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, uint8_t *remUe ) #else -PRIVATE Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe) +static Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; uint8_t *remUe; @@ -4742,13 +4742,13 @@ uint8_t *remUe; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlNewTx +static Void rgSCHSc1UlNewTx ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1UlNewTx(cell, allocInfo) +static Void rgSCHSc1UlNewTx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif @@ -4809,14 +4809,14 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlInsUeInQ +static Void rgSCHSc1UlInsUeInQ ( CmLListCp *lst, RgSchUeCb *ue, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHSc1UlInsUeInQ(lst, ue, cell) +static Void rgSCHSc1UlInsUeInQ(lst, ue, cell) CmLListCp *lst; RgSchUeCb *ue; RgSchCellCb *cell; @@ -4879,13 +4879,13 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlPosnUeInQ +static Void rgSCHSc1UlPosnUeInQ ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1UlPosnUeInQ(cell, ue) +static Void rgSCHSc1UlPosnUeInQ(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -5263,13 +5263,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlDatTransAllocFnlz +static Void rgSCHSc1UlDatTransAllocFnlz ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo) +static Void rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif @@ -5351,13 +5351,13 @@ RgSchCmnUlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlContResAllocFnlz +static Void rgSCHSc1UlContResAllocFnlz ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1UlContResAllocFnlz(cell, allocInfo) +static Void rgSCHSc1UlContResAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif diff --git a/src/5gnrsch/rg_sch_sc1.x b/src/5gnrsch/rg_sch_sc1.x index 96e68966d..30f22cfc2 100755 --- a/src/5gnrsch/rg_sch_sc1.x +++ b/src/5gnrsch/rg_sch_sc1.x @@ -129,228 +129,228 @@ typedef struct rgSc1DlSvc { } RgSchSc1DlSvc; -EXTERN Void rgSCHSc1DlLcRmv ARGS(( +Void rgSCHSc1DlLcRmv ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -EXTERN Void rgSCHSc1DlLcBoUpd ARGS(( +Void rgSCHSc1DlLcBoUpd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -EXTERN Void rgSCHSc1DlProcAddToCellRetx ARGS(( +Void rgSCHSc1DlProcAddToCellRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -EXTERN Void rgSCHSc1DlAllocFnlz ARGS(( +Void rgSCHSc1DlAllocFnlz ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -EXTERN Void rgSCHSc1UlAllocFnlz ARGS(( +Void rgSCHSc1UlAllocFnlz ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo )); -EXTERN Void rgSCHSc1UlCqiInd ARGS(( +Void rgSCHSc1UlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, TfuUlCqiRpt *ulCqiInfo )); -EXTERN S16 rgSCHSc1UlLcgUpd ARGS(( +S16 rgSCHSc1UlLcgUpd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgInfUeDatInd *datInd )); -EXTERN Void rgSCHSc1DlCqiInd ARGS(( +Void rgSCHSc1DlCqiInd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, Bool isPucchInfo, Void *dlCqi )); -EXTERN Void rgSCHSc1UlUeRefresh ARGS(( +Void rgSCHSc1UlUeRefresh ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1UlUeReset ARGS(( +Void rgSCHSc1UlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1DlUeRefresh ARGS(( +Void rgSCHSc1DlUeRefresh ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1DlHndlInActUes ARGS(( +Void rgSCHSc1DlHndlInActUes ARGS(( RgSchCellCb *cell, CmLListCp *inactvLst )); -EXTERN Void rgSCHSc1UlHndlInActUes ARGS(( +Void rgSCHSc1UlHndlInActUes ARGS(( RgSchCellCb *cell, CmLListCp *inactvLst )); -EXTERN Void rgSCHSc1UlActvtUe ARGS(( +Void rgSCHSc1UlActvtUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1DlActvtUe ARGS(( +Void rgSCHSc1DlActvtUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1DlInit ARGS(( +Void rgSCHSc1DlInit ARGS(( RgDlSchdApis *apis )); -EXTERN Void rgSCHSc1UlInit ARGS(( +Void rgSCHSc1UlInit ARGS(( RgUlSchdApis *apis )); -EXTERN S16 rgSCHSc1RgrUlCellCfg ARGS(( +S16 rgSCHSc1RgrUlCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrDlCellCfg ARGS(( +S16 rgSCHSc1RgrDlCellCfg ARGS(( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err )); -EXTERN Void rgSCHSc1UlCellDel ARGS(( +Void rgSCHSc1UlCellDel ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSCHSc1DlCellDel ARGS(( +Void rgSCHSc1DlCellDel ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHSc1RgrUlUeCfg ARGS(( +S16 rgSCHSc1RgrUlUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrDlUeCfg ARGS(( +S16 rgSCHSc1RgrDlUeCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrUlUeRecfg ARGS(( +S16 rgSCHSc1RgrUlUeRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrDlUeRecfg ARGS(( +S16 rgSCHSc1RgrDlUeRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg, RgSchErrInfo *err )); -EXTERN Void rgSCHSc1UlUeDel ARGS(( +Void rgSCHSc1UlUeDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1DlUeDel ARGS(( +Void rgSCHSc1DlUeDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHSc1RgrLcCfg ARGS(( +S16 rgSCHSc1RgrLcCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchCfg *lcCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrLcgCfg ARGS(( +S16 rgSCHSc1RgrLcgCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, RgrLcgCfg *lcgCfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrLcRecfg ARGS(( +S16 rgSCHSc1RgrLcRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *dlLc, RgrLchRecfg *lcRecfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1RgrLcgRecfg ARGS(( +S16 rgSCHSc1RgrLcgRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, RgrLcgRecfg *reCfg, RgSchErrInfo *err )); -EXTERN Void rgSCHSc1LcgDel ARGS(( +Void rgSCHSc1LcgDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg )); -EXTERN Void rgSCHSc1UpdBsrShort ARGS(( +Void rgSCHSc1UpdBsrShort ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, uint8_t bsr )); -EXTERN Void rgSCHSc1UpdBsrTrunc ARGS(( +Void rgSCHSc1UpdBsrTrunc ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, uint8_t bsr )); -EXTERN Void rgSCHSc1UpdBsrLong ARGS(( +Void rgSCHSc1UpdBsrLong ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, uint8_t bsArr[] )); -EXTERN Void rgSCHSc1ContResUlGrant ARGS(( +Void rgSCHSc1ContResUlGrant ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1SrRcvd ARGS(( +Void rgSCHSc1SrRcvd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN Void rgSCHSc1UlSched ARGS(( +Void rgSCHSc1UlSched ARGS(( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo )); -EXTERN Void rgSCHSc1DlSched ARGS(( +Void rgSCHSc1DlSched ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -EXTERN S16 rgSCHSc1RgrUlCellRecfg ARGS(( +S16 rgSCHSc1RgrUlCellRecfg ARGS(( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err )); -EXTERN Void rgSCHSc1DlUeReset ARGS(( +Void rgSCHSc1DlUeReset ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -EXTERN S16 rgSCHSc1DlUeHqEntInit ARGS(( +S16 rgSCHSc1DlUeHqEntInit ARGS(( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt )); -EXTERN S16 rgSCHSc1DlUeHqEntDeInit ARGS(( +S16 rgSCHSc1DlUeHqEntDeInit ARGS(( RgSchCellCb *cell, RgSchDlHqEnt *hqE )); -EXTERN S16 rgSCHSc1UlLchCfg ARGS(( +S16 rgSCHSc1UlLchCfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrLchCfg *cfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1UlLchRecfg ARGS(( +S16 rgSCHSc1UlLchRecfg ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrLchRecfg *recfg, RgSchErrInfo *err )); -EXTERN S16 rgSCHSc1UlLchDel ARGS(( +S16 rgSCHSc1UlLchDel ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, CmLteLcId lcId, diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c index 4e4dd7376..49e5a5230 100755 --- a/src/5gnrsch/rg_sch_scell.c +++ b/src/5gnrsch/rg_sch_scell.c @@ -110,7 +110,7 @@ CmLteUeCategory ueCat, uint8_t sCellIdx )); #endif -PRIVATE S16 rgSCHSCellTrgMacHqEReset ARGS(( +static S16 rgSCHSCellTrgMacHqEReset ARGS(( Inst inst, uint16_t secCellId, uint16_t rnti @@ -511,12 +511,12 @@ RgSchUeCellInfo *sCellInfo * **/ #ifdef ANSI -PRIVATE Void rgSCHCellClearScellLstOfCQI +static Void rgSCHCellClearScellLstOfCQI ( RgSchUeCellInfo *sCellInfo ) #else -PRIVATE Void rgSCHCellClearScellLstOfCQI(sCellInfo) +static Void rgSCHCellClearScellLstOfCQI(sCellInfo) RgSchUeCellInfo *sCellInfo; #endif { @@ -578,12 +578,12 @@ RgSchUeCellInfo *sCellInfo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellDeActivation +static S16 rgSCHSCellDeActivation ( RgSchUeCellInfo *sCellInfo ) #else -PRIVATE S16 rgSCHSCellDeActivation(sCellInfo) +static S16 rgSCHSCellDeActivation(sCellInfo) RgSchUeCellInfo *sCellInfo #endif { @@ -661,14 +661,14 @@ RgSchUeCellInfo *sCellInfo * **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellTrgMacHqEReset +static S16 rgSCHSCellTrgMacHqEReset ( Inst inst, uint16_t secCellId, uint16_t rnti ) #else -PRIVATE S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti) +static S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti) Inst inst; uint16_t secCellId; uint16_t rnti; @@ -1005,14 +1005,14 @@ uint8_t action; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellSelectForAct +static S16 rgSCHSCellSelectForAct ( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t *sCellIdx ) #else -PRIVATE S16 rgSCHSCellSelectForAct(cell, ueCb) +static S16 rgSCHSCellSelectForAct(cell, ueCb) RgSchCellCb *cell; RgSchUeCb *ueCb; uint8_t *sCellIdx; @@ -1586,13 +1586,13 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE uint8_t rgSCHUtlSCellCmpCqiCfg +static uint8_t rgSCHUtlSCellCmpCqiCfg ( RgSchUePCqiCb *cqiCb1, RgSchUePCqiCb *cqiCb2 ) #else -PRIVATE uint8_t rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2) +static uint8_t rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2) RgSchUePCqiCb *cqiCb1; RgSchUePCqiCb *cqiCb2; #endif diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c index 06215ce48..bc1c10ba2 100755 --- a/src/5gnrsch/rg_sch_tmr.c +++ b/src/5gnrsch/rg_sch_tmr.c @@ -56,7 +56,7 @@ static int RLOG_FILE_ID=175; #include "rg_sch.x" /* typedefs for MAC */ #ifdef LTE_ADV -EXTERN Void rgSCHSCellActivation ARGS(( +Void rgSCHSCellActivation ARGS(( RgSchUeCellInfo *sCell )); #endif diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index 5e48dd38d..c32ee2e22 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -66,17 +66,17 @@ uint8_t rgSCHCmnCalcPcqiBitSz(RgSchUeCb *ueCb,uint8_t numTxAnt); S16 rgSCHDhm5gtfHqFdbkInd(RgSchUeCb *ue,RgSchCellCb *cell,CmLteTimingInfo timingInfo,TfuHqFdbk fdbk,RgSchErrInfo *err); /* local defines */ #ifdef EMTC_ENABLE -EXTERN Bool rgSCHEmtcChkEmtcUe ARGS( +Bool rgSCHEmtcChkEmtcUe ARGS( ( RgSchCellCb *cell, uint16_t rapId )); -EXTERN Void rgSchTomTtiEmtcSched ARGS( +Void rgSchTomTtiEmtcSched ARGS( ( - RgSchCellCb *cell +RgSchCellCb *cell )); -EXTERN S16 rgSCHEmtcRamVldtProcRaReq +S16 rgSCHEmtcRamVldtProcRaReq ( uint8_t raRntiCnt, uint8_t raReqCnt, @@ -86,91 +86,91 @@ RgSchUeCb *ue, Bool *isEmtcUe, RgSchErrInfo *err ); -EXTERN Void rgSCHEmtcUpdCqiInfo +Void rgSCHEmtcUpdCqiInfo ( RgSchUeCb *ue, RgSchUePCqiCb *cqiCb, uint16_t *cqiIdx ); -EXTERN Void rgSCHEmtcUpdSRInfo +Void rgSCHEmtcUpdSRInfo ( RgSchUeCb *ue, uint16_t *srIdx ); -EXTERN Void rgSCHCmnEmtcHdlCrcFailInd +Void rgSCHCmnEmtcHdlCrcFailInd ( RgSchCellCb *cell, RgSchRaCb *raCb ); -EXTERN S16 rgSCHEmtcTomUtlProcAtCrc +S16 rgSCHEmtcTomUtlProcAtCrc ( RgSchCellCb *cell, CmLteTimingInfo crntHiDci0Frm, TfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err ); -EXTERN Void rgSCHEmtcInitUeRecpReqLst +Void rgSCHEmtcInitUeRecpReqLst ( TfuRecpReqInfo *recpReqInfo ); -EXTERN Void rgSCHEmtcFillPucchRecpInfo +Void rgSCHEmtcFillPucchRecpInfo ( RgSchCellCb *cell, RgSchDlHqProcCb *hqCb, uint16_t *hqRes ); -EXTERN Bool rgSCHEmtcAddRecpInfoToLst +Bool rgSCHEmtcAddRecpInfoToLst ( RgSchDlHqProcCb *hqCb, TfuRecpReqInfo *recpReqInfo, TfuUeRecpReqInfo *pucchRecpInfo, Bool isEmtcUe ); -EXTERN Void rgSCHEmtcWillUeRptCqi +Void rgSCHEmtcWillUeRptCqi ( RgSchUeCb *ue, Bool *willUeRprtCqi ); -EXTERN Void rgSchEmtcTomTtiCnsldtSfAlloc +Void rgSchEmtcTomTtiCnsldtSfAlloc ( RgSchCellCb *cell ); -EXTERN S16 rgSchEmtcTomTtiL1DlAndUlCfg +S16 rgSchEmtcTomTtiL1DlAndUlCfg ( RgSchCellCb *cell, RgTfuCntrlReqInfo *cntrlInfo ); -EXTERN S16 rgSCHTomEmtcUtlFillDatRecpReq +S16 rgSCHTomEmtcUtlFillDatRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err ); -EXTERN S16 rgSCHEmtcTomUtlFillHqFdbkRecpReq +S16 rgSCHEmtcTomUtlFillHqFdbkRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err ); -EXTERN S16 rgSCHEmtcDhmRlsDlsfHqProc +S16 rgSCHEmtcDhmRlsDlsfHqProc ( RgSchCellCb *cell, CmLteTimingInfo timingInfo ); -EXTERN Void rgSCHEmtcCmnUlSch +Void rgSCHEmtcCmnUlSch ( - RgSchCellCb *cell +RgSchCellCb *cell ); #ifdef RG_ULSCHED_AT_CRC -EXTERN S16 rgSCHEmtcTomUtlProcDlSfAtCrc +S16 rgSCHEmtcTomUtlProcDlSfAtCrc ( RgSchEmtcDlSf *ulSf, CmLteTimingInfo crntUlFrm, @@ -179,28 +179,28 @@ TfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err ); -EXTERN RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet +RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet ( RgSchCellCb *cell, CmLteTimingInfo frm ); #endif -EXTERN uint32_t gDlMpdcchBlank; -EXTERN uint32_t gUlMpdcchBlank; -EXTERN S16 rgSCHUtlIotResPrcTti +uint32_t gDlMpdcchBlank; +uint32_t gUlMpdcchBlank; +S16 rgSCHUtlIotResPrcTti ( RgSchCellCb *cell ); #endif -EXTERN RgSchUeCb* rgSCHCmnGetHoUe +RgSchUeCb* rgSCHCmnGetHoUe ( RgSchCellCb *cell, uint16_t rapId ); -EXTERN RgSchUeCb* rgSCHCmnGetPoUe +RgSchUeCb* rgSCHCmnGetPoUe ( RgSchCellCb *cell, uint16_t rapId, @@ -208,50 +208,48 @@ CmLteTimingInfo timingInfo ); S16 rgSCHTomUtlFillDatAperRecpReq ARGS( ( - RgSchCellCb *cell, - uint8_t cqiReq, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres, - uint16_t validIdx - )); +RgSchCellCb *cell, +uint8_t cqiReq, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres, +uint16_t validIdx +)); S16 rgSCHTomUtlFillDatPriRecpReq ARGS( ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres, - uint16_t validIdx - )); +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres, +uint16_t validIdx +)); S16 rgSCHTomUtlFillDatPCqiRecpReq ARGS( ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres, - uint16_t validIdx - )); +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres, +uint16_t validIdx +)); S16 rgSCHTomUtlFillDatSrsRecpReq ARGS( ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres - )); +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres +)); -void schFillCrntTime( - SlotIndInfo slotInd, - Inst schInst); +void schFillCrntTime( SlotIndInfo slotInd,Inst schInst); #ifdef CA_DBG -EXTERN uint32_t delayedApiCnt; +uint32_t delayedApiCnt; uint32_t gPCellTb1AckCount=0,gPCellTb2AckCount=0,gPCellTb1NackCount=0,gPCellTb2NackCount=0; uint32_t gSCellSchedCount=0,gPrimarySchedCount=0; uint32_t gSCellTb1AckCount=0,gSCellTb2AckCount=0,gSCellTb1NackCount=0,gSCellTb2NackCount=0; @@ -287,12 +285,12 @@ uint32_t gUlCrcPassCounter = 0; #endif #ifdef RG_5GTF -EXTERN uint32_t gUl5gtfPdcchSend; +uint32_t gUl5gtfPdcchSend; #endif #ifdef UNUSED_FUNC #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr ARGS +static S16 rgSCHTomUtlFillCqiSrsWithSr ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, @@ -300,48 +298,48 @@ TfuRecpReqInfo *recpReqInfo, TfuUeRecpReqInfo *pucchRecpInfo, uint16_t validIdx )); -PRIVATE Bool rgSCHTomUtlFillDatHarqRecpReq ARGS +static Bool rgSCHTomUtlFillDatHarqRecpReq ARGS (( RgSchCellCb *cell, RgSchUlAlloc *alloc, TfuUeRecpReqInfo *datRecpInfo, TfuRecpReqInfo *recpReqInfo )); -PRIVATE S16 rgSCHTomUtlFillSrRecpReq ARGS(( +static S16 rgSCHTomUtlFillSrRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, uint16_t validIdx, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlFillRiRecpReq ARGS(( +static S16 rgSCHTomUtlFillRiRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, uint16_t validIdx, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq ARGS(( +static S16 rgSCHTomUtlFillPcqiRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, uint16_t validIdx, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlFillSrsRecpReq ARGS(( +static S16 rgSCHTomUtlFillSrsRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, uint16_t validIdx, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlGenIndices ARGS(( +static S16 rgSCHTomUtlGenIndices ARGS(( uint32_t label, uint8_t posM, uint8_t valN, uint8_t valK, TfuSubbandInfo* sbInfo)); #endif -PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq ARGS( +static S16 rgSCHTomUtlFillCqiRiRecpReq ARGS( ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - )); -PRIVATE Void rgSchTomFillCellTtiInfo ARGS +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +)); +static Void rgSchTomFillCellTtiInfo ARGS (( TfuTtiIndInfo *ttiInd, Inst schInst, @@ -364,14 +362,14 @@ uint32_t ri1Cnt ; uint32_t ri2Cnt ; uint32_t gDlNumUePerTti[20] = {0}; uint32_t gUlNumUePerTti[20] = {0}; -PRIVATE S16 rgSCHTomUtlProcDlSf ARGS(( +static S16 rgSCHTomUtlProcDlSf ARGS(( RgSchDlSf *dlSf, RgSchDlSf *ulSf, RgSchCellCb *cell, RgTfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err)); #ifdef RG_ULSCHED_AT_CRC -PRIVATE S16 rgSCHTomUtlProcDlSfAtCrc ARGS(( +static S16 rgSCHTomUtlProcDlSfAtCrc ARGS(( RgSchDlSf *ulSf, CmLteTimingInfo crntUlFrm, RgSchCellCb *cell, @@ -380,38 +378,38 @@ PRIVATE S16 rgSCHTomUtlProcDlSfAtCrc ARGS(( #endif /* RG_ULSCHED_AT_CRC */ #ifdef LTE_TDD #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomUtlPrcUlTddSpclSf ARGS(( +static S16 rgSCHTomUtlPrcUlTddSpclSf ARGS(( RgSchCellCb *cell, RgSchErrInfo *err)); #endif /* TFU_UPGRADE */ #endif -PRIVATE S16 rgSCHTomUtlFillPhich ARGS(( +static S16 rgSCHTomUtlFillPhich ARGS(( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchDlSf *dlSf, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlFillDlPdcch ARGS(( +static S16 rgSCHTomUtlFillDlPdcch ARGS(( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchDlSf *dlSf, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlFillUlPdcch ARGS(( +static S16 rgSCHTomUtlFillUlPdcch ARGS(( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchDlSf *ulSf, RgSchErrInfo *err)); -PRIVATE S16 rgSCHTomUtlProcTA ARGS(( +static S16 rgSCHTomUtlProcTA ARGS(( RgSchCellCb *cell)); #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS(( +static S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, uint16_t validIdx, RgSchErrInfo *err)); #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS(( +static S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, RgSchErrInfo *err)); @@ -420,23 +418,23 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq ARGS(( S16 rgSCHTomFillOnlySrsRecpReq ARGS (( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo - )); -PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo +)); +static S16 rgSCHTomUtlFillCqiSrSrsWithHq ARGS (( - RgSchCellCb *cell, - TfuRecpReqInfo *recpReqInfo, - RgSchUeCb *ue, - TfuUeRecpReqInfo *pucchRecpInfo, - uint16_t validIdx, - Bool isDatPresOnSecCell - )); +RgSchCellCb *cell, +TfuRecpReqInfo *recpReqInfo, +RgSchUeCb *ue, +TfuUeRecpReqInfo *pucchRecpInfo, +uint16_t validIdx, +Bool isDatPresOnSecCell +)); S16 rgSCHTomUtlFillRiBitWidthInfo ARGS (( - RgSchUeCb *ueCb +RgSchUeCb *ueCb )); uint8_t rgSCHTomUtlFetchPcqiBitSz ARGS @@ -461,43 +459,43 @@ RgSchUeCb *ueCb, uint16_t validIdx )); -PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion ARGS +static S16 rgSCHTomUtlMovePcqiNxtOccasion ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUePCqiCb *cqiCb )); -PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion ARGS +static S16 rgSCHTomUtlMovePriNxtOccasion ARGS (( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUePCqiCb *riCb )); -PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion ARGS +static S16 rgSCHTomUtlMoveSrNxtOccasion ARGS (( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion ARGS +static S16 rgSCHTomUtlMoveSrsNxtOccasion ARGS (( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ARGS(( +static S16 rgSCHTomUtlWillUeRprtCqiRi ARGS(( RgSchUeCb *ue, Bool *willueRprtCqiRii)); #endif #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS(( +static S16 rgSCHTomUtlFillDatRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, uint16_t validIdx, RgSchErrInfo *err)); #else -PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS(( +static S16 rgSCHTomUtlFillDatRecpReq ARGS(( TfuRecpReqInfo *recpReq, RgSchCellCb *cell, RgSchErrInfo *err)); @@ -505,7 +503,7 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq ARGS(( #ifdef LTE_TDD #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS(( +static S16 rgSCHTomUtlFillSfRepHqFdbk ARGS(( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err, @@ -517,7 +515,7 @@ PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS(( uint16_t validIdx )); #else -PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS(( +static S16 rgSCHTomUtlFillSfRepHqFdbk ARGS(( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err, @@ -529,7 +527,7 @@ PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk ARGS(( )); #endif #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS(( +static S16 rgSCHTomUtlFillSfHqFdbk ARGS(( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err, @@ -541,7 +539,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS(( uint16_t validIdx )); #else -PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS(( +static S16 rgSCHTomUtlFillSfHqFdbk ARGS(( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err, @@ -553,7 +551,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbk ARGS(( )); #endif -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS(( +static S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS(( RgSchDlHqProcCb *hqCb, TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cellCb, @@ -573,24 +571,24 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe ARGS(( )); #endif #ifdef LTEMAC_SPS -EXTERN Void rgSCHCmnDlSpsSch (RgSchCellCb *cell); +Void rgSCHCmnDlSpsSch (RgSchCellCb *cell); #ifndef LTE_TDD #ifdef UNUSED_FUNC #ifdef TFU_UPGRADE -PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS +static S16 rgSCHTomCnsdrRelPdcch ARGS (( - RgSchCellCb *cell, - RgSchDlSf *dlSf, - TfuRecpReqInfo *recpReqInfo, - uint16_t validIdx, - RgSchErrInfo *err - )); +RgSchCellCb *cell, +RgSchDlSf *dlSf, +TfuRecpReqInfo *recpReqInfo, +uint16_t validIdx, +RgSchErrInfo *err +)); #else - PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS +static S16 rgSCHTomCnsdrRelPdcch ARGS (( - RgSchCellCb *cell, - RgSchDlSf *dlSf, - TfuRecpReqInfo *recpReqInfo, + RgSchCellCb *cell, + RgSchDlSf *dlSf, + TfuRecpReqInfo *recpReqInfo, RgSchErrInfo *err )); #endif @@ -598,49 +596,49 @@ PRIVATE S16 rgSCHTomCnsdrRelPdcch ARGS #endif #endif -PRIVATE Void rgSchTomTtiMiscFunctions ARGS +static Void rgSchTomTtiMiscFunctions ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSchTomTtiUlAndDlCmnChSch ARGS +static Void rgSchTomTtiUlAndDlCmnChSch ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSchTomTtiDlSch ARGS +static Void rgSchTomTtiDlSch ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSchTomTtiCnsldtSfAlloc ARGS +static Void rgSchTomTtiCnsldtSfAlloc ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSchTomTtiL1DlAndUlCfg ARGS +static Void rgSchTomTtiL1DlAndUlCfg ARGS (( RgSchCellCb *cell, RgTfuCntrlReqInfo *cntrlInfo )); #ifdef RGR_RRM_TICK -PRIVATE Void rgSCHTomUtlSendSfnTick ARGS +static Void rgSCHTomUtlSendSfnTick ARGS (( RgSchCellCb *cell )); #endif #ifdef LTE_TDD -PRIVATE Void rgSchTomUtlTddRlsSfAndHarq ARGS +static Void rgSchTomUtlTddRlsSfAndHarq ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSCHTomUtlProcTddUlSf ARGS +static Void rgSCHTomUtlProcTddUlSf ARGS (( RgSchCellCb *cell )); #ifdef LTE_ADV -PRIVATE Void rgSCHTomUtlGethqRes ARGS +static Void rgSCHTomUtlGethqRes ARGS (( uint8_t noFdbks, RgSchDlSf *dlSf, @@ -648,24 +646,24 @@ RgSchPdcch *pdcch, RgSchCellCb *cellCb, uint16_t *hqRes )); -PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 ARGS +static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 ARGS (( - RgSchDlHqProcCb *hqCb, - TfuUePucchRecpReq *hqRecpReq, - uint8_t noFdbks, - RgSchDlSf *dlSf, - RgSchPdcch *pdcch, - RgSchCellCb *cellCb +RgSchDlHqProcCb *hqCb, +TfuUePucchRecpReq *hqRecpReq, +uint8_t noFdbks, +RgSchDlSf *dlSf, +RgSchPdcch *pdcch, +RgSchCellCb *cellCb )); -PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ARGS +static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ARGS (( - RgSchDlHqProcCb *hqCb, - TfuUePucchRecpReq *hqRecpReq, - uint8_t noFdbks, - RgSchDlSf *dlSf, - RgSchPdcch *pdcch, - RgSchCellCb *cellCb, - uint8_t elemIdx +RgSchDlHqProcCb *hqCb, +TfuUePucchRecpReq *hqRecpReq, +uint8_t noFdbks, +RgSchDlSf *dlSf, +RgSchPdcch *pdcch, +RgSchCellCb *cellCb, +uint8_t elemIdx )); #endif/*LTE_ADV*/ #endif/*LTE_TDD*/ @@ -681,9 +679,9 @@ uint32_t rgSch5gtfCqi2Mcs[15] = /*HARQ Feedback interpretation in accordance with Femto Forum. Note: There is no value as '0' in Femto Forum Spec but in order to retain the existing usage in MAC (and its Acceptance), its being considered*/ -//CONSTANT PRIVATE uint8_t rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4}; +//const static uint8_t rgSchTomHqFbkMap[8] = {0,1,0,0,4,4,4,4}; /*added #defines instead of magic numbers*/ -/*CONSTANT PRIVATE uint32_t rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={ +/*const static uint32_t rgSCHTomBinCoe[RG_SCH_MAX_NUM_UE_SEL_SUBBANDS][RG_SCH_MAX_TOT_NUM_SUBBANDS]={ {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28}, {0,1,3,6,10,15,21,28,36,45,55,66,78,91,105,120,136,153,171,190,210,231,253,276,300,325,351,378}, {0,0,1,4,10,20,35,56,84,120,165,220,286,364,455,560,680,816,969,1140,1330,1540,1771,2024,2300,2600,2925,3276}, @@ -697,7 +695,7 @@ the existing usage in MAC (and its Acceptance), its being considered*/ /*Tables Derived from 3GPP TS 36.211 Section 5.5.3.3 */ /* Table 5.5.3.3-1 */ #ifndef LTE_TDD -CONSTANT RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = { +const RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = { {TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE}, {TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE}, {FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE}, @@ -717,7 +715,7 @@ CONSTANT RgSchFddCellSpSrsSubfrmTbl rgSchFddCellSpSrsSubfrmTbl = { }; #else /* Table 5.5.3.3-2 */ -CONSTANT RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = { +const RgSchTddCellSpSrsSubfrmTbl rgSchTddCellSpSrsSubfrmTbl = { {FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE}, {FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE}, {FALSE, TRUE, FALSE, TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE}, @@ -1452,14 +1450,14 @@ TfuDlCqiIndInfo *dlCqiInd; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion +static S16 rgSCHTomUtlMovePcqiNxtOccasion ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUePCqiCb *cqiCb ) #else -PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) +static S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) RgSchCellCb *cell; RgSchUeCb *ue; RgSchUePCqiCb *cqiCb; @@ -1524,14 +1522,14 @@ PRIVATE S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion +static S16 rgSCHTomUtlMovePriNxtOccasion ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchUePCqiCb *riCb ) #else -PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) +static S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) RgSchCellCb *cell; RgSchUeCb *ue; RgSchUePCqiCb *riCb; @@ -1646,13 +1644,13 @@ PRIVATE S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion +static S16 rgSCHTomUtlMoveSrNxtOccasion ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) +static S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -1700,13 +1698,13 @@ PRIVATE S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion +static S16 rgSCHTomUtlMoveSrsNxtOccasion ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) +static S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2116,7 +2114,7 @@ S16 rgSCHTomSrsInd(cell, srsInd) */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHTomUtlGenIndices +static S16 rgSCHTomUtlGenIndices ( uint32_t label, uint8_t posM, @@ -2125,7 +2123,7 @@ PRIVATE S16 rgSCHTomUtlGenIndices TfuSubbandInfo* sbInfo ) #else -PRIVATE S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo) +static S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo) uint32_t label; uint8_t posM; uint8_t valN; @@ -2812,13 +2810,13 @@ Inst schInst; */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlProcUlSf +static S16 rgSCHTomUtlProcUlSf ( RgSchCellCb *cell, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlProcUlSf (cell, err) +static S16 rgSCHTomUtlProcUlSf (cell, err) RgSchCellCb *cell; RgSchErrInfo *err; #endif @@ -2893,13 +2891,13 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlPrcUlTddSpclSf +static S16 rgSCHTomUtlPrcUlTddSpclSf ( RgSchCellCb *cell, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlPrcUlTddSpclSf (cell, err) +static S16 rgSCHTomUtlPrcUlTddSpclSf (cell, err) RgSchCellCb *cell; RgSchErrInfo *err; #endif @@ -2972,7 +2970,7 @@ RgSchErrInfo *err; * @return S16 */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlProcDlSf +static S16 rgSCHTomUtlProcDlSf ( RgSchDlSf *dlSf, RgSchDlSf *ulSf, @@ -2981,7 +2979,7 @@ RgTfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, err) +static S16 rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, err) RgSchDlSf *dlSf; RgSchDlSf *ulSf; RgSchCellCb *cell; @@ -3110,7 +3108,7 @@ if(0 == cntrlInfo->dlMpdcchLst.count) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillPhich +static S16 rgSCHTomUtlFillPhich ( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, @@ -3118,7 +3116,7 @@ RgSchDlSf *dlSf, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillPhich(cell, cntrlInfo, dlSf, err) +static S16 rgSCHTomUtlFillPhich(cell, cntrlInfo, dlSf, err) RgSchCellCb *cell; TfuCntrlReqInfo *cntrlInfo; RgSchDlSf *dlSf; @@ -3186,13 +3184,13 @@ RgSchErrInfo *err; * @return Void */ #ifdef ANSI -PRIVATE Void rgSCHTmrRestartScellDeactTmr +static Void rgSCHTmrRestartScellDeactTmr ( RgSchCellCb *cell, RgSchUeCb *ueCb ) #else -PRIVATE Void rgSCHTmrRestartScellDeactTmr (cell, ueCb) +static Void rgSCHTmrRestartScellDeactTmr (cell, ueCb) RgSchCellCb *cell; RgSchUeCb *ueCb; @@ -3240,9 +3238,9 @@ PRIVATE Void rgSCHTmrRestartScellDeactTmr (cell, ueCb) * -# ROK * -# RFAILED */ -EXTERN uint32_t numdlSpsRelSentToTf; +uint32_t numdlSpsRelSentToTf; #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillDlPdcch +static S16 rgSCHTomUtlFillDlPdcch ( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, @@ -3250,7 +3248,7 @@ RgSchDlSf *dlSf, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillDlPdcch(cell,cntrlInfo, dlSf, err) +static S16 rgSCHTomUtlFillDlPdcch(cell,cntrlInfo, dlSf, err) RgSchCellCb *cell; TfuCntrlReqInfo *cntrlInfo; RgSchDlSf *dlSf; @@ -3362,8 +3360,8 @@ RgSchErrInfo *err; } /* end of rgSCHTomUtlFillDlPdcch*/ #ifdef RGSCH_SPS_STATS -extern uint32_t rgSchSpsRelSentToTf; -extern uint32_t rgSchSpsRelPdcchAllocd; +uint32_t rgSchSpsRelSentToTf; +uint32_t rgSchSpsRelPdcchAllocd; #endif /** @brief This function will send all the UL PDCCH's for the given * subframe. @@ -3384,7 +3382,7 @@ extern uint32_t rgSchSpsRelPdcchAllocd; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillUlPdcch +static S16 rgSCHTomUtlFillUlPdcch ( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, @@ -3392,7 +3390,7 @@ RgSchDlSf *dlSf, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillUlPdcch(cntrlInfo, dlSf, err) +static S16 rgSCHTomUtlFillUlPdcch(cntrlInfo, dlSf, err) RgSchCellCb *cell; TfuCntrlReqInfo *cntrlInfo; RgSchDlSf *dlSf; @@ -3502,12 +3500,12 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlProcTA +static S16 rgSCHTomUtlProcTA ( RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHTomUtlProcTA (cell) +static S16 rgSCHTomUtlProcTA (cell) RgSchCellCb *cell; #endif { @@ -3785,7 +3783,7 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf +static S16 rgSCHTomUtlFillHqFdbkFor5gtf ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -3796,7 +3794,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) +static S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -3880,7 +3878,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlS */ #ifdef TFU_UPGRADE #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B +static S16 rgSCHTomUtlFillHqFdbkForFrmt1B ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -3891,7 +3889,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) +static S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -3902,7 +3900,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, validIdx, hqCb, d #endif #else #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B +static S16 rgSCHTomUtlFillHqFdbkForFrmt1B ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -3912,7 +3910,7 @@ TfuUeRecpReqInfo *pucchRecpInfo, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err) +static S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; RgSchDlHqInfo *dlSfHqInfo; @@ -4210,7 +4208,7 @@ RgSchErrInfo *err; */ #ifdef TFU_UPGRADE #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 +static S16 rgSCHTomUtlFillHqFdbkForFrmt3 ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4221,7 +4219,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) +static S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -4232,7 +4230,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, validIdx, hqCb, dl #endif #else #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 +static S16 rgSCHTomUtlFillHqFdbkForFrmt3 ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4242,7 +4240,7 @@ TfuUeRecpReqInfo *pucchRecpInfo, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err) +static S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; RgSchDlHqInfo *dlSfHqInfo; @@ -4328,7 +4326,7 @@ RgSchErrInfo *err; */ #ifdef TFU_UPGRADE #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq +static S16 rgSCHTomUtlFillHqFdbkRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4336,7 +4334,7 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -4344,14 +4342,14 @@ PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx, err) #endif #else #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq +static S16 rgSCHTomUtlFillHqFdbkRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, err) +static S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; RgSchErrInfo *err; @@ -4439,7 +4437,7 @@ RgSchErrInfo *err; */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSrRecpReq +static S16 rgSCHTomUtlFillSrRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4447,7 +4445,7 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -4543,13 +4541,13 @@ PRIVATE S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi +static S16 rgSCHTomUtlWillUeRprtCqiRi ( RgSchUeCb *ue, Bool *willueRprtCqiRi ) #else -PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) +static S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) RgSchUeCb *ue; Bool *willueRprtCqiRi; #endif @@ -4602,7 +4600,7 @@ PRIVATE S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillRiRecpReq +static S16 rgSCHTomUtlFillRiRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4610,7 +4608,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -4725,7 +4723,7 @@ PRIVATE S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq +static S16 rgSCHTomUtlFillCqiRiRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4733,7 +4731,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -4794,7 +4792,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq +static S16 rgSCHTomUtlFillPcqiRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4802,7 +4800,7 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -4906,7 +4904,7 @@ PRIVATE S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSrsRecpReq +static S16 rgSCHTomUtlFillSrsRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -4914,7 +4912,7 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -5003,14 +5001,14 @@ PRIVATE S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillDatRecpReq +static S16 rgSCHTomUtlFillDatRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, err) +static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; RgSchErrInfo *err; @@ -5114,7 +5112,7 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillDatRecpReq +static S16 rgSCHTomUtlFillDatRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, @@ -5122,7 +5120,7 @@ PRIVATE S16 rgSCHTomUtlFillDatRecpReq RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) +static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cell; uint16_t validIdx; @@ -6241,7 +6239,7 @@ S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq +static S16 rgSCHTomUtlFillCqiSrSrsWithHq ( RgSchCellCb *cell, TfuRecpReqInfo *recpReqInfo, @@ -6251,7 +6249,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq Bool isDatPresOnSecCell ) #else -PRIVATE S16 rgSCHTomUtlFillCqiSrSrsWithHq(cell, recpReqInfo, ue, +static S16 rgSCHTomUtlFillCqiSrSrsWithHq(cell, recpReqInfo, ue, pucchRecpInfo, validIdx,isDatPresOnSecCell) RgSchCellCb *cell; TfuRecpReqInfo *recpReqInfo; @@ -6562,7 +6560,7 @@ Bool isDatPresOnSecCell; **/ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr +static S16 rgSCHTomUtlFillCqiSrsWithSr ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -6571,7 +6569,7 @@ PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr uint16_t validIdx ) #else -PRIVATE S16 rgSCHTomUtlFillCqiSrsWithSr(cell, ue, recpReqInfo, +static S16 rgSCHTomUtlFillCqiSrsWithSr(cell, ue, recpReqInfo, pucchRecpInfo, validIdx) RgSchCellCb *cell; RgSchUeCb *ue; @@ -6745,7 +6743,7 @@ uint16_t validIdx; */ #ifdef TFU_UPGRADE #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk +static S16 rgSCHTomUtlFillSfRepHqFdbk ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cellCb, @@ -6758,7 +6756,7 @@ PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk uint16_t validIdx ) #else -PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, +static S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, noFdbks, memCp, elemIdx, nxtDlsf, validIdx) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cellCb; @@ -6772,7 +6770,7 @@ noFdbks, memCp, elemIdx, nxtDlsf, validIdx) #endif #else #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk +static S16 rgSCHTomUtlFillSfRepHqFdbk ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cellCb, @@ -6784,7 +6782,7 @@ uint8_t elemIdx, RgSchDlSf *nxtDlsf ) #else -PRIVATE S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, +static S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, noFdbks, memCp, elemIdx, nxtDlsf) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cellCb; @@ -6926,7 +6924,7 @@ noFdbks, memCp, elemIdx, nxtDlsf) */ #ifdef TFU_UPGRADE #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo +static S16 rgSCHTomUtlFillSfHqFdbkInfo ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cellCb, @@ -6943,7 +6941,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo RgSchDlHqProcCb *prvHqCb ) #else -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, +static S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, noFdbks, memCp, elemIdx, nxtDlsf, validIdx, hqCb, pucchInfo, alloc, prvHqCb) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cellCb; @@ -6961,7 +6959,7 @@ RgSchDlHqProcCb *prvHqCb; #endif #else #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo +static S16 rgSCHTomUtlFillSfHqFdbkInfo ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cellCb, @@ -6977,7 +6975,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo RgSchDlHqProcCb *prvHqCb ) #else -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, +static S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, noFdbks, memCp, elemIdx, nxtDlsf, hqCb, pucchInfo, alloc, prvHqCb) TfuRecpReqInfo *recpReqInfo; RgSchCellCb *cellCb; @@ -7197,7 +7195,7 @@ RgSchDlHqProcCb *prvHqCb; * @return void */ #ifdef ANSI -PRIVATE Void rgSCHTomUtlGethqRes +static Void rgSCHTomUtlGethqRes ( uint8_t noFdbks, RgSchDlSf *dlSf, @@ -7206,7 +7204,7 @@ RgSchCellCb *cellCb, uint16_t *hqRes ) #else -PRIVATE Void rgSCHTomUtlGethqRes(noFdbks,dlSf,pdcch,cellCb,hqRes) +static Void rgSCHTomUtlGethqRes(noFdbks,dlSf,pdcch,cellCb,hqRes) uint8_t noFdbks; RgSchDlSf *dlSf; RgSchPdcch *pdcch; @@ -7253,7 +7251,7 @@ uint16_t *hqRes; * @return void */ #ifdef ANSI -PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 +static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 ( RgSchDlHqProcCb *hqCb, TfuUePucchRecpReq *hqRecpReq, @@ -7263,7 +7261,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 RgSchCellCb *cellCb ) #else -PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq, +static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq, noFdbks,dlSf,pdcch,cellCb) RgSchDlHqProcCb *hqCb; TfuUePucchRecpReq *hqRecpReq; @@ -7484,7 +7482,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq, * @return void */ #ifdef ANSI -PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 +static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ( RgSchDlHqProcCb *hqCb, TfuUePucchRecpReq *hqRecpReq, @@ -7495,7 +7493,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 uint8_t elemIdx ) #else -PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234( +static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234( hqCb,hqRecpReq,noFdbks,dlSf,pdcch,cellCb,elemIdx) RgSchDlHqProcCb *hqCb; TfuUePucchRecpReq *hqRecpReq; @@ -7645,7 +7643,7 @@ PRIVATE Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234( * @return S16 */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS +static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS ( RgSchDlHqProcCb *hqCb, TfuUePucchRecpReq *hqRecpReq, @@ -7656,7 +7654,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS RgSchCellCb *cellCb ) #else -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch, +static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch, n1PucchTkn,elemIdx,cellCb) RgSchDlHqProcCb *hqCb; TfuUePucchRecpReq *hqRecpReq; @@ -7710,7 +7708,7 @@ PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe +static S16 rgSCHTomUtlFillSfHqFdbkForOneUe ( RgSchDlHqProcCb *hqCb, TfuRecpReqInfo *recpReqInfo, @@ -7730,7 +7728,7 @@ Bool *allocRef, uint8_t hqSz ) #else -PRIVATE S16 rgSCHTomUtlFillSfHqFdbkForOneUe(hqCb,recpReqInfo, cellCb, err, dlSf, +static S16 rgSCHTomUtlFillSfHqFdbkForOneUe(hqCb,recpReqInfo, cellCb, err, dlSf, noFdbks, memCp, elemIdx, nxtDlsf, rnti, ackNackMode, pucchInfoRef, pdcch, n1PucchTkn, allocRef, hqSz) RgSchDlHqProcCb *hqCb; @@ -8043,7 +8041,7 @@ uint8_t hqSz; * @return S16 */ #ifdef ANSI -PRIVATE S16 rgSCHTomUtlProcDlSfAtCrc +static S16 rgSCHTomUtlProcDlSfAtCrc ( RgSchDlSf *ulSf, CmLteTimingInfo crntUlFrm, @@ -8052,7 +8050,7 @@ TfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHTomUtlProcDlSfAtCrc (ulSf, crntUlFrm, cell, cntrlInfo, err) +static S16 rgSCHTomUtlProcDlSfAtCrc (ulSf, crntUlFrm, cell, cntrlInfo, err) RgSchDlSf *ulSf; CmLteTimingInfo crntUlFrm; RgSchCellCb *cell; @@ -8133,12 +8131,12 @@ RgSchErrInfo *err; * @param [in] RgSchCellCb *cell */ #ifdef ANSI -PRIVATE Void rgSCHTomUtlSendSfnTick +static Void rgSCHTomUtlSendSfnTick ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHTomUtlSendSfnTick (cell) +static Void rgSCHTomUtlSendSfnTick (cell) RgSchCellCb *cell; #endif { @@ -8190,12 +8188,12 @@ RgSchCellCb *cell; */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Void rgSCHDynTDDMrkCrntSfIdx +static Void rgSCHDynTDDMrkCrntSfIdx ( Inst schInst ) #else /* ANSI */ -PRIVATE Void rgSCHDynTDDMrkCrntSfIdx(schInst) +static Void rgSCHDynTDDMrkCrntSfIdx(schInst) Inst schInst; #endif /* ANSI */ { @@ -8229,7 +8227,7 @@ Inst schInst; */ #ifdef UNUSED_FUNC #ifdef ANSI -PRIVATE Void rgSchTomFillCellTtiInfo +static Void rgSchTomFillCellTtiInfo ( TfuTtiIndInfo *ttiInd, Inst schInst, @@ -8237,7 +8235,7 @@ uint8_t *nCell, RgSchCellCb *cells[] ) #else -PRIVATE Void rgSchTomFillCellTtiInfo (ttiInd, schInst, nCell, cells) +static Void rgSchTomFillCellTtiInfo (ttiInd, schInst, nCell, cells) TfuTtiIndInfo *ttiInd; Inst schInst; uint8_t *nCell; @@ -8410,12 +8408,12 @@ void schFillCrntTime( * */ #ifdef ANSI -PRIVATE Void rgSchTomTtiUlAndDlCmnChSch +static Void rgSchTomTtiUlAndDlCmnChSch ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchTomTtiUlAndDlCmnChSch (cell) +static Void rgSchTomTtiUlAndDlCmnChSch (cell) RgSchCellCb *cell; #endif { @@ -8487,12 +8485,12 @@ RgSchCellCb *cell; * */ #ifdef ANSI -PRIVATE Void rgSchTomTtiMiscFunctions +static Void rgSchTomTtiMiscFunctions ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchTomTtiMiscFunctions (cell) +static Void rgSchTomTtiMiscFunctions (cell) RgSchCellCb *cell; #endif { @@ -8579,12 +8577,12 @@ RgSchCellCb *cell; * */ #ifdef ANSI -PRIVATE Void rgSchTomTtiDlSch +static Void rgSchTomTtiDlSch ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchTomTtiDlSch (cell) +static Void rgSchTomTtiDlSch (cell) RgSchCellCb *cell; #endif { @@ -8610,12 +8608,12 @@ RgSchCellCb *cell; * */ #ifdef ANSI -PRIVATE Void rgSchTomTtiCnsldtSfAlloc +static Void rgSchTomTtiCnsldtSfAlloc ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchTomTtiCnsldtSfAlloc (cell) +static Void rgSchTomTtiCnsldtSfAlloc (cell) RgSchCellCb *cell; #endif { @@ -8648,13 +8646,13 @@ RgSchCellCb *cell; * */ #ifdef ANSI -PRIVATE Void rgSchTomTtiL1DlAndUlCfg +static Void rgSchTomTtiL1DlAndUlCfg ( RgSchCellCb *cell, RgTfuCntrlReqInfo *cntrlInfo ) #else -PRIVATE Void rgSchTomTtiL1DlAndUlCfg (cell, cntrlInfo) +static Void rgSchTomTtiL1DlAndUlCfg (cell, cntrlInfo) RgSchCellCb *cell; RgTfuCntrlReqInfo *cntrlInfo; #endif @@ -8693,12 +8691,12 @@ RgTfuCntrlReqInfo *cntrlInfo; * */ #ifdef ANSI -PRIVATE Void rgSchTomUtlTddRlsSfAndHarq +static Void rgSchTomUtlTddRlsSfAndHarq ( RgSchCellCb *cell ) #else -PRIVATE Void rgSchTomUtlTddRlsSfAndHarq (cell) +static Void rgSchTomUtlTddRlsSfAndHarq (cell) RgSchCellCb *cell; #endif { @@ -8733,12 +8731,12 @@ RgSchCellCb *cell; * */ #ifdef ANSI -PRIVATE Void rgSCHTomUtlProcTddUlSf +static Void rgSCHTomUtlProcTddUlSf ( RgSchCellCb *cell ) #else -PRIVATE Void rgSCHTomUtlProcTddUlSf (cell) +static Void rgSCHTomUtlProcTddUlSf (cell) RgSchCellCb *cell; #endif { diff --git a/src/5gnrsch/rg_sch_uhm.c b/src/5gnrsch/rg_sch_uhm.c index 3e1e6ff36..0689961c8 100755 --- a/src/5gnrsch/rg_sch_uhm.c +++ b/src/5gnrsch/rg_sch_uhm.c @@ -64,9 +64,9 @@ #ifdef EMTC_ENABLE uint32_t gUlRetxPassCntr = 0; - /*EXTERN uint32_t gUlRetxFailCntr; - EXTERN uint32_t gUlCrcPassCounter; - EXTERN uint32_t gUlCrcFailCounter;*/ + /*uint32_t gUlRetxFailCntr; + uint32_t gUlCrcPassCounter; + uint32_t gUlCrcFailCounter;*/ #endif uint8_t rgRvIdxTable[] = {0, 3, 1, 2}; /* This gives rvIdx for a given rv */ uint8_t rgRvTable[] = {0, 2, 3 ,1}; /* This gives rv for a given rvIdx */ diff --git a/src/5gnrsch/rg_sch_utl.c b/src/5gnrsch/rg_sch_utl.c index ee627e857..22092d80a 100755 --- a/src/5gnrsch/rg_sch_utl.c +++ b/src/5gnrsch/rg_sch_utl.c @@ -96,7 +96,7 @@ uint32_t rgNumMsg3DtxRcvd =0; /* CRC Fail with SINR < 0 */ uint32_t rgNumDedPreamUECtxtFound =0; /* Num of Dedicated Preambles recvd */ -PRIVATE uint8_t rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, +static uint8_t rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, 0,1,0,1,0,1,0,0,0,1, 0,0,0,1,0,1,0,0,0,0, 0,1,0,0,0,0,0,0,0,1, @@ -105,51 +105,51 @@ PRIVATE uint8_t rgSchDciAmbigSizeTbl[61] = {0,0,0,0,0,0,0,0,0,0,0, /* local defines */ -EXTERN uint32_t rgSchCmnBetaCqiOffstTbl[16]; -EXTERN uint32_t rgSchCmnBetaRiOffstTbl[16]; -EXTERN RgSchdApis rgSchCmnApis; -EXTERN S16 RgUiRgmSendPrbRprtInd ARGS(( +uint32_t rgSchCmnBetaCqiOffstTbl[16]; +uint32_t rgSchCmnBetaRiOffstTbl[16]; +RgSchdApis rgSchCmnApis; +S16 RgUiRgmSendPrbRprtInd ARGS(( Pst* pst, SuId suId, RgmPrbRprtInd *prbRprtInd )); -EXTERN S16 RgUiRgmSendTmModeChangeInd ARGS(( +S16 RgUiRgmSendTmModeChangeInd ARGS(( Pst* pst, SuId suId, RgmTransModeInd *txModeChngInd )); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHEmtcUtlGetSfAlloc ARGS(( +S16 rgSCHEmtcUtlGetSfAlloc ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHEmtcUtlPutSfAlloc ARGS(( +S16 rgSCHEmtcUtlPutSfAlloc ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSCHEmtcUtlUpdUeDciSize ARGS(( +Void rgSCHEmtcUtlUpdUeDciSize ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb )); -EXTERN Void rgSCHEmtcGetDciFrmt61ASize ARGS(( +Void rgSCHEmtcGetDciFrmt61ASize ARGS(( RgSchCellCb *cell )); -EXTERN Void rgSCHEmtcGetDciFrmt60ASize ARGS(( +Void rgSCHEmtcGetDciFrmt60ASize ARGS(( RgSchCellCb *cell )); -EXTERN S16 rgSCHEmtcUtlFillPdschDciInfo ARGS(( +S16 rgSCHEmtcUtlFillPdschDciInfo ARGS(( TfuPdschDciInfo *pdsch, TfuDciInfo *pdcchDci )); -EXTERN Void rgSCHEmtcUtlRlsRnti ARGS(( +Void rgSCHEmtcUtlRlsRnti ARGS(( RgSchCellCb *cell, RgSchRntiLnk *rntiLnk, uint8_t *isLegacy )); -EXTERN S16 rgSCHEmtcPdcchAlloc ARGS(( +S16 rgSCHEmtcPdcchAlloc ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); -EXTERN Void rgSCHEmtcPdcchFree ARGS(( +Void rgSCHEmtcPdcchFree ARGS(( RgSchCellCb *cell, RgSchPdcch *pdcch )); @@ -191,37 +191,37 @@ NULLP, rgSchUtlDlCalc1CwPrb, rgSchUtlDlCalc1CwPrb, NULLP, NULLP}; #ifdef LTE_TDD /* The below table will be used to map the UL SF number in a TDD Cfg 0 frame to the ul Sf array maintained in cellCb */ -PRIVATE uint8_t rgSchTddCfg0UlSfTbl[] = {2, 3, 4, 7, 8, 9}; +static uint8_t rgSchTddCfg0UlSfTbl[] = {2, 3, 4, 7, 8, 9}; #endif -PRIVATE S16 rgSCHUtlUlAllocDbInit ARGS(( +static S16 rgSCHUtlUlAllocDbInit ARGS(( RgSchCellCb *cell, RgSchUlAllocDb *db, uint8_t maxAllocs )); -PRIVATE Void rgSCHUtlUlAllocDbDeinit ARGS(( +static Void rgSCHUtlUlAllocDbDeinit ARGS(( RgSchCellCb *cell, RgSchUlAllocDb *db )); -PRIVATE S16 rgSCHUtlUlHoleDbInit ARGS(( +static S16 rgSCHUtlUlHoleDbInit ARGS(( RgSchCellCb *cell, RgSchUlHoleDb *db, uint8_t maxHoles, uint8_t start, uint8_t num )); -PRIVATE Void rgSCHUtlUlHoleDbDeinit ARGS(( +static Void rgSCHUtlUlHoleDbDeinit ARGS(( RgSchCellCb *cell, RgSchUlHoleDb *db )); -PRIVATE S16 rgSCHChkBoUpdate ARGS(( +static S16 rgSCHChkBoUpdate ARGS(( RgSchCellCb *cell, RgInfCmnBoRpt *boUpdt )); #ifdef UNUSE_FUN #ifdef TFU_UPGRADE -PRIVATE uint8_t rgSCHUtlFetchPcqiBitSz ARGS(( +static uint8_t rgSCHUtlFetchPcqiBitSz ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t numTxAnt @@ -229,7 +229,7 @@ PRIVATE uint8_t rgSCHUtlFetchPcqiBitSz ARGS(( #endif #endif /* sorted in ascending order of tbSz */ -CONSTANT struct rgSchUtlBcchPcchTbSz +const struct rgSchUtlBcchPcchTbSz { uint8_t rbIndex; /* RB index {2,3} */ uint16_t tbSz; /* one of the Transport block size in bits of @@ -256,7 +256,7 @@ CONSTANT struct rgSchUtlBcchPcchTbSz /* forward references */ #ifdef LTE_TDD -PRIVATE Void rgSCHUtlUpdPrachOcc ARGS(( +static Void rgSCHUtlUpdPrachOcc ARGS(( RgSchCellCb *cell, RgrTddPrachInfo *cellCfg)); #endif @@ -800,7 +800,7 @@ S16 rgSchSFRTotalPoolInit RgSchDlSf *sf ) #else -PRIVATE Void rgSchSFRTotalPoolInit(cell, sf) +static Void rgSchSFRTotalPoolInit(cell, sf) RgSchCellCb *cell; RgSchDlSf *sf; #endif @@ -994,7 +994,7 @@ S16 rgSchDSFRRntpInfoInit uint16_t bw ) #else -PRIVATE Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) +static Void rgSchDSFRRntpInfoInit(rntpPtr, cell, bw) TknStrOSXL *rntpPtr; RgSchCellCb *cell; uint16_t bw; @@ -1041,7 +1041,7 @@ S16 rgSchDSFRRntpInfoFree uint16_t bw ) #else -PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) +static Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) TknStrOSXL *rntpPtr; RgSchCellCb *cell; uint16_t bw; @@ -1077,13 +1077,13 @@ PRIVATE Void rgSchDSFRRntpInfoFree(rntpPtr, cell, bw) * **/ #ifdef ANSI -PRIVATE Void rgSchSFRResetPoolVariables +static Void rgSchSFRResetPoolVariables ( RgSchCellCb *cell, RgSchSFRPoolInfo *pool ) #else -PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) +static Void rgSchSFRResetPoolVariables(cell, pool) RgSchCellCb *cell; RgSchSFRPoolInfo *pool; #endif @@ -1117,13 +1117,13 @@ PRIVATE Void rgSchSFRResetPoolVariables(cell, pool) * **/ #ifdef ANSI -PRIVATE Void rgSCHSFRUtlTotalPoolReset +static Void rgSCHSFRUtlTotalPoolReset ( RgSchCellCb *cell, RgSchDlSf *subFrm ) #else -PRIVATE Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) +static Void rgSCHSFRUtlTotalPoolReset(cell, subFrm) RgSchCellCb *cell; RgSchDlSf *subFrm; #endif @@ -1270,13 +1270,13 @@ Bool isForMsg3; * **/ #ifdef ANSI -PRIVATE Void rgSCHUtlPhichReset +static Void rgSCHUtlPhichReset ( RgSchCellCb *cell, RgSchDlSf *subFrm ) #else -PRIVATE Void rgSCHUtlPhichReset(cell, subFrm) +static Void rgSCHUtlPhichReset(cell, subFrm) RgSchCellCb *cell; RgSchDlSf *subFrm; #endif @@ -1632,7 +1632,7 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PRIVATE uint16_t rgSCHUtlCalcTotalRegs +static uint16_t rgSCHUtlCalcTotalRegs ( uint8_t bw, uint8_t cfi, @@ -1640,7 +1640,7 @@ uint8_t numAntna, Bool isEcp ) #else -PRIVATE uint16_t rgSCHUtlCalcTotalRegs(bw, cfi, numAntna, isEcp) +static uint16_t rgSCHUtlCalcTotalRegs(bw, cfi, numAntna, isEcp) uint8_t bw; uint8_t cfi; uint8_t numAntna; @@ -1698,13 +1698,13 @@ Bool isEcp; * **********************************************************/ #ifdef ANSI -PRIVATE uint16_t rgSCHUtlCalcPhichRegs +static uint16_t rgSCHUtlCalcPhichRegs ( uint8_t bw, uint8_t ng6 ) #else -PRIVATE uint16_t rgSCHUtlCalcPhichRegs(bw, ng6) +static uint16_t rgSCHUtlCalcPhichRegs(bw, ng6) uint8_t bw; uint8_t ng6; #endif @@ -2158,13 +2158,13 @@ TfuUeUlSchRecpInfo *recpReq; * **/ #ifdef ANSI -PRIVATE Void rgSCHUtlUpdPrachOcc +static Void rgSCHUtlUpdPrachOcc ( RgSchCellCb *cell, RgrTddPrachInfo *cellCfg ) #else -PRIVATE Void rgSCHUtlUpdPrachOcc(cell, cellCfg) +static Void rgSCHUtlUpdPrachOcc(cell, cellCfg) RgSchCellCb *cell; RgrTddPrachInfo *cellCfg; #endif @@ -3610,7 +3610,7 @@ uint8_t tbIdx; cmLListAdd2Tail(&ue->dl.dlSfHqInfo[cell->cellId][subFrm->dlIdx].hqPLst,&hqP->hqPSfLnk); #ifdef CA_DBG { - extern uint32_t gSCellSchedCount,gPrimarySchedCount; + uint32_t gSCellSchedCount,gPrimarySchedCount; if(RG_SCH_IS_CELL_SEC(hqP->hqE->ue,hqP->hqE->cell)) { gSCellSchedCount++; @@ -5855,7 +5855,7 @@ Void rgSchDSFRPwrCheck Bool *isAllUePwrHigh ) #else -PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) +static Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) RgSchDlSf *sf; Bool *isAllUePwrHigh; @@ -5904,14 +5904,14 @@ PRIVATE Void rgSchDSFRPwrCheck(sf, isAllUePwrHigh) * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHUtlFillRgInfTbInfo +static Void rgSCHUtlFillRgInfTbInfo ( RgSchDlHqProcCb *hqP, RgInfUeAlloc *allocInfo, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHUtlFillRgInfTbInfo (hqP, allocInfo, cell) +static Void rgSCHUtlFillRgInfTbInfo (hqP, allocInfo, cell) RgSchDlHqProcCb *hqP; RgInfUeAlloc *allocInfo; RgSchCellCb *cell; @@ -5923,7 +5923,7 @@ RgSchCellCb *cell; uint8_t tbCnt; /* LTE_ADV_FLAG_REMOVED_START */ #ifdef TFU_UPGRADE - PRIVATE uint32_t tmpCnt = 0; + static uint32_t tmpCnt = 0; Bool isAllUePwrHigh = FALSE; #endif /* LTE_ADV_FLAG_REMOVED_END */ @@ -7026,8 +7026,8 @@ RgrTtiIndInfo *rgrTti; S16 ret = ROK; RgSchUpSapCb *rgrSap; /*!< RGR SAP Control Block */ #ifdef L2_L3_SPLIT - extern Bool g_usettitmr; - extern Void mtTmrHdlrPublic(void); + Bool g_usettitmr; + Void mtTmrHdlrPublic(void); #endif rgrSap = cell->rgrSap; @@ -7510,7 +7510,8 @@ Size memSize; #endif { Mem sMem; - VOLATILE uint32_t startTime=0; + volatile uint32_t startTime=0; + sMem.region = rgSchCb[inst].rgSchInit.region; sMem.pool = rgSchCb[inst].rgSchInit.pool; @@ -8044,14 +8045,14 @@ RgSchUlSf *sf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHUtlUlAllocDbInit +static S16 rgSCHUtlUlAllocDbInit ( RgSchCellCb *cell, RgSchUlAllocDb *allocDb, uint8_t maxAllocs ) #else -PRIVATE S16 rgSCHUtlUlAllocDbInit(cell, allocDb, maxAllocs) +static S16 rgSCHUtlUlAllocDbInit(cell, allocDb, maxAllocs) RgSchCellCb *cell; RgSchUlAllocDb *allocDb; uint8_t maxAllocs; @@ -8082,13 +8083,13 @@ uint8_t maxAllocs; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHUtlUlAllocDbDeinit +static Void rgSCHUtlUlAllocDbDeinit ( RgSchCellCb *cell, RgSchUlAllocDb *allocDb ) #else -PRIVATE Void rgSCHUtlUlAllocDbDeinit(cell, allocDb) +static Void rgSCHUtlUlAllocDbDeinit(cell, allocDb) RgSchCellCb *cell; RgSchUlAllocDb *allocDb; #endif @@ -8113,7 +8114,7 @@ RgSchUlAllocDb *allocDb; * **********************************************************/ #ifdef ANSI -PRIVATE S16 rgSCHUtlUlHoleDbInit +static S16 rgSCHUtlUlHoleDbInit ( RgSchCellCb *cell, RgSchUlHoleDb *holeDb, @@ -8122,7 +8123,7 @@ uint8_t start, uint8_t num ) #else -PRIVATE S16 rgSCHUtlUlHoleDbInit(cell, holeDb, maxHoles, start, num) +static S16 rgSCHUtlUlHoleDbInit(cell, holeDb, maxHoles, start, num) RgSchCellCb *cell; RgSchUlHoleDb *holeDb; uint8_t maxHoles; @@ -8160,13 +8161,13 @@ uint8_t num; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHUtlUlHoleDbDeinit +static Void rgSCHUtlUlHoleDbDeinit ( RgSchCellCb *cell, RgSchUlHoleDb *holeDb ) #else -PRIVATE Void rgSCHUtlUlHoleDbDeinit(cell, holeDb) +static Void rgSCHUtlUlHoleDbDeinit(cell, holeDb) RgSchCellCb *cell; RgSchUlHoleDb *holeDb; #endif @@ -9711,14 +9712,14 @@ uint8_t numSb; * RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHUtlValidateQci +static S16 rgSCHUtlValidateQci ( RgSchCellCb *cellCb, uint8_t numQci, uint8_t *qci ) #else -PRIVATE S16 rgSCHUtlValidateQci(cellCb, numQci, qci) +static S16 rgSCHUtlValidateQci(cellCb, numQci, qci) RgSchCellCb *cellCb; uint8_t numQci; uint8_t *qci; @@ -10720,13 +10721,13 @@ RgSchUeCb *ueCb; * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHChkBoUpdate +static S16 rgSCHChkBoUpdate ( RgSchCellCb *cell, RgInfCmnBoRpt *boUpdt ) #else -PRIVATE S16 rgSCHChkBoUpdate (cell, boUpdt) +static S16 rgSCHChkBoUpdate (cell, boUpdt) RgSchCellCb *cell; RgInfCmnBoRpt *boUpdt; #endif @@ -11012,14 +11013,14 @@ uint32_t *prbReqrd; * **********************************************************/ #ifdef ANSI -PRIVATE uint8_t rgSCHUtlFetchPcqiBitSz +static uint8_t rgSCHUtlFetchPcqiBitSz ( RgSchCellCb *cell, RgSchUeCb *ueCb, uint8_t numTxAnt ) #else -PRIVATE uint8_t rgSCHUtlFetchPcqiBitSz (cell, ueCb, numTxAnt) +static uint8_t rgSCHUtlFetchPcqiBitSz (cell, ueCb, numTxAnt) RgSchCellCb *cell; RgSchUeCb *ueCb; uint8_t numTxAnt; @@ -11513,7 +11514,7 @@ Void rgSCHTomUtlGetTrigSet uint8_t *triggerSet ) #else -PRIVATE S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) +static S16 rgSCHTomUtlGetTrigSet(cell, ueCb, cqiReq, triggerSet) RgSchCellCb *cell; RgSchUeCb *ueCb; uint8_t cqiReq; @@ -12041,13 +12042,13 @@ Void rgSCHUtlCpuOvrLdAdjItbsCap(cell) * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr +static Void rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr ( RgSchCellCb *cell, uint8_t crntCpuOvrLdIns ) #else -PRIVATE S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) +static S16 rgSCHUtlChkAndUpdNumUePerTtiCpuOvInstr(cell, crntCpuOvrLdIns) RgSchCellCb *cell; uint8_t crntCpuOvrLdIns; #endif diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 03896c0b1..f0141f9d9 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -48,7 +48,7 @@ #include "sch.h" #include "sch_utils.h" -extern SchCb schCb[SCH_MAX_INST]; +SchCb schCb[SCH_MAX_INST]; void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm); /* local defines */ diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c index e5ceaf34c..1ecd83233 100644 --- a/src/5gnrsch/sch_common.c +++ b/src/5gnrsch/sch_common.c @@ -43,10 +43,10 @@ File: sch_common.c #include "sch.h" #include "sch_utils.h" -extern SchCb schCb[SCH_MAX_INST]; -extern uint16_t prachCfgIdxTable[MAX_PRACH_CONFIG_IDX][8]; -extern uint16_t numRbForPrachTable[MAX_RACH_NUM_RB_IDX][5]; -extern uint8_t pucchResourceSet[MAX_PUCCH_RES_SET_IDX][4]; +SchCb schCb[SCH_MAX_INST]; +uint16_t prachCfgIdxTable[MAX_PRACH_CONFIG_IDX][8]; +uint16_t numRbForPrachTable[MAX_RACH_NUM_RB_IDX][5]; +uint8_t pucchResourceSet[MAX_PUCCH_RES_SET_IDX][4]; SchMacUlSchInfoFunc schMacUlSchInfoOpts[] = { diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 16bb9708d..7cec7b860 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -42,8 +42,8 @@ #include "sch.h" #include "sch_utils.h" -extern SchCb schCb[SCH_MAX_INST]; -extern uint8_t puschDeltaTable[MAX_MU_PUSCH]; +SchCb schCb[SCH_MAX_INST]; +uint8_t puschDeltaTable[MAX_MU_PUSCH]; /** * @brief calculate ra-rnti function. diff --git a/src/5gnrsch/sch_slot_ind.c b/src/5gnrsch/sch_slot_ind.c index 98647013c..9579bec54 100644 --- a/src/5gnrsch/sch_slot_ind.c +++ b/src/5gnrsch/sch_slot_ind.c @@ -49,8 +49,8 @@ SchMacDlAllocFunc schMacDlAllocOpts[] = packSchMacDlAlloc }; -extern SchCb schCb[SCH_MAX_INST]; -extern int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t +SchCb schCb[SCH_MAX_INST]; +int schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offsetPointA); /******************************************************************* diff --git a/src/5gnrsch/sch_utils.h b/src/5gnrsch/sch_utils.h index 3811b94ca..07174609c 100644 --- a/src/5gnrsch/sch_utils.h +++ b/src/5gnrsch/sch_utils.h @@ -82,8 +82,8 @@ _pst.selector = ODU_SELECTOR_TC; \ } -extern int8_t coresetIdxTable[MAX_CORESET_INDEX][4]; -extern int8_t searchSpaceIdxTable[MAX_SEARCH_SPACE_INDEX][4]; +int8_t coresetIdxTable[MAX_CORESET_INDEX][4]; +int8_t searchSpaceIdxTable[MAX_SEARCH_SPACE_INDEX][4]; /* functions declarations */ void freqDomRscAllocType0(uint16_t startPrb, uint16_t prbSize, uint8_t *freqDomain); diff --git a/src/cm/ckw.c b/src/cm/ckw.c index 637ce7861..9a8ff4138 100755 --- a/src/cm/ckw.c +++ b/src/cm/ckw.c @@ -37,7 +37,7 @@ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*for extern "C"*/ #ifdef LCCKW diff --git a/src/cm/ckw.h b/src/cm/ckw.h index 56164da43..2073ee084 100755 --- a/src/cm/ckw.h +++ b/src/cm/ckw.h @@ -33,7 +33,7 @@ #define __CKW_H__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*for extern "C"*/ /** @file ckw.h diff --git a/src/cm/ckw.x b/src/cm/ckw.x index d3087fb1a..6f170ca87 100755 --- a/src/cm/ckw.x +++ b/src/cm/ckw.x @@ -33,7 +33,7 @@ #define __CKW_X__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*for extern "C"*/ /** @file ckw.x @@ -216,7 +216,7 @@ typedef S16 (*CkwUbndReq) ARGS((Pst *pst, SpId spId, Reason reason)); * Allowable values: 0 to 32767. * @return ROK */ -EXTERN S16 RlcUiCkwBndReq ARGS((Pst *pst, SuId suId, SpId spId)); +S16 RlcUiCkwBndReq ARGS((Pst *pst, SuId suId, SpId spId)); /** * @details RLC invokes the bind confirm primitive to acknowledge the receipt @@ -235,7 +235,7 @@ CM_BND_OK: Bind request succeeded\n CM_BND_NOK: Error encountered during the processing of the bind request. * @return ROK */ -EXTERN S16 RlcUiCkwBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); +S16 RlcUiCkwBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); /** * @details The RLC service user initiates this primitive for performing @@ -252,7 +252,7 @@ EXTERN S16 RlcUiCkwBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); * Allowable value: CKW_UBND_REQ. * @return ROK */ -EXTERN S16 RlcUiCkwUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); +S16 RlcUiCkwUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); /* Layer interface Control Primitives */ /** @@ -273,7 +273,7 @@ EXTERN S16 RlcUiCkwUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); * @param[in] cfgInfo - This structure contains the configuration information * @return ROK */ -EXTERN S16 RlcProcCfgReq ARGS((Pst *pst, RlcCfgInfo *cfgInfo)); +S16 RlcProcCfgReq ARGS((Pst *pst, RlcCfgInfo *cfgInfo)); /** *@details This primitive is used by RLC to confirm the configuration requested @@ -294,7 +294,7 @@ EXTERN S16 RlcProcCfgReq ARGS((Pst *pst, RlcCfgInfo *cfgInfo)); * information. * @return ROK */ -EXTERN S16 RlcUiRlcCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo *cfmInfo)); +S16 RlcUiRlcCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo *cfmInfo)); /** *@details This primitive is used by RRC to change the UeId for the existing UE @@ -308,7 +308,7 @@ EXTERN S16 RlcUiRlcCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo *cfmInfo)); * @param[in] newUeInfo - New UE Id Info for existing UE context. * @return ROK */ -EXTERN S16 RlcUiCkwUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, +S16 RlcUiCkwUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo)); /** @@ -333,39 +333,39 @@ EXTERN S16 RlcUiCkwUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, * information. * @return ROK */ -EXTERN S16 RlcUiCkwUeIdChgCfm ARGS((Pst *pst, SuId suId, uint32_t transId, +S16 RlcUiCkwUeIdChgCfm ARGS((Pst *pst, SuId suId, uint32_t transId, CkwUeInfo *ueInfo, CmStatus status)); /* RRC Extern declarations */ #ifdef NH -EXTERN S16 NhLiCkwBndReq ARGS(( +S16 NhLiCkwBndReq ARGS(( Pst *pst, SuId suId, SpId spId)); -EXTERN S16 NhLiCkwUbndReq ARGS(( +S16 NhLiCkwUbndReq ARGS(( Pst *pst, SpId spId, Reason reason)); -EXTERN S16 NhLiCkwBndCfm ARGS((Pst *pst, +S16 NhLiCkwBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 NhLiRlcCfgReq ARGS(( +S16 NhLiRlcCfgReq ARGS(( Pst *pst, SpId spId, RlcCfgInfo *cfgInfo)); -EXTERN S16 NhLiRlcCfgCfm ARGS((Pst *pst, +S16 NhLiRlcCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo* cfmInfo)); -EXTERN S16 NhLiCkwUeIdChgReq ARGS((Pst *pst, +S16 NhLiCkwUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo)); -EXTERN S16 NhLiCkwUeIdChgCfm ARGS((Pst *pst, +S16 NhLiCkwUeIdChgCfm ARGS((Pst *pst, SuId suId, uint32_t transId, CkwUeInfo *ueInfo, CmStatus status)); @@ -373,34 +373,34 @@ EXTERN S16 NhLiCkwUeIdChgCfm ARGS((Pst *pst, /* Dummy RRC Interface primitives */ #ifdef DM -EXTERN S16 DmUiCkwBndReq ARGS(( +S16 DmUiCkwBndReq ARGS(( Pst *pst, SuId suId, SpId spId)); -EXTERN S16 DmUiCkwUbndReq ARGS(( +S16 DmUiCkwUbndReq ARGS(( Pst *pst, SpId spId, Reason reason)); -EXTERN S16 DmUiCkwBndCfm ARGS((Pst *pst, +S16 DmUiCkwBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 DmUiRlcCfgReq ARGS(( +S16 DmUiRlcCfgReq ARGS(( Pst *pst, SpId spId, RlcCfgInfo *cfgInfo)); -EXTERN S16 DmUiRlcCfgCfm ARGS((Pst *pst, +S16 DmUiRlcCfgCfm ARGS((Pst *pst, SuId suId, RlcCfgCfmInfo* cfmInfo)); -EXTERN S16 DmUiCkwUeIdChgReq ARGS((Pst *pst, +S16 DmUiCkwUeIdChgReq ARGS((Pst *pst, SpId spId, uint32_t transId, CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo)); -EXTERN S16 DmUiCkwUeIdChgCfm ARGS((Pst *pst, +S16 DmUiCkwUeIdChgCfm ARGS((Pst *pst, SuId suId, uint32_t transId, CkwUeInfo *ueInfo, CmStatus status)); @@ -411,83 +411,83 @@ EXTERN S16 DmUiCkwUeIdChgCfm ARGS((Pst *pst, ****************************************************************************/ #ifdef LCCKW /* Packing functions */ -EXTERN S16 cmPkRlcTmInfo ARGS (( +S16 cmPkRlcTmInfo ARGS (( RlcTmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRlcUmInfo ARGS (( +S16 cmPkRlcUmInfo ARGS (( RlcEntCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRlcAmInfo ARGS (( +S16 cmPkRlcAmInfo ARGS (( RlcAmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCkwLChInfo ARGS (( +S16 cmPkCkwLChInfo ARGS (( CkwLChInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRlcEntCfgInfo ARGS (( +S16 cmPkRlcEntCfgInfo ARGS (( RlcEntCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRlcCfgInfo ARGS (( +S16 cmPkRlcCfgInfo ARGS (( RlcCfgInfo *param, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRlcEntCfgCfmInfo ARGS (( +S16 cmPkRlcEntCfgCfmInfo ARGS (( RlcEntCfgCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRlcCfgCfmInfo ARGS (( +S16 cmPkRlcCfgCfmInfo ARGS (( RlcCfgCfmInfo *param, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCkwUeInfo ARGS (( +S16 cmPkCkwUeInfo ARGS (( CkwUeInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCkwBndReq ARGS (( +S16 cmPkCkwBndReq ARGS (( Pst *pst, SuId suId, SpId spId )); -EXTERN S16 cmPkCkwUbndReq ARGS (( +S16 cmPkCkwUbndReq ARGS (( Pst *pst, SpId spId, Reason reason )); -EXTERN S16 cmPkCkwBndCfm ARGS (( +S16 cmPkCkwBndCfm ARGS (( Pst *pst, SuId suId, uint8_t status )); -EXTERN S16 packUeCreateReq ARGS (( +S16 packUeCreateReq ARGS (( Pst *pst, RlcCfgInfo *cfgInfo )); -EXTERN S16 cmPkRlcCfgCfm ARGS (( +S16 cmPkRlcCfgCfm ARGS (( Pst *pst, SuId suId, RlcCfgCfmInfo *cfgCfmInfo )); -EXTERN S16 cmPkCkwUeIdChgReq ARGS (( +S16 cmPkCkwUeIdChgReq ARGS (( Pst *pst, SpId spId, uint32_t transId, @@ -495,7 +495,7 @@ CkwUeInfo *ueInfo, CkwUeInfo *newUeInfo )); -EXTERN S16 cmPkCkwUeIdChgCfm ARGS (( +S16 cmPkCkwUeIdChgCfm ARGS (( Pst *pst, SuId suId, uint32_t transId, @@ -504,95 +504,95 @@ CmStatus status )); /* Unpacking functions */ -EXTERN S16 cmUnpkRlcTmInfo ARGS (( +S16 cmUnpkRlcTmInfo ARGS (( RlcTmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcUmInfo ARGS (( +S16 cmUnpkRlcUmInfo ARGS (( RlcEntCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcAmInfo ARGS (( +S16 cmUnpkRlcAmInfo ARGS (( RlcAmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwLInfo ARGS (( +S16 cmUnpkCkwLInfo ARGS (( CkwLChInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcCfgCfmInfo ARGS (( +S16 cmUnpkRlcCfgCfmInfo ARGS (( RlcCfgCfmInfo *param, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwBndReq ARGS (( +S16 cmUnpkCkwBndReq ARGS (( CkwBndReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwLChInfo ARGS (( +S16 cmUnpkCkwLChInfo ARGS (( CkwLChInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcEntCfgInfo ARGS (( +S16 cmUnpkRlcEntCfgInfo ARGS (( RlcEntCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcCfgInfo ARGS (( +S16 cmUnpkRlcCfgInfo ARGS (( RlcCfgInfo *param, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwUeInfo ARGS (( +S16 cmUnpkCkwUeInfo ARGS (( CkwUeInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcCfgCfm ARGS (( +S16 cmUnpkRlcCfgCfm ARGS (( RlcCfgCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwUbndReq ARGS (( +S16 cmUnpkCkwUbndReq ARGS (( CkwUbndReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwBndCfm ARGS (( +S16 cmUnpkCkwBndCfm ARGS (( CkwBndCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 unpackUeCreateReq ARGS (( +S16 unpackUeCreateReq ARGS (( RlcCfgReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkRlcEntCfgCfmInfo ARGS (( +S16 cmUnpkRlcEntCfgCfmInfo ARGS (( RlcEntCfgCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwUeIdChgReq ARGS (( +S16 cmUnpkCkwUeIdChgReq ARGS (( CkwUeIdChgReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCkwUeIdChgCfm ARGS (( +S16 cmUnpkCkwUeIdChgCfm ARGS (( CkwUeIdChgCfm func, Pst *pst, Buffer *mBuf diff --git a/src/cm/cm5.x b/src/cm/cm5.x index 1455b3e09..6195304b3 100755 --- a/src/cm/cm5.x +++ b/src/cm/cm5.x @@ -81,11 +81,11 @@ typedef struct cmTmrArg typedef Void (*PFV) ARGS((PTR, S16)); -extern Void cmInitTimers ARGS((CmTimer* timers, uint8_t max)); -extern Void cmPlcCbTq ARGS((CmTmrArg* arg)); -extern Void cmRmvCbTq ARGS((CmTmrArg* arg)); -extern Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func)); -extern Void cmRstCbTq ARGS((CmTmrArg* arg)); +Void cmInitTimers ARGS((CmTimer* timers, uint8_t max)); +Void cmPlcCbTq ARGS((CmTmrArg* arg)); +Void cmRmvCbTq ARGS((CmTmrArg* arg)); +Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func)); +Void cmRstCbTq ARGS((CmTmrArg* arg)); #ifdef __cplusplus } diff --git a/src/cm/cm_bdy5.c b/src/cm/cm_bdy5.c index d2cf7e736..59ade357b 100644 --- a/src/cm/cm_bdy5.c +++ b/src/cm/cm_bdy5.c @@ -185,7 +185,7 @@ PFV func; /* function */ CmTqType *tqEnt, *tqEnt1; PTR cb; CmTimer *tmp1; - VOLATILE uint32_t startTime = 0; + volatile uint32_t startTime = 0; /*starting Task*/ diff --git a/src/cm/cm_hash.c b/src/cm/cm_hash.c index e2b7cc6e3..5793bc3f8 100644 --- a/src/cm/cm_hash.c +++ b/src/cm/cm_hash.c @@ -110,34 +110,34 @@ extern "C" { #endif -PRIVATE S16 cmHashFuncBCD8 ARGS((CmHashListCp *hashListCp, uint8_t *key, +static S16 cmHashFuncBCD8 ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashFuncConId ARGS((CmHashListCp *hashListCp, uint8_t *key, +static S16 cmHashFuncConId ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashFuncUInt32Mod ARGS((CmHashListCp *hashListCp, uint8_t *key, +static S16 cmHashFuncU32Mod ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashFuncString ARGS((CmHashListCp *hashListCp, uint8_t *key, +static S16 cmHashFuncString ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashFuncDefault ARGS((CmHashListCp *hashListCp, uint8_t *key, +static S16 cmHashFuncDefault ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashFuncAnyKey ARGS((CmHashListCp *hashListCp, uint8_t *key, +static S16 cmHashFuncAnyKey ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashMatchKey ARGS((uint8_t *key1, uint16_t keyLen1, uint8_t *key2, uint16_t keyLen2)); +static S16 cmHashMatchKey ARGS((uint8_t *key1, uint16_t keyLen1, uint8_t *key2, uint16_t keyLen2)); -PRIVATE S16 cmListInsert ARGS((CmListEnt *oldEntry, CmListEnt *newEntry)); +static S16 cmListInsert ARGS((CmListEnt *oldEntry, CmListEnt *newEntry)); -PRIVATE S16 cmListDelete ARGS((CmListEnt *entry)); +static S16 cmListDelete ARGS((CmListEnt *entry)); /* cm_hash_c_001.main_22: Fixing warnings on GCC compiler */ -PRIVATE S16 cmHashFuncMult24 ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); +static S16 cmHashFuncMult24 ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); -PRIVATE S16 cmHashFuncDirIdx ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); +static S16 cmHashFuncDirIdx ARGS((CmHashListCp *hashListCp, uint8_t *key, uint16_t keyLen, uint16_t *idx)); #ifdef __cplusplus } @@ -172,7 +172,7 @@ PRIVATE S16 cmHashFuncDirIdx ARGS((CmHashListCp *hashListCp, uint8_t *key, uint1 */ #ifdef ANSI -PRIVATE S16 cmHashFuncAnyKey +static S16 cmHashFuncAnyKey ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -180,7 +180,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* idx to return */ ) #else -PRIVATE S16 cmHashFuncAnyKey (hashListCp, key, keyLen, idx) +static S16 cmHashFuncAnyKey (hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -242,7 +242,7 @@ uint16_t *idx; /* idx to return */ /* * -* Fun: cmHashFuncUInt32Mod +* Fun: cmHashFuncU32Mod * * Desc: Computes the hash list index (bin number) for a specified * key of type CM_HASH_KEYTYPE_MOD. @@ -258,7 +258,7 @@ uint16_t *idx; /* idx to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncUInt32Mod +static S16 cmHashFuncU32Mod ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -266,7 +266,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* idx to return */ ) #else -PRIVATE S16 cmHashFuncUInt32Mod (hashListCp, key, keyLen, idx) +static S16 cmHashFuncU32Mod (hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -290,7 +290,7 @@ uint16_t *idx; /* idx to return */ return ROK; -} /* end of cmHashFuncUInt32Mod () */ +} /* end of cmHashFuncU32Mod () */ /* * @@ -318,7 +318,7 @@ uint16_t *idx; /* idx to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncBCD8 +static S16 cmHashFuncBCD8 ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -326,7 +326,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* idx to return */ ) #else -PRIVATE S16 cmHashFuncBCD8 (hashListCp, key, keyLen, idx) +static S16 cmHashFuncBCD8 (hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -392,7 +392,7 @@ uint16_t *idx; /* idx to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncString +static S16 cmHashFuncString ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -400,7 +400,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* idx to return */ ) #else -PRIVATE S16 cmHashFuncString (hashListCp, key, keyLen, idx) +static S16 cmHashFuncString (hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -449,7 +449,7 @@ uint16_t *idx; /* idx to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncDefault +static S16 cmHashFuncDefault ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -457,7 +457,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* index to return */ ) #else -PRIVATE S16 cmHashFuncDefault(hashListCp, key, keyLen, idx) +static S16 cmHashFuncDefault(hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -517,7 +517,7 @@ uint16_t *idx; /* index to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncMult24 +static S16 cmHashFuncMult24 ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -525,7 +525,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* index to return */ ) #else -PRIVATE S16 cmHashFuncMult24(hashListCp, key, keyLen, idx) +static S16 cmHashFuncMult24(hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -579,7 +579,7 @@ uint16_t *idx; /* index to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncConId +static S16 cmHashFuncConId ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -587,7 +587,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* index to return */ ) #else -PRIVATE S16 cmHashFuncConId(hashListCp, key, keyLen, idx) +static S16 cmHashFuncConId(hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -647,7 +647,7 @@ uint16_t *idx; /* index to return */ */ #ifdef ANSI -PRIVATE S16 cmHashFuncDirIdx +static S16 cmHashFuncDirIdx ( CmHashListCp *hashListCp, /* hash list control point */ uint8_t *key, /* key string */ @@ -655,7 +655,7 @@ uint16_t keyLen, /* length of key string */ uint16_t *idx /* index to return */ ) #else -PRIVATE S16 cmHashFuncDirIdx(hashListCp, key, keyLen, idx) +static S16 cmHashFuncDirIdx(hashListCp, key, keyLen, idx) CmHashListCp *hashListCp; /* hash list control point */ uint8_t *key; /* key string */ uint16_t keyLen; /* length of key string */ @@ -688,7 +688,7 @@ uint16_t *idx; /* index to return */ */ #ifdef ANSI -PRIVATE S16 cmHashMatchKey +static S16 cmHashMatchKey ( uint8_t *key1, /* first key string */ uint16_t keyLen1, /* length of first key string */ @@ -696,7 +696,7 @@ uint8_t *key2, /* second key string */ uint16_t keyLen2 /* length of second key string */ ) #else -PRIVATE S16 cmHashMatchKey(key1, keyLen1, key2, keyLen2) +static S16 cmHashMatchKey(key1, keyLen1, key2, keyLen2) uint8_t *key1; /* first key string */ uint16_t keyLen1; /* length of first key string */ uint8_t *key2; /* second key string */ @@ -728,13 +728,13 @@ uint16_t keyLen2; /* length of second key string */ */ #ifdef ANSI -PRIVATE S16 cmListInsert +static S16 cmListInsert ( CmListEnt *oldEntry, /* add new entry after this entry */ CmListEnt *newEntry /* new entry to add */ ) #else -PRIVATE S16 cmListInsert(oldEntry, newEntry) +static S16 cmListInsert(oldEntry, newEntry) CmListEnt *oldEntry; /* add new entry after this entry */ CmListEnt *newEntry; /* new entry to add */ #endif @@ -764,12 +764,12 @@ CmListEnt *newEntry; /* new entry to add */ */ #ifdef ANSI -PRIVATE S16 cmListDelete +static S16 cmListDelete ( CmListEnt *entry /* entry to delete */ ) #else -PRIVATE S16 cmListDelete(entry) +static S16 cmListDelete(entry) CmListEnt *entry; /* entry to delete */ #endif { @@ -895,7 +895,7 @@ Pool pool; /* memory pool to allocate bins */ break; case CM_HASH_KEYTYPE_UINT32_MOD: - hashListCp->hashFunc = cmHashFuncUInt32Mod; + hashListCp->hashFunc = cmHashFuncU32Mod; break; case CM_HASH_KEYTYPE_BCD8: diff --git a/src/cm/cm_hash.h b/src/cm/cm_hash.h index 5a95de2bf..062d0b124 100755 --- a/src/cm/cm_hash.h +++ b/src/cm/cm_hash.h @@ -64,7 +64,7 @@ /* Constants */ #define CM_STR_HASHFUNC_CONSTANT 31 /* Constant for CM_HASH_KEYTYPE_STR */ -/* CONSTANTS for CmHashFuncConId */ +/* constS for CmHashFuncConId */ /* cm_hash_h_001.main_13 : Fixed for 64 Bit */ #define CM_HASHKEYLEN_UINT32 sizeof(uint32_t) /* size of uint32_t */ #define CM_HASHKEYLEN_UINT16 sizeof(uint16_t) /* size of uint16_t */ diff --git a/src/cm/cm_hash.x b/src/cm/cm_hash.x index 716f1d19f..bd113af9b 100755 --- a/src/cm/cm_hash.x +++ b/src/cm/cm_hash.x @@ -106,7 +106,7 @@ struct cmHashListCp /* hash list control point */ /* functions prototypes */ -EXTERN S16 cmHashListInit ARGS(( +S16 cmHashListInit ARGS(( CmHashListCp *hashListCp, /* hash list to initialize */ uint16_t nmbBins, /* number of hash list bins */ uint16_t offset, /* offset of CmHashListEnt in entries */ @@ -115,33 +115,33 @@ EXTERN S16 cmHashListInit ARGS(( Region region, /* memory region to allocate bins */ Pool pool)); /* memory pool to allocate bins */ -EXTERN S16 cmHashListDeinit ARGS(( +S16 cmHashListDeinit ARGS(( CmHashListCp *hashListCp));/* hash list to initialize */ -EXTERN S16 cmHashListInsert ARGS(( +S16 cmHashListInsert ARGS(( CmHashListCp *hashListCp, /* hash list to add to */ PTR entry, /* entry to add */ uint8_t *key, /* pointer to key */ uint16_t keyLen)); /* length of key */ -EXTERN S16 cmHashListDelete ARGS(( +S16 cmHashListDelete ARGS(( CmHashListCp *hashListCp, /* hash list to delete from */ PTR entry)); /* entry to delete */ -EXTERN S16 cmHashListFind ARGS(( +S16 cmHashListFind ARGS(( CmHashListCp *hashListCp, /* hash list to search */ uint8_t *key, /* pointer to key */ uint16_t keyLen, /* length of key */ uint16_t seqNmb, /* used in case of duplicate keys */ PTR *entry)); /* entry to be returned */ -EXTERN S16 cmHashListGetNext ARGS(( +S16 cmHashListGetNext ARGS(( CmHashListCp *hashListCp, /* hash list to get from */ PTR prevEnt, /* previous entry */ PTR *entry)); /* entry to be returned */ #ifdef CM_MT_HASH_BIN -EXTERN S16 cmHashListBinGetNextEntry ARGS(( +S16 cmHashListBinGetNextEntry ARGS(( CmHashListCp *hashListCp, /* hash list to get from */ uint16_t binIdx, /* Index of the bin */ PTR prevEnt, /* previous entry */ @@ -150,14 +150,14 @@ EXTERN S16 cmHashListBinGetNextEntry ARGS(( /* This function is obsoleted! Use macros defined in cm_hash.h instead */ -EXTERN S16 cmHashListQuery ARGS(( +S16 cmHashListQuery ARGS(( CmHashListCp *hashListCp, /* hash list to query */ uint8_t queryType, /* type of query */ uint16_t *result)); /* result of query */ /* Hash list with open addressing */ -EXTERN S16 cmHashListOAInsert ARGS(( +S16 cmHashListOAInsert ARGS(( CmHashListCp *hashListCp, /* hash list to add to */ PTR entry, /* entry to add */ uint8_t *key, /* pointer to key */ diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c index ae9e0479f..8aead4b0e 100644 --- a/src/cm/cm_inet.c +++ b/src/cm/cm_inet.c @@ -246,16 +246,16 @@ extern "C" { /* added !(defined(CMINETFLATBUF) */ #if (!(defined(WIN32)) && !(defined(CMINETFLATBUF))) /* Added another function parameter */ -PRIVATE S16 buildRecvBuf ARGS((CmInetMemInfo *info, MsgLen len, +static S16 buildRecvBuf ARGS((CmInetMemInfo *info, MsgLen len, CmInetIovec rxArr[], Buffer *dBuf[], uint16_t maxSize, struct msghdr *msg, Bool isStrmMsg)); -PRIVATE S16 buildRecvMsg ARGS((CmInetMemInfo *info, CmInetIovec rxArr[], +static S16 buildRecvMsg ARGS((CmInetMemInfo *info, CmInetIovec rxArr[], S16 numBduf, MsgLen msgLen, Buffer *dBufs[], Buffer **mPtr)); /* cm_inet_c_001.main_50 - Added parameter to get length of dbufs packed for partial * send handling */ -PRIVATE S16 buildSendIovec ARGS((Buffer *mBuf, MsgLen msgLen, +static S16 buildSendIovec ARGS((Buffer *mBuf, MsgLen msgLen, CmInetIovec txArr[], S16 numDBuf, S16 *numIovElems, uint32_t *strtEndDBufNum, MsgLen *ioLen)); @@ -266,28 +266,28 @@ PRIVATE S16 buildSendIovec ARGS((Buffer *mBuf, MsgLen msgLen, #ifdef IPV6_SUPPORTED #ifdef IPV6_OPTS_SUPPORTED -PRIVATE S16 cmInet6BuildSendHBHOpts ARGS((CmInetIpv6HBHHdrArr *hbhOptsArr, +static S16 cmInet6BuildSendHBHOpts ARGS((CmInetIpv6HBHHdrArr *hbhOptsArr, uint8_t *cmsgBuf, uint32_t *curMsgIdx, uint8_t hdrId)); -PRIVATE S16 cmInet6BuildSendRouteOpts ARGS((CmInetIpv6RtHdr *rtOptsArr, +static S16 cmInet6BuildSendRouteOpts ARGS((CmInetIpv6RtHdr *rtOptsArr, uint8_t *cmsgBuf, uint32_t *curMsgIdx)); -PRIVATE S16 cmInet6BuildRecvRtHdr ARGS((uint8_t *cmsgData, uint32_t rtDataLen, +static S16 cmInet6BuildRecvRtHdr ARGS((uint8_t *cmsgData, uint32_t rtDataLen, CmInetIpv6RtHdr0 *rtHdr0, CmInetIpv6RtHdr *rtOptsArr, CmInetMemInfo *info)); -PRIVATE S16 cmInet6BuildRecvHopOptsArr ARGS((uint8_t *cmsgData, uint32_t hbhDataLen, +static S16 cmInet6BuildRecvHopOptsArr ARGS((uint8_t *cmsgData, uint32_t hbhDataLen, CmInetIpv6HBHHdrArr *hbhOptsArr, uint8_t hdrId, CmInetMemInfo *info)); -PRIVATE S16 cmInet6GetHopLimitValue ARGS((uint8_t *cmsgData, uint32_t hopLimitDataLen, +static S16 cmInet6GetHopLimitValue ARGS((uint8_t *cmsgData, uint32_t hopLimitDataLen, CmInetIpv6HdrParm *ipv6HdrParam)); #ifdef SS_LINUX -PRIVATE S16 cmInetBuildSendHoplimit ARGS((uint32_t hoplimit, uint8_t *cmsgBuf, +static S16 cmInetBuildSendHoplimit ARGS((uint32_t hoplimit, uint8_t *cmsgBuf, uint32_t *curMsgIdx)); #endif /* SS_LINUX */ #ifdef LOCAL_INTF -PRIVATE S16 cmInet6BuildSendPktinfo ARGS((CmInetIpAddr6 *srcAddr, +static S16 cmInet6BuildSendPktinfo ARGS((CmInetIpAddr6 *srcAddr, uint8_t *cmsgBuf, uint32_t *curMsgIdx, uint8_t protType)); #endif /* LOCAL_INTF */ @@ -896,7 +896,7 @@ CmInetPollFd *pollFdArr; /* poll FD Array */ */ #ifdef ANSI -PRIVATE S16 buildRecvBuf +static S16 buildRecvBuf ( CmInetMemInfo *info, /* buffer allocation info */ MsgLen len, /* message length */ @@ -907,7 +907,7 @@ struct msghdr *msg, /* message header for recvmsg() */ Bool isStrmMsg /* Is a TCP message */ ) #else -PRIVATE S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) +static S16 buildRecvBuf(info, len, rxArr, dBuf, maxSize, msg, isStrmMsg) CmInetMemInfo *info; /* buffer allocation info */ MsgLen len; /* message length */ CmInetIovec rxArr[]; /* gather array */ @@ -1059,7 +1059,7 @@ cleanup: */ #ifdef ANSI -PRIVATE S16 buildRecvMsg +static S16 buildRecvMsg ( CmInetMemInfo *info, /* buffer allocation info */ CmInetIovec rxArr[], /* scatter array */ @@ -1069,7 +1069,7 @@ Buffer *dBufs[], /* dBufs */ Buffer **mPtr /* message built from dBufs */ ) #else -PRIVATE S16 buildRecvMsg(info, rxArr, numBuf, msgLen, dBufs, mPtr) +static S16 buildRecvMsg(info, rxArr, numBuf, msgLen, dBufs, mPtr) CmInetMemInfo *info; /* buffer allocation info */ CmInetIovec rxArr[]; /* scatter array */ S16 numBuf; /* number of allocated dBufs */ @@ -1158,7 +1158,7 @@ cleanup: * */ #ifdef ANSI -PRIVATE S16 buildSendIovec +static S16 buildSendIovec ( Buffer *mBuf, /* Message buffer */ MsgLen msgLen, /* Length of mBuf */ @@ -1169,7 +1169,7 @@ uint32_t *strtEndDBufNum, /* dBuf number to start and end */ MsgLen *ioLen /* cm_inet_c_001.main_50 - Len of dbuf packed into IO-vector */ ) #else -PRIVATE S16 buildSendIovec(mBuf, msgLen, txArr, numDBufs, numIovElems, +static S16 buildSendIovec(mBuf, msgLen, txArr, numDBufs, numIovElems, strtEndDBufNum,ioLen) Buffer *mBuf; /* Message buffer */ MsgLen msgLen; /* Length of mBuf */ @@ -4140,14 +4140,14 @@ CmInetFd *newSockFd; /* socket file descriptor for new connection*/ */ #ifdef ANSI -PRIVATE S16 cmInet4FillTos +static S16 cmInet4FillTos ( uint8_t tos, /* tos value to be filled in ipheader */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx /* idx in cmsgBuf where HBH/Dest ext hdr ends */ ) #else -PRIVATE S16 cmInet4FillTos(tos, cmsgBuf, curMsgIdx, protType) +static S16 cmInet4FillTos(tos, cmsgBuf, curMsgIdx, protType) uint8_t tos; /* tos value to be filled in ipheader */ uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ @@ -4608,7 +4608,7 @@ S16 flags; /* additional control flags, unused */ #ifdef NTL_LIB { - extern int ntl_hLib; + int ntl_hLib; if ( sockFd->fd >= 0xD001) ret = ntl_sendmsg(ntl_hLib, sockFd->fd, &msg, 0); else @@ -5113,7 +5113,7 @@ S16 flags; /* additional control flags, unused */ #ifdef NTL_LIB { - extern int ntl_hLib; + int ntl_hLib; if ( sockFd->fd >= 0xD001) ret = ntl_sendmsg(ntl_hLib, sockFd->fd, &msg, 0); else @@ -5204,7 +5204,7 @@ S16 flags; /* additional control flags, unused */ */ #ifdef ANSI -PRIVATE S16 cmInet6BuildSendPktinfo +static S16 cmInet6BuildSendPktinfo ( CmInetIpAddr6 *srcAddr, /* src ip addr to set on outgoing packet */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ @@ -5212,7 +5212,7 @@ uint32_t *curMsgIdx, /* idx in cmsgBuf where HBH/Dest ext hdr ends */ uint8_t protType /* whether IPv4/IPv6 socket */ ) #else -PRIVATE S16 cmInet6BuildSendPktinfo(srcAddr, cmsgBuf, curMsgIdx, protType) +static S16 cmInet6BuildSendPktinfo(srcAddr, cmsgBuf, curMsgIdx, protType) CmInetIpAddr6 *srcAddr; /* src ip addr to set on outgoing packet */ uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ @@ -5321,14 +5321,14 @@ uint8_t protType; /* whether IPv4/IPv6 socket */ */ #ifdef ANSI -PRIVATE S16 cmInetBuildSendHoplimit +static S16 cmInetBuildSendHoplimit ( uint32_t hoplimit, /* the hoplimit value to be set on outgoing packet */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx /* idx in cmsgBuf where HBH/Dest ext hdr ends */ ) #else -PRIVATE S16 cmInetBuildSendHoplimit(hoplimit, cmsgBuf, curMsgIdx) +static S16 cmInetBuildSendHoplimit(hoplimit, cmsgBuf, curMsgIdx) uint32_t hoplimit; /* the hoplimit value to be sent on outgoing packet */ uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ @@ -5391,7 +5391,7 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ */ #ifdef ANSI -PRIVATE S16 cmInet6BuildSendHBHOpts +static S16 cmInet6BuildSendHBHOpts ( CmInetIpv6HBHHdrArr *hbhOptsArr,/* IPv6 extensions headers HBH/Dest opts */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ @@ -5399,7 +5399,7 @@ uint32_t *curMsgIdx, /* idx in cmsgBuf where HBH/Dest ext hdr en uint8_t hdrId /* 0: HBH hdr, 1:Dest Hdr */ ) #else -PRIVATE S16 cmInet6BuildSendHBHOpts(hbhOptsArr, cmsgBuf, curMsgIdx, hdrId) +static S16 cmInet6BuildSendHBHOpts(hbhOptsArr, cmsgBuf, curMsgIdx, hdrId) CmInetIpv6HBHHdrArr *hbhOptsArr;/* IPv6 extensions headers HBH/Dest opts */ uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx; /* idx in cmsgBuf where HBH/Dest ext hdr ends */ @@ -5513,14 +5513,14 @@ uint8_t hdrId; /* 0: HBH hdr, 1:Dest Hdr */ */ #ifdef ANSI -PRIVATE S16 cmInet6BuildSendRouteOpts +static S16 cmInet6BuildSendRouteOpts ( CmInetIpv6RtHdr *rtOptsArr, /* IPv6 destination options array */ uint8_t *cmsgBuf, /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx /* idx in cmsgBuf where to start building RT hdr */ ) #else -PRIVATE S16 cmInet6BuildSendRouteOpts(rtOptsArr, cmsgBuf, curMsgIdx) +static S16 cmInet6BuildSendRouteOpts(rtOptsArr, cmsgBuf, curMsgIdx) CmInetIpv6RtHdr *rtOptsArr; /* IPv6 destination options array */ uint8_t *cmsgBuf; /* flat buffer where to build ext hdrs */ uint32_t *curMsgIdx; /* idx in cmsgBuf where to start building RT hd */ @@ -5608,7 +5608,7 @@ uint32_t *curMsgIdx; /* idx in cmsgBuf where to start building RT h */ #ifdef ANSI -PRIVATE S16 cmInet6BuildRecvHopOptsArr +static S16 cmInet6BuildRecvHopOptsArr ( uint8_t *cmsgData, /* flat buffer where to build ext hdrs */ uint32_t hbhDataLen, /* byte len of cmsghdr + hbh ancil data */ @@ -5617,7 +5617,7 @@ uint8_t hdrId, /* 0: HBH, 1: DEST */ CmInetMemInfo *info /* Memory information */ ) #else -PRIVATE S16 cmInet6BuildRecvHopOptsArr(cmsgData, hbhDataLen, hbhOptsArr, hdrId, +static S16 cmInet6BuildRecvHopOptsArr(cmsgData, hbhDataLen, hbhOptsArr, hdrId, info) uint8_t *cmsgData; /* flat buffer where to build ext hdrs */ uint32_t hbhDataLen; /* byte len of cmsghdr + hbh ancil data */ @@ -5822,7 +5822,7 @@ CmInetMemInfo *info; /* Memory information */ */ #ifdef ANSI -PRIVATE S16 cmInet6BuildRecvRtHdr +static S16 cmInet6BuildRecvRtHdr ( uint8_t *cmsgData, /* flat buffer where to build Route hdr */ uint32_t rtDataLen, /* byte len of cmsghdr struc+rtHdr ancil data */ @@ -5831,7 +5831,7 @@ CmInetIpv6RtHdr *rtOptsArr,/* IPv6 extensions headers */ CmInetMemInfo *info /* Memory information */ ) #else -PRIVATE S16 cmInet6BuildRecvRtHdr(cmsgData, rtDataLen, rtHdr0, rtOptsArr, info) +static S16 cmInet6BuildRecvRtHdr(cmsgData, rtDataLen, rtHdr0, rtOptsArr, info) uint8_t *cmsgData; /* flat buffer where to build Route hdr */ uint32_t rtDataLen; /* byte len of cmsghdr struc+rtHdr ancil data */ CmInetIpv6RtHdr0 *rtHdr0; /* rtHeader0 struct that precedes IPV6 addrss */ @@ -5920,14 +5920,14 @@ CmInetMemInfo *info; /* Memory information */ */ #ifdef ANSI -PRIVATE S16 cmInet6GetHopLimitValue +static S16 cmInet6GetHopLimitValue ( uint8_t *cmsgData, /* flat buffer where to build ext hdrs */ uint32_t hopLimitDataLen, /* byte len of cmsghdr + hbh ancil data */ CmInetIpv6HdrParm *ipv6HdrParam /* ipv6 header parameters */ ) #else -PRIVATE S16 cmInet6GetHopLimitValue(cmsgData, hopLimitDataLen, ipv6HdrParam) +static S16 cmInet6GetHopLimitValue(cmsgData, hopLimitDataLen, ipv6HdrParam) uint8_t *cmsgData; /* flat buffer where to build ext hdrs */ uint32_t hopLimitDataLen; /* byte len of cmsghdr + hbh ancil data */ CmInetIpv6HdrParm *ipv6HdrParam; /* ipv6 header parameters */ @@ -8338,7 +8338,7 @@ Ptr value; /* option value */ /* disable the IP_OPTIONS for Router Alert. */ #ifdef WIN32 ret = setsockopt(sockFd->fd, level, IP_OPTIONS, - (CONSTANT char *)&disableOpt, sizeof(int)); + (const char *)&disableOpt, sizeof(int)); #else ret = setsockopt(sockFd->fd, level, IP_OPTIONS, NULL, 0); #endif /* WIN32 */ @@ -8429,7 +8429,7 @@ Ptr value; /* option value */ (char *)&lpEnable, sizeof(lpEnable)); #else ret = setsockopt(sockFd->fd, level, IP_MULTICAST_LOOP, - (CONSTANT char *)&lpEnable, sizeof(lpEnable)); + (const char *)&lpEnable, sizeof(lpEnable)); #endif /* SS_VW */ } else @@ -8439,7 +8439,7 @@ Ptr value; /* option value */ (char *)&lpDisable, sizeof(lpDisable)); #else ret = setsockopt(sockFd->fd, level, IP_MULTICAST_LOOP, - (CONSTANT char *)&lpDisable, sizeof(lpDisable)); + (const char *)&lpDisable, sizeof(lpDisable)); #endif /* SS_VW */ } break; @@ -8453,13 +8453,13 @@ Ptr value; /* option value */ case CM_INET_OPT_MCAST_TTL: optVal = (uint32_t*)value; - /* remove CONSTANT in setsockopt for VW */ + /* remove const in setsockopt for VW */ #ifdef SS_VW ret = setsockopt(sockFd->fd, level, IP_MULTICAST_TTL, (char *)optVal, sizeof(uint8_t)); #else ret = setsockopt(sockFd->fd, level, IP_MULTICAST_TTL, - (CONSTANT char *)optVal, sizeof(uint8_t)); + (const char *)optVal, sizeof(uint8_t)); #endif /* SS_VW */ break; #endif /* SUNOS || WIN32 || SS_PS || SS_VW_MCAST || HPOS */ @@ -10388,16 +10388,16 @@ uint8_t *val; /* Domain Name String */ #ifdef ANSI S32 cmInetGetAddrInfo ( -CONSTANT S8 *node, /* Network addr which has to be resolved */ -CONSTANT S8 *service, /* Sets the port number in network addr */ -CONSTANT CmInetAddrInfo *hints, /* Specifies preferred socket type or protocol */ +const S8 *node, /* Network addr which has to be resolved */ +const S8 *service, /* Sets the port number in network addr */ +const CmInetAddrInfo *hints, /* Specifies preferred socket type or protocol */ CmInetAddrInfo **res /* Link list of addrInfo structure */ ) #else S32 cmInetGetAddrInfo(node,service,hints,res) -CONSTANT S8 *node; /* Network addr which has to be resolved */ -CONSTANT S8 *service; /* Sets the port number in network addr */ -CONSTANT CmInetAddrInfo *hints; /* Specifies preferred socket type or protocol */ +const S8 *node; /* Network addr which has to be resolved */ +const S8 *service; /* Sets the port number in network addr */ +const CmInetAddrInfo *hints; /* Specifies preferred socket type or protocol */ CmInetAddrInfo **res; /* Link list of addrInfo structure */ #endif { diff --git a/src/cm/cm_inet.x b/src/cm/cm_inet.x index 6a5048fa1..ed7ce47d2 100644 --- a/src/cm/cm_inet.x +++ b/src/cm/cm_inet.x @@ -606,156 +606,156 @@ typedef struct addrinfo CmInetAddrInfo; #ifdef CM_INET2 #ifdef IPV6_SUPPORTED -EXTERN S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd, uint8_t protocol, +S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd, uint8_t protocol, uint8_t family)); #else -EXTERN S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd, uint8_t protocol)); +S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd, uint8_t protocol)); #endif /* IPV6_SUPPORTED */ #else /* CM_INET2 */ -EXTERN S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd)); +S16 cmInetSocket ARGS((uint8_t type, CmInetFd *sockFd)); #endif /* CM_INET2 */ /* cm_inet_x_001.main_22 1. Added new interface - cmInetFlushRecvBuf() to flush the data from socket receive buffer. */ #ifdef CM_INET_FLUSH_RECV_BUF -EXTERN S16 cmInetFlushRecvBuf ARGS((CmInetFd *sockFd, +S16 cmInetFlushRecvBuf ARGS((CmInetFd *sockFd, MsgLen *len, S32 flags)); #endif /* CM_INET_FLUSH_RECV_BUF*/ -EXTERN S16 cmInetBind ARGS((CmInetFd *sockFd, CmInetAddr *myAddr)); -EXTERN S16 cmInetConnect ARGS((CmInetFd *sockFd, CmInetAddr *servAddr)); -EXTERN S16 cmInetListen ARGS((CmInetFd *sockFd, S16 backLog)); -EXTERN S16 cmInetAccept ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, +S16 cmInetBind ARGS((CmInetFd *sockFd, CmInetAddr *myAddr)); +S16 cmInetConnect ARGS((CmInetFd *sockFd, CmInetAddr *servAddr)); +S16 cmInetListen ARGS((CmInetFd *sockFd, S16 backLog)); +S16 cmInetAccept ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, CmInetFd *newSockFd)); #ifdef IPV6_OPTS_SUPPORTED #ifdef LOCAL_INTF -EXTERN S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer **mPtr, MsgLen *len, CmInetIpHdrParm *ipHdrParams, CmInetLocalInf *localIf, S32 flags)); #else -EXTERN S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer **mPtr, MsgLen *len, CmInetIpHdrParm *ipHdrParams, S32 flags)); #endif /* LOCAL_INTF */ #else #ifdef LOCAL_INTF -EXTERN S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer **mPtr, MsgLen *len, CmInetLocalInf *localIf, S32 flags)); #else -EXTERN S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetRecvMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer **mPtr, MsgLen *len, S32 flags)); #endif /* LOCAL_INTF */ #endif /* IPV6_OPTS_SUPPORTED */ -EXTERN S16 cmInetSendDscpMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetSendDscpMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer *mBuf, MsgLen *len, CmInetIpHdrParm *ipHdrParams, S16 flags)); #ifdef IPV6_OPTS_SUPPORTED -EXTERN S16 cmInetSendMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetSendMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer *mBuf, MsgLen *len, CmInetIpHdrParm *ipHdrParams, S16 flags)); #else -EXTERN S16 cmInetSendMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, +S16 cmInetSendMsg ARGS((CmInetFd *sockFd, CmInetAddr *dstAddr, CmInetMemInfo *info, Buffer *mBuf, MsgLen *len, S16 flags)); #endif /* IPV6_OPTS_SUPPORTED */ -EXTERN S16 cmInetPeek ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, +S16 cmInetPeek ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, CmInetMemInfo *info, MsgLen dataPos, MsgLen dataLen, uint8_t *data)); /* cm_inet_x_001.main_26: Added new function declaration cmInetPeekNew() */ -EXTERN S16 cmInetPeekNew ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, +S16 cmInetPeekNew ARGS((CmInetFd *sockFd, CmInetAddr *fromAddr, CmInetMemInfo *info, MsgLen dataPos, MsgLen dataLen, uint8_t *data)); -EXTERN S16 cmInetClose ARGS((CmInetFd *sockFd)); -EXTERN S16 cmInetShutdown ARGS((CmInetFd *sockFd, S32 howTo)); -EXTERN S16 cmInetSelect ARGS((CmInetFdSet *readFdS, CmInetFdSet *writeFdS, +S16 cmInetClose ARGS((CmInetFd *sockFd)); +S16 cmInetShutdown ARGS((CmInetFd *sockFd, S32 howTo)); +S16 cmInetSelect ARGS((CmInetFdSet *readFdS, CmInetFdSet *writeFdS, uint32_t *mSecTimeout, S16 *numFdS)); -EXTERN S16 cmInetSetOpt ARGS((CmInetFd *sockFd, uint32_t level, uint32_t type, +S16 cmInetSetOpt ARGS((CmInetFd *sockFd, uint32_t level, uint32_t type, Ptr value)); -EXTERN S16 cmInetGetNumRead ARGS((CmInetFd *sockFd, uint32_t *dataLen)); +S16 cmInetGetNumRead ARGS((CmInetFd *sockFd, uint32_t *dataLen)); #ifndef SS_PS -EXTERN S16 cmInetGetHostByName ARGS((S8 *hostName, CmInetIpAddrTbl *addrTbl)); -EXTERN S16 cmInetGetIpNodeByName ARGS((S8 *hostName, CmInetIpAddrArr *addrArr)); -EXTERN S16 cmInetAddr ARGS((S8 *asciiAddr, CmInetIpAddr *address)); -EXTERN S16 cmInetNtoa ARGS((CmInetIpAddr address, S8 **asciiAddr)); -EXTERN S16 cmInetPton ARGS((CmInetIpAddr *address, S8 *asciiAddr)); +S16 cmInetGetHostByName ARGS((S8 *hostName, CmInetIpAddrTbl *addrTbl)); +S16 cmInetGetIpNodeByName ARGS((S8 *hostName, CmInetIpAddrArr *addrArr)); +S16 cmInetAddr ARGS((S8 *asciiAddr, CmInetIpAddr *address)); +S16 cmInetNtoa ARGS((CmInetIpAddr address, S8 **asciiAddr)); +S16 cmInetPton ARGS((CmInetIpAddr *address, S8 *asciiAddr)); #ifdef IPV6_SUPPORTED -EXTERN S16 cmInetPton6 ARGS((CmInetIpAddr6 *address6, S8 *asciiAddr)); +S16 cmInetPton6 ARGS((CmInetIpAddr6 *address6, S8 *asciiAddr)); #endif /* IPV6_SUPPORTED */ #endif /* SS_PS */ /* Function prototypes to peek into file descriptor set. */ #if (defined(WIN32) || defined(SUNOS) || defined(SS_LINUX) || defined(SS_VW) \ || defined(HPOS)) -EXTERN S16 cmInetFdSetInfoInit ARGS((CmInetFdSetInfo *fdSetInfo)); -EXTERN S16 cmInetGetFd ARGS((CmInetFdSetInfo *fdSetInfo, CmInetFdSet *fdSet, +S16 cmInetFdSetInfoInit ARGS((CmInetFdSetInfo *fdSetInfo)); +S16 cmInetGetFd ARGS((CmInetFdSetInfo *fdSetInfo, CmInetFdSet *fdSet, CmInetFdType *sockFd)); #endif /* WIN32 | SUNOS | SS_LINUX | SS_VW | HPOS */ -EXTERN S16 cmInetGetMemSize ARGS((S32 *size)); -EXTERN S16 cmInetInit ARGS((Void)); -EXTERN S16 cmInetDeInit ARGS((Void)); -EXTERN S16 cmInetGetSockName ARGS((CmInetFd *sockFd, CmInetAddr *locAddr)); +S16 cmInetGetMemSize ARGS((S32 *size)); +S16 cmInetInit ARGS((Void)); +S16 cmInetDeInit ARGS((Void)); +S16 cmInetGetSockName ARGS((CmInetFd *sockFd, CmInetAddr *locAddr)); -EXTERN S16 cmInetConvertStrToIpAddr ARGS((uint16_t len, uint8_t *val, +S16 cmInetConvertStrToIpAddr ARGS((uint16_t len, uint8_t *val, CmInetNetAddr *address)); -EXTERN S16 cmInetAsciiToIpv4 ARGS((uint8_t numBytes, uint8_t *ipv4Addr, +S16 cmInetAsciiToIpv4 ARGS((uint8_t numBytes, uint8_t *ipv4Addr, uint16_t len, uint8_t *val)); /* cm_inet_x_001.main_29 Poll Implementation Changes */ -EXTERN S16 cmInetPoll ARGS((CmInetPollFd *pollFdArr,uint32_t idx,S16 *numFdS,uint32_t timeout)); -EXTERN S16 cmInetPollSetFd ARGS((CmInetFd *sockFd,CmInetPollFd *pollFdArr,S16 idx, uint16_t eventMask)); -EXTERN S16 cmInetPollFdIsSet ARGS((CmInetPollFd *pollFdArr, S16 idx, uint16_t eventMask)); -EXTERN S16 cmInetPollClearFdREvent ARGS((CmInetPollFd *pollFdArr, S16 idx, uint16_t eventMask)); -EXTERN S16 cmInetPollClearFdEvent ARGS((CmInetPollFd *pollFdArr,S16 idx, uint16_t eventMask)); -EXTERN S16 cmInetPollDelFd ARGS((CmInetPollFd *pollFdArr, S16 delIdx, S16 crntIdx)); -EXTERN S16 cmInetPollInitFdArr ARGS((CmInetPollFd *pollFdArr)); -EXTERN S16 cmInetNtop ARGS((uint8_t type,Void *address,S8 *asciiAddr,uint32_t len)); +S16 cmInetPoll ARGS((CmInetPollFd *pollFdArr,uint32_t idx,S16 *numFdS,uint32_t timeout)); +S16 cmInetPollSetFd ARGS((CmInetFd *sockFd,CmInetPollFd *pollFdArr,S16 idx, uint16_t eventMask)); +S16 cmInetPollFdIsSet ARGS((CmInetPollFd *pollFdArr, S16 idx, uint16_t eventMask)); +S16 cmInetPollClearFdREvent ARGS((CmInetPollFd *pollFdArr, S16 idx, uint16_t eventMask)); +S16 cmInetPollClearFdEvent ARGS((CmInetPollFd *pollFdArr,S16 idx, uint16_t eventMask)); +S16 cmInetPollDelFd ARGS((CmInetPollFd *pollFdArr, S16 delIdx, S16 crntIdx)); +S16 cmInetPollInitFdArr ARGS((CmInetPollFd *pollFdArr)); +S16 cmInetNtop ARGS((uint8_t type,Void *address,S8 *asciiAddr,uint32_t len)); /* cm_inet_x_001.main_21:Added wrapper function for getaddrinfo and freeaddrinfo */ #if (!defined(SS_VW) && !defined(SS_PS) && !defined(WIN32)) -EXTERN S32 cmInetGetAddrInfo ARGS((CONSTANT S8* node, CONSTANT S8* service, - CONSTANT CmInetAddrInfo *hints, CmInetAddrInfo **res)); -EXTERN Void cmInetFreeAddrInfo ARGS((CmInetAddrInfo *res)); +S32 cmInetGetAddrInfo ARGS((const S8* node, const S8* service, + const CmInetAddrInfo *hints, CmInetAddrInfo **res)); +Void cmInetFreeAddrInfo ARGS((CmInetAddrInfo *res)); #endif /* SS_VW | SS_PS | WIN32 */ /*cm_inet_x_001.main_23 Updated for TUCL 2.1 Release (Kernel SCTP Support) */ #ifdef CM_LKSCTP -EXTERN S16 cmInetSctpBindx ARGS((CmInetFd *sockFd, +S16 cmInetSctpBindx ARGS((CmInetFd *sockFd, CmInetNetAddrLst *addrLst, uint16_t port)); -EXTERN S16 cmInetSctpConnectx ARGS((CmInetFd *sockFd, CmInetNetAddr *primAddr, +S16 cmInetSctpConnectx ARGS((CmInetFd *sockFd, CmInetNetAddr *primAddr, CmInetNetAddrLst *addrLst, uint16_t port)); -EXTERN S16 cmInetSctpPeelOff ARGS((CmInetFd *sockFd, uint32_t assocId, +S16 cmInetSctpPeelOff ARGS((CmInetFd *sockFd, uint32_t assocId, CmInetFdType *assocFd)); -EXTERN S16 cmInetSctpSendMsg ARGS((CmInetFd *sockFd, CmInetNetAddr *dstAddr, +S16 cmInetSctpSendMsg ARGS((CmInetFd *sockFd, CmInetNetAddr *dstAddr, uint16_t port, CmInetMemInfo *info, Buffer *mBuf, MsgLen *len, uint16_t strmId, Bool unorderFlg, uint16_t ttl, uint32_t ppId, uint32_t context)); -EXTERN S16 cmInetSctpRecvMsg ARGS((CmInetFd *sockFd, CmInetNetAddr *srcAddr, +S16 cmInetSctpRecvMsg ARGS((CmInetFd *sockFd, CmInetNetAddr *srcAddr, uint16_t *port, CmInetMemInfo *info, Buffer **mBuf, MsgLen *len, CmInetSctpSndRcvInfo *sinfo, uint32_t *flag, CmInetSctpNotification *ntfy)); -EXTERN S16 cmInetSctpGetPAddrs ARGS((CmInetFd *sockFd, uint32_t assocId, +S16 cmInetSctpGetPAddrs ARGS((CmInetFd *sockFd, uint32_t assocId, CmInetNetAddrLst *addrlst)); -EXTERN S16 cmInetGetOpt ARGS((CmInetFd *sockFd, uint32_t level, uint32_t type, +S16 cmInetGetOpt ARGS((CmInetFd *sockFd, uint32_t level, uint32_t type, Ptr value)); /*cm_inet_x_001.main_25: Added new funcion */ -EXTERN S16 cmInetShutDownSctp ARGS((CmInetFd *sockFd)); +S16 cmInetShutDownSctp ARGS((CmInetFd *sockFd)); /*cm_inet_x_001.main_30: Added new function */ -EXTERN S16 cmInetAbortSctpAssoc ARGS((CmInetFd *sockFd, UConnId assocId)); +S16 cmInetAbortSctpAssoc ARGS((CmInetFd *sockFd, UConnId assocId)); #endif #ifdef __cplusplus diff --git a/src/cm/cm_lib.c b/src/cm/cm_lib.c index 52f83d5e1..8503d8549 100644 --- a/src/cm/cm_lib.c +++ b/src/cm/cm_lib.c @@ -174,8 +174,8 @@ #endif #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ -EXTERN Data *startPtr128; -EXTERN Size regMemSize; +Data *startPtr128; +Size regMemSize; #endif /* @@ -200,13 +200,13 @@ EXTERN Size regMemSize; uint8_t *cmMemcpy ( uint8_t *tgt, -CONSTANT uint8_t *src, +const uint8_t *src, PTR len ) #else uint8_t *cmMemcpy(tgt, src, len) uint8_t *tgt; -CONSTANT uint8_t *src; +const uint8_t *src; PTR len; #endif { @@ -264,20 +264,20 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize))) #ifdef ANSI S16 cmMemcmp ( -CONSTANT uint8_t *s1, -CONSTANT uint8_t *s2, +const uint8_t *s1, +const uint8_t *s2, PTR len ) #else S16 cmMemcmp (s1, s2, len) -CONSTANT uint8_t *s1; -CONSTANT uint8_t *s2; +const uint8_t *s1; +const uint8_t *s2; PTR len; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if MEMCMP_AVAIL /* memcmp is available */ - return ((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len)); + return ((S16) memcmp((const Void *)s1, (const Void *)s2, (size_t)len)); #else /* MEMCMP_AVAIL: memcmp is not available */ while (len--) { @@ -390,18 +390,18 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize))) #ifdef ANSI S16 cmStrcmp ( -CONSTANT uint8_t *s1, -CONSTANT uint8_t *s2 +const uint8_t *s1, +const uint8_t *s2 ) #else S16 cmStrcmp (s1, s2) -CONSTANT uint8_t *s1; -CONSTANT uint8_t *s2; +const uint8_t *s1; +const uint8_t *s2; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if (STRCMP_AVAIL) - return (strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2)); + return (strcmp((const S8 *)s1, (const S8 *)s2)); #else /* STRCMP_AVAIL */ while (*s1 && *s2) @@ -454,20 +454,20 @@ CONSTANT uint8_t *s2; #ifdef ANSI S16 cmStrncmp ( -CONSTANT uint8_t *s1, -CONSTANT uint8_t *s2, +const uint8_t *s1, +const uint8_t *s2, MsgLen len /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/ ) #else S16 cmStrncmp (s1, s2, len) -CONSTANT uint8_t *s1; -CONSTANT uint8_t *s2; +const uint8_t *s1; +const uint8_t *s2; MsgLen len; #endif { /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ #if (STRNCMP_AVAIL) - return (strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len)); + return (strncmp((const S8 *)s1, (const S8 *)s2, (size_t) len)); #else /* STRNCMP_AVAIL */ while (*s1 && *s2 && len--) @@ -508,17 +508,17 @@ MsgLen len; #ifdef ANSI MsgLen cmStrlen ( -CONSTANT uint8_t *s +const uint8_t *s ) #else /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/ MsgLen cmStrlen (s) -CONSTANT uint8_t *s; +const uint8_t *s; #endif { #if (STRLEN_AVAIL) /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/ - return ((MsgLen)strlen((CONSTANT S8 *)s)); + return ((MsgLen)strlen((const S8 *)s)); #else /* STRLEN_AVAIL */ MsgLen i; diff --git a/src/cm/cm_lib.x b/src/cm/cm_lib.x index f8912dc9a..42e55efe6 100755 --- a/src/cm/cm_lib.x +++ b/src/cm/cm_lib.x @@ -40,14 +40,14 @@ extern "C" { #endif -uint8_t *cmMemcpy ARGS((uint8_t *tgt, CONSTANT uint8_t *src, PTR len)); -S16 cmMemcmp ARGS((CONSTANT uint8_t *s1, CONSTANT uint8_t *s2, PTR len)); +uint8_t *cmMemcpy ARGS((uint8_t *tgt, const uint8_t *src, PTR len)); +S16 cmMemcmp ARGS((const uint8_t *s1, const uint8_t *s2, PTR len)); uint8_t *cmMemset ARGS((uint8_t *src, uint8_t val, PTR len)); -S16 cmStrcmp ARGS((CONSTANT uint8_t *s1, CONSTANT uint8_t *s2)); +S16 cmStrcmp ARGS((const uint8_t *s1, const uint8_t *s2)); /* cm_lib_x_001.main_8:Changing from S16 to MsgLen.*/ -S16 cmStrncmp ARGS((CONSTANT uint8_t *s1, CONSTANT uint8_t *s2, MsgLen len)); -MsgLen cmStrlen ARGS((CONSTANT uint8_t *s)); +S16 cmStrncmp ARGS((const uint8_t *s1, const uint8_t *s2, MsgLen len)); +MsgLen cmStrlen ARGS((const uint8_t *s)); #ifdef __cplusplus } diff --git a/src/cm/cm_llist.x b/src/cm/cm_llist.x index 5d4522c21..acafe771c 100755 --- a/src/cm/cm_llist.x +++ b/src/cm/cm_llist.x @@ -56,14 +56,14 @@ struct cmLListCp uint32_t count; /* number of entries */ }; -EXTERN Void cmLListInit ARGS ((CmLListCp *lList)); -EXTERN Void cmLListAdd2Head ARGS ((CmLListCp *lList, CmLList *node)); -EXTERN Void cmLListAdd2Tail ARGS ((CmLListCp *lList, CmLList *node)); -EXTERN Void cmLListInsCrnt ARGS ((CmLListCp *lList, CmLList *node)); +Void cmLListInit ARGS ((CmLListCp *lList)); +Void cmLListAdd2Head ARGS ((CmLListCp *lList, CmLList *node)); +Void cmLListAdd2Tail ARGS ((CmLListCp *lList, CmLList *node)); +Void cmLListInsCrnt ARGS ((CmLListCp *lList, CmLList *node)); /* cm_llist_x_001.main_6 - Add function */ -EXTERN Void cmLListInsAfterCrnt ARGS ((CmLListCp *lList, CmLList *node)); -EXTERN CmLList *cmLListDelFrm ARGS ((CmLListCp *lList, CmLList *node)); -EXTERN Void cmLListCatLList ARGS (( CmLListCp *list1, CmLListCp *list2)); +Void cmLListInsAfterCrnt ARGS ((CmLListCp *lList, CmLList *node)); +CmLList *cmLListDelFrm ARGS ((CmLListCp *lList, CmLList *node)); +Void cmLListCatLList ARGS (( CmLListCp *list1, CmLListCp *list2)); #ifdef __cplusplus } diff --git a/src/cm/cm_lte.h b/src/cm/cm_lte.h index 354f04d70..2044f16bd 100755 --- a/src/cm/cm_lte.h +++ b/src/cm/cm_lte.h @@ -32,7 +32,7 @@ #define __CM_LTE_H__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*__cplusplus*/ /** @file cm_lte.h diff --git a/src/cm/cm_lte.x b/src/cm/cm_lte.x index 7505afd0a..0c6a3a776 100755 --- a/src/cm/cm_lte.x +++ b/src/cm/cm_lte.x @@ -66,7 +66,7 @@ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*__cplusplus*/ /** @file cm_lte.x @@ -212,48 +212,48 @@ typedef enum cmLteUeCategory * PACK/UNPACK Functions ***************************************************************************/ -EXTERN S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo); +S16 cmUpdateSsiMemInfo(CmLteMemInfo *mInfo); -EXTERN S16 cmFillMemUtilizationMeas(CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo); +S16 cmFillMemUtilizationMeas(CmLteMemInfo *memoryInfo,CmLteMemInfo *memInfo); -EXTERN S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo); -EXTERN S16 UpdateSocMemInfo(uint8_t area , CmLteMemInfo *mInfo); +S16 cmClearMemUtilizationCounter(CmLteMemInfo *memInfo); +S16 UpdateSocMemInfo(uint8_t area , CmLteMemInfo *mInfo); -EXTERN S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo); +S16 cmFillCpuUtilizationMeas(CmLteCpuInfo *cpuMeasInfo,CmCpuStatsInfo *cpuInfo); -EXTERN S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo); -EXTERN Void UpdateSocCpuInfo(CmCpuStatsInfo *cpuInfo,uint8_t Idx); +S16 cmClearCpuUtilizationCounter(CmCpuStatsInfo *cpuInfo); +Void UpdateSocCpuInfo(CmCpuStatsInfo *cpuInfo,uint8_t Idx); -EXTERN S16 SGetRegPoolInfo(uint8_t* numRegion, uint8_t* numPool); +S16 SGetRegPoolInfo(uint8_t* numRegion, uint8_t* numPool); /* Packing Functions */ -EXTERN S16 cmPkLteRlcId ARGS (( +S16 cmPkLteRlcId ARGS (( CmLteRlcId *param, Buffer *mBuf )); -EXTERN S16 cmPkLteTimingInfo ARGS (( +S16 cmPkLteTimingInfo ARGS (( CmLteTimingInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkLtePdcpId ARGS (( +S16 cmPkLtePdcpId ARGS (( CmLtePdcpId *param, Buffer *mBuf )); /* Unpack Function */ -EXTERN S16 cmUnpkLteRlcId ARGS (( +S16 cmUnpkLteRlcId ARGS (( CmLteRlcId *param, Buffer *mBuf )); -EXTERN S16 cmUnpkLteTimingInfo ARGS (( +S16 cmUnpkLteTimingInfo ARGS (( CmLteTimingInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkLtePdcpId ARGS (( +S16 cmUnpkLtePdcpId ARGS (( CmLtePdcpId *param, Buffer *mBuf )); @@ -271,10 +271,10 @@ typedef struct cmTtiProc uint32_t phyReptTtiStretchCount; }CmTtiProc; -EXTERN CmTtiProc ttiProc; +CmTtiProc ttiProc; -EXTERN Void cmUpdateTtiCounters(uint32_t ttiProcessingTime); -EXTERN Void cmResetTtiCounters(Void); +Void cmUpdateTtiCounters(uint32_t ttiProcessingTime); +Void cmResetTtiCounters(Void); #endif #ifdef __cplusplus diff --git a/src/cm/cm_math.x b/src/cm/cm_math.x index ddf9ffab5..f6bcea25f 100755 --- a/src/cm/cm_math.x +++ b/src/cm/cm_math.x @@ -32,7 +32,7 @@ #define __CMMATHX__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif #ifdef SS_FLOAT @@ -41,11 +41,11 @@ EXTERN "C" { #include /* Math library function prototypes */ -EXTERN uint32_t cmAbs ARGS((F64 val)); -EXTERN F64 cmPow ARGS((F64 x, F64 y)); -EXTERN F64 cmFloor ARGS((F64 x)); -EXTERN F64 cmLog ARGS((F64 x)); -EXTERN F64 cmLog10 ARGS((F64 x)); +uint32_t cmAbs ARGS((F64 val)); +F64 cmPow ARGS((F64 x, F64 y)); +F64 cmFloor ARGS((F64 x)); +F64 cmLog ARGS((F64 x)); +F64 cmLog10 ARGS((F64 x)); #endif diff --git a/src/cm/cm_mblk.c b/src/cm/cm_mblk.c index fb6b9131c..fe78a73d0 100644 --- a/src/cm/cm_mblk.c +++ b/src/cm/cm_mblk.c @@ -44,7 +44,7 @@ #include "cm_mblk.x" /* Typedef file */ #ifdef SS_LOCKLESS_MEMORY -EXTERN pthread_t tmpRegTidMap[20]; +pthread_t tmpRegTidMap[20]; #define CM_MEM_GET_REGION(_region) \ { \ uint8_t _regCnt; \ @@ -63,7 +63,7 @@ EXTERN pthread_t tmpRegTidMap[20]; -PRIVATE Void cmAddMemNode ARGS((CmMemListCp *lCp,CmMemList *node)); +static Void cmAddMemNode ARGS((CmMemListCp *lCp,CmMemList *node)); /* @@ -651,13 +651,13 @@ Ptr memPtr; /* Link List CP */ * */ #ifdef ANSI -PRIVATE Void cmAddMemNode +static Void cmAddMemNode ( CmMemListCp *lCp, /* list control point */ CmMemList *node /* node to be added */ ) #else -PRIVATE Void cmAddMemNode (lCp, node) +static Void cmAddMemNode (lCp, node) CmMemListCp *lCp; /* list control point */ CmMemList *node; /* node to be added */ #endif diff --git a/src/cm/cm_mblk.x b/src/cm/cm_mblk.x index 8918bc9a2..85ab72204 100755 --- a/src/cm/cm_mblk.x +++ b/src/cm/cm_mblk.x @@ -33,7 +33,7 @@ #define __CMMBLKX__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /************************************************ @@ -91,44 +91,44 @@ typedef struct cmMemStatus ***********************************************/ #ifdef TFU_ALLOC_EVENT_NO_INIT -EXTERN S16 cmAllocEvntNoInit ARGS(( + S16 cmAllocEvntNoInit ARGS(( Size evntSize, Size maxBlkSize, Mem *sMem, Ptr *ptr)); #endif #ifdef TFU_ALLOC_EVENT_NO_INIT -EXTERN S16 cmGetMemNoInit ARGS(( + S16 cmGetMemNoInit ARGS(( Ptr memPtr, Size size, Ptr *allocPtr)); #endif -EXTERN S16 cmAllocEvnt ARGS(( + S16 cmAllocEvnt ARGS(( Size evntSize, Size maxBlkSize, Mem *sMem, Ptr *ptr)); -EXTERN Void cmInitMemCp ARGS(( + Void cmInitMemCp ARGS(( CmMemListCp *memCp, Size maxBlkSize, Mem *sMem )); #ifdef TFU_ALLOC_EVENT_NO_INIT -EXTERN S16 cmGetMemNoInit ARGS(( + S16 cmGetMemNoInit ARGS(( Ptr memPtr, Size size, Ptr *allocPtr)); #endif -EXTERN S16 cmGetMem ARGS(( + S16 cmGetMem ARGS(( Ptr memPtr, Size size, Ptr *allocPtr)); -EXTERN Void cmFreeMem ARGS(( + Void cmFreeMem ARGS(( Ptr memPtr)); -EXTERN Void cmGetMemStatus ARGS(( + Void cmGetMemStatus ARGS(( Ptr memPtr, CmMemStatus *status)); diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c index 2ed6f2e73..6bda4fb99 100755 --- a/src/cm/cm_mem.c +++ b/src/cm/cm_mem.c @@ -154,86 +154,86 @@ Size regMemSize=0; #endif #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); /*cm_mem_c_001.main_20-added new functionto allocate memory from new region*/ #else -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, uint32_t line, +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size, +static S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #else /* no histogram support */ /* cm_mem_c_001.main_12 - prototype is changed to accept memType(static/dynamic) */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t memType)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t memType)); #else #ifndef USE_PURE -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); #endif/*USE_PURE*/ #endif /* SSI_DEBUG_LEVEL1 */ #ifndef USE_PURE -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); +static S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); #endif/*USE_PURE*/ /* cm_mem_c_001.main_15 :Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType, uint32_t lineNo,uint8_t *funcName )); -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, uint32_t lineNo, uint8_t* funcName)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType, uint32_t lineNo,uint8_t *funcName )); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, uint32_t lineNo, uint8_t* funcName)); #else /*SS_LIGHT_MEM_LEAK_STS */ #if (defined(SSI_DEBUG_LEVEL1) || defined(BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType)); #else #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char* file, uint32_t line)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char* file, uint32_t line)); #else -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); #endif #endif /* SSI_DEBUG_LEVEL1 */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, char* file, uint32_t line)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, char* file, uint32_t line)); #else -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); #endif #endif /* SS_HISTOGRAM_SUPPORT */ #endif /*SS_LIGHT_MEM_LEAK_STS*/ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef SS_FAP -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); #endif -PRIVATE S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); +static S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); -PRIVATE Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); -PRIVATE Void cmMmBktInit ARGS((Data **memAddr, CmMmRegCb *regCb, +static Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); +static Void cmMmBktInit ARGS((Data **memAddr, CmMmRegCb *regCb, CmMmRegCfg *cfg, uint16_t bktIdx, uint16_t *lstMapIdx)); /* cm_mem_c_001.main_12 - addition of protoypes for sanity check and hash list functions */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmMmBktSanityChk ARGS((CmMmBkt *bkt)); -PRIVATE S16 cmMmHeapSanityChk ARGS((CmMmHeapCb *heapCb)); -PRIVATE S16 cmMmHashFunc ARGS((CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx )); -PRIVATE S16 cmMmHashListInit ARGS((CmMmHashListCp *hashListCp, uint16_t nmbBins, +static S16 cmMmBktSanityChk ARGS((CmMmBkt *bkt)); +static S16 cmMmHeapSanityChk ARGS((CmMmHeapCb *heapCb)); +static S16 cmMmHashFunc ARGS((CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx )); +static S16 cmMmHashListInit ARGS((CmMmHashListCp *hashListCp, uint16_t nmbBins, Region region, Pool pool)); -PRIVATE S16 cmMmHashListDeinit ARGS((CmMmHashListCp *hashListCp, Region region, Pool pool)); -PRIVATE S16 cmMmHashListInsert ARGS((CmMmHashListCp *hashListCp, uint32_t key)); +static S16 cmMmHashListDeinit ARGS((CmMmHashListCp *hashListCp, Region region, Pool pool)); +static S16 cmMmHashListInsert ARGS((CmMmHashListCp *hashListCp, uint32_t key)); #endif /* SSI_DEBUG_LEVEL1 */ /* cm_mem_c_001.main_15 : Addtions */ #ifdef SS_HISTOGRAM_SUPPORT -PRIVATE S16 cmHstGrmAllocInsert ARGS((CmHstGrmHashListCp *hashListCp, uint32_t blkSz, uint32_t *reqSz, uint32_t line, uint8_t *fileName, uint8_t entId)); -PRIVATE S16 cmHstGrmFreeInsert ARGS((CmHstGrmHashListCp* hashListCp, uint32_t blkSz, uint32_t line, uint8_t *fileName, uint8_t entId)); -PRIVATE S16 cmHstGrmHashListInit ARGS((CmHstGrmHashListCp *hashListCp)); -PRIVATE S16 cmHstGrmHashListDeInit ARGS((CmHstGrmHashListCp *hashListCp)); -PRIVATE S16 cmHstGrmGetHashIdxAndKey ARGS((uint8_t *fileName, uint32_t line, uint32_t *binIdx, uint32_t *key)); -PRIVATE S16 cmHstGrmFindEntry ARGS((CmHstGrmHashListCp *hashListCp, uint32_t key, uint32_t *binIdx, CmMemEntries **entry)); -PRIVATE S16 cmHstGrmFillEntry ARGS((CmMemEntries *entry, uint32_t key, uint32_t line, uint8_t *fileName, uint8_t entId)); +static S16 cmHstGrmAllocInsert ARGS((CmHstGrmHashListCp *hashListCp, uint32_t blkSz, uint32_t *reqSz, uint32_t line, uint8_t *fileName, uint8_t entId)); +static S16 cmHstGrmFreeInsert ARGS((CmHstGrmHashListCp* hashListCp, uint32_t blkSz, uint32_t line, uint8_t *fileName, uint8_t entId)); +static S16 cmHstGrmHashListInit ARGS((CmHstGrmHashListCp *hashListCp)); +static S16 cmHstGrmHashListDeInit ARGS((CmHstGrmHashListCp *hashListCp)); +static S16 cmHstGrmGetHashIdxAndKey ARGS((uint8_t *fileName, uint32_t line, uint32_t *binIdx, uint32_t *key)); +static S16 cmHstGrmFindEntry ARGS((CmHstGrmHashListCp *hashListCp, uint32_t key, uint32_t *binIdx, CmMemEntries **entry)); +static S16 cmHstGrmFillEntry ARGS((CmMemEntries *entry, uint32_t key, uint32_t line, uint8_t *fileName, uint8_t entId)); #endif /* SS_HISTOGRAM_SUPPORT */ /* cm_mem_c_001.main_22: Fixing warnings on GCC compiler */ @@ -416,8 +416,8 @@ void DumpT2kMemLeakInfoToFile() /* cm_mem_c_008.104 - Addition for memory calculator tool */ #ifdef MEMCAL_DEBUG -PRIVATE Txt prntBuf[200]; /* print buffer */ -PRIVATE uint8_t tryHeap=0; +static Txt prntBuf[200]; /* print buffer */ +static uint8_t tryHeap=0; #endif /* cm_mem_c_001.main_12 - addition for ssi enhancements prints */ @@ -425,7 +425,7 @@ PRIVATE uint8_t tryHeap=0; #if (defined(SSI_DEBUG_LEVEL1) || defined(SS_HISTOGRAM_SUPPORT) || \ defined(BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) #ifdef DEBUGP -PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ +static Txt dbgPrntBuf[200]; /* print buffer */ #endif /* DEBUGP */ #endif /*SSI_DEBUG_LEVEL1 || SS_HISTOGRAM_SUPPORT */ @@ -928,7 +928,7 @@ int regFreeBktSts[10][2][6]={{0}}; #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -941,7 +941,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) Void *regionCb; Size *size; uint32_t flags; @@ -954,7 +954,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -966,7 +966,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) Void *regionCb; Size *size; uint32_t flags; @@ -980,7 +980,7 @@ Bool hstReg; #else #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -991,7 +991,7 @@ uint32_t lineNo, uint8_t *funcName ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr ,memType, lineNo, funcName) +static S16 cmAlloc(regionCb, size, flags, ptr ,memType, lineNo, funcName) Void *regionCb; Size *size; uint32_t flags; @@ -1003,7 +1003,7 @@ uint8_t *funcName; #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -1012,7 +1012,7 @@ Data **ptr, uint32_t memType ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType) +static S16 cmAlloc(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; uint32_t flags; @@ -1022,7 +1022,7 @@ uint32_t memType; #else #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -1031,7 +1031,7 @@ Data **ptr, uint32_t memType ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType) +static S16 cmAlloc(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; uint32_t flags; @@ -1040,7 +1040,7 @@ uint32_t memType; #endif #else #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -1051,7 +1051,7 @@ PRIVATE S16 cmAlloc ) #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -1059,7 +1059,7 @@ uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr) +static S16 cmAlloc(regionCb, size, flags, ptr) Void *regionCb; Size *size; uint32_t flags; @@ -1610,7 +1610,7 @@ Data **prevptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -1619,7 +1619,7 @@ uint32_t lineNo, uint8_t *funcName ) #else -PRIVATE S16 cmFree(regionCb, ptr, size, lineNo, funcName) +static S16 cmFree(regionCb, ptr, size, lineNo, funcName) Void *regionCb; Data *ptr; Size size; @@ -1629,7 +1629,7 @@ uint8_t *funcName; #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -1640,7 +1640,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) Void *regionCb; Data *ptr; Size size; @@ -1652,7 +1652,7 @@ Bool hstReg; #else #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -1662,14 +1662,14 @@ PRIVATE S16 cmFree ) #else /* T2K_MEM_LEAK_DBG */ #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFree(regionCb, ptr, size) +static S16 cmFree(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -3220,7 +3220,7 @@ Size size; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef SS_FAP #ifdef ANSI -PRIVATE S16 cmAllocWL +static S16 cmAllocWL ( Void *regionCb, Size *size, @@ -3228,7 +3228,7 @@ uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAllocWL(regionCb, size, flags, ptr) +static S16 cmAllocWL(regionCb, size, flags, ptr) Void *regionCb; Size *size; uint32_t flags; @@ -3343,14 +3343,14 @@ Data **ptr; */ #ifdef ANSI -PRIVATE S16 cmFreeWL +static S16 cmFreeWL ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFreeWL(regionCb, ptr, size) +static S16 cmFreeWL(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -3471,14 +3471,14 @@ Size size; */ #ifdef ANSI -PRIVATE S16 cmCtl +static S16 cmCtl ( Void *regionCb, Event event, SMemCtl *memCtl ) #else -PRIVATE S16 cmCtl(regionCb, event, memCtl) +static S16 cmCtl(regionCb, event, memCtl) Void *regionCb; Event event; SMemCtl *memCtl; @@ -3603,7 +3603,7 @@ SMemCtl *memCtl; * */ #ifdef ANSI -PRIVATE Void cmMmBktInit +static Void cmMmBktInit ( Data **memAddr, CmMmRegCb *regCb, @@ -3612,7 +3612,7 @@ uint16_t bktIdx, uint16_t *lstMapIdx ) #else -PRIVATE Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) +static Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) Data **memAddr; CmMmRegCb *regCb; CmMmRegCfg *cfg; @@ -3858,14 +3858,14 @@ uint16_t *lstMapIdx; * */ #ifdef ANSI -PRIVATE Void cmMmHeapInit +static Void cmMmHeapInit ( Data *memAddr, CmMmHeapCb *heapCb, Size size ) #else -PRIVATE Void cmMmHeapInit (memAddr, heapCb, size) +static Void cmMmHeapInit (memAddr, heapCb, size) Data *memAddr; CmMmHeapCb *heapCb; Size size; @@ -3944,12 +3944,12 @@ Size size; /* cm_mem_c_001.main_12 - addition for taking another parameter memType(static/dynamic) */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_4GMX_LCORE -EXTERN uint8_t ysCellConfigDone; +uint8_t ysCellConfigDone; #endif #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -3961,7 +3961,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -3973,7 +3973,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -3984,7 +3984,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -3997,7 +3997,7 @@ Bool hstReg; #else #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4005,7 +4005,7 @@ Size *size, uint32_t memType ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType) +static S16 cmHeapAlloc (heapCb, ptr, size, memType) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4013,14 +4013,14 @@ uint32_t memType; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size) +static S16 cmHeapAlloc (heapCb, ptr, size) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4316,7 +4316,7 @@ Size *size; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, @@ -4327,7 +4327,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -4338,14 +4338,14 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size) +static S16 cmHeapFree (heapCb, ptr, size) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -6042,12 +6042,12 @@ CmMmBlkHdr *blkPtr; * */ #ifdef ANSI -PRIVATE S16 cmMmBktSanityChk +static S16 cmMmBktSanityChk ( CmMmBkt *bkt ) #else -PRIVATE S16 cmMmBktSanityChk(bkt) +static S16 cmMmBktSanityChk(bkt) CmMmBkt *bkt; #endif { @@ -6102,12 +6102,12 @@ CmMmBkt *bkt; * */ #ifdef ANSI -PRIVATE S16 cmMmHeapSanityChk +static S16 cmMmHeapSanityChk ( CmMmHeapCb *heapCb ) #else -PRIVATE S16 cmMmHeapSanityChk(heapCb) +static S16 cmMmHeapSanityChk(heapCb) CmMmHeapCb *heapCb; #endif { @@ -6140,14 +6140,14 @@ CmMmHeapCb *heapCb; * */ #ifdef ANSI -PRIVATE S16 cmMmHashFunc +static S16 cmMmHashFunc ( CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx ) #else -PRIVATE S16 cmMmHashFunc (hashListCp, key, idx) +static S16 cmMmHashFunc (hashListCp, key, idx) CmMmHashListCp *hashListCp; /* hash list control point */ uint32_t key; /* key string */ uint16_t *idx; /* idx to return */ @@ -6182,7 +6182,7 @@ uint16_t *idx; /* idx to return */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInit +static S16 cmMmHashListInit ( CmMmHashListCp *hashListCp, /* hash list to initialize */ uint16_t nmbBins, /* number of hash list bins */ @@ -6190,7 +6190,7 @@ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) +static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) CmMmHashListCp *hashListCp; /* hash list to initialize */ uint16_t nmbBins; /* number of hash list bins */ Region region; /* memory region to allocate bins */ @@ -6247,14 +6247,14 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListDeinit +static S16 cmMmHashListDeinit ( CmMmHashListCp *hashListCp, /* hash list to deinitialize */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListDeinit(hashListCp, region, pool) +static S16 cmMmHashListDeinit(hashListCp, region, pool) CmMmHashListCp *hashListCp; /* hash list to deinitialize */ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ @@ -6293,13 +6293,13 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInsert +static S16 cmMmHashListInsert ( CmMmHashListCp *hashListCp, /* hash list to add to */ uint32_t key /* pointer to key */ ) #else -PRIVATE S16 cmMmHashListInsert(hashListCp, key) +static S16 cmMmHashListInsert(hashListCp, key) CmMmHashListCp *hashListCp; /* hash list to add to */ uint32_t key; /* pointer to key */ #endif @@ -6377,12 +6377,12 @@ uint32_t key; /* pointer to key */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListInit +static S16 cmHstGrmHashListInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListInit(hashListCp) +static S16 cmHstGrmHashListInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { @@ -6417,12 +6417,12 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListDeInit +static S16 cmHstGrmHashListDeInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListDeInit(hashListCp) +static S16 cmHstGrmHashListDeInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { @@ -6461,7 +6461,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFreeInsert +static S16 cmHstGrmFreeInsert ( CmHstGrmHashListCp* hashListCp, /* hash list cp */ uint32_t blkSz, /* size of the block freed */ @@ -6470,7 +6470,7 @@ uint8_t *fileName, /* file name */ uint8_t entId /* Tapa task which free the memory */ ) #else -PRIVATE S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) +static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) CmHstGrmHashListCp* hashListCp; /* hash list cp */ uint32_t blkSz; /* size of the block freed */ uint32_t line; /* line number */ @@ -6543,7 +6543,7 @@ uint8_t entId; /* Tapa task which frees the memory */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmAllocInsert +static S16 cmHstGrmAllocInsert ( CmHstGrmHashListCp *hashListCp, uint32_t blkSz, @@ -6553,7 +6553,7 @@ uint8_t *fileName, uint8_t entId ) #else -PRIVATE S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) +static S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) CmHstGrmHashListCp *hashListCp; uint32_t blkSz; uint32_t *reqSz; @@ -6630,7 +6630,7 @@ uint8_t entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmGetHashIdxAndKey +static S16 cmHstGrmGetHashIdxAndKey ( uint8_t *fileName, uint32_t line, @@ -6638,7 +6638,7 @@ uint32_t *binIdx, uint32_t *key ) #else -PRIVATE S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) +static S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) uint8_t *fileName; uint32_t line; uint32_t *binIdx; @@ -6679,7 +6679,7 @@ uint32_t *key; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFillEntry +static S16 cmHstGrmFillEntry ( CmMemEntries *entry, uint32_t key, @@ -6688,7 +6688,7 @@ uint8_t *fileName, uint8_t entId ) #else -PRIVATE S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) +static S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) CmMemEntries *entry; uint32_t key; uint32_t line; @@ -6727,7 +6727,7 @@ uint8_t entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFindEntry +static S16 cmHstGrmFindEntry ( CmHstGrmHashListCp *hashListCp, uint32_t key, @@ -6735,7 +6735,7 @@ uint32_t *binIdx, CmMemEntries **entry ) #else -PRIVATE S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) +static S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) CmHstGrmHashListCp *hashListCp; uint32_t key; uint32_t *binIdx; diff --git a/src/cm/cm_mem.x b/src/cm/cm_mem.x index f4e807c6b..c53d29d97 100644 --- a/src/cm/cm_mem.x +++ b/src/cm/cm_mem.x @@ -343,12 +343,12 @@ typedef struct memLeakCb uint32_t tail; }MemLeakCb; -EXTERN Void cmInitMemLeak ARGS((Void)); -EXTERN Void cmDeinitMemLeak ARGS((Void)); -EXTERN Void cmStartStopLeakLog ARGS((Void)); -EXTERN uint32_t cmStorAllocBlk ARGS((Void *addr)); -EXTERN Void cmRlsAllocBlk ARGS((uint32_t indx)); -EXTERN Void cmPrintLeakLog ARGS((Void)); +Void cmInitMemLeak ARGS((Void)); +Void cmDeinitMemLeak ARGS((Void)); +Void cmStartStopLeakLog ARGS((Void)); +uint32_t cmStorAllocBlk ARGS((Void *addr)); +Void cmRlsAllocBlk ARGS((uint32_t indx)); +Void cmPrintLeakLog ARGS((Void)); #endif /* SS_LIGHT_MEM_LEAK_STS */ /* cm_mem_x_001.main_11: Additions */ @@ -433,74 +433,74 @@ typedef struct _regMemLeakInfo /* functions prototypes */ -EXTERN S16 cmMmRegInit ARGS(( +S16 cmMmRegInit ARGS(( Region region, CmMmRegCb *regCb, CmMmRegCfg *cfg)); -EXTERN S16 cmMmRegDeInit ARGS(( CmMmRegCb *regCb)); +S16 cmMmRegDeInit ARGS(( CmMmRegCb *regCb)); /* cm_mem_x_001.main_11: Additions */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 -EXTERN Void cmRlsAllocBlk ARGS((CmMmBlkHdr *ptrHdr, CmMmRegCb *regCb)); -EXTERN Void cmStorAllocBlk ARGS((CmMmBlkHdr *ptrHdr, Size reqSz, Size allocSz, +Void cmRlsAllocBlk ARGS((CmMmBlkHdr *ptrHdr, CmMmRegCb *regCb)); +Void cmStorAllocBlk ARGS((CmMmBlkHdr *ptrHdr, Size reqSz, Size allocSz, uint16_t bktIdx, CmMmRegCb *regCb)); #endif #ifdef SS_MEM_LEAK_STS -EXTERN Void cmInitMemLeakMdl ARGS((Void)); +Void cmInitMemLeakMdl ARGS((Void)); /* cm_mem_x_001.main_12 : Additions */ -EXTERN Void cmDeinitMemLeakMdl ARGS((Void)); +Void cmDeinitMemLeakMdl ARGS((Void)); #ifdef BIT_64 -EXTERN Void cmStorAllocBlk ARGS((uint64_t addr, Size reqSz, Size allocSz, +Void cmStorAllocBlk ARGS((uint64_t addr, Size reqSz, Size allocSz, uint16_t bktIdx)); -EXTERN Void cmRlsAllocBlk ARGS((uint64_t addr)); +Void cmRlsAllocBlk ARGS((uint64_t addr)); #else -EXTERN Void cmStorAllocBlk ARGS((uint32_t addr, Size reqSz, Size allocSz, +Void cmStorAllocBlk ARGS((uint32_t addr, Size reqSz, Size allocSz, uint16_t bktIdx)); -EXTERN Void cmRlsAllocBlk ARGS((uint32_t addr)); +Void cmRlsAllocBlk ARGS((uint32_t addr)); #endif -EXTERN uint8_t cmMemGetModuleId ARGS((S8 **funNm, S32 traceSize)); -EXTERN S16 cmMemGetStrMtchIdx ARGS((uint8_t strtIdx, uint8_t endIdx, +uint8_t cmMemGetModuleId ARGS((S8 **funNm, S32 traceSize)); +S16 cmMemGetStrMtchIdx ARGS((uint8_t strtIdx, uint8_t endIdx, S8 *str, S8 **strLst)); -EXTERN Void cmMemOpenMemLkFile ARGS((S8 *arg)); -EXTERN Void SLogLkInfo ARGS((Void)); -EXTERN Void SFlushLkInfo ARGS((Void)); +Void cmMemOpenMemLkFile ARGS((S8 *arg)); +Void SLogLkInfo ARGS((Void)); +Void SFlushLkInfo ARGS((Void)); #ifdef SS_MEM_LEAK_SOL -EXTERN S32 cmAddrToSymStr ARGS((Void *pc, S8 *buffer, S32 size)); -EXTERN S32 cmLeakCallBack ARGS((uintptr_t pc, S32 signo, Void *arg)); -EXTERN S32 backtrace ARGS((Void **buffer, S32 count)); +S32 cmAddrToSymStr ARGS((Void *pc, S8 *buffer, S32 size)); +S32 cmLeakCallBack ARGS((uintptr_t pc, S32 signo, Void *arg)); +S32 backtrace ARGS((Void **buffer, S32 count)); #endif /* SS_MEM_LEAK_SOL */ #endif /* SS_MEM_LEAK_STS */ /* cm_mem_x_001.main_9 - addition of an API prototype for sanity check */ #ifdef SSI_DEBUG_LEVEL1 -EXTERN S16 cmMmRegIsBlkSane ARGS((CmMmBlkHdr *blkPtr)); +S16 cmMmRegIsBlkSane ARGS((CmMmBlkHdr *blkPtr)); #endif /* SSI_DEBUG_LEVEL1 */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 -EXTERN S16 cmMmRegIsBlkSane ARGS((CmMmBlkHdr *blkPtr, Size size)); +S16 cmMmRegIsBlkSane ARGS((CmMmBlkHdr *blkPtr, Size size)); #endif #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -EXTERN S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); +S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #else -EXTERN S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); +S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #endif #elif defined(SS_LIGHT_MEM_LEAK_STS) -EXTERN S16 cmAllocNL ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr,uint32_t memType,uint32_t lineNo,uint8_t *funcName)); +S16 cmAllocNL ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr,uint32_t memType,uint32_t lineNo,uint8_t *funcName)); #else #if (defined(SSI_DEBUG_LEVEL1) || defined(BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) -EXTERN S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType)); +S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType)); #else -EXTERN S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +S16 cmAllocNL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); #endif #endif #ifdef SS_HISTOGRAM_SUPPORT -EXTERN S16 cmFreeNL ARGS((Void *regionCb, Data *ptr, Size size, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); +S16 cmFreeNL ARGS((Void *regionCb, Data *ptr, Size size, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #elif defined(SS_LIGHT_MEM_LEAK_STS) -EXTERN S16 cmFreeNL ARGS((Void *regionCb,Data *ptr, Size size,uint32_t lineNo,uint8_t *funcName)); +S16 cmFreeNL ARGS((Void *regionCb,Data *ptr, Size size,uint32_t lineNo,uint8_t *funcName)); #else -EXTERN S16 cmFreeNL ARGS((Void *regionCb, Data *ptr, Size size)); +S16 cmFreeNL ARGS((Void *regionCb, Data *ptr, Size size)); #endif #ifdef __cplusplus diff --git a/src/cm/cm_mem_wl.c b/src/cm/cm_mem_wl.c index 6372891c1..7c60b2a59 100755 --- a/src/cm/cm_mem_wl.c +++ b/src/cm/cm_mem_wl.c @@ -115,7 +115,7 @@ The following functions are provided in this file. #ifdef L2_L3_SPLIT #include "mt_plat_t33.h" -extern S32 clusterMode; +S32 clusterMode; #endif #include "cm_lte.x" @@ -126,7 +126,7 @@ extern S32 clusterMode; #ifdef TENB_T2K3K_SPECIFIC_CHANGES /* selva */ uint32_t gMemoryAlarm; -PRIVATE uint32_t memoryCheckCounter; +static uint32_t memoryCheckCounter; #define NUM_CALLS_TO_CHECK_MEM_AGAIN 80 /* Number of calls after which need to check mem */ #ifndef L2_L3_SPLIT @@ -222,68 +222,68 @@ typedef struct cmMemDoubleFree PTR prvAllocPtr[8]; uint8_t stopBtInfo = FALSE; Buffer *palBuffer; -EXTERN Buffer *mtTskBuffer1; -EXTERN Buffer *mtTskBuffer2; +Buffer *mtTskBuffer1; +Buffer *mtTskBuffer2; #ifdef SS_USE_ICC_MEMORY -PRIVATE pthread_mutex_t iccAllocFreeLock; +static pthread_mutex_t iccAllocFreeLock; #else -PRIVATE pthread_mutex_t dynAllocFreeLock; +static pthread_mutex_t dynAllocFreeLock; #endif /* SS_USE_ICC_MEMORY */ #ifdef SS_MEM_WL_DEBUG -PRIVATE S16 cmInitBtInfo ARGS((void)); +static S16 cmInitBtInfo ARGS((void)); #endif #ifdef SS_USE_ICC_MEMORY #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); -PRIVATE S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); -PRIVATE S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); -PRIVATE S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); +static S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char*, uint32_t)); +static S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); void InsertToT2kMemLeakInfo ARGS((uint32_t address, uint32_t size, uint32_t lineNo, char* fileName)); void RemoveFromT2kMemLeakInfo ARGS((uint32_t address, char *file, uint32_t line)); -PRIVATE uint32_t getT2kMemLeakIndex ARGS((uint32_t address)); +static uint32_t getT2kMemLeakIndex ARGS((uint32_t address)); #else -PRIVATE S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size)); -PRIVATE S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmIccAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmIccFree ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmIccAllocWithLock ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmIccFreeWithLock ARGS((Void *regionCb, Data *ptr, Size size)); #endif #else /* SS_USE_ICC_MEMORY */ -PRIVATE S16 cmDynAllocWithLock ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); -PRIVATE S16 cmDynFreeWithLock ARGS((Void *regionCb,Data *ptr, Size size)); -PRIVATE S16 cmDynAlloc ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); -PRIVATE S16 cmDynFree ARGS((Void *regionCb,Data *ptr, Size size)); +static S16 cmDynAllocWithLock ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); +static S16 cmDynFreeWithLock ARGS((Void *regionCb,Data *ptr, Size size)); +static S16 cmDynAlloc ARGS((Void *regionCb,Size *size,uint32_t flags,Data **ptr)); +static S16 cmDynFree ARGS((Void *regionCb,Data *ptr, Size size)); #endif /* SS_USE_ICC_MEMORY */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); #else -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); #endif #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr,char*,uint32_t); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size,char*, uint32_t); #else -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); #endif #ifndef USE_PURE -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); +static S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); #endif -PRIVATE S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); -PRIVATE Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); +static S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); +static Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); /* cm_mem_c_001.main_22: Fixing warnings on GCC compiler */ #ifdef __cplusplus @@ -311,15 +311,15 @@ MemLkCb memLkCb; /* cm_mem_c_008.104 - Addition for memory calculator tool */ #ifdef MEMCAL_DEBUG -PRIVATE Txt prntBuf[200]; /* print buffer */ -PRIVATE uint8_t tryHeap=0; +static Txt prntBuf[200]; /* print buffer */ +static uint8_t tryHeap=0; #endif /* cm_mem_c_001.main_12 - addition for ssi enhancements prints */ /* cm_mem_c_001.main_20 Additions */ #if (defined(SSI_DEBUG_LEVEL1) || defined(SS_HISTOGRAM_SUPPORT)) #ifdef DEBUGP -PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ +static Txt dbgPrntBuf[200]; /* print buffer */ #endif /* DEBUGP */ #endif /*SSI_DEBUG_LEVEL1 || SS_HISTOGRAM_SUPPORT */ @@ -334,8 +334,8 @@ PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ #endif uint32_t num_times = 0; -EXTERN pthread_t tmpRegTidMap[20]; -extern Bool g_usettitmr; +pthread_t tmpRegTidMap[20]; +Bool g_usettitmr; void DumpLayersDebugInformation() { DumpSSIDemandQDebugInformation(); @@ -389,7 +389,7 @@ void DumpLayersDebugInformation() * */ #ifdef ANSI -PRIVATE Void cmMmStatBktInit +static Void cmMmStatBktInit ( Data **memAddr, CmMmRegCb *regCb, @@ -398,7 +398,7 @@ uint16_t bktIdx, uint16_t *lstMapIdx ) #else -PRIVATE Void cmMmStatBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) +static Void cmMmStatBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) Data **memAddr; CmMmRegCb *regCb; CmMmRegCfg *cfg; @@ -900,7 +900,7 @@ CmMmGlobRegCb *regCb; */ #ifdef T2K_MEM_LEAK_DBG #ifdef ANSI -PRIVATE S16 cmIccAllocWithLock +static S16 cmIccAllocWithLock ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -912,7 +912,7 @@ uint32_t line #endif #else #ifdef ANSI -PRIVATE S16 cmIccAllocWithLock +static S16 cmIccAllocWithLock ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -920,7 +920,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmIccAllocWithLock(regionCb, size, flags, ptr) +static S16 cmIccAllocWithLock(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -992,7 +992,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ */ #ifdef T2K_MEM_LEAK_DBG #ifdef ANSI -PRIVATE S16 cmIccFreeWithLock +static S16 cmIccFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ @@ -1003,14 +1003,14 @@ uint32_t line #endif #else #ifdef ANSI -PRIVATE S16 cmIccFreeWithLock +static S16 cmIccFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmIccFreeWithLock(regionCb, ptr, size) +static S16 cmIccFreeWithLock(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -1060,7 +1060,7 @@ Size size; /* Size of the block */ */ #ifdef T2K_MEM_LEAK_DBG #ifdef ANSI -PRIVATE S16 cmIccAlloc +static S16 cmIccAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1073,7 +1073,7 @@ uint32_t line #endif #else #ifdef ANSI -PRIVATE S16 cmIccAlloc +static S16 cmIccAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1081,7 +1081,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmIccAlloc(regionCb, size, flags, ptr) +static S16 cmIccAlloc(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -1141,7 +1141,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ * */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmIccFree +static S16 cmIccFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ @@ -1151,14 +1151,14 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmIccFree +static S16 cmIccFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmIccFree(regionCb, ptr, size) +static S16 cmIccFree(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -1554,13 +1554,13 @@ CmMmRegCb *regCb; */ #ifdef ANSI -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForAlloc +static CmMmBlkSetElement* cmGetMemBlkSetForAlloc ( uint8_t bucketIndex, /* Index to the bucket list */ CmMmDynBktCb *bkt /* Bucket list control block */ ) #else -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForAlloc(bucketIndex, bkt) +static CmMmBlkSetElement* cmGetMemBlkSetForAlloc(bucketIndex, bkt) uint8_t bucketIndex; /* Index to the bucket list */ CmMmDynBktCb *bkt; /* Bucket list control block */ #endif @@ -1678,13 +1678,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ */ #ifdef ANSI -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForFree +static CmMmBlkSetElement* cmGetMemBlkSetForFree ( uint8_t bucketIndex, /* Index to the bucket list */ CmMmDynBktCb *bkt /* Bucket list control block */ ) #else -PRIVATE CmMmBlkSetElement* cmGetMemBlkSetForFree(bucketIndex, bkt) +static CmMmBlkSetElement* cmGetMemBlkSetForFree(bucketIndex, bkt) uint8_t bucketIndex; /* Index to the bucket list */ CmMmDynBktCb *bkt; /* Bucket list control block */ #endif @@ -1794,13 +1794,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ */ #ifdef ANSI -PRIVATE S16 cmRemoveAllocPtrFromList +static S16 cmRemoveAllocPtrFromList ( CmMmDynRegCb *regionCb, /* Pointer to a region */ PTR ptr ) #else -PRIVATE S16 cmRemoveAllocPtrFromList(regionCb, ptr) +static S16 cmRemoveAllocPtrFromList(regionCb, ptr) CmMmDynRegCb *regionCb; /* Pointer to a region */ PTR ptr; #endif @@ -1860,13 +1860,13 @@ PTR ptr; */ #ifdef ANSI -PRIVATE S16 cmInsertAllocPtrToList +static S16 cmInsertAllocPtrToList ( CmMmDynRegCb *regionCb, /* Pointer to a region */ PTR ptr ) #else -PRIVATE S16 cmInsertAllocPtrToList(regionCb, ptr) +static S16 cmInsertAllocPtrToList(regionCb, ptr) CmMmDynRegCb *regionCb; /* Pointer to a region */ PTR ptr; #endif @@ -1914,7 +1914,7 @@ PTR ptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef ANSI -PRIVATE S16 cmDynAllocWithLock +static S16 cmDynAllocWithLock ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1922,7 +1922,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmDynAllocWithLock(regionCb, size, flags, ptr) +static S16 cmDynAllocWithLock(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -1967,7 +1967,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ /* cm_mem_c_001.main_15 : Additions */ #ifdef ANSI -PRIVATE S16 cmDynAlloc +static S16 cmDynAlloc ( Void *regionCb, /* Pointer to a region */ Size *size, /* size needs to be allocated */ @@ -1975,7 +1975,7 @@ uint32_t flags, /* Flags used */ Data **ptr /* Reference to pointer for which need to be allocate */ ) #else -PRIVATE S16 cmDynAlloc(regionCb, size, flags, ptr) +static S16 cmDynAlloc(regionCb, size, flags, ptr) Void *regionCb; /* Pointer to a region */ Size *size; /* size needs to be allocated */ uint32_t flags; /* Flags used */ @@ -2183,7 +2183,7 @@ int g_overused[5] = {0}; /* cm_mem_c_001.main_15 : Additions */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2196,7 +2196,7 @@ PRIVATE S16 cmAlloc #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2209,7 +2209,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) Void *regionCb; Size *size; uint32_t flags; @@ -2222,7 +2222,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2234,7 +2234,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) Void *regionCb; Size *size; uint32_t flags; @@ -2250,7 +2250,7 @@ Bool hstReg; #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2259,7 +2259,7 @@ Data **ptr, uint32_t memType ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType) +static S16 cmAlloc(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; uint32_t flags; @@ -2268,7 +2268,7 @@ uint32_t memType; #endif #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, @@ -2276,7 +2276,7 @@ uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr) +static S16 cmAlloc(regionCb, size, flags, ptr) Void *regionCb; Size *size; uint32_t flags; @@ -2743,11 +2743,11 @@ S16 cmInitDoubleFreeList() * */ #ifdef ANSI -PRIVATE S16 cmInitBtInfo +static S16 cmInitBtInfo ( ) #else -PRIVATE S16 cmInitBtInfo (Void) +static S16 cmInitBtInfo (Void) #endif { regBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); @@ -2852,14 +2852,14 @@ uint32_t idx; * */ #ifdef ANSI -PRIVATE S16 cmDynFreeWithLock +static S16 cmDynFreeWithLock ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmDynFreeWithLock(regionCb, ptr, size) +static S16 cmDynFreeWithLock(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -2902,14 +2902,14 @@ Size size; /* Size of the block */ * */ #ifdef ANSI -PRIVATE S16 cmDynFree +static S16 cmDynFree ( Void *regionCb, /* Pointer to region cb */ Data *ptr, /* Memory block needs to be freed */ Size size /* Size of the block */ ) #else -PRIVATE S16 cmDynFree(regionCb, ptr, size) +static S16 cmDynFree(regionCb, ptr, size) Void *regionCb; /* Pointer to region cb */ Data *ptr; /* Memory block needs to be freed */ Size size; /* Size of the block */ @@ -3100,7 +3100,7 @@ Size size; /* Size of the block */ /* cm_mem_c_001.main_15 : Additions */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -3111,7 +3111,7 @@ PRIVATE S16 cmFree #else #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, @@ -3122,7 +3122,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) Void *regionCb; Data *ptr; Size size; @@ -3135,14 +3135,14 @@ Bool hstReg; #else #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFree(regionCb, ptr, size) +static S16 cmFree(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -3482,7 +3482,7 @@ Size size; /*cm_mem_c_001.main_21-added new function*/ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAllocWL +static S16 cmAllocWL ( Void *regionCb, Size *size, @@ -3493,7 +3493,7 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmAllocWL +static S16 cmAllocWL ( Void *regionCb, Size *size, @@ -3501,7 +3501,7 @@ uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAllocWL(regionCb, size, flags, ptr) +static S16 cmAllocWL(regionCb, size, flags, ptr) Void *regionCb; Size *size; uint32_t flags; @@ -3644,7 +3644,7 @@ Data **ptr; */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFreeWL +static S16 cmFreeWL ( Void *regionCb, Data *ptr, @@ -3654,14 +3654,14 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmFreeWL +static S16 cmFreeWL ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFreeWL(regionCb, ptr, size) +static S16 cmFreeWL(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -3804,14 +3804,14 @@ Size size; */ #ifdef ANSI -PRIVATE S16 cmCtl +static S16 cmCtl ( Void *regionCb, Event event, SMemCtl *memCtl ) #else -PRIVATE S16 cmCtl(regionCb, event, memCtl) +static S16 cmCtl(regionCb, event, memCtl) Void *regionCb; Event event; SMemCtl *memCtl; @@ -3936,14 +3936,14 @@ SMemCtl *memCtl; * */ #ifdef ANSI -PRIVATE Void cmMmHeapInit +static Void cmMmHeapInit ( Data *memAddr, CmMmHeapCb *heapCb, Size size ) #else -PRIVATE Void cmMmHeapInit (memAddr, heapCb, size) +static Void cmMmHeapInit (memAddr, heapCb, size) Data *memAddr; CmMmHeapCb *heapCb; Size size; @@ -4025,7 +4025,7 @@ Size size; #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4037,7 +4037,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4049,7 +4049,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4060,7 +4060,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4073,7 +4073,7 @@ Bool hstReg; #else #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, @@ -4081,7 +4081,7 @@ Size *size, uint32_t memType ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType) +static S16 cmHeapAlloc (heapCb, ptr, size, memType) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4089,14 +4089,14 @@ uint32_t memType; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size) +static S16 cmHeapAlloc (heapCb, ptr, size) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4380,7 +4380,7 @@ Size *size; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, @@ -4391,7 +4391,7 @@ uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -4402,14 +4402,14 @@ Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size) +static S16 cmHeapFree (heapCb, ptr, size) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -5631,12 +5631,12 @@ S32 count; * */ #ifdef ANSI -PRIVATE S16 cmMmBktSanityChk +static S16 cmMmBktSanityChk ( CmMmBkt *bkt ) #else -PRIVATE S16 cmMmBktSanityChk(bkt) +static S16 cmMmBktSanityChk(bkt) CmMmBkt *bkt; #endif { @@ -5692,12 +5692,12 @@ CmMmBkt *bkt; * */ #ifdef ANSI -PRIVATE S16 cmMmHeapSanityChk +static S16 cmMmHeapSanityChk ( CmMmHeapCb *heapCb ) #else -PRIVATE S16 cmMmHeapSanityChk(heapCb) +static S16 cmMmHeapSanityChk(heapCb) CmMmHeapCb *heapCb; #endif { @@ -5769,14 +5769,14 @@ CmMmBlkHdr *blkPtr; * */ #ifdef ANSI -PRIVATE S16 cmMmHashFunc +static S16 cmMmHashFunc ( CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx ) #else -PRIVATE S16 cmMmHashFunc (hashListCp, key, idx) +static S16 cmMmHashFunc (hashListCp, key, idx) CmMmHashListCp *hashListCp; /* hash list control point */ uint32_t key; /* key string */ uint16_t *idx; /* idx to return */ @@ -5811,7 +5811,7 @@ uint16_t *idx; /* idx to return */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInit +static S16 cmMmHashListInit ( CmMmHashListCp *hashListCp, /* hash list to initialize */ uint16_t nmbBins, /* number of hash list bins */ @@ -5819,7 +5819,7 @@ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) +static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) CmMmHashListCp *hashListCp; /* hash list to initialize */ uint16_t nmbBins; /* number of hash list bins */ Region region; /* memory region to allocate bins */ @@ -5876,14 +5876,14 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListDeinit +static S16 cmMmHashListDeinit ( CmMmHashListCp *hashListCp, /* hash list to deinitialize */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListDeinit(hashListCp, region, pool) +static S16 cmMmHashListDeinit(hashListCp, region, pool) CmMmHashListCp *hashListCp; /* hash list to deinitialize */ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ @@ -5922,13 +5922,13 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInsert +static S16 cmMmHashListInsert ( CmMmHashListCp *hashListCp, /* hash list to add to */ uint32_t key /* pointer to key */ ) #else -PRIVATE S16 cmMmHashListInsert(hashListCp, key) +static S16 cmMmHashListInsert(hashListCp, key) CmMmHashListCp *hashListCp; /* hash list to add to */ uint32_t key; /* pointer to key */ #endif @@ -6006,12 +6006,12 @@ uint32_t key; /* pointer to key */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListInit +static S16 cmHstGrmHashListInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListInit(hashListCp) +static S16 cmHstGrmHashListInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { @@ -6046,12 +6046,12 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListDeInit +static S16 cmHstGrmHashListDeInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListDeInit(hashListCp) +static S16 cmHstGrmHashListDeInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { @@ -6090,7 +6090,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFreeInsert +static S16 cmHstGrmFreeInsert ( CmHstGrmHashListCp* hashListCp, /* hash list cp */ uint32_t blkSz, /* size of the block freed */ @@ -6099,7 +6099,7 @@ uint8_t *fileName, /* file name */ uint8_t entId /* Tapa task which free the memory */ ) #else -PRIVATE S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) +static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) CmHstGrmHashListCp* hashListCp; /* hash list cp */ uint32_t blkSz; /* size of the block freed */ uint32_t line; /* line number */ @@ -6172,7 +6172,7 @@ uint8_t entId; /* Tapa task which frees the memory */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmAllocInsert +static S16 cmHstGrmAllocInsert ( CmHstGrmHashListCp *hashListCp, uint32_t blkSz, @@ -6182,7 +6182,7 @@ uint8_t *fileName, uint8_t entId ) #else -PRIVATE S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) +static S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) CmHstGrmHashListCp *hashListCp; uint32_t blkSz; uint32_t *reqSz; @@ -6259,7 +6259,7 @@ uint8_t entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmGetHashIdxAndKey +static S16 cmHstGrmGetHashIdxAndKey ( uint8_t *fileName, uint32_t line, @@ -6267,7 +6267,7 @@ uint32_t *binIdx, uint32_t *key ) #else -PRIVATE S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) +static S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) uint8_t *fileName; uint32_t line; uint32_t *binIdx; @@ -6308,7 +6308,7 @@ uint32_t *key; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFillEntry +static S16 cmHstGrmFillEntry ( CmMemEntries *entry, uint32_t key, @@ -6317,7 +6317,7 @@ uint8_t *fileName, uint8_t entId ) #else -PRIVATE S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) +static S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) CmMemEntries *entry; uint32_t key; uint32_t line; @@ -6356,7 +6356,7 @@ uint8_t entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFindEntry +static S16 cmHstGrmFindEntry ( CmHstGrmHashListCp *hashListCp, uint32_t key, @@ -6364,7 +6364,7 @@ uint32_t *binIdx, CmMemEntries **entry ) #else -PRIVATE S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) +static S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) CmHstGrmHashListCp *hashListCp; uint32_t key; uint32_t *binIdx; @@ -6730,11 +6730,11 @@ Region region; * */ #ifdef ANSI -PRIVATE uint32_t isMemUsageAboveUpperThreshold( +static uint32_t isMemUsageAboveUpperThreshold( Region region ) #else -PRIVATE uint32_t isMemUsageAboveUpperThreshold(region) +static uint32_t isMemUsageAboveUpperThreshold(region) Region region; #endif { diff --git a/src/cm/cm_mem_wl.x b/src/cm/cm_mem_wl.x index 59e1a6d1f..a47cdef65 100755 --- a/src/cm/cm_mem_wl.x +++ b/src/cm/cm_mem_wl.x @@ -435,61 +435,61 @@ typedef struct backtrace /* functions prototypes */ -EXTERN S16 cmMmRegInit ARGS(( +S16 cmMmRegInit ARGS(( Region region, CmMmRegCb *regCb, CmMmRegCfg *cfg)); -EXTERN S16 cmMmRegDeInit ARGS(( CmMmRegCb *regCb)); +S16 cmMmRegDeInit ARGS(( CmMmRegCb *regCb)); /* cm_mem_x_001.main_11: Additions */ #ifdef SS_MEM_LEAK_STS -EXTERN Void cmInitMemLeakMdl ARGS((Void)); +Void cmInitMemLeakMdl ARGS((Void)); /* cm_mem_x_001.main_12 : Additions */ -EXTERN Void cmDeinitMemLeakMdl ARGS((Void)); -EXTERN Void cmStorAllocBlk ARGS((uint32_t addr, Size reqSz, Size allocSz, +Void cmDeinitMemLeakMdl ARGS((Void)); +Void cmStorAllocBlk ARGS((uint32_t addr, Size reqSz, Size allocSz, uint16_t bktIdx)); -EXTERN Void cmRlsAllocBlk ARGS((uint32_t addr)); -EXTERN uint8_t cmMemGetModuleId ARGS((S8 **funNm, S32 traceSize)); -EXTERN S16 cmMemGetStrMtchIdx ARGS((uint8_t strtIdx, uint8_t endIdx, +Void cmRlsAllocBlk ARGS((uint32_t addr)); +uint8_t cmMemGetModuleId ARGS((S8 **funNm, S32 traceSize)); +S16 cmMemGetStrMtchIdx ARGS((uint8_t strtIdx, uint8_t endIdx, S8 *str, S8 **strLst)); -EXTERN Void cmMemOpenMemLkFile ARGS((S8 *arg)); -EXTERN Void SLogLkInfo ARGS((Void)); -EXTERN Void SFlushLkInfo ARGS((Void)); +Void cmMemOpenMemLkFile ARGS((S8 *arg)); +Void SLogLkInfo ARGS((Void)); +Void SFlushLkInfo ARGS((Void)); #ifdef SS_MEM_LEAK_SOL -EXTERN S32 cmAddrToSymStr ARGS((Void *pc, S8 *buffer, S32 size)); -EXTERN S32 cmLeakCallBack ARGS((uintptr_t pc, S32 signo, Void *arg)); -EXTERN S32 backtrace ARGS((Void **buffer, S32 count)); +S32 cmAddrToSymStr ARGS((Void *pc, S8 *buffer, S32 size)); +S32 cmLeakCallBack ARGS((uintptr_t pc, S32 signo, Void *arg)); +S32 backtrace ARGS((Void **buffer, S32 count)); #endif /* SS_MEM_LEAK_SOL */ #endif /* SS_MEM_LEAK_STS */ /* cm_mem_x_001.main_9 - addition of an API prototype for sanity check */ #ifdef SSI_DEBUG_LEVEL1 -EXTERN S16 cmMmRegIsBlkSane ARGS((CmMmBlkHdr *blkPtr)); +S16 cmMmRegIsBlkSane ARGS((CmMmBlkHdr *blkPtr)); #endif /* SSI_DEBUG_LEVEL1 */ -EXTERN Void DumpLayersDebugInformation ARGS((Void)); -EXTERN Void DumpSSIDemandQDebugInformation ARGS((Void)); -EXTERN Void DumpPDCPDlDebugInformation ARGS((Void)); -EXTERN Void DumpPDCPUlDebugInformation ARGS((Void)); -EXTERN Void DumpRLCDlDebugInformation ARGS((Void)); -EXTERN Void DumpRLCUlDebugInformation ARGS((Void)); -EXTERN Void DumpRLCUlDebugInformation ARGS((Void)); -EXTERN Void printMacCellInfo ARGS((Void)); -EXTERN Void printSchCellInfo ARGS((Void)); +Void DumpLayersDebugInformation ARGS((Void)); +Void DumpSSIDemandQDebugInformation ARGS((Void)); +Void DumpPDCPDlDebugInformation ARGS((Void)); +Void DumpPDCPUlDebugInformation ARGS((Void)); +Void DumpRLCDlDebugInformation ARGS((Void)); +Void DumpRLCUlDebugInformation ARGS((Void)); +Void DumpRLCUlDebugInformation ARGS((Void)); +Void printMacCellInfo ARGS((Void)); +Void printSchCellInfo ARGS((Void)); -EXTERN uint32_t isMemThreshReached ARGS((Region region)); +uint32_t isMemThreshReached ARGS((Region region)); -EXTERN S16 cmMmStatRegInit ARGS((Region region, CmMmRegCb *regCb, CmMmRegCfg *cfg)); -EXTERN S16 cmMmGlobRegInit ARGS((CmMmGlobRegCb *regCb)); -EXTERN S16 cmMmDynRegInit ARGS((CmMmDynRegCb *regCb)); +S16 cmMmStatRegInit ARGS((Region region, CmMmRegCb *regCb, CmMmRegCfg *cfg)); +S16 cmMmGlobRegInit ARGS((CmMmGlobRegCb *regCb)); +S16 cmMmDynRegInit ARGS((CmMmDynRegCb *regCb)); #ifdef USE_MALLOC -EXTERN S16 ssGetDynMemBlkSet ARGS((uint8_t bktIdx, CmMmBlkSetElement *dynMemSetElem)); -EXTERN S16 ssPutDynMemBlkSet ARGS((uint8_t bktIdx, CmMmBlkSetElement *dynMemSetElem)); +S16 ssGetDynMemBlkSet ARGS((uint8_t bktIdx, CmMmBlkSetElement *dynMemSetElem)); +S16 ssPutDynMemBlkSet ARGS((uint8_t bktIdx, CmMmBlkSetElement *dynMemSetElem)); #else -EXTERN S16 ssPutDynMemBlkSet ARGS((uint8_t bktIdx,CmMmBlkSetElement *dynMemSetElem, +S16 ssPutDynMemBlkSet ARGS((uint8_t bktIdx,CmMmBlkSetElement *dynMemSetElem, uint32_t doNotBlockForLock)); -EXTERN S16 ssGetDynMemBlkSet ARGS((uint8_t bktIdx, CmMmBlkSetElement *dynMemSetElem, +S16 ssGetDynMemBlkSet ARGS((uint8_t bktIdx, CmMmBlkSetElement *dynMemSetElem, uint32_t doNotBlockForLock)); #endif /* USE_MALLOC */ #endif /* SS_LOCKLESS_MEMORY */ diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index 29cc975bc..b0ca7f766 100755 --- a/src/cm/cm_tenb_stats.c +++ b/src/cm/cm_tenb_stats.c @@ -68,23 +68,23 @@ #include "cm_tenb_stats.x" /* Total EnodeB Stats declarations */ #ifdef TENB_STATS -PRIVATE Void TSInfUtlPackUeInfo ARGS(( +static Void TSInfUtlPackUeInfo ARGS(( Buffer *mBuf, TSInfL2UeStats *stats )); -PRIVATE Void TSInfUtlPackCellInfo ARGS(( +static Void TSInfUtlPackCellInfo ARGS(( Buffer *mBuf, TSInfL2CellStats *stats )); -PRIVATE Void TSInfUtlUnpkUeInfo ARGS(( +static Void TSInfUtlUnpkUeInfo ARGS(( Buffer *mBuf, TSInfL2UeStats *stats )); -PRIVATE Void TSInfUtlUnpkCellInfo ARGS(( +static Void TSInfUtlUnpkCellInfo ARGS(( Buffer *mBuf, TSInfL2CellStats *stats )); -PRIVATE Buffer* TSInfUtlAllocMsg ARGS(( +static Buffer* TSInfUtlAllocMsg ARGS(( Pst *pst )); @@ -101,13 +101,13 @@ PRIVATE Buffer* TSInfUtlAllocMsg ARGS(( * */ #ifdef ANSI -PRIVATE Void TSInfTrigL2Stats +static Void TSInfTrigL2Stats ( Region region, Pool pool ) #else -PRIVATE Void TSInfTrigL2Stats(region, pool) +static Void TSInfTrigL2Stats(region, pool) Region region; Pool pool; #endif @@ -163,12 +163,12 @@ Void TSInfTrigStats(region, pool) #ifdef ANSI -PRIVATE Buffer* TSInfUtlAllocMsg +static Buffer* TSInfUtlAllocMsg ( Pst *pst ) #else -PRIVATE Buffer* TSInfUtlAllocMsg(pst) +static Buffer* TSInfUtlAllocMsg(pst) Pst *pst; #endif { @@ -182,13 +182,13 @@ PRIVATE Buffer* TSInfUtlAllocMsg(pst) } #ifdef ANSI -PRIVATE Void TSInfUtlPackUeInfo +static Void TSInfUtlPackUeInfo ( Buffer *mBuf, TSInfL2UeStats *stats ) #else -PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) +static Void TSInfUtlPackUeInfo(mBuf, stats) Buffer *mBuf; TSInfL2UeStats *stats; #endif @@ -263,13 +263,13 @@ PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) } #ifdef ANSI -PRIVATE Void TSInfUtlPackCellInfo +static Void TSInfUtlPackCellInfo ( Buffer *mBuf, TSInfL2CellStats *stats ) #else -PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) +static Void TSInfUtlPackCellInfo(mBuf, stats) Buffer *mBuf; TSInfL2CellStats *stats; #endif @@ -379,13 +379,13 @@ PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) } #ifdef ANSI -PRIVATE Void TSInfUtlUnpkUeInfo +static Void TSInfUtlUnpkUeInfo ( Buffer *mBuf, TSInfL2UeStats *stats ) #else -PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) +static Void TSInfUtlUnpkUeInfo(mBuf, stats) Buffer *mBuf; TSInfL2UeStats *stats; #endif @@ -461,13 +461,13 @@ PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) } #ifdef ANSI -PRIVATE Void TSInfUtlUnpkCellInfo +static Void TSInfUtlUnpkCellInfo ( Buffer *mBuf, TSInfL2CellStats *stats ) #else -PRIVATE Void TSInfUtlUnpkCellInfo(mBuf, stats) +static Void TSInfUtlUnpkCellInfo(mBuf, stats) Buffer *mBuf; TSInfL2CellStats *stats; #endif diff --git a/src/cm/cm_tenb_stats.x b/src/cm/cm_tenb_stats.x index ebe6cf24d..b104419bc 100755 --- a/src/cm/cm_tenb_stats.x +++ b/src/cm/cm_tenb_stats.x @@ -185,12 +185,12 @@ typedef Void (*TSInfL2UeStatsInd) ARGS(( SuId , TSInfL2UeStats * )); -EXTERN Void TSInfHdlL2UeStatsInd ARGS(( +Void TSInfHdlL2UeStatsInd ARGS(( Pst *pst, SuId suId, TSInfL2UeStats *stats )); -EXTERN Void TSInfUnpkL2UeStats ARGS(( +Void TSInfUnpkL2UeStats ARGS(( TSInfL2UeStatsInd func, Pst *pst, Buffer *mBuf @@ -200,27 +200,27 @@ typedef Void (*TSInfL2CellStatsInd) ARGS(( SuId , TSInfL2CellStats * )); -EXTERN Void TSInfHdlL2CellStatsInd ARGS(( +Void TSInfHdlL2CellStatsInd ARGS(( Pst *pst, SuId suId, TSInfL2CellStats *stats )); -EXTERN Void TSInfUnpkL2CellStats ARGS(( +Void TSInfUnpkL2CellStats ARGS(( TSInfL2CellStatsInd func, Pst *pst, Buffer *mBuf )); -EXTERN Void TSInfPkSndL2UeStats ARGS(( +Void TSInfPkSndL2UeStats ARGS(( Pst *pst, SuId suId, TSInfL2UeStats *stats )); -EXTERN Void TSInfPkSndL2CellStats ARGS(( +Void TSInfPkSndL2CellStats ARGS(( Pst *pst, SuId suId, TSInfL2CellStats *stats )); -EXTERN Void TSInfTrigStats ARGS(( +Void TSInfTrigStats ARGS(( Region region, Pool pool )); diff --git a/src/cm/cm_tkns.x b/src/cm/cm_tkns.x index 48084c2d5..15afb7132 100755 --- a/src/cm/cm_tkns.x +++ b/src/cm/cm_tkns.x @@ -153,35 +153,35 @@ typedef struct tknStrUNIXL /* Universal String */ } TknStrUNIXL; /* common packing functions */ -EXTERN S16 cmPkTknPres ARGS((TknPres *tknPres, Buffer *mBuf)); -EXTERN S16 cmPkTknS16 ARGS((TknS16 *tknS16, Buffer *mBuf)); -EXTERN S16 cmPkTknBStr32 ARGS((TknBStr32 *tknbStr32, Buffer *mBuf)); -EXTERN S16 cmPkTknStr8 ARGS((TknStr8 *tknStr8, Buffer *mBuf)); -EXTERN S16 cmPkTknStr16 ARGS((TknStr16 *tknStr16, Buffer *mBuf)); -EXTERN S16 cmPkTknStrOSXL ARGS((TknStrOSXL *tknStrOSXL, Buffer *mBuf)); -EXTERN S16 cmPkTknStrBSXL ARGS((TknStrBSXL *tknStrBSXL, Buffer *mBuf)); -EXTERN S16 cmPkTknStrBMP4 ARGS((TknStrBMP4 *tknStrBMP4, Buffer *mBuf)); -EXTERN S16 cmPkTknStrBMPXL ARGS((TknStrBMPXL *tknStrBMPXL, Buffer *mBuf)); -EXTERN S16 cmPkTknStrUNI4 ARGS((TknStrUNI4 *tknStrUNI4, Buffer *mBuf)); -EXTERN S16 cmPkTknStrUNIXL ARGS((TknStrUNIXL *tknStrUNIXL, Buffer *mBuf)); +S16 cmPkTknPres ARGS((TknPres *tknPres, Buffer *mBuf)); +S16 cmPkTknS16 ARGS((TknS16 *tknS16, Buffer *mBuf)); +S16 cmPkTknBStr32 ARGS((TknBStr32 *tknbStr32, Buffer *mBuf)); +S16 cmPkTknStr8 ARGS((TknStr8 *tknStr8, Buffer *mBuf)); +S16 cmPkTknStr16 ARGS((TknStr16 *tknStr16, Buffer *mBuf)); +S16 cmPkTknStrOSXL ARGS((TknStrOSXL *tknStrOSXL, Buffer *mBuf)); +S16 cmPkTknStrBSXL ARGS((TknStrBSXL *tknStrBSXL, Buffer *mBuf)); +S16 cmPkTknStrBMP4 ARGS((TknStrBMP4 *tknStrBMP4, Buffer *mBuf)); +S16 cmPkTknStrBMPXL ARGS((TknStrBMPXL *tknStrBMPXL, Buffer *mBuf)); +S16 cmPkTknStrUNI4 ARGS((TknStrUNI4 *tknStrUNI4, Buffer *mBuf)); +S16 cmPkTknStrUNIXL ARGS((TknStrUNIXL *tknStrUNIXL, Buffer *mBuf)); /* common unpacking functions */ -EXTERN S16 cmUnpkTknPres ARGS((TknPres *tknPres, Buffer *mBuf)); -EXTERN S16 cmUnpkTknS16 ARGS((TknS16 *tknS16, Buffer *mBuf)); -EXTERN S16 cmUnpkTknBStr32 ARGS((TknBStr32 *tknBStr32, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr8 ARGS((TknStr8 *tknStr8, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr16 ARGS((TknStr16 *tknStr16, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrOSXL ARGS((TknStrOSXL *tknStrOSXL, Buffer *mBuf, +S16 cmUnpkTknPres ARGS((TknPres *tknPres, Buffer *mBuf)); +S16 cmUnpkTknS16 ARGS((TknS16 *tknS16, Buffer *mBuf)); +S16 cmUnpkTknBStr32 ARGS((TknBStr32 *tknBStr32, Buffer *mBuf)); +S16 cmUnpkTknStr8 ARGS((TknStr8 *tknStr8, Buffer *mBuf)); +S16 cmUnpkTknStr16 ARGS((TknStr16 *tknStr16, Buffer *mBuf)); +S16 cmUnpkTknStrOSXL ARGS((TknStrOSXL *tknStrOSXL, Buffer *mBuf, Ptr ptr)); -EXTERN S16 cmUnpkTknStrBSXL ARGS((TknStrBSXL *tknStrBSXL, Ptr ptr, +S16 cmUnpkTknStrBSXL ARGS((TknStrBSXL *tknStrBSXL, Ptr ptr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrBMP4 ARGS((TknStrBMP4 *tknStrBMP4, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrBMPXL ARGS((TknStrBMPXL *tknStrBMPXL, Buffer *mBuf, +S16 cmUnpkTknStrBMP4 ARGS((TknStrBMP4 *tknStrBMP4, Buffer *mBuf)); +S16 cmUnpkTknStrBMPXL ARGS((TknStrBMPXL *tknStrBMPXL, Buffer *mBuf, Ptr ptr)); -EXTERN S16 cmUnpkTknStrUNI4 ARGS((TknStrUNI4 *tknStrUNI4, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrUNIXL ARGS((TknStrUNIXL *tknStrUNIXL, Buffer *mBuf, +S16 cmUnpkTknStrUNI4 ARGS((TknStrUNI4 *tknStrUNI4, Buffer *mBuf)); +S16 cmUnpkTknStrUNIXL ARGS((TknStrUNIXL *tknStrUNIXL, Buffer *mBuf, Ptr ptr)); diff --git a/src/cm/cm_tpt.c b/src/cm/cm_tpt.c index c3a9fe066..e22afaed6 100755 --- a/src/cm/cm_tpt.c +++ b/src/cm/cm_tpt.c @@ -147,13 +147,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmPkCmIpv6NetAddr +static S16 cmPkCmIpv6NetAddr ( CmIpv6NetAddr *pkParam, Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmPkCmIpv6NetAddr (pkParam, mBuf) +static S16 cmPkCmIpv6NetAddr (pkParam, mBuf) CmIpv6NetAddr *pkParam; Buffer *mBuf; /* message buffer */ #endif @@ -185,13 +185,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmPkCmIpv6TptAddr +static S16 cmPkCmIpv6TptAddr ( CmIpv6TptAddr *pkParam, /* IPv6 transport address */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmPkCmIpv6TptAddr (pkParam, mBuf) +static S16 cmPkCmIpv6TptAddr (pkParam, mBuf) CmIpv6TptAddr *pkParam; /* IPv6 transport address */ Buffer *mBuf; /* message buffer */ #endif @@ -439,13 +439,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmPkCmSockOpts +static S16 cmPkCmSockOpts ( CmSockOpts *pkParam, Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmPkCmSockOpts (pkParam, mBuf) +static S16 cmPkCmSockOpts (pkParam, mBuf) CmSockOpts *pkParam; Buffer *mBuf; /* message buffer */ #endif @@ -504,13 +504,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmPkCmSockParam +static S16 cmPkCmSockParam ( CmSockParam *pkParam, Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmPkCmSockParam (pkParam, mBuf) +static S16 cmPkCmSockParam (pkParam, mBuf) CmSockParam *pkParam; Buffer *mBuf; /* message buffer */ #endif @@ -548,13 +548,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmPkTlsTptParam +static S16 cmPkTlsTptParam ( TlsTptParam *pkParam, /**/ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmPkTlsTptParam(pkParam, mBuf) +static S16 cmPkTlsTptParam(pkParam, mBuf) TlsTptParam *pkParam; /**/ Buffer *mBuf; /* message buffer */ #endif @@ -690,13 +690,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmUnpkCmIpv6NetAddr +static S16 cmUnpkCmIpv6NetAddr ( CmIpv6NetAddr *unpkParam, /* IPv6 address */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmUnpkCmIpv6NetAddr (unpkParam, mBuf) +static S16 cmUnpkCmIpv6NetAddr (unpkParam, mBuf) CmIpv6NetAddr *unpkParam; /* IPv6 address */ Buffer *mBuf; /* message buffer */ #endif @@ -730,13 +730,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmUnpkCmIpv6TptAddr +static S16 cmUnpkCmIpv6TptAddr ( CmIpv6TptAddr *unpkParam, /* IPv6 transport address */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmUnpkCmIpv6TptAddr (unpkParam, mBuf) +static S16 cmUnpkCmIpv6TptAddr (unpkParam, mBuf) CmIpv6TptAddr *unpkParam; /* IPv6 transport address */ Buffer *mBuf; /* message buffer */ #endif @@ -943,13 +943,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmUnpkCmSockOpts +static S16 cmUnpkCmSockOpts ( CmSockOpts *unpkParam, /* socket options */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmUnpkCmSockOpts (unpkParam, mBuf) +static S16 cmUnpkCmSockOpts (unpkParam, mBuf) CmSockOpts *unpkParam; /* socket options */ Buffer *mBuf; /* message buffer */ #endif @@ -1010,13 +1010,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmUnpkCmSockParam +static S16 cmUnpkCmSockParam ( CmSockParam *unpkParam, /* socket parameters */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmUnpkCmSockParam (unpkParam, mBuf) +static S16 cmUnpkCmSockParam (unpkParam, mBuf) CmSockParam *unpkParam; /* socket parameters */ Buffer *mBuf; /* message buffer */ #endif @@ -1056,13 +1056,13 @@ Buffer *mBuf; /* message buffer */ * */ #ifdef ANSI -PRIVATE S16 cmUnpkTlsTptParam +static S16 cmUnpkTlsTptParam ( TlsTptParam *unpkParam, /* TLS parameters */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE S16 cmUnpkTlsTptParam (unpkParam, mBuf) +static S16 cmUnpkTlsTptParam (unpkParam, mBuf) TlsTptParam *unpkParam; /* TLS parameters */ Buffer *mBuf; /* message buffer */ #endif diff --git a/src/cm/cm_tpt.x b/src/cm/cm_tpt.x index f958bf896..7843b9b37 100755 --- a/src/cm/cm_tpt.x +++ b/src/cm/cm_tpt.x @@ -461,66 +461,66 @@ typedef struct cmIcmpv6Hdr /* packing/unpacking function prototypes */ /* Added packing and unpacking function prototypes */ -EXTERN S16 cmPkCmIpv4TptAddr ARGS((CmIpv4TptAddr *pkParam, Buffer *mBuf)); -EXTERN S16 cmPkCmNetAddrTbl ARGS((CmNetAddrTbl *pkParam, Buffer *mBuf)); -EXTERN S16 cmPkCmNetAddr ARGS((CmNetAddr *pkParam, Buffer *mBuf)); -EXTERN S16 cmPkCmTptAddr ARGS((CmTptAddr *pkParam, Buffer *mBuf)); +S16 cmPkCmIpv4TptAddr ARGS((CmIpv4TptAddr *pkParam, Buffer *mBuf)); +S16 cmPkCmNetAddrTbl ARGS((CmNetAddrTbl *pkParam, Buffer *mBuf)); +S16 cmPkCmNetAddr ARGS((CmNetAddr *pkParam, Buffer *mBuf)); +S16 cmPkCmTptAddr ARGS((CmTptAddr *pkParam, Buffer *mBuf)); #ifdef IPV6_SUPPORTED -EXTERN S16 cmPkCmNetMCastInf6 ARGS((CmNetMCastInf6 *pkParam, Buffer *mBuf)); +S16 cmPkCmNetMCastInf6 ARGS((CmNetMCastInf6 *pkParam, Buffer *mBuf)); #endif /* IPV6_SUPPORTED */ -EXTERN S16 cmPkCmTptParam ARGS((CmTptParam *pkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmNetAddrTbl ARGS((CmNetAddrTbl *unpkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmIpv4TptAddr ARGS((CmIpv4TptAddr *unpkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmNetAddr ARGS((CmNetAddr *unpkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmTptAddr ARGS((CmTptAddr *unpkParam, Buffer *mBuf)); +S16 cmPkCmTptParam ARGS((CmTptParam *pkParam, Buffer *mBuf)); +S16 cmUnpkCmNetAddrTbl ARGS((CmNetAddrTbl *unpkParam, Buffer *mBuf)); +S16 cmUnpkCmIpv4TptAddr ARGS((CmIpv4TptAddr *unpkParam, Buffer *mBuf)); +S16 cmUnpkCmNetAddr ARGS((CmNetAddr *unpkParam, Buffer *mBuf)); +S16 cmUnpkCmTptAddr ARGS((CmTptAddr *unpkParam, Buffer *mBuf)); #ifdef IPV6_SUPPORTED -EXTERN S16 cmUnpkCmNetMCastInf6 ARGS((CmNetMCastInf6 *unpkParam, Buffer *mBuf)); +S16 cmUnpkCmNetMCastInf6 ARGS((CmNetMCastInf6 *unpkParam, Buffer *mBuf)); #endif /* IPV6_SUPPORTED */ -EXTERN S16 cmUnpkCmTptParam ARGS((CmTptParam *unpkParam, Buffer *mBuf)); +S16 cmUnpkCmTptParam ARGS((CmTptParam *unpkParam, Buffer *mBuf)); #ifdef CM_INET2 -EXTERN S16 cmPkCmIpHdrParm ARGS((CmIpHdrParm *pkParam, Buffer *mBuf)); +S16 cmPkCmIpHdrParm ARGS((CmIpHdrParm *pkParam, Buffer *mBuf)); /* changed to include meminfo required to hold IPv6 extension headers */ #ifdef IPV6_OPTS_SUPPORTED -EXTERN S16 cmUnpkCmIpHdrParm ARGS((CmIpHdrParm *unpkParam, Buffer *mBuf, +S16 cmUnpkCmIpHdrParm ARGS((CmIpHdrParm *unpkParam, Buffer *mBuf, Mem *memInfo)); #else -EXTERN S16 cmUnpkCmIpHdrParm ARGS((CmIpHdrParm *unpkParam, Buffer *mBuf)); +S16 cmUnpkCmIpHdrParm ARGS((CmIpHdrParm *unpkParam, Buffer *mBuf)); #endif /* added new packing/unpacking function */ #ifdef LOCAL_INTF -EXTERN S16 cmPkCmTptLocalInf ARGS((CmTptLocalInf *pkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmTptLocalInf ARGS((CmTptLocalInf *unpkParam, Buffer *mBuf)); +S16 cmPkCmTptLocalInf ARGS((CmTptLocalInf *pkParam, Buffer *mBuf)); +S16 cmUnpkCmTptLocalInf ARGS((CmTptLocalInf *unpkParam, Buffer *mBuf)); #endif /* LOCAL_INTF */ -EXTERN S16 cmPkCmIcmpFilter ARGS((CmIcmpFilter *pkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmIcmpFilter ARGS((CmIcmpFilter *unpkParam, Buffer *mBuf)); +S16 cmPkCmIcmpFilter ARGS((CmIcmpFilter *pkParam, Buffer *mBuf)); +S16 cmUnpkCmIcmpFilter ARGS((CmIcmpFilter *unpkParam, Buffer *mBuf)); /* added new packing/unpacking functions */ #ifdef IPV6_OPTS_SUPPORTED -EXTERN S16 cmPkCmIpv6ExtHdr ARGS((CmIpv6ExtHdr *pkParam, Buffer *mBuf)); -EXTERN S16 cmPkCmIpv6RtHdr ARGS((CmIpv6RtHdr *pkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmIpv6RtHdr ARGS((CmIpv6RtHdr *unpkParam, Buffer *mBuf, +S16 cmPkCmIpv6ExtHdr ARGS((CmIpv6ExtHdr *pkParam, Buffer *mBuf)); +S16 cmPkCmIpv6RtHdr ARGS((CmIpv6RtHdr *pkParam, Buffer *mBuf)); +S16 cmUnpkCmIpv6RtHdr ARGS((CmIpv6RtHdr *unpkParam, Buffer *mBuf, Mem *memInfo)); -EXTERN S16 cmUnpkCmIpv6ExtHdr ARGS((CmIpv6ExtHdr *unpkParam, Buffer *mBuf, +S16 cmUnpkCmIpv6ExtHdr ARGS((CmIpv6ExtHdr *unpkParam, Buffer *mBuf, Mem *memInfo)); -EXTERN S16 cmPkCmIpv6DestOptsArr ARGS((CmIpv6DestOptsArr *pkParam, +S16 cmPkCmIpv6DestOptsArr ARGS((CmIpv6DestOptsArr *pkParam, Buffer *mBuf)); -EXTERN S16 cmPkCmIpv6DestOptsHdr ARGS((CmIpv6DestOptsHdr *pkParam, +S16 cmPkCmIpv6DestOptsHdr ARGS((CmIpv6DestOptsHdr *pkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmIpv6DestOptsHdr ARGS((CmIpv6DestOptsHdr *unpkParam, +S16 cmUnpkCmIpv6DestOptsHdr ARGS((CmIpv6DestOptsHdr *unpkParam, Buffer *mBuf, Mem *memInfo)); -EXTERN S16 cmUnpkCmIpv6DestOptsArr ARGS((CmIpv6DestOptsArr *unpkParam, +S16 cmUnpkCmIpv6DestOptsArr ARGS((CmIpv6DestOptsArr *unpkParam, Buffer *mBuf, Mem *memInfo)); -EXTERN S16 cmPkCmIpv6HBHHdrArr ARGS((CmIpv6HBHHdrArr *pkParam, Buffer *mBuf)); -EXTERN S16 cmPkCmIpv6HBHHdr ARGS((CmIpv6HBHHdr *pkParam, Buffer *mBuf)); -EXTERN S16 cmUnpkCmIpv6HBHHdr ARGS((CmIpv6HBHHdr *unpkParam, Buffer *mBuf, +S16 cmPkCmIpv6HBHHdrArr ARGS((CmIpv6HBHHdrArr *pkParam, Buffer *mBuf)); +S16 cmPkCmIpv6HBHHdr ARGS((CmIpv6HBHHdr *pkParam, Buffer *mBuf)); +S16 cmUnpkCmIpv6HBHHdr ARGS((CmIpv6HBHHdr *unpkParam, Buffer *mBuf, Mem *memInfo)); -EXTERN S16 cmUnpkCmIpv6HBHHdrArr ARGS((CmIpv6HBHHdrArr *unpkParam, +S16 cmUnpkCmIpv6HBHHdrArr ARGS((CmIpv6HBHHdrArr *unpkParam, Buffer *mBuf, Mem *memInfo)); #endif /* IPV6_OPTS_SUPPORTED */ #endif /* CM_INET2 */ diff --git a/src/cm/crg.c b/src/cm/crg.c index 28730d107..2acd045ba 100755 --- a/src/cm/crg.c +++ b/src/cm/crg.c @@ -1044,13 +1044,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkCrgUeSCellCfg +static S16 cmPkCrgUeSCellCfg ( CrgUeSCellInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkCrgUeSCellCfg(param, mBuf) +static S16 cmPkCrgUeSCellCfg(param, mBuf) CrgUeSCellInfo *param; Buffer *mBuf; #endif @@ -1078,13 +1078,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkCrgUeSCellCfg +static S16 cmUnpkCrgUeSCellCfg ( CrgUeSCellInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkCrgUeSCellCfg(param, mBuf) +static S16 cmUnpkCrgUeSCellCfg(param, mBuf) CrgUeSCellInfo *param; Buffer *mBuf; #endif diff --git a/src/cm/crg.x b/src/cm/crg.x index 66ca1ab76..5f6507309 100755 --- a/src/cm/crg.x +++ b/src/cm/crg.x @@ -369,34 +369,34 @@ typedef S16 (*CrgCfgCfm) ARGS(( uint8_t status)); /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 RgUiCrgBndReq ARGS(( +S16 RgUiCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 RgUiCrgBndCfm ARGS(( +S16 RgUiCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRC to MAC to Unbind the interface SAPs. */ -EXTERN S16 RgUiCrgUbndReq ARGS(( +S16 RgUiCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Configuration Request from RRC to MAC for * configuring Cell/Ue/Lch. */ -EXTERN S16 RgUiCrgCfgReq ARGS(( +S16 RgUiCrgCfgReq ARGS(( Pst* pst, SpId spId, CrgCfgTransId transId, CrgCfgReqInfo * cfgReqInfo )); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 RgUiCrgCfgCfm ARGS(( +S16 RgUiCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, @@ -405,34 +405,34 @@ EXTERN S16 RgUiCrgCfgCfm ARGS(( #ifdef NH /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 NhLiCrgBndReq ARGS(( +S16 NhLiCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 NhLiCrgBndCfm ARGS(( +S16 NhLiCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRC to MAC to Unbind the interface SAPs. */ -EXTERN S16 NhLiCrgUbndReq ARGS(( +S16 NhLiCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Configuration Request from RRC to MAC for * configuring Cell/Ue/Lch. */ -EXTERN S16 NhLiCrgCfgReq ARGS(( +S16 NhLiCrgCfgReq ARGS(( Pst* pst, SpId spId, CrgCfgTransId transId, CrgCfgReqInfo * cfgReqInfo )); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 NhLiCrgCfgCfm ARGS(( +S16 NhLiCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, @@ -442,46 +442,46 @@ EXTERN S16 NhLiCrgCfgCfm ARGS(( #ifdef LCCRG /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 cmPkCrgBndReq ARGS(( +S16 cmPkCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 cmUnpkCrgBndReq ARGS(( +S16 cmUnpkCrgBndReq ARGS(( CrgBndReq func, Pst* pst, Buffer *mBuf )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 cmPkCrgBndCfm ARGS(( +S16 cmPkCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 cmUnpkCrgBndCfm ARGS(( +S16 cmUnpkCrgBndCfm ARGS(( CrgBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief Request from RRC to MAC to unbind the interface SAPs. */ -EXTERN S16 cmPkCrgUbndReq ARGS(( +S16 cmPkCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Request from RRC to MAC to unbind the interface SAPs. */ -EXTERN S16 cmUnpkCrgUbndReq ARGS(( +S16 cmUnpkCrgUbndReq ARGS(( CrgUbndReq func, Pst* pst, Buffer *mBuf )); /** @brief Configuration Request from RRC to MAC for * configuring Cell/Ue/Lch. */ -EXTERN S16 cmPkCrgCfgReq ARGS(( +S16 cmPkCrgCfgReq ARGS(( Pst* pst, SpId spId, CrgCfgTransId transId, @@ -489,178 +489,178 @@ EXTERN S16 cmPkCrgCfgReq ARGS(( )); /** @brief Configuration Request from RRC to MAC for * configuring Cell/Ue/Lch. */ -EXTERN S16 cmUnpkCrgCfgReq ARGS(( +S16 cmUnpkCrgCfgReq ARGS(( CrgCfgReq func, Pst* pst, Buffer *mBuf )); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 cmPkCrgCfgCfm ARGS(( +S16 cmPkCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, uint8_t status )); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 cmUnpkCrgCfgCfm ARGS(( +S16 cmUnpkCrgCfgCfm ARGS(( CrgCfgCfm func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkCrgCfgTransId ARGS(( +S16 cmPkCrgCfgTransId ARGS(( CrgCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgCfgTransId ARGS(( +S16 cmUnpkCrgCfgTransId ARGS(( CrgCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgBwCfg ARGS(( +S16 cmPkCrgBwCfg ARGS(( CrgBwCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgBwCfg ARGS(( +S16 cmUnpkCrgBwCfg ARGS(( CrgBwCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgRachCfg ARGS(( +S16 cmPkCrgRachCfg ARGS(( CrgRachCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgRachCfg ARGS(( +S16 cmUnpkCrgRachCfg ARGS(( CrgRachCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgCellCfg ARGS(( +S16 cmPkCrgCellCfg ARGS(( CrgCellCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgCellCfg ARGS(( +S16 cmUnpkCrgCellCfg ARGS(( CrgCellCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgUeUlHqCfg ARGS(( +S16 cmPkCrgUeUlHqCfg ARGS(( CrgUeUlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUeUlHqCfg ARGS(( +S16 cmUnpkCrgUeUlHqCfg ARGS(( CrgUeUlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgUeCfg ARGS(( +S16 cmPkCrgUeCfg ARGS(( CrgUeCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUeCfg ARGS(( +S16 cmUnpkCrgUeCfg ARGS(( CrgUeCfg *param, Buffer *mBuf )); #ifdef LTE_ADV -EXTERN S16 cmPkCrgUeSecCellInfo ARGS(( +S16 cmPkCrgUeSecCellInfo ARGS(( CrgUeSecCellInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUeSecCellInfo ARGS(( +S16 cmUnpkCrgUeSecCellInfo ARGS(( CrgUeSecCellInfo *param, Buffer *mBuf )); #endif /* LTE_ADV */ -EXTERN S16 cmPkCrgDlLchCfg ARGS(( +S16 cmPkCrgDlLchCfg ARGS(( CrgDlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgDlLchCfg ARGS(( +S16 cmUnpkCrgDlLchCfg ARGS(( CrgDlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgUlLchCfg ARGS(( +S16 cmPkCrgUlLchCfg ARGS(( CrgUlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUlLchCfg ARGS(( +S16 cmUnpkCrgUlLchCfg ARGS(( CrgUlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgLchCfg ARGS(( +S16 cmPkCrgLchCfg ARGS(( CrgLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgLchCfg ARGS(( +S16 cmUnpkCrgLchCfg ARGS(( CrgLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgCfg ARGS(( +S16 cmPkCrgCfg ARGS(( CrgCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgCfg ARGS(( +S16 cmUnpkCrgCfg ARGS(( CrgCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgActvTime ARGS(( +S16 cmPkCrgActvTime ARGS(( CrgActvTime *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgActvTime ARGS(( +S16 cmUnpkCrgActvTime ARGS(( CrgActvTime *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgCellRecfg ARGS(( +S16 cmPkCrgCellRecfg ARGS(( CrgCellRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgCellRecfg ARGS(( +S16 cmUnpkCrgCellRecfg ARGS(( CrgCellRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgUeRecfg ARGS(( +S16 cmPkCrgUeRecfg ARGS(( CrgUeRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgUeRecfg ARGS(( +S16 cmUnpkCrgUeRecfg ARGS(( CrgUeRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgLchRecfg ARGS(( +S16 cmPkCrgLchRecfg ARGS(( CrgLchRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgLchRecfg ARGS(( +S16 cmUnpkCrgLchRecfg ARGS(( CrgLchRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgRecfg ARGS(( +S16 cmPkCrgRecfg ARGS(( CrgRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgRecfg ARGS(( +S16 cmUnpkCrgRecfg ARGS(( CrgRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgDel ARGS(( +S16 cmPkCrgDel ARGS(( CrgDel *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgDel ARGS(( +S16 cmUnpkCrgDel ARGS(( CrgDel *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgRst ARGS(( +S16 cmPkCrgRst ARGS(( CrgRst *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgRst ARGS(( +S16 cmUnpkCrgRst ARGS(( CrgRst *param, Buffer *mBuf )); -EXTERN S16 cmPkCrgCfgReqInfo ARGS(( +S16 cmPkCrgCfgReqInfo ARGS(( CrgCfgReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCrgCfgReqInfo ARGS(( +S16 cmUnpkCrgCfgReqInfo ARGS(( CrgCfgReqInfo *param, Buffer *mBuf )); @@ -668,34 +668,34 @@ EXTERN S16 cmUnpkCrgCfgReqInfo ARGS(( #ifdef DM /** @brief Request from RRC to MAC to bind the interface SAPs. */ -EXTERN S16 DmUiCrgBndReq ARGS(( +S16 DmUiCrgBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRC for the bind/unbind * request for the interface SAPs. */ -EXTERN S16 DmUiCrgBndCfm ARGS(( +S16 DmUiCrgBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRC to MAC to unbind the interface SAPs. */ -EXTERN S16 DmUiCrgUbndReq ARGS(( +S16 DmUiCrgUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Configuration Request from RRC to MAC for * configuring Cell/Ue/Lch. */ -EXTERN S16 DmUiCrgCfgReq ARGS(( +S16 DmUiCrgCfgReq ARGS(( Pst* pst, SpId spId, CrgCfgTransId transId, CrgCfgReqInfo * cfgReqInfo )); /** @brief Configuration Confirm from MAC to RRC. */ -EXTERN S16 DmUiCrgCfgCfm ARGS(( +S16 DmUiCrgCfgCfm ARGS(( Pst* pst, SuId suId, CrgCfgTransId transId, diff --git a/src/cm/ctf.c b/src/cm/ctf.c index cf5c07898..08e00eaa8 100755 --- a/src/cm/ctf.c +++ b/src/cm/ctf.c @@ -424,13 +424,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmRelCtfCfgReq +static S16 cmRelCtfCfgReq ( Pst *pst, CtfCfgReqInfo *cfgReqInfo ) #else -PRIVATE S16 cmRelCtfCfgReq(pst,cfgReqInfo) +static S16 cmRelCtfCfgReq(pst,cfgReqInfo) Pst *pst; CtfCfgReqInfo *param; #endif @@ -5141,13 +5141,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkCtfUnLicnsdCellParam +static S16 cmPkCtfUnLicnsdCellParam ( CtfUnLicnsdCfgInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkCtfUnLicnsdCellParam(param, mBuf) +static S16 cmPkCtfUnLicnsdCellParam(param, mBuf) CtfUnLicnsdCfgInfo *param; Buffer *mBuf; #endif @@ -5318,13 +5318,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkCtfUnLicnsdCellParam +static S16 cmUnpkCtfUnLicnsdCellParam ( CtfUnLicnsdCfgInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf) +static S16 cmUnpkCtfUnLicnsdCellParam(param, mBuf) CtfUnLicnsdCfgInfo *param; Buffer *mBuf; #endif diff --git a/src/cm/ctf.x b/src/cm/ctf.x index 2247ac482..8d2209cbe 100755 --- a/src/cm/ctf.x +++ b/src/cm/ctf.x @@ -1393,7 +1393,7 @@ typedef S16 (*CtfUeIdChgCfm) ARGS(( * -# RFAILED on failure * */ -EXTERN S16 TfUiCtfBndReq ARGS(( +S16 TfUiCtfBndReq ARGS(( Pst* pst, SuId suId, SpId spId @@ -1425,7 +1425,7 @@ EXTERN S16 TfUiCtfBndReq ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfBndCfm ARGS(( +S16 TfUiCtfBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status @@ -1449,7 +1449,7 @@ EXTERN S16 TfUiCtfBndCfm ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfUbndReq ARGS(( +S16 TfUiCtfUbndReq ARGS(( Pst* pst, SpId spId, Reason reason @@ -1481,7 +1481,7 @@ EXTERN S16 TfUiCtfUbndReq ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCfgReq ARGS(( +S16 TfUiCtfCfgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -1512,7 +1512,7 @@ EXTERN S16 TfUiCtfCfgReq ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCfgCfm ARGS(( +S16 TfUiCtfCfgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, @@ -1539,7 +1539,7 @@ EXTERN S16 TfUiCtfCfgCfm ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCnmCellSyncReq ARGS(( +S16 TfUiCtfCnmCellSyncReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, @@ -1570,7 +1570,7 @@ EXTERN S16 TfUiCtfCnmCellSyncReq ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCnmCellSyncRsp ARGS(( +S16 TfUiCtfCnmCellSyncRsp ARGS(( Pst* pst, SuId suId, CtfCfgTransId * transId, @@ -1597,7 +1597,7 @@ EXTERN S16 TfUiCtfCnmCellSyncRsp ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCnmInitSyncReq ARGS(( +S16 TfUiCtfCnmInitSyncReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, @@ -1628,7 +1628,7 @@ EXTERN S16 TfUiCtfCnmInitSyncReq ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCnmInitSyncRsp ARGS(( +S16 TfUiCtfCnmInitSyncRsp ARGS(( Pst* pst, SuId suId, CtfCfgTransId * transId, @@ -1659,7 +1659,7 @@ EXTERN S16 TfUiCtfCnmInitSyncRsp ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfCnmCellSyncInd ARGS(( +S16 TfUiCtfCnmCellSyncInd ARGS(( Pst* pst, SuId suId, CtfCfgTransId * transId, @@ -1683,7 +1683,7 @@ EXTERN S16 TfUiCtfCnmCellSyncInd ARGS(( * -# RFAILED * */ -EXTERN S16 TfUiCtfUeIdChgReq ARGS(( +S16 TfUiCtfUeIdChgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -1716,7 +1716,7 @@ EXTERN S16 TfUiCtfUeIdChgReq ARGS(( * */ /** UE ID Change Confirm from PHY to User. */ -EXTERN S16 TfUiCtfUeIdChgCfm ARGS(( +S16 TfUiCtfUeIdChgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, @@ -1727,41 +1727,41 @@ EXTERN S16 TfUiCtfUeIdChgCfm ARGS(( #ifdef NH /* Request from User to PHY to Bind the CTF interface SAPs. */ -EXTERN S16 NhLiCtfBndReq ARGS(( +S16 NhLiCtfBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /* Confirmation from PHY to User for the Bind/Unbind * Request for the CTF interface SAP. */ -EXTERN S16 NhLiCtfBndCfm ARGS(( +S16 NhLiCtfBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /* Request from User to PHY to Unbind the CTF interface SAP. */ -EXTERN S16 NhLiCtfUbndReq ARGS(( +S16 NhLiCtfUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /* Configuration Request from User to PHY for * cell or dedicated configuration. */ -EXTERN S16 NhLiCtfCfgReq ARGS(( +S16 NhLiCtfCfgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, CtfCfgReqInfo* cfgReqInfo )); /* Configuration Confirm from PHY to User. */ -EXTERN S16 NhLiCtfCfgCfm ARGS(( +S16 NhLiCtfCfgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, uint8_t status )); /** UE ID Change Request from User to PHY. */ -EXTERN S16 NhLiCtfUeIdChgReq ARGS(( +S16 NhLiCtfUeIdChgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -1769,7 +1769,7 @@ EXTERN S16 NhLiCtfUeIdChgReq ARGS(( CtfUeInfo * newUeInfo )); /** UE ID Change Confirm from PHY to user. */ -EXTERN S16 NhLiCtfUeIdChgCfm ARGS(( +S16 NhLiCtfUeIdChgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, @@ -1780,13 +1780,13 @@ EXTERN S16 NhLiCtfUeIdChgCfm ARGS(( #ifdef LCCTF /* Request from User to PHY to Bind the CTF interface SAP. */ -EXTERN S16 cmPkCtfBndReq ARGS(( +S16 cmPkCtfBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /* Request from User to PHY to Bind the CTF interface SAP. */ -EXTERN S16 cmUnpkCtfBndReq ARGS(( +S16 cmUnpkCtfBndReq ARGS(( CtfBndReq func, Pst* pst, Buffer *mBuf @@ -1794,7 +1794,7 @@ EXTERN S16 cmUnpkCtfBndReq ARGS(( /* Confirmation from PHY to user for the Bind/Unbind * Request for the CTF interface SAP. */ -EXTERN S16 cmPkCtfBndCfm ARGS(( +S16 cmPkCtfBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status @@ -1802,19 +1802,19 @@ EXTERN S16 cmPkCtfBndCfm ARGS(( /* Confirmation from PHY to User for the Bind/Unbind * Request for the CTF interface SAP. */ -EXTERN S16 cmUnpkCtfBndCfm ARGS(( +S16 cmUnpkCtfBndCfm ARGS(( CtfBndCfm func, Pst* pst, Buffer *mBuf )); /* Request from User to PHY to Unbind the CTF interface SAP. */ -EXTERN S16 cmPkCtfUbndReq ARGS(( +S16 cmPkCtfUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /* Request from User to PHY to Unbind the interface SAPs. */ -EXTERN S16 cmUnpkCtfUbndReq ARGS(( +S16 cmUnpkCtfUbndReq ARGS(( CtfUbndReq func, Pst* pst, Buffer *mBuf @@ -1823,66 +1823,66 @@ EXTERN S16 cmUnpkCtfUbndReq ARGS(( * cell or dedicated configuration. */ /* Cnm Start */ -EXTERN S16 cmPkCtfCnmCellSyncReq ARGS(( +S16 cmPkCtfCnmCellSyncReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, CtfCnmCellSyncReq * ctfCnmCellSyncreq )); -EXTERN S16 cmUnpkCnmCellSyncReq ARGS(( +S16 cmUnpkCnmCellSyncReq ARGS(( CtfCnmCellSyncReqMsg func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmCellSyncRsp ARGS(( +S16 cmPkCtfCnmCellSyncRsp ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, CtfCnmCellSyncRsp * ctfCnmCellSyncrsp )); -EXTERN S16 cmUnpkCnmCellSyncRsp ARGS(( +S16 cmUnpkCnmCellSyncRsp ARGS(( CtfCnmCellSyncRspMsg func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmCellSyncInd ARGS(( +S16 cmPkCtfCnmCellSyncInd ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, CtfCnmCellSyncInd * ctfCnmCellSyncind )); -EXTERN S16 cmUnpkCnmCellSyncInd ARGS(( +S16 cmUnpkCnmCellSyncInd ARGS(( CtfCnmCellSyncIndMsg func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmInitSyncReq ARGS(( +S16 cmPkCtfCnmInitSyncReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, CtfCnmInitSyncReq * ctfCnmInitSyncreq )); -EXTERN S16 cmUnpkCnmInitSyncReq ARGS(( +S16 cmUnpkCnmInitSyncReq ARGS(( CtfCnmInitSyncReqMsg func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmInitSyncRsp ARGS(( +S16 cmPkCtfCnmInitSyncRsp ARGS(( Pst* pst, SpId spId, CtfCfgTransId * transId, CtfCnmInitSyncRsp * ctfCnmInitSyncrsp )); -EXTERN S16 cmUnpkCnmInitSyncRsp ARGS(( +S16 cmUnpkCnmInitSyncRsp ARGS(( CtfCnmInitSyncRspMsg func, Pst* pst, Buffer *mBuf @@ -1891,7 +1891,7 @@ EXTERN S16 cmUnpkCnmInitSyncRsp ARGS(( /* Cnm End */ #ifdef TENB_AS_SECURITY -EXTERN S16 cmPkCtfKdfReq ARGS(( +S16 cmPkCtfKdfReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -1900,13 +1900,13 @@ EXTERN S16 cmPkCtfKdfReq ARGS(( /* Configuration Request from User to PHY for * cell or dedicated configuration. */ -EXTERN S16 cmUnpkCtfKdfReq ARGS(( +S16 cmUnpkCtfKdfReq ARGS(( CtfKdfReq func, Pst* pst, Buffer *mBuf )); /* Configuration Confirm from PHY to User. */ -EXTERN S16 cmPkCtfkdfCfm ARGS(( +S16 cmPkCtfkdfCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, @@ -1914,14 +1914,14 @@ EXTERN S16 cmPkCtfkdfCfm ARGS(( uint8_t status )); /* Configuration Confirm from PHY to User. */ -EXTERN S16 cmUnpkCtfKdfCfm ARGS(( +S16 cmUnpkCtfKdfCfm ARGS(( CtfKdfCfm func, Pst* pst, Buffer *mBuf )); #endif -EXTERN S16 cmPkCtfCfgReq ARGS(( +S16 cmPkCtfCfgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -1930,38 +1930,38 @@ EXTERN S16 cmPkCtfCfgReq ARGS(( /* Configuration Request from User to PHY for * cell or dedicated configuration. */ -EXTERN S16 cmUnpkCtfCfgReq ARGS(( +S16 cmUnpkCtfCfgReq ARGS(( CtfCfgReq func, Pst* pst, Buffer *mBuf )); /* Configuration Confirm from PHY to User. */ -EXTERN S16 cmPkCtfCfgCfm ARGS(( +S16 cmPkCtfCfgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, uint8_t status )); /* ENB-STOP Indication from PHY to User. */ -EXTERN S16 cmPkCtfEnbStopInd ARGS(( +S16 cmPkCtfEnbStopInd ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId )); /* Configuration Confirm from PHY to User. */ -EXTERN S16 cmUnpkCtfCfgCfm ARGS(( +S16 cmUnpkCtfCfgCfm ARGS(( CtfCfgCfm func, Pst* pst, Buffer *mBuf )); /* unpack ENB-STOP Indication from PHY to User. */ -EXTERN S16 cmUnpkCtfEnbStopInd ARGS(( +S16 cmUnpkCtfEnbStopInd ARGS(( CtfEnbStopInd func, Pst* pst, Buffer *mBuf )); /** UE ID Change Request from User to PHY. */ -EXTERN S16 cmPkCtfUeIdChgReq ARGS(( +S16 cmPkCtfUeIdChgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -1969,13 +1969,13 @@ EXTERN S16 cmPkCtfUeIdChgReq ARGS(( CtfUeInfo * newUeInfo )); /** UE ID Change Request from User to PHY. */ -EXTERN S16 cmUnpkCtfUeIdChgReq ARGS(( +S16 cmUnpkCtfUeIdChgReq ARGS(( CtfUeIdChgReq func, Pst* pst, Buffer *mBuf )); /** UE ID Change Confirm from PHY to User. */ -EXTERN S16 cmPkCtfUeIdChgCfm ARGS(( +S16 cmPkCtfUeIdChgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, @@ -1983,7 +1983,7 @@ EXTERN S16 cmPkCtfUeIdChgCfm ARGS(( CmStatus status )); /** UE ID Change Confirm from PHY to User. */ -EXTERN S16 cmUnpkCtfUeIdChgCfm ARGS(( +S16 cmUnpkCtfUeIdChgCfm ARGS(( CtfUeIdChgCfm func, Pst* pst, Buffer *mBuf @@ -1997,35 +1997,35 @@ typedef S16 (*CtfPerRemCellSrchRsp) ARGS(( CtfCfgTransId* transId, CtfPeriodicRemCellSearchRsp* sniffCellRsp)); -EXTERN S16 cmUnpkPerRemCellSrchRsp ARGS (( +S16 cmUnpkPerRemCellSrchRsp ARGS (( CtfPerRemCellSrchRsp func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPerRemCellSrch ARGS (( +S16 cmUnpkCtfPerRemCellSrch ARGS (( CtfPeriodicRemCellSearchRsp *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPerRemScanCellInfo ARGS (( +S16 cmUnpkCtfPerRemScanCellInfo ARGS (( CtfPeriodicRemCellInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPeriodicCellSearchRsp ARGS (( +S16 cmPkCtfPeriodicCellSearchRsp ARGS (( CtfPeriodicRemCellSearchRsp *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPeriodicRemCellSearchRsp ARGS (( +S16 cmPkCtfPeriodicRemCellSearchRsp ARGS (( Pst* pst, SpId spId, CtfCfgTransId *transId, CtfPeriodicRemCellSearchRsp *CellCfgRsp )); -EXTERN S16 cmPkPerRemScanCellInfo ARGS (( +S16 cmPkPerRemScanCellInfo ARGS (( CtfPeriodicRemCellInfo *param, Buffer *mBuf )); @@ -2035,7 +2035,7 @@ Buffer *mBuf #ifdef DM /* Request from User to PHY to Bind the CTF interface SAP. */ -EXTERN S16 DmUiCtfBndReq ARGS(( +S16 DmUiCtfBndReq ARGS(( Pst* pst, SuId suId, SpId spId @@ -2043,13 +2043,13 @@ EXTERN S16 DmUiCtfBndReq ARGS(( /* Confirmation from PHY to User for the Bind/Unbind * Request for the CTF interface SAP. */ -EXTERN S16 DmUiCtfBndCfm ARGS(( +S16 DmUiCtfBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /* Request from User to PHY to Unbind the CTF interface SAP. */ -EXTERN S16 DmUiCtfUbndReq ARGS(( +S16 DmUiCtfUbndReq ARGS(( Pst* pst, SpId spId, Reason reason @@ -2057,21 +2057,21 @@ EXTERN S16 DmUiCtfUbndReq ARGS(( /* Configuration Request from User to PHY for * cell or dedicated configuration. */ -EXTERN S16 DmUiCtfCfgReq ARGS(( +S16 DmUiCtfCfgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, CtfCfgReqInfo* cfgReqInfo )); /* Configuration Confirm from PHY to User. */ -EXTERN S16 DmUiCtfCfgCfm ARGS(( +S16 DmUiCtfCfgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, uint8_t status )); /** UE ID Change Request from User to PHY. */ -EXTERN S16 DmUiCtfUeIdChgReq ARGS(( +S16 DmUiCtfUeIdChgReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId transId, @@ -2079,7 +2079,7 @@ EXTERN S16 DmUiCtfUeIdChgReq ARGS(( CtfUeInfo * newUeInfo )); /** UE ID Change Confirm from PHY to user. */ -EXTERN S16 DmUiCtfUeIdChgCfm ARGS(( +S16 DmUiCtfUeIdChgCfm ARGS(( Pst* pst, SuId suId, CtfCfgTransId transId, @@ -2092,303 +2092,303 @@ EXTERN S16 DmUiCtfUeIdChgCfm ARGS(( * PACK/UNPACK FUNCTIONS ****************************************************************************/ #ifdef LCCTF -EXTERN S16 cmPkCtfCfgTransId ARGS(( +S16 cmPkCtfCfgTransId ARGS(( CtfCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCfgTransId ARGS(( +S16 cmUnpkCtfCfgTransId ARGS(( CtfCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfUeInfo ARGS(( +S16 cmPkCtfUeInfo ARGS(( CtfUeInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfUeInfo ARGS(( +S16 cmUnpkCtfUeInfo ARGS(( CtfUeInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfBwCfgInfo ARGS(( +S16 cmPkCtfBwCfgInfo ARGS(( CtfBwCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfBwCfgInfo ARGS(( +S16 cmUnpkCtfBwCfgInfo ARGS(( CtfBwCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfTxSchemeCfg ARGS(( +S16 cmPkCtfTxSchemeCfg ARGS(( CtfTxSchemeCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfTxSchemeCfg ARGS(( +S16 cmUnpkCtfTxSchemeCfg ARGS(( CtfTxSchemeCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfAntennaCfgInfo ARGS(( +S16 cmPkCtfAntennaCfgInfo ARGS(( CtfAntennaCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfAntennaCfgInfo ARGS(( +S16 cmUnpkCtfAntennaCfgInfo ARGS(( CtfAntennaCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPrachCfgInfo ARGS(( +S16 cmPkCtfPrachCfgInfo ARGS(( CtfPrachCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPrachCfgInfo ARGS(( +S16 cmUnpkCtfPrachCfgInfo ARGS(( CtfPrachCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPdschCfgInfo ARGS(( +S16 cmPkCtfPdschCfgInfo ARGS(( CtfPdschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPdschCfgInfo ARGS(( +S16 cmUnpkCtfPdschCfgInfo ARGS(( CtfPdschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPuschCfgBasic ARGS(( +S16 cmPkCtfPuschCfgBasic ARGS(( CtfPuschCfgBasic *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPuschCfgBasic ARGS(( +S16 cmUnpkCtfPuschCfgBasic ARGS(( CtfPuschCfgBasic *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPuschUlRS ARGS(( +S16 cmPkCtfPuschUlRS ARGS(( CtfPuschUlRS *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPuschUlRS ARGS(( +S16 cmUnpkCtfPuschUlRS ARGS(( CtfPuschUlRS *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPuschCfgInfo ARGS(( +S16 cmPkCtfPuschCfgInfo ARGS(( CtfPuschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPuschCfgInfo ARGS(( +S16 cmUnpkCtfPuschCfgInfo ARGS(( CtfPuschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPhichCfgInfo ARGS(( +S16 cmPkCtfPhichCfgInfo ARGS(( CtfPhichCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPhichCfgInfo ARGS(( +S16 cmUnpkCtfPhichCfgInfo ARGS(( CtfPhichCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfPucchCfgInfo ARGS(( +S16 cmPkCtfPucchCfgInfo ARGS(( CtfPucchCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfPucchCfgInfo ARGS(( +S16 cmUnpkCtfPucchCfgInfo ARGS(( CtfPucchCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfSrsUlCfgInfo ARGS(( +S16 cmPkCtfSrsUlCfgInfo ARGS(( CtfSrsUlCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfSrsUlCfgInfo ARGS(( +S16 cmUnpkCtfSrsUlCfgInfo ARGS(( CtfSrsUlCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfTddSfCfgInfo ARGS(( +S16 cmPkCtfTddSfCfgInfo ARGS(( CtfTddSfCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfTddSfCfgInfo ARGS(( +S16 cmUnpkCtfTddSfCfgInfo ARGS(( CtfTddSfCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCellCfgInfo ARGS(( +S16 cmPkCtfCellCfgInfo ARGS(( CtfCellCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCellCfgInfo ARGS(( +S16 cmUnpkCtfCellCfgInfo ARGS(( CtfCellCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCellRecfgInfo ARGS(( +S16 cmPkCtfCellRecfgInfo ARGS(( CtfCellRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCellRecfgInfo ARGS(( +S16 cmUnpkCtfCellRecfgInfo ARGS(( CtfCellRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedPdschCfgInfo ARGS(( +S16 cmPkCtfDedPdschCfgInfo ARGS(( CtfDedPdschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedPdschCfgInfo ARGS(( +S16 cmUnpkCtfDedPdschCfgInfo ARGS(( CtfDedPdschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedPucchCfgInfo ARGS(( +S16 cmPkCtfDedPucchCfgInfo ARGS(( CtfDedPucchCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedPucchCfgInfo ARGS(( +S16 cmUnpkCtfDedPucchCfgInfo ARGS(( CtfDedPucchCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedPuschCfgInfo ARGS(( +S16 cmPkCtfDedPuschCfgInfo ARGS(( CtfDedPuschCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedPuschCfgInfo ARGS(( +S16 cmUnpkCtfDedPuschCfgInfo ARGS(( CtfDedPuschCfgInfo *param, Buffer *mBuf )); #ifndef TFU_UPGRADE -EXTERN S16 cmPkCtfCqiRptModePeriodic ARGS(( +S16 cmPkCtfCqiRptModePeriodic ARGS(( CtfCqiRptModePeriodic *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCqiRptModePeriodic ARGS(( +S16 cmUnpkCtfCqiRptModePeriodic ARGS(( CtfCqiRptModePeriodic *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCqiReportCfgInfo ARGS(( +S16 cmPkCtfCqiReportCfgInfo ARGS(( CtfCqiReportCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCqiReportCfgInfo ARGS(( +S16 cmUnpkCtfCqiReportCfgInfo ARGS(( CtfCqiReportCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedSrsUlCfgInfo ARGS(( +S16 cmPkCtfDedSrsUlCfgInfo ARGS(( CtfDedSrsUlCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedSrsUlCfgInfo ARGS(( +S16 cmUnpkCtfDedSrsUlCfgInfo ARGS(( CtfDedSrsUlCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedSRCfgInfo ARGS(( +S16 cmPkCtfDedSRCfgInfo ARGS(( CtfDedSRCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedSRCfgInfo ARGS(( +S16 cmUnpkCtfDedSRCfgInfo ARGS(( CtfDedSRCfgInfo *param, Buffer *mBuf )); #endif /* TFU_UPGRADE */ -EXTERN S16 cmPkCtfDedAntCfgInfo ARGS(( +S16 cmPkCtfDedAntCfgInfo ARGS(( CtfDedAntCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedAntCfgInfo ARGS(( +S16 cmUnpkCtfDedAntCfgInfo ARGS(( CtfDedAntCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfUeSecCellCfgInfo ARGS(( +S16 cmPkCtfUeSecCellCfgInfo ARGS(( CtfUeSecCellCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfSecCellCfgInfo ARGS(( +S16 cmPkCtfSecCellCfgInfo ARGS(( CtfSecCellCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfUeSecCellCfgInfo ARGS(( +S16 cmUnpkCtfUeSecCellCfgInfo ARGS(( CtfUeSecCellCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfSecCellCfgInfo ARGS(( +S16 cmUnpkCtfSecCellCfgInfo ARGS(( CtfSecCellCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfUeCatCfgInfo ARGS(( +S16 cmPkCtfUeCatCfgInfo ARGS(( CtfUeCatCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfUeCatCfgInfo ARGS(( +S16 cmUnpkCtfUeCatCfgInfo ARGS(( CtfUeCatCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedCfgInfo ARGS(( +S16 cmPkCtfDedCfgInfo ARGS(( CtfDedCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedCfgInfo ARGS(( +S16 cmUnpkCtfDedCfgInfo ARGS(( CtfDedCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedRecfgInfo ARGS(( +S16 cmPkCtfDedRecfgInfo ARGS(( CtfDedRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedRecfgInfo ARGS(( +S16 cmUnpkCtfDedRecfgInfo ARGS(( CtfDedRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCellReleaseInfo ARGS(( +S16 cmPkCtfCellReleaseInfo ARGS(( CtfCellReleaseInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCellReleaseInfo ARGS(( +S16 cmUnpkCtfCellReleaseInfo ARGS(( CtfCellReleaseInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfDedReleaseInfo ARGS(( +S16 cmPkCtfDedReleaseInfo ARGS(( CtfDedReleaseInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfDedReleaseInfo ARGS(( +S16 cmUnpkCtfDedReleaseInfo ARGS(( CtfDedReleaseInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCfgInfo ARGS(( +S16 cmPkCtfCfgInfo ARGS(( CtfCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCfgInfo ARGS(( +S16 cmUnpkCtfCfgInfo ARGS(( CtfCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfReCfgInfo ARGS(( +S16 cmPkCtfReCfgInfo ARGS(( CtfReCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfReCfgInfo ARGS(( +S16 cmUnpkCtfReCfgInfo ARGS(( CtfReCfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfReleaseInfo ARGS(( +S16 cmPkCtfReleaseInfo ARGS(( CtfReleaseInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfReleaseInfo ARGS(( +S16 cmUnpkCtfReleaseInfo ARGS(( CtfReleaseInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCfgReqInfo ARGS(( +S16 cmPkCtfCfgReqInfo ARGS(( CtfCfgReqInfo *param, Buffer *mBuf )); /* ctf_x_001.main_4: Added support for vendor specific parameters */ -EXTERN S16 cmUnpkCtfCfgReqInfo ARGS(( +S16 cmUnpkCtfCfgReqInfo ARGS(( Pst *pst, CtfCfgReqInfo *param, Buffer *mBuf )); #ifdef CTF_VER3 -EXTERN S16 cmPkCtfVendorSpecParams ARGS(( +S16 cmPkCtfVendorSpecParams ARGS(( CtfVendorSpecific *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfVendorSpecParams ARGS(( +S16 cmUnpkCtfVendorSpecParams ARGS(( Pst* pst, CtfVendorSpecific *param, Buffer *mBuf @@ -2396,101 +2396,101 @@ EXTERN S16 cmUnpkCtfVendorSpecParams ARGS(( #endif /* CTF_VER3*/ /* Starts - Fix for CR ccpu00123185 */ -EXTERN S16 cmPkCtfCellPwrcfgInfo ARGS(( +S16 cmPkCtfCellPwrcfgInfo ARGS(( CtfCellRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCellStop ARGS(( +S16 cmPkCtfCellStop ARGS(( CtfCellRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCellPwrcfgInfo ARGS(( +S16 cmUnpkCtfCellPwrcfgInfo ARGS(( CtfCellRecfgInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCellStop ARGS(( +S16 cmUnpkCtfCellStop ARGS(( CtfCellRecfgInfo *param, Buffer *mBuf )); /* Ends - Fix for CR ccpu00123185 */ #ifdef TENB_AS_SECURITY -EXTERN S16 cmPkCtfNhKeyInfo ARGS( +S16 cmPkCtfNhKeyInfo ARGS( ( CtfNhKeyInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfKenbStarInfo ARGS( +S16 cmPkCtfKenbStarInfo ARGS( ( CtfKenbStarInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfAskeyInfo ARGS( +S16 cmPkCtfAskeyInfo ARGS( ( CtfAsKeyInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfKdfReqInfo ARGS( +S16 cmPkCtfKdfReqInfo ARGS( ( CtfKdfReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfKdfReq ARGS( +S16 cmPkCtfKdfReq ARGS( ( Pst* pst, SpId spId, CtfCfgTransId transId, CtfKdfReqInfo* kdfReqInfo )); -EXTERN S16 cmUnpkCtfNhKeyInfo ARGS( +S16 cmUnpkCtfNhKeyInfo ARGS( ( CtfNhKeyInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfKenbStarInfo ARGS( +S16 cmUnpkCtfKenbStarInfo ARGS( ( CtfKenbStarInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfAskeyInfo ARGS( +S16 cmUnpkCtfAskeyInfo ARGS( ( CtfAsKeyInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfKdfReqInfo ARGS( +S16 cmUnpkCtfKdfReqInfo ARGS( ( CtfKdfReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfKdfReq ARGS( +S16 cmUnpkCtfKdfReq ARGS( ( CtfKdfReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfNhKeyCfmInfo ARGS( +S16 cmPkCtfNhKeyCfmInfo ARGS( ( CtfNhKeyCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfKenbStarCfmInfo ARGS( +S16 cmPkCtfKenbStarCfmInfo ARGS( ( CtfKenbStarCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfAskeyCfmInfo ARGS( +S16 cmPkCtfAskeyCfmInfo ARGS( ( CtfAskeyCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfKdfCfmInfo ARGS( +S16 cmPkCtfKdfCfmInfo ARGS( ( CtfKdfCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfKdfCfm ARGS( +S16 cmPkCtfKdfCfm ARGS( ( Pst* pst, SuId suId, @@ -2498,27 +2498,27 @@ CtfCfgTransId transId, CtfKdfCfmInfo *kdfCfmInfo, uint8_t status )); -EXTERN S16 cmUnpkCtfNhKeyCfmInfo ARGS( +S16 cmUnpkCtfNhKeyCfmInfo ARGS( ( CtfNhKeyCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfKenbStarCfmInfo ARGS( +S16 cmUnpkCtfKenbStarCfmInfo ARGS( ( CtfKenbStarCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfAskeyCfmInfo ARGS( +S16 cmUnpkCtfAskeyCfmInfo ARGS( ( CtfAskeyCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfKdfCfmInfo ARGS( +S16 cmUnpkCtfKdfCfmInfo ARGS( ( CtfKdfCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfKdfCfm ARGS( +S16 cmUnpkCtfKdfCfm ARGS( ( CtfKdfCfm func, Pst *pst, @@ -2527,152 +2527,152 @@ Buffer *mBuf #endif #endif /* LCCTF */ -EXTERN S16 UrUiCtfHandleSnfMsgs ARGS(( +S16 UrUiCtfHandleSnfMsgs ARGS(( Pst* pst, Buffer* mBuf )); -EXTERN S16 cmPkCtfCnmVendorSpecificInfo ARGS(( +S16 cmPkCtfCnmVendorSpecificInfo ARGS(( CtfCnmVendorSpecificInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCtfCnmCellSyncReq ARGS(( +S16 cmPkCtfCtfCnmCellSyncReq ARGS(( CtfCnmCellSyncReq *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCnmVendorSpecificInfo ARGS(( +S16 cmUnpkCtfCnmVendorSpecificInfo ARGS(( CtfCnmVendorSpecificInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCtfCnmCellSyncReq ARGS(( +S16 cmUnpkCtfCtfCnmCellSyncReq ARGS(( CtfCnmCellSyncReq *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmCellSyncReq ARGS(( +S16 cmPkCtfCnmCellSyncReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncReq * cfgReqInfo )); -EXTERN S16 cmUnpkCtfCnmCellSyncReq ARGS(( +S16 cmUnpkCtfCnmCellSyncReq ARGS(( CtfCnmCellSyncReqMsg func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmInitSyncReq ARGS(( +S16 cmPkCtfCnmInitSyncReq ARGS(( Pst* pst, SpId spId, CtfCfgTransId *transId, CtfCnmInitSyncReq * cfgReqInfo )); -EXTERN S16 cmUnpkCtfCnmInitSyncReq ARGS(( +S16 cmUnpkCtfCnmInitSyncReq ARGS(( CtfCnmInitSyncReqMsg func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfctfCnmMibInfo ARGS(( +S16 cmPkCtfctfCnmMibInfo ARGS(( CtfCnmMibInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfctfCnmInitSyncInfo ARGS(( +S16 cmPkCtfctfCnmInitSyncInfo ARGS(( CtfCnmInitSyncInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmInitSyncRsp ARGS(( +S16 cmPkCtfCnmInitSyncRsp ARGS(( Pst* pst, SpId spId, CtfCfgTransId *transId, CtfCnmInitSyncRsp * cfgRspInfo )); -EXTERN S16 cmUnpkCtfctfCnmMibInfo ARGS(( +S16 cmUnpkCtfctfCnmMibInfo ARGS(( CtfCnmMibInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkctfCnmInitSyncInfo ARGS(( +S16 cmUnpkctfCnmInitSyncInfo ARGS(( CtfCnmInitSyncInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCnmInitSyncRspMsg ARGS(( +S16 cmUnpkCtfCnmInitSyncRspMsg ARGS(( CtfCnmInitSyncRsp *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCnmInitSyncRsp ARGS(( +S16 cmUnpkCtfCnmInitSyncRsp ARGS(( CtfCnmInitSyncRspMsg func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmCellSyncRsp ARGS(( +S16 cmPkCtfCnmCellSyncRsp ARGS(( Pst* pst, SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncRsp * cfgRspInfo )); -EXTERN S16 cmUnpkCtfCnmSyncRspMsg ARGS(( +S16 cmUnpkCtfCnmSyncRspMsg ARGS(( CtfCnmCellSyncRsp *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCnmCellSyncRsp ARGS(( +S16 cmUnpkCtfCnmCellSyncRsp ARGS(( CtfCnmCellSyncRspMsg func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfCnmCellSyncInd ARGS(( +S16 cmPkCtfCnmCellSyncInd ARGS(( Pst* pst, SpId spId, CtfCfgTransId *transId, CtfCnmCellSyncInd * cfgIndInfo )); -EXTERN S16 cmUnpkCtfCnmSyncIndMsg ARGS(( +S16 cmUnpkCtfCnmSyncIndMsg ARGS(( CtfCnmCellSyncInd *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfCnmCellSyncInd ARGS(( +S16 cmUnpkCtfCnmCellSyncInd ARGS(( CtfCnmCellSyncIndMsg func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkCtfcfgReqInfo ARGS(( +S16 cmPkCtfcfgReqInfo ARGS(( CtfCnmInitSyncReq *param, Buffer *mBuf )); -EXTERN S16 cmUnpkCtfsyncReqInfo ARGS(( +S16 cmUnpkCtfsyncReqInfo ARGS(( CtfCnmInitSyncReq *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfcfgRspInfo ARGS(( +S16 cmPkCtfcfgRspInfo ARGS(( CtfCnmInitSyncRsp *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfCellSyncRsp ARGS(( +S16 cmPkCtfCellSyncRsp ARGS(( CtfCnmCellSyncRsp *param, Buffer *mBuf )); -EXTERN S16 cmPkCtfcfgIndInfo ARGS(( +S16 cmPkCtfcfgIndInfo ARGS(( CtfCnmCellSyncInd *param, Buffer *mBuf )); diff --git a/src/cm/envdep.h b/src/cm/envdep.h index a9e941b3a..8140c8ff3 100755 --- a/src/cm/envdep.h +++ b/src/cm/envdep.h @@ -1148,119 +1148,11 @@ typedef INTERRPT Void (*PIF) ARGS((void )); /* pointer to interrupt function */ #define PUBLIC #endif /* PUBLIC */ -#ifdef PRIVATE -#undef PRIVATE -#define PRIVATE static /* private is c static scope */ -#else /* not PRIVATE */ -#define PRIVATE static /* private is c static scope */ -#endif /* PRIVATE */ -#ifdef EXTERN -#undef EXTERN -#define EXTERN extern -#else /* not EXTERN */ -#define EXTERN extern -#endif /* EXTERN */ - - -#ifdef ANSI -#define CONSTANT const /* constant */ -#else -#define CONSTANT -#endif /* ANSI */ - -#ifdef _MCC68K /* microtec 68K cross compiler */ - -#ifdef VOLATILE -#undef VOLATILE -#define VOLATILE volatile /* volatile */ -#else -#define VOLATILE volatile -#endif - -#if _STR_CMP(_VERSION,"4.4") >= 0 /* MCC68K only, check version */ -#ifdef INLINE -#undef INLINE -#define INLINE inline /* inline */ -#else /* not INLINE */ -#define INLINE inline /* inline */ -#endif /* INLINE */ -#else -#define INLINE /* no inline */ -#endif /* __STR_CMP */ -#else /* not _MCC68K */ -#ifdef __GNUC__ -#ifndef __STRICT_ANSI__ -#ifdef INLINE -#undef INLINE -#define INLINE __inline__ -#else /* not inline */ -#define INLINE __inline__ -#endif /* INLINE */ -#else /* not strict ansi */ -#ifdef INLINE -#undef INLINE -#define INLINE -#else /* not inline */ -#define INLINE -#endif /* INLINE */ -#endif /* __STRICT_ANSI */ -#ifdef VOLATILE -#undef VOLATILE -#define VOLATILE volatile /* volatile */ -#else /* volatile */ -#define VOLATILE volatile -#endif -#else /* not gnuc */ -#ifdef WIN32 -#ifdef VOLATILE -#undef VOLATILE -#define VOLATILE volatile -#else /* VOLATILE */ -#define VOLATILE volatile -#endif /* VOLATILE */ - -#ifdef INLINE -#undef INLINE -#define INLINE -#else -#define INLINE -#endif /* INLINE */ -#else /* not WIN32 */ - -#ifdef VOLATILE -#undef VOLATILE -#define VOLATILE /* volatile */ -#else -#define VOLATILE /* volatile */ -#endif /* VOLATILE */ - -#ifdef INLINE -#undef INLINE -#define INLINE -#else -#define INLINE -#endif /* INLINE */ - -#endif /* WIN32 */ -#endif /* __GNUC__ */ -#endif /* _MCC68K */ /*envdep_h_001.main_77 SSI-4GMX specfic changes*/ /*envdep_h_001.main_78 : removed SSI-4GMX specfic changes*/ -#ifdef VOLATILE -#undef VOLATILE -#define VOLATILE volatile -#else -#define VOLATILE volatile -#endif -#ifdef __cplusplus -#ifdef INLINE -#undef INLINE -#endif -#define INLINE -#endif /********************************************************************** @@ -1272,25 +1164,25 @@ typedef INTERRPT Void (*PIF) ARGS((void )); /* pointer to interrupt function */ #ifndef STDIO_INCLD #ifdef SUNOS41 -EXTERN S8 *sprintf ARGS((S8 *buffer, CONSTANT S8 *format, /* args */ ...)); +S8 *sprintf ARGS((S8 *buffer, const S8 *format, /* args */ ...)); #else #ifdef SUNOS51 #else /* not SUNOS51 */ #ifdef HPOS -EXTERN int sprintf ARGS((S8 *s, CONSTANT S8 *format, /* args */ ... )); +int sprintf ARGS((S8 *s, const S8 *format, /* args */ ... )); #else #ifdef _MCC68K -EXTERN Void sprintf ARGS((S8 *outbuf, S8 *fmt, /* args */ ...)); /* td68k.x */ +Void sprintf ARGS((S8 *outbuf, S8 *fmt, /* args */ ...)); /* td68k.x */ #else /* other os */ #ifdef WIN32 -EXTERN int sprintf ARGS((S8 *buffer,CONSTANT S8 *format, /* args */ ...)); +int sprintf ARGS((S8 *buffer,const S8 *format, /* args */ ...)); #else #ifdef VW -EXTERN int sprintf ARGS((S8 *buffer,CONSTANT S8 *format, /* args */ ...)); +int sprintf ARGS((S8 *buffer,const S8 *format, /* args */ ...)); #else #ifdef SS_PS -EXTERN int sprintf ARGS((S8 *buffer,CONSTANT S8 *format, /* args */ ...)); +int sprintf ARGS((S8 *buffer,const S8 *format, /* args */ ...)); #endif /* SS_PS */ #endif /* VW */ #endif /* WIN32 */ @@ -1796,10 +1688,10 @@ typedef S8 *ARGTYPE; #ifdef TRACE5 /* trace 5 - call stack */ #define T5M 64 /* trace 5 - maximum call stack height */ -extern S8 *t5s[]; /* trace 5 - call stack */ -extern S16 t5t; /* trace 5 - top of call stack */ +S8 *t5s[]; /* trace 5 - call stack */ +S16 t5t; /* trace 5 - top of call stack */ #ifdef ERRCHK -extern Void FAR exit(int); +Void FAR exit(int); #endif #endif diff --git a/src/cm/gen.h b/src/cm/gen.h index 1f5c86ea7..14572e50e 100755 --- a/src/cm/gen.h +++ b/src/cm/gen.h @@ -2659,7 +2659,7 @@ typedef struct _debugInfo uint32_t count; } DebugInfo; -EXTERN DebugInfo debugInfo; +DebugInfo debugInfo; #endif #endif /* __GENH__ */ diff --git a/src/cm/gen.x b/src/cm/gen.x index 868178868..ba6f02f94 100755 --- a/src/cm/gen.x +++ b/src/cm/gen.x @@ -1604,38 +1604,38 @@ typedef uint8_t CmIpAddr6[16]; /* 16 byte IPV6 address */ /* common packing functions */ /* system services structures */ -EXTERN S16 cmPkDateTime ARGS((DateTime *dateTime, Buffer *mBuf)); -EXTERN S16 cmPkDuration ARGS((Duration *duration, Buffer *mBuf)); -EXTERN S16 oduPackPointer ARGS((PTR ptr, Buffer *mBuf)); -EXTERN S16 cmPkEntityId ARGS((EntityId *entityId, Buffer *mBuf)); -EXTERN S16 cmPkElmntId ARGS((ElmntId *elmntId, Buffer *mBuf)); -EXTERN S16 cmPkMemoryId ARGS((MemoryId *memoryId, Buffer *mBuf)); +S16 cmPkDateTime ARGS((DateTime *dateTime, Buffer *mBuf)); +S16 cmPkDuration ARGS((Duration *duration, Buffer *mBuf)); +S16 oduPackPointer ARGS((PTR ptr, Buffer *mBuf)); +S16 cmPkEntityId ARGS((EntityId *entityId, Buffer *mBuf)); +S16 cmPkElmntId ARGS((ElmntId *elmntId, Buffer *mBuf)); +S16 cmPkMemoryId ARGS((MemoryId *memoryId, Buffer *mBuf)); /* general structures */ -EXTERN S16 cmPkSystemId ARGS((SystemId *systemId, Buffer *mBuf)); -EXTERN S16 cmPkAddrs ARGS((Addrs *addrs, Buffer *mBuf)); -EXTERN S16 cmPkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf)); -EXTERN S16 cmPkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf)); -EXTERN S16 cmPkShrtAddrs ARGS((ShrtAddrs *addrs, Buffer *mBuf)); -EXTERN S16 cmPkAddrMask ARGS((uint8_t *mask, Buffer *mBuf)); -EXTERN S16 cmPkBndCfg ARGS((BndCfg *bndCfg, Buffer *mBuf)); -EXTERN S16 cmPkPst ARGS((Pst *pst, Buffer *mBuf)); -EXTERN S16 cmPkElmtHdr ARGS((ElmtHdr *m, Buffer *mBuf)); -EXTERN S16 cmPkTknUInt8 ARGS((TknUInt8 *tknUInt8, Buffer *mBuf)); -EXTERN S16 cmPkTknS8 ARGS((TknS8 *tknS8, Buffer *mBuf)); -EXTERN S16 cmPkTknUInt16 ARGS((TknUInt16 *tknUInt16, Buffer *mBuf)); -EXTERN S16 cmPkTknUInt32 ARGS((TknUInt32 *tknUInt32, Buffer *mBuf)); -EXTERN S16 cmPkTknStr ARGS((TknStr *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStrM ARGS((TknStrM *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStrS ARGS((TknStrS *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStrE ARGS((TknStrE *tknStr, Buffer *mBuf)); - -EXTERN S16 cmPkTknStr4 ARGS((TknStr4 *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStr12 ARGS((TknStr12 *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStr32 ARGS((TknStr32 *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStr64 ARGS((TknStr64 *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStr132 ARGS((TknStr132 *tknStr, Buffer *mBuf)); -EXTERN S16 cmPkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf)); +S16 cmPkSystemId ARGS((SystemId *systemId, Buffer *mBuf)); +S16 cmPkAddrs ARGS((Addrs *addrs, Buffer *mBuf)); +S16 cmPkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf)); +S16 cmPkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf)); +S16 cmPkShrtAddrs ARGS((ShrtAddrs *addrs, Buffer *mBuf)); +S16 cmPkAddrMask ARGS((uint8_t *mask, Buffer *mBuf)); +S16 cmPkBndCfg ARGS((BndCfg *bndCfg, Buffer *mBuf)); +S16 cmPkPst ARGS((Pst *pst, Buffer *mBuf)); +S16 cmPkElmtHdr ARGS((ElmtHdr *m, Buffer *mBuf)); +S16 cmPkTknUInt8 ARGS((TknUInt8 *tknUInt8, Buffer *mBuf)); +S16 cmPkTknS8 ARGS((TknS8 *tknS8, Buffer *mBuf)); +S16 cmPkTknUInt16 ARGS((TknUInt16 *tknU16, Buffer *mBuf)); +S16 cmPkTknUInt32 ARGS((TknUInt32 *tknU32, Buffer *mBuf)); +S16 cmPkTknStr ARGS((TknStr *tknStr, Buffer *mBuf)); +S16 cmPkTknStrM ARGS((TknStrM *tknStr, Buffer *mBuf)); +S16 cmPkTknStrS ARGS((TknStrS *tknStr, Buffer *mBuf)); +S16 cmPkTknStrE ARGS((TknStrE *tknStr, Buffer *mBuf)); + +S16 cmPkTknStr4 ARGS((TknStr4 *tknStr, Buffer *mBuf)); +S16 cmPkTknStr12 ARGS((TknStr12 *tknStr, Buffer *mBuf)); +S16 cmPkTknStr32 ARGS((TknStr32 *tknStr, Buffer *mBuf)); +S16 cmPkTknStr64 ARGS((TknStr64 *tknStr, Buffer *mBuf)); +S16 cmPkTknStr132 ARGS((TknStr132 *tknStr, Buffer *mBuf)); +S16 cmPkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf)); S16 cmPkTknS32 ARGS((TknS32 *tknS32, Buffer *mBuf)); S16 cmPkTknOid ARGS((TknOid *tknOid, Buffer *mBuf)); @@ -1646,48 +1646,48 @@ EXTERN S16 cmPkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf)); #endif /* layer management structures */ -EXTERN S16 cmPkHeader ARGS((Header *header, Buffer *mBuf)); -EXTERN S16 cmPkSmCfg ARGS((SmCfg *smCfg, Buffer *mBuf)); -EXTERN S16 cmPkTmrCfg ARGS((TmrCfg *tmrCfg, Buffer *mBuf)); -EXTERN S16 cmPkCmStatus ARGS((CmStatus *status, Buffer *mBuf)); -EXTERN S16 cmPkCmAlarm ARGS((CmAlarm *alrm, Buffer *mBuf)); +S16 cmPkHeader ARGS((Header *header, Buffer *mBuf)); +S16 cmPkSmCfg ARGS((SmCfg *smCfg, Buffer *mBuf)); +S16 cmPkTmrCfg ARGS((TmrCfg *tmrCfg, Buffer *mBuf)); +S16 cmPkCmStatus ARGS((CmStatus *status, Buffer *mBuf)); +S16 cmPkCmAlarm ARGS((CmAlarm *alrm, Buffer *mBuf)); /* common unpacking functions */ /* system services structures */ -EXTERN S16 cmUnpkDateTime ARGS((DateTime *dateTime, Buffer *mBuf)); -EXTERN S16 cmUnpkDuration ARGS((Duration *duration, Buffer *mBuf)); -EXTERN S16 oduUnpackPointer ARGS((PTR *ptr, Buffer *mBuf)); -EXTERN S16 cmUnpkEntityId ARGS((EntityId *entityId, Buffer *mBuf)); -EXTERN S16 cmUnpkElmntId ARGS((ElmntId *elmntId, Buffer *mBuf)); -EXTERN S16 cmUnpkMemoryId ARGS((MemoryId *memoryId, Buffer *mBuf)); +S16 cmUnpkDateTime ARGS((DateTime *dateTime, Buffer *mBuf)); +S16 cmUnpkDuration ARGS((Duration *duration, Buffer *mBuf)); +S16 oduUnpackPointer ARGS((PTR *ptr, Buffer *mBuf)); +S16 cmUnpkEntityId ARGS((EntityId *entityId, Buffer *mBuf)); +S16 cmUnpkElmntId ARGS((ElmntId *elmntId, Buffer *mBuf)); +S16 cmUnpkMemoryId ARGS((MemoryId *memoryId, Buffer *mBuf)); /* general structures */ -EXTERN S16 cmUnpkSystemId ARGS((SystemId *systemId, Buffer *mBuf)); -EXTERN S16 cmUnpkAddrs ARGS((Addrs *addrs, Buffer *mBuf)); -EXTERN S16 cmUnpkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf)); -EXTERN S16 cmUnpkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf)); -EXTERN S16 cmUnpkShrtAddrs ARGS((ShrtAddrs *addrs, Buffer *mBuf)); -EXTERN S16 cmUnpkAddrMask ARGS((uint8_t *mask, Buffer *mBuf)); -EXTERN S16 cmUnpkBndCfg ARGS((BndCfg *bndCfg, Buffer *mBuf)); -EXTERN S16 cmUnpkPst ARGS((Pst *pst, Buffer *mBuf)); -EXTERN S16 cmUnpkElmtHdr ARGS((ElmtHdr *m, Buffer *mBuf)); -EXTERN S16 cmUnpkTknUInt8 ARGS((TknUInt8 *tknUInt8, Buffer *mBuf)); -EXTERN S16 cmUnpkTknS8 ARGS((TknS8 *tknS8, Buffer *mBuf)); -EXTERN S16 cmUnpkTknUInt16 ARGS((TknUInt16 *tknUInt16, Buffer *mBuf)); -EXTERN S16 cmUnpkTknUInt32 ARGS((TknUInt32 *tknUInt32, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr ARGS((TknStr *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrM ARGS((TknStrM *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrS ARGS((TknStrS *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStrE ARGS((TknStrE *tknStr, Buffer *mBuf)); - -EXTERN S16 cmUnpkTknStr4 ARGS((TknStr4 *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr12 ARGS((TknStr12 *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr32 ARGS((TknStr32 *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr64 ARGS((TknStr64 *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr132 ARGS((TknStr132 *tknStr, Buffer *mBuf)); -EXTERN S16 cmUnpkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf)); +S16 cmUnpkSystemId ARGS((SystemId *systemId, Buffer *mBuf)); +S16 cmUnpkAddrs ARGS((Addrs *addrs, Buffer *mBuf)); +S16 cmUnpkProtAddr ARGS((ProtAddr *protAddr, Buffer *mBuf)); +S16 cmUnpkProtAddrTbl ARGS((ProtAddrTbl *protAddr, Buffer *mBuf)); +S16 cmUnpkShrtAddrs ARGS((ShrtAddrs *addrs, Buffer *mBuf)); +S16 cmUnpkAddrMask ARGS((uint8_t *mask, Buffer *mBuf)); +S16 cmUnpkBndCfg ARGS((BndCfg *bndCfg, Buffer *mBuf)); +S16 cmUnpkPst ARGS((Pst *pst, Buffer *mBuf)); +S16 cmUnpkElmtHdr ARGS((ElmtHdr *m, Buffer *mBuf)); +S16 cmUnpkTknUInt8 ARGS((TknUInt8 *tknUInt8, Buffer *mBuf)); +S16 cmUnpkTknS8 ARGS((TknS8 *tknS8, Buffer *mBuf)); +S16 cmUnpkTknUInt16 ARGS((TknUInt16 *tknU16, Buffer *mBuf)); +S16 cmUnpkTknUInt32 ARGS((TknUInt32 *tknU32, Buffer *mBuf)); +S16 cmUnpkTknStr ARGS((TknStr *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStrM ARGS((TknStrM *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStrS ARGS((TknStrS *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStrE ARGS((TknStrE *tknStr, Buffer *mBuf)); + +S16 cmUnpkTknStr4 ARGS((TknStr4 *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStr12 ARGS((TknStr12 *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStr32 ARGS((TknStr32 *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStr64 ARGS((TknStr64 *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStr132 ARGS((TknStr132 *tknStr, Buffer *mBuf)); +S16 cmUnpkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf)); S16 cmUnpkTknS32 ARGS((TknS32 *tknS32, Buffer *mBuf)); S16 cmUnpkTknOid ARGS((TknOid *tknOid, Buffer *mBuf)); @@ -1698,11 +1698,11 @@ EXTERN S16 cmUnpkTknStr256 ARGS((TknStr256 *tknStr, Buffer *mBuf)); #endif /* layer management structures */ -EXTERN S16 cmUnpkHeader ARGS((Header *header, Buffer *mBuf)); -EXTERN S16 cmUnpkSmCfg ARGS((SmCfg *smCfg, Buffer *mBuf)); -EXTERN S16 cmUnpkTmrCfg ARGS((TmrCfg *tmrCfg, Buffer *mBuf)); -EXTERN S16 cmUnpkCmStatus ARGS((CmStatus *status, Buffer *mBuf)); -EXTERN S16 cmUnpkCmAlarm ARGS((CmAlarm *alrm, Buffer *mBuf)); +S16 cmUnpkHeader ARGS((Header *header, Buffer *mBuf)); +S16 cmUnpkSmCfg ARGS((SmCfg *smCfg, Buffer *mBuf)); +S16 cmUnpkTmrCfg ARGS((TmrCfg *tmrCfg, Buffer *mBuf)); +S16 cmUnpkCmStatus ARGS((CmStatus *status, Buffer *mBuf)); +S16 cmUnpkCmAlarm ARGS((CmAlarm *alrm, Buffer *mBuf)); #endif /* CMFILE_REORG_1 */ #if defined(XEON_SPECIFIC_CHANGES) || defined(INTEL_WLS) diff --git a/src/cm/kwu.h b/src/cm/kwu.h index 3a4dfacb2..3cfbdc43c 100755 --- a/src/cm/kwu.h +++ b/src/cm/kwu.h @@ -33,7 +33,7 @@ #define __KWU_H__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*for extern "C"*/ /** @file kwu.h diff --git a/src/cm/kwu.x b/src/cm/kwu.x index ba32990ea..32be9db13 100755 --- a/src/cm/kwu.x +++ b/src/cm/kwu.x @@ -33,7 +33,7 @@ #define __KWU_X__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*for extern "C"*/ /** @file kwu.x @@ -156,7 +156,7 @@ Allowable values: 0 to 32767. * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuBndReq ARGS((Pst *pst, +S16 RlcUiKwuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); @@ -178,7 +178,7 @@ CM_BND_NOK: Error encountered during the processing of the bind request. * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuBndCfm ARGS((Pst *pst, +S16 RlcUiKwuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); @@ -196,7 +196,7 @@ disassociated from its service user SAP. Allowable values: 0 to 32767. * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuUbndReq ARGS((Pst *pst, +S16 RlcUiKwuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); @@ -213,7 +213,7 @@ EXTERN S16 RlcUiKwuUbndReq ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 rlcSendUlDataToDu ARGS((Pst *pst, +S16 rlcSendUlDataToDu ARGS((Pst *pst, KwuDatIndInfo* datInd, Buffer *mBuf)); @@ -229,7 +229,7 @@ EXTERN S16 rlcSendUlDataToDu ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuDatCfm ARGS((Pst *pst, +S16 RlcUiKwuDatCfm ARGS((Pst *pst, SuId suId, KwuDatCfmInfo* datCfm)); @@ -245,7 +245,7 @@ EXTERN S16 RlcUiKwuDatCfm ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuDiscSduReq ARGS((Pst *pst, +S16 RlcUiKwuDiscSduReq ARGS((Pst *pst, SpId spId, KwuDiscSduInfo* discSdu)); @@ -261,7 +261,7 @@ EXTERN S16 RlcUiKwuDiscSduReq ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuStaInd ARGS((Pst *pst, +S16 RlcUiKwuStaInd ARGS((Pst *pst, SuId suId, KwuStaIndInfo* staInd)); @@ -277,7 +277,7 @@ EXTERN S16 RlcUiKwuStaInd ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuDiscSduCfm ARGS((Pst *pst, +S16 RlcUiKwuDiscSduCfm ARGS((Pst *pst, SpId spId, KwuDiscSduInfo* discCfmSdu)); @@ -292,7 +292,7 @@ EXTERN S16 RlcUiKwuDiscSduCfm ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuFlowCntrlInd ARGS((Pst *pst, +S16 RlcUiKwuFlowCntrlInd ARGS((Pst *pst, SuId suId, KwuFlowCntrlIndInfo* flowCntrlIndInfo)); #ifdef LTE_L2_MEAS @@ -308,199 +308,199 @@ EXTERN S16 RlcUiKwuFlowCntrlInd ARGS((Pst *pst, * -# ROK * -# RFAILED */ -EXTERN S16 RlcUiKwuDatAckInd ARGS((Pst *pst, +S16 RlcUiKwuDatAckInd ARGS((Pst *pst, SuId suId, KwuDatAckInfo* ackInd)); #endif /* LTE_L2_MEAS */ -EXTERN S16 RlcUiKwuReEstCmpInd ARGS((Pst *pst, +S16 RlcUiKwuReEstCmpInd ARGS((Pst *pst, SuId suId, CmLteRlcId rlcId )); /* RRC Extern Declarations */ #ifdef NH -EXTERN S16 NhLiKwuBndReq ARGS((Pst *pst, +S16 NhLiKwuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); -EXTERN S16 NhLiKwuBndCfm ARGS((Pst *pst, +S16 NhLiKwuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 NhLiKwuUbndReq ARGS((Pst *pst, +S16 NhLiKwuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); -EXTERN S16 NhLiKwuDatReq ARGS((Pst *pst, +S16 NhLiKwuDatReq ARGS((Pst *pst, SpId spId, KwuDatReqInfo* datReq, Buffer *buf)); -EXTERN S16 NhLiKwuDatInd ARGS((Pst *pst, +S16 NhLiKwuDatInd ARGS((Pst *pst, KwuDatIndInfo* datInd, Buffer *buf)); #endif /* NH */ /* Dummy RRC Interface primitives */ #ifdef DM -EXTERN S16 DmUiKwuBndReq ARGS((Pst *pst, +S16 DmUiKwuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); -EXTERN S16 DmUiKwuBndCfm ARGS((Pst *pst, +S16 DmUiKwuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 DmUiKwuUbndReq ARGS((Pst *pst, +S16 DmUiKwuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); -EXTERN S16 DmUiKwuDatReq ARGS((Pst *pst, +S16 DmUiKwuDatReq ARGS((Pst *pst, SpId spId, KwuDatReqInfo* datReq, Buffer *buf)); -EXTERN S16 DmUiKwuDatInd ARGS((Pst *pst, +S16 DmUiKwuDatInd ARGS((Pst *pst, SuId suId, KwuDatIndInfo* datInd, Buffer *buf)); -EXTERN S16 DmUiKwuReEstCmpInd ARGS((Pst *pst, +S16 DmUiKwuReEstCmpInd ARGS((Pst *pst, SuId suId, CmLteRlcId rlcId)); #endif /* DM */ /* PDCP Extern Declarations */ #ifdef PJ -EXTERN S16 PjLiKwuBndReq ARGS((Pst *pst, +S16 PjLiKwuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); -EXTERN S16 PjLiKwuBndCfm ARGS((Pst *pst, +S16 PjLiKwuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); -EXTERN S16 PjLiKwuUbndReq ARGS((Pst *pst, +S16 PjLiKwuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); -EXTERN S16 PjLiKwuDatReq ARGS((Pst *pst, +S16 PjLiKwuDatReq ARGS((Pst *pst, SpId spId, KwuDatReqInfo* datReq, Buffer *buf)); -EXTERN S16 PjLiKwuDatInd ARGS((Pst *pst, +S16 PjLiKwuDatInd ARGS((Pst *pst, KwuDatIndInfo* datInd, Buffer *buf)); -EXTERN S16 PjLiKwuDatCfm ARGS((Pst *pst, +S16 PjLiKwuDatCfm ARGS((Pst *pst, SuId suId, KwuDatCfmInfo* datCfm)); -EXTERN S16 PjLiKwuStaInd ARGS((Pst *pst, +S16 PjLiKwuStaInd ARGS((Pst *pst, SuId suId, KwuStaIndInfo* staInd)); -EXTERN S16 PjLiKwuDiscSduReq ARGS((Pst *pst, +S16 PjLiKwuDiscSduReq ARGS((Pst *pst, SpId spId, KwuDiscSduInfo* discSdu)); -EXTERN S16 PjLiKwuReEstCmpInd ARGS((Pst *pst, +S16 PjLiKwuReEstCmpInd ARGS((Pst *pst, SuId suId, CmLteRlcId rlcId)); /* kwu_x_001.main_3 Added support for L2 Measurement */ -EXTERN S16 PjLiKwuDiscSduCfm ARGS((Pst *pst, +S16 PjLiKwuDiscSduCfm ARGS((Pst *pst, SpId spId, KwuDiscSduInfo* discCfmSdu)); -EXTERN S16 PjLiKwuFlowCntrlInd ARGS((Pst *pst, +S16 PjLiKwuFlowCntrlInd ARGS((Pst *pst, SuId suId, KwuFlowCntrlIndInfo *flowCntrlInfo)); #ifdef LTE_L2_MEAS -EXTERN S16 PjLiKwuDatAckInd ARGS((Pst *pst, +S16 PjLiKwuDatAckInd ARGS((Pst *pst, SuId suId, KwuDatAckInfo* ackInd)); #endif /* LTE_L2_MEAS */ #endif /* PJ */ #ifdef MAC_RLC_UL_RBUF -EXTERN S16 rlcUlBatchProc ARGS((Void)); +S16 rlcUlBatchProc ARGS((Void)); #endif /***************************************************************************** * PACK/UNPACK FUNCTIONS ****************************************************************************/ #ifdef LCKWU /* Packing Functions */ -EXTERN uint8_t cmPkKwuDatReqInfo ARGS (( +uint8_t cmPkKwuDatReqInfo ARGS (( KwuDatReqInfo *param, Buffer *mBuf )); -EXTERN uint8_t cmPkKwuDatIndInfo ARGS (( +uint8_t cmPkKwuDatIndInfo ARGS (( KwuDatIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkKwuDatCfmInfo ARGS (( +S16 cmPkKwuDatCfmInfo ARGS (( KwuDatCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkKwuStaIndInfo ARGS (( +S16 cmPkKwuStaIndInfo ARGS (( KwuStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkKwuBndReq ARGS (( +S16 cmPkKwuBndReq ARGS (( Pst * pst, SuId suId, SpId spId )); -EXTERN S16 cmPkKwuUbndReq ARGS (( +S16 cmPkKwuUbndReq ARGS (( Pst * pst, SuId suId, Reason reason )); -EXTERN S16 cmPkKwuBndCfm ARGS (( +S16 cmPkKwuBndCfm ARGS (( Pst * pst, SuId suId, uint8_t status )); -EXTERN uint8_t cmPkKwuDatReq ARGS (( +uint8_t cmPkKwuDatReq ARGS (( Pst * pst, KwuDatReqInfo* datReq, Buffer * mBuf )); -EXTERN uint8_t cmPkKwuDatInd ARGS (( +uint8_t cmPkKwuDatInd ARGS (( Pst * pst, KwuDatIndInfo* datInd, Buffer * mBuf )); -EXTERN S16 cmPkKwuDatCfm ARGS (( +S16 cmPkKwuDatCfm ARGS (( Pst * pst, SuId suId, KwuDatCfmInfo* datCfm )); -EXTERN S16 cmPkKwuStaInd ARGS (( +S16 cmPkKwuStaInd ARGS (( Pst * pst, SuId suId, KwuStaIndInfo* staInd )); -EXTERN S16 cmPkKwuReEstCmpInd ARGS (( +S16 cmPkKwuReEstCmpInd ARGS (( Pst * pst, SuId suId, CmLteRlcId rlcId )); -EXTERN S16 cmPkKwuDiscSduReq ARGS (( +S16 cmPkKwuDiscSduReq ARGS (( Pst * pst, SpId spId, KwuDiscSduInfo* discSdu @@ -508,105 +508,105 @@ KwuDiscSduInfo* discSdu /* kwu_x_001.main_3 Added support for L2 Measurement */ #ifdef LTE_L2_MEAS -EXTERN S16 cmPkKwuDatAckInfo ARGS (( +S16 cmPkKwuDatAckInfo ARGS (( KwuDatAckInfo* datAckInd, Buffer * mBuf )); -EXTERN S16 cmPkKwuDatAckInd ARGS (( +S16 cmPkKwuDatAckInd ARGS (( Pst * pst, SuId suId, KwuDatAckInfo* ackInfo )); #endif /* LTE_L2_MEAS */ -EXTERN S16 cmPkKwuDiscSduCfm ARGS (( +S16 cmPkKwuDiscSduCfm ARGS (( Pst * pst, SpId spId, KwuDiscSduInfo* cfmSdu )); -EXTERN S16 cmPkKwuFlowCntrlInd ARGS (( +S16 cmPkKwuFlowCntrlInd ARGS (( Pst *pst, SuId suId, KwuFlowCntrlIndInfo *flowCntrlIndInfo )); /* Unpacking Functions */ -EXTERN S16 cmUnpkKwuDatReqInfo ARGS (( +S16 cmUnpkKwuDatReqInfo ARGS (( KwuDatReqInfo *param, Buffer *mBuf )); -EXTERN uint8_t cmUnpkKwuDatIndInfo ARGS (( +uint8_t cmUnpkKwuDatIndInfo ARGS (( KwuDatIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuDatCfmInfo ARGS (( +S16 cmUnpkKwuDatCfmInfo ARGS (( KwuDatCfmInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuStaIndInfo ARGS (( +S16 cmUnpkKwuStaIndInfo ARGS (( KwuStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuBndReq ARGS (( +S16 cmUnpkKwuBndReq ARGS (( KwuBndReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuUbndReq ARGS (( +S16 cmUnpkKwuUbndReq ARGS (( KwuUbndReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuBndCfm ARGS (( +S16 cmUnpkKwuBndCfm ARGS (( KwuBndCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuDatReq ARGS (( +S16 cmUnpkKwuDatReq ARGS (( KwuDatReq func, Pst *pst, Buffer *mBuf )); -EXTERN uint8_t cmUnpkKwuDatInd ARGS (( +uint8_t cmUnpkKwuDatInd ARGS (( KwuDatInd func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuDatCfm ARGS (( +S16 cmUnpkKwuDatCfm ARGS (( KwuDatCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuStaInd ARGS (( +S16 cmUnpkKwuStaInd ARGS (( KwuStaInd func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuReEstCmpInd ARGS (( +S16 cmUnpkKwuReEstCmpInd ARGS (( KwuReEstCmpInd func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuDiscSduReq ARGS (( +S16 cmUnpkKwuDiscSduReq ARGS (( KwuDiscSduReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuFlowCntrlInd ARGS (( +S16 cmUnpkKwuFlowCntrlInd ARGS (( KwuFlowCntrlInd func, Pst *pst, Buffer *mBuf @@ -614,30 +614,30 @@ Buffer *mBuf /* kwu_x_001.main_3 Added support for L2 Measurement */ #ifdef LTE_L2_MEAS -EXTERN S16 cmUnpkKwuDatAckInfo ARGS (( +S16 cmUnpkKwuDatAckInfo ARGS (( KwuDatAckInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuDatAckInd ARGS (( +S16 cmUnpkKwuDatAckInd ARGS (( KwuDatAckInd func, Pst *pst, Buffer *mBuf )); #endif /* LTE_L2_MEAS */ -EXTERN S16 cmUnpkKwuDiscSduCfm ARGS (( +S16 cmUnpkKwuDiscSduCfm ARGS (( KwuDiscSduCfm func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkKwuFlowCntrlIndInfo ARGS(( +S16 cmPkKwuFlowCntrlIndInfo ARGS(( KwuFlowCntrlIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkKwuFlowCntrlIndInfo ARGS(( +S16 cmUnpkKwuFlowCntrlIndInfo ARGS(( KwuFlowCntrlIndInfo *param, Buffer *mBuf )); diff --git a/src/cm/l2_tenb_stats.x b/src/cm/l2_tenb_stats.x index c52c4fcfd..5b27df7c6 100755 --- a/src/cm/l2_tenb_stats.x +++ b/src/cm/l2_tenb_stats.x @@ -52,24 +52,24 @@ typedef struct tSL2UeStatsCb TSInfL2UeStats stats; }TSL2UeStatsCb; -EXTERN Void TSL2AllocStatsMem ARGS(( +Void TSL2AllocStatsMem ARGS(( Region region, Pool pool )); -EXTERN TSL2UeStatsCb* TSL2AllocUeStatsBlk ARGS(( +TSL2UeStatsCb* TSL2AllocUeStatsBlk ARGS(( uint16_t rnti )); -EXTERN Void TSL2DeallocUeStatsBlk ARGS(( +Void TSL2DeallocUeStatsBlk ARGS(( uint16_t rnti, TSL2UeStatsCb *statsCb )); -EXTERN TSL2CellStatsCb* TSL2AllocCellStatsBlk ARGS(( +TSL2CellStatsCb* TSL2AllocCellStatsBlk ARGS(( uint32_t cellId )); -EXTERN Void TSL2DeallocCellStatsBlk ARGS(( +Void TSL2DeallocCellStatsBlk ARGS(( uint32_t cellId )); -EXTERN Void TSL2SendStatsToApp ARGS(( +Void TSL2SendStatsToApp ARGS(( Pst *pst, SuId suId )); diff --git a/src/cm/lkw.c b/src/cm/lkw.c index ee085dd44..66f2ec32d 100755 --- a/src/cm/lkw.c +++ b/src/cm/lkw.c @@ -58,47 +58,47 @@ Txt ptNmb[LKW_PART_NUM_STR_LEN]; /* Part number */ /* forward references */ -PRIVATE S16 cmPkRlcMngmt ARGS ((RlcMngmt *param ,Event eventType, +static S16 cmPkRlcMngmt ARGS ((RlcMngmt *param ,Event eventType, Buffer *mBuf)); -PRIVATE S16 cmPkRlcCfg ARGS ((RlcMngmt *param ,Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmPkRlcCntrl ARGS ((RlcMngmt *cntrl, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmPkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmPkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt etmnt, Event eventType, +static S16 cmPkRlcCfg ARGS ((RlcMngmt *param ,Elmnt elmnt, Buffer *mBuf)); +static S16 cmPkRlcCntrl ARGS ((RlcMngmt *cntrl, Elmnt elmnt, Buffer *mBuf)); +static S16 cmPkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf)); +static S16 cmPkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt etmnt, Event eventType, Buffer *mBuf)); -PRIVATE S16 cmPkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmPkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf)); -PRIVATE S16 cmPkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf)); -PRIVATE S16 cmPkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf)); +static S16 cmPkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf)); +static S16 cmPkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf)); +static S16 cmPkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf)); +static S16 cmPkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf)); /* lkw_c_001.main_2 removed support of RGU sap statistics as it is reflecting * in general statstics. * */ -PRIVATE S16 cmPkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf)); +static S16 cmPkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf)); -PRIVATE S16 cmUnpkRlcMngmt ARGS ((RlcMngmt *param, Event eventType, +static S16 cmUnpkRlcMngmt ARGS ((RlcMngmt *param, Event eventType, Buffer * mBuf)); -PRIVATE S16 cmUnpkRlcCfg ARGS ((RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmUnpkRlcCntrl ARGS ((RlcMngmt *param, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmUnpkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmUnpkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt elmnt, Event eventType, +static S16 cmUnpkRlcCfg ARGS ((RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf)); +static S16 cmUnpkRlcCntrl ARGS ((RlcMngmt *param, Elmnt elmnt, Buffer *mBuf)); +static S16 cmUnpkRlcUsta ARGS ((RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf)); +static S16 cmUnpkRlcSsta ARGS ((RlcMngmt *ssta, Elmnt elmnt, Event eventType, Buffer *mBuf)); -PRIVATE S16 cmUnpkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf)); -PRIVATE S16 cmUnpkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf)); -PRIVATE S16 cmUnpkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf)); -PRIVATE S16 cmUnpkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf)); +static S16 cmUnpkRlcSts ARGS ((RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf)); +static S16 cmUnpkGenSts ARGS ((RlcGenSts *gen, Buffer *mBuf)); +static S16 cmUnpkCkwSapSts ARGS ((RlcCkwCntSts *rcSap, Buffer *mBuf)); +static S16 cmUnpkKwuSapSts ARGS ((RlcKwuSapSts *ruSap, Buffer *mBuf)); /* lkw_c_001.main_2 removed support of RGU sap statistics as it is reflecting * in general statstics. * */ -PRIVATE S16 cmUnpkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf)); +static S16 cmUnpkRlcTrc ARGS ((RlcMngmt *trc, Buffer *mBuf)); -PRIVATE S16 cmPkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf)); -PRIVATE S16 cmUnpkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf)); +static S16 cmPkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf)); +static S16 cmUnpkCkwSapSta ARGS ((RlcCkwCntSapSta *rcSap, Buffer *mBuf)); -PRIVATE S16 cmPkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf)); -PRIVATE S16 cmUnpkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf)); +static S16 cmPkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf)); +static S16 cmUnpkKwuSapSta ARGS ((RlcKwuSapSta *rlSap, Buffer *mBuf)); -PRIVATE S16 cmPkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf)); -PRIVATE S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf)); +static S16 cmPkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf)); +static S16 cmUnpkRguSapSta ARGS ((RlcRguSapSta *mkSap, Buffer *mBuf)); /** * @brief @@ -998,13 +998,13 @@ Buffer *mBuf; /* message buffer */ */ #ifdef ANSI -PRIVATE S16 cmPkCkwSapSta +static S16 cmPkCkwSapSta ( RlcCkwCntSapSta *rcSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) #else -PRIVATE S16 cmPkCkwSapSta(rcSap, mBuf) +static S16 cmPkCkwSapSta(rcSap, mBuf) RlcCkwCntSapSta *rcSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif @@ -1028,13 +1028,13 @@ Buffer *mBuf; /* Message buffer */ * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkCkwSapSta +static S16 cmUnpkCkwSapSta ( RlcCkwCntSapSta *rcSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) #else -PRIVATE S16 cmUnpkCkwSapSta(rcSap, mBuf) +static S16 cmUnpkCkwSapSta(rcSap, mBuf) RlcCkwCntSapSta *rcSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif @@ -1057,13 +1057,13 @@ Buffer *mBuf; /* Message buffer */ * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkKwuSapSta +static S16 cmPkKwuSapSta ( RlcKwuSapSta *rlSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) #else -PRIVATE S16 cmPkKwuSapSta(rlSap, mBuf) +static S16 cmPkKwuSapSta(rlSap, mBuf) RlcKwuSapSta *rlSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif @@ -1087,13 +1087,13 @@ Buffer *mBuf; /* Message buffer */ * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkKwuSapSta +static S16 cmUnpkKwuSapSta ( RlcKwuSapSta *rlSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) #else -PRIVATE S16 cmUnpkKwuSapSta(rlSap, mBuf) +static S16 cmUnpkKwuSapSta(rlSap, mBuf) RlcKwuSapSta *rlSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif @@ -1117,13 +1117,13 @@ Buffer *mBuf; /* Message buffer */ * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkRguSapSta +static S16 cmPkRguSapSta ( RlcRguSapSta *mkSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) #else -PRIVATE S16 cmPkRguSapSta(mkSap, mBuf) +static S16 cmPkRguSapSta(mkSap, mBuf) RlcRguSapSta *mkSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif @@ -1147,13 +1147,13 @@ Buffer *mBuf; /* Message buffer */ * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRguSapSta +static S16 cmUnpkRguSapSta ( RlcRguSapSta *mkSap, /* SAP statistics */ Buffer *mBuf /* Message buffer */ ) #else -PRIVATE S16 cmUnpkRguSapSta(mkSap, mBuf) +static S16 cmUnpkRguSapSta(mkSap, mBuf) RlcRguSapSta *mkSap; /* SAP statistics */ Buffer *mBuf; /* Message buffer */ #endif @@ -1454,14 +1454,14 @@ RlcMngmt *cfm; /* statistics confirmation */ */ #ifdef ANSI -PRIVATE S16 cmPkRlcMngmt +static S16 cmPkRlcMngmt ( RlcMngmt *param, /* Managment */ Event eventType, /* Event type */ Buffer *mBuf /* Message Buffer */ ) #else -PRIVATE S16 cmPkRlcMngmt(param ,eventType, mBuf) +static S16 cmPkRlcMngmt(param ,eventType, mBuf) RlcMngmt *param; /* Managment */ Event eventType; /* Event type */ Buffer *mBuf; /* Message Buffer */ @@ -1543,14 +1543,14 @@ Buffer *mBuf; /* Message Buffer */ * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkRlcCfg +static S16 cmPkRlcCfg ( RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmPkRlcCfg(cfg, elmnt, mBuf) +static S16 cmPkRlcCfg(cfg, elmnt, mBuf) RlcMngmt *cfg; Elmnt elmnt; Buffer *mBuf; @@ -1607,14 +1607,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkRlcCntrl +static S16 cmPkRlcCntrl ( RlcMngmt *cntrl, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmPkRlcCntrl(cntrl, elmnt, mBuf) +static S16 cmPkRlcCntrl(cntrl, elmnt, mBuf) RlcMngmt *cntrl; Elmnt elmnt; Buffer *mBuf; @@ -1686,14 +1686,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkRlcUsta +static S16 cmPkRlcUsta ( RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmPkRlcUsta(usta, elmnt, mBuf) +static S16 cmPkRlcUsta(usta, elmnt, mBuf) RlcMngmt *usta; Elmnt elmnt; Buffer *mBuf; @@ -1727,7 +1727,7 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkRlcSsta +static S16 cmPkRlcSsta ( RlcMngmt *ssta, Elmnt elmnt, @@ -1735,7 +1735,7 @@ Event eventType, Buffer *mBuf ) #else -PRIVATE S16 cmPkRlcSsta(ssta, elmnt, eventType, mBuf) +static S16 cmPkRlcSsta(ssta, elmnt, eventType, mBuf) RlcMngmt *ssta; Elmnt elmnt; Event eventType; @@ -1791,13 +1791,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkRlcTrc +static S16 cmPkRlcTrc ( RlcMngmt *trc, /* trace */ Buffer *mBuf /* data buffer */ ) #else -PRIVATE S16 cmPkRlcTrc(trc, mBuf) +static S16 cmPkRlcTrc(trc, mBuf) RlcMngmt *trc; /* trace */ Buffer *mBuf; /* data buffer */ #endif @@ -1822,14 +1822,14 @@ Buffer *mBuf; /* data buffer */ */ #ifdef ANSI -PRIVATE S16 cmPkRlcSts +static S16 cmPkRlcSts ( RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmPkRlcSts(sts, elmnt, mBuf) +static S16 cmPkRlcSts(sts, elmnt, mBuf) RlcMngmt *sts; Elmnt elmnt; Buffer *mBuf; @@ -1880,13 +1880,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkGenSts +static S16 cmPkGenSts ( RlcGenSts *gen, Buffer *mBuf ) #else -PRIVATE S16 cmPkGenSts(gen, mBuf) +static S16 cmPkGenSts(gen, mBuf) RlcGenSts *gen; Buffer *mBuf; #endif @@ -1919,13 +1919,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkCkwSapSts +static S16 cmPkCkwSapSts ( RlcCkwCntSts *rcSap, Buffer *mBuf ) #else -PRIVATE S16 cmPkCkwSapSts(rcSap, mBuf) +static S16 cmPkCkwSapSts(rcSap, mBuf) RlcCkwCntSts *rcSap; Buffer *mBuf; #endif @@ -1947,13 +1947,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmPkKwuSapSts +static S16 cmPkKwuSapSts ( RlcKwuSapSts *ruSap, Buffer *mBuf ) #else -PRIVATE S16 cmPkKwuSapSts(ruSap, mBuf) +static S16 cmPkKwuSapSts(ruSap, mBuf) RlcKwuSapSts *ruSap; Buffer *mBuf; #endif @@ -1983,14 +1983,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcMngmt +static S16 cmUnpkRlcMngmt ( RlcMngmt *param, Event eventType, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcMngmt(param ,eventType, mBuf) +static S16 cmUnpkRlcMngmt(param ,eventType, mBuf) RlcMngmt *param; Event eventType; Buffer *mBuf; @@ -2076,14 +2076,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcCfg +static S16 cmUnpkRlcCfg ( RlcMngmt *cfg, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcCfg(cfg ,elmnt, mBuf) +static S16 cmUnpkRlcCfg(cfg ,elmnt, mBuf) RlcMngmt *cfg; Elmnt elmnt; Buffer *mBuf; @@ -2140,14 +2140,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcCntrl +static S16 cmUnpkRlcCntrl ( RlcMngmt *cfm, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcCntrl(cfm, elmnt, mBuf) +static S16 cmUnpkRlcCntrl(cfm, elmnt, mBuf) RlcMngmt *cfm; Elmnt elmnt; Buffer *mBuf; @@ -2226,14 +2226,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcUsta +static S16 cmUnpkRlcUsta ( RlcMngmt *usta, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcUsta(usta ,elmnt, mBuf) +static S16 cmUnpkRlcUsta(usta ,elmnt, mBuf) RlcMngmt *usta; Elmnt elmnt; Buffer *mBuf; @@ -2266,7 +2266,7 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcSsta +static S16 cmUnpkRlcSsta ( RlcMngmt *ssta, Elmnt elmnt, @@ -2274,7 +2274,7 @@ Event eventType, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcSsta(ssta ,elmnt, eventType, mBuf) +static S16 cmUnpkRlcSsta(ssta ,elmnt, eventType, mBuf) RlcMngmt *ssta; Elmnt elmnt; Event eventType; @@ -2330,13 +2330,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcTrc +static S16 cmUnpkRlcTrc ( RlcMngmt *trc, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcTrc(trc, mBuf) +static S16 cmUnpkRlcTrc(trc, mBuf) RlcMngmt *trc; Buffer *mBuf; #endif @@ -2361,14 +2361,14 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkRlcSts +static S16 cmUnpkRlcSts ( RlcMngmt *sts, Elmnt elmnt, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRlcSts(sts ,elmnt, mBuf) +static S16 cmUnpkRlcSts(sts ,elmnt, mBuf) RlcMngmt *sts; Elmnt elmnt; Buffer *mBuf; @@ -2417,13 +2417,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkGenSts +static S16 cmUnpkGenSts ( RlcGenSts *gen, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkGenSts(gen, mBuf) +static S16 cmUnpkGenSts(gen, mBuf) RlcGenSts *gen; Buffer *mBuf; #endif @@ -2455,13 +2455,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkCkwSapSts +static S16 cmUnpkCkwSapSts ( RlcCkwCntSts *rcSap, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkCkwSapSts(rcSap ,mBuf) +static S16 cmUnpkCkwSapSts(rcSap ,mBuf) RlcCkwCntSts *rcSap; Buffer *mBuf; #endif @@ -2485,13 +2485,13 @@ Buffer *mBuf; * -# Failure : RFAILED */ #ifdef ANSI -PRIVATE S16 cmUnpkKwuSapSts +static S16 cmUnpkKwuSapSts ( RlcKwuSapSts *ruSap, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkKwuSapSts(ruSap, mBuf) +static S16 cmUnpkKwuSapSts(ruSap, mBuf) RlcKwuSapSts *ruSap; Buffer *mBuf; #endif diff --git a/src/cm/lkw.h b/src/cm/lkw.h index 3fe97d3fb..02455b2d0 100755 --- a/src/cm/lkw.h +++ b/src/cm/lkw.h @@ -32,7 +32,7 @@ #define __LKW_H__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /*for extern "C"*/ #define STUDXSAP 189 diff --git a/src/cm/lkw.x b/src/cm/lkw.x index 24cebae05..a7199c74d 100755 --- a/src/cm/lkw.x +++ b/src/cm/lkw.x @@ -33,7 +33,7 @@ #define __LKW_X__ #ifdef __cplusplus -EXTERN "C" { +extern "C" { #endif /* __cplusplus */ diff --git a/src/cm/lrg.c b/src/cm/lrg.c index 8d1c25151..7a0f38ee8 100755 --- a/src/cm/lrg.c +++ b/src/cm/lrg.c @@ -3585,13 +3585,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmPkNmbActvUeQciReq +static S16 cmPkNmbActvUeQciReq ( LrgNmbActvUeQCI *nmbActvUeQci, Buffer *mBuf ) #else -PRIVATE S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf) +static S16 cmPkNmbActvUeQciReq(nmbActvUeQci, mBuf) LrgNmbActvUeQCI *nmbActvUeQci; Buffer *mBuf; #endif @@ -3622,13 +3622,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmPkAvgPrbQciReq +static S16 cmPkAvgPrbQciReq ( LrgAvgPrbQCI *avgPrbQciReq, Buffer *mBuf ) #else -PRIVATE S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf) +static S16 cmPkAvgPrbQciReq(avgPrbQciReq, mBuf) LrgAvgPrbQCI *avgPrbQciReq; Buffer *mBuf; #endif @@ -3801,13 +3801,13 @@ LrgSchMeasSndReqInfo *measInfo; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmUnpkNmbActvUeQciReq +static S16 cmUnpkNmbActvUeQciReq ( LrgNmbActvUeQCI *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkNmbActvUeQciReq(param, mBuf) +static S16 cmUnpkNmbActvUeQciReq(param, mBuf) LrgNmbActvUeQCI *param; Buffer *mBuf; #endif @@ -3837,13 +3837,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmUnpkAvgPrbQciReq +static S16 cmUnpkAvgPrbQciReq ( LrgAvgPrbQCI *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkAvgPrbQciReq (param, mBuf) +static S16 cmUnpkAvgPrbQciReq (param, mBuf) LrgAvgPrbQCI *param; Buffer *mBuf; #endif @@ -4084,13 +4084,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmPkNumUeQciCfm +static S16 cmPkNumUeQciCfm ( LrgNumActvUeQCICfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkNumUeQciCfm(param, mBuf) +static S16 cmPkNumUeQciCfm(param, mBuf) LrgNumActvUeQCICfm *param; Buffer *mBuf; #endif @@ -4122,13 +4122,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmPkAvgPrbQciCfm +static S16 cmPkAvgPrbQciCfm ( LrgAvgPrbQCICfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkAvgPrbQciCfm(param, mBuf) +static S16 cmPkAvgPrbQciCfm(param, mBuf) LrgAvgPrbQCICfm *param; Buffer *mBuf; #endif @@ -4159,13 +4159,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmPkRaPrmbsCfm +static S16 cmPkRaPrmbsCfm ( LrgRaPreamblesCfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkRaPrmbsCfm(param, mBuf) +static S16 cmPkRaPrmbsCfm(param, mBuf) LrgRaPreamblesCfm *param; Buffer *mBuf; #endif @@ -4190,13 +4190,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmPkAvgPrbCfm +static S16 cmPkAvgPrbCfm ( LrgAvgPrbCfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkAvgPrbCfm(param, mBuf) +static S16 cmPkAvgPrbCfm(param, mBuf) LrgAvgPrbCfm *param; Buffer *mBuf; #endif @@ -4307,13 +4307,13 @@ LrgSchMeasCfmInfo *measInfo; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmUnpkNumUeQciCfm +static S16 cmUnpkNumUeQciCfm ( LrgNumActvUeQCICfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkNumUeQciCfm(param, mBuf) +static S16 cmUnpkNumUeQciCfm(param, mBuf) LrgNumActvUeQCICfm *param; Buffer *mBuf; #endif @@ -4344,13 +4344,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmUnpkAvgPrbQciCfm +static S16 cmUnpkAvgPrbQciCfm ( LrgAvgPrbQCICfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkAvgPrbQciCfm(param, mBuf) +static S16 cmUnpkAvgPrbQciCfm(param, mBuf) LrgAvgPrbQCICfm *param; Buffer *mBuf; #endif @@ -4382,13 +4382,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmUnpkRaPrmbsCfm +static S16 cmUnpkRaPrmbsCfm ( LrgRaPreamblesCfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRaPrmbsCfm(param, mBuf) +static S16 cmUnpkRaPrmbsCfm(param, mBuf) LrgRaPreamblesCfm *param; Buffer *mBuf; #endif @@ -4414,13 +4414,13 @@ Buffer *mBuf; * -# ROK **/ #ifdef ANSI -PRIVATE S16 cmUnpkAvgPrbCfm +static S16 cmUnpkAvgPrbCfm ( LrgAvgPrbCfm *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkAvgPrbCfm(param, mBuf) +static S16 cmUnpkAvgPrbCfm(param, mBuf) LrgAvgPrbCfm *param; Buffer *mBuf; #endif diff --git a/src/cm/lrg.x b/src/cm/lrg.x index 2432c9885..bdd6f9883 100755 --- a/src/cm/lrg.x +++ b/src/cm/lrg.x @@ -123,8 +123,8 @@ typedef struct rgSchHqRetxStats RgSchHqNumRetx ulCqiStat[15]; /*!< UL stats */ } RgSchHqRetxStats; -EXTERN RgSchNackAckStats hqFailStats; -EXTERN RgSchHqRetxStats hqRetxStats; +RgSchNackAckStats hqFailStats; +RgSchHqRetxStats hqRetxStats; #endif /* MAC_SCH_STATS */ /** diff --git a/src/cm/lsctp.h b/src/cm/lsctp.h index eb40306f5..ce0605afe 100644 --- a/src/cm/lsctp.h +++ b/src/cm/lsctp.h @@ -21,7 +21,7 @@ #define __LSCTP_H___ typedef uint8_t (*SctpNtfy) ARGS((Buffer *mBuf, CmInetSctpNotification *ntfy)); -extern uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy); -extern uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf); +uint8_t cmPkSctpNtfy(Pst *pst, CmInetSctpNotification *ntfy); +uint8_t cmUnpkSctpNtfy(SctpNtfy func, Pst *pst, Buffer *mBuf); #endif diff --git a/src/cm/pj_tenb_stats.x b/src/cm/pj_tenb_stats.x index b8ea7c494..5d617c04e 100755 --- a/src/cm/pj_tenb_stats.x +++ b/src/cm/pj_tenb_stats.x @@ -52,24 +52,24 @@ typedef struct tSL2UeStatsCb TSInfL2UeStats stats; }TSL2UeStatsCb; -EXTERN Void TSL2AllocStatsMem ARGS(( +Void TSL2AllocStatsMem ARGS(( Region region, Pool pool )); -EXTERN TSL2UeStatsCb* TSL2AllocUeStatsBlk ARGS(( +TSL2UeStatsCb* TSL2AllocUeStatsBlk ARGS(( uint16_t rnti )); -EXTERN Void TSL2DeallocUeStatsBlk ARGS(( +Void TSL2DeallocUeStatsBlk ARGS(( uint16_t rnti, TSL2UeStatsCb *statsCb )); -EXTERN TSL2CellStatsCb* TSL2AllocCellStatsBlk ARGS(( +TSL2CellStatsCb* TSL2AllocCellStatsBlk ARGS(( uint32_t cellId )); -EXTERN Void TSL2DeallocCellStatsBlk ARGS(( +Void TSL2DeallocCellStatsBlk ARGS(( uint32_t cellId )); -EXTERN Void TSL2SendStatsToApp ARGS(( +Void TSL2SendStatsToApp ARGS(( Pst *pst, SuId suId )); diff --git a/src/cm/rgm.x b/src/cm/rgm.x index 82fd29c1e..c967e515c 100755 --- a/src/cm/rgm.x +++ b/src/cm/rgm.x @@ -137,14 +137,14 @@ typedef S16 (*RgmTransModeIndFptr) ARGS(( * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgmBndReq ARGS((Pst* pst,SuId suId,SpId spId)); +S16 RgUiRgmBndReq ARGS((Pst* pst,SuId suId,SpId spId)); /** @brief Unbind Request from RLC to MAC to unbind the interface SAPs * @param pst Pointer to the post structure. * @param spId SAP ID of the service provider. * @param reason Reason for unbind request. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgmUbndReq ARGS((Pst* pst,SpId spId,Reason reason)); +S16 RgUiRgmUbndReq ARGS((Pst* pst,SpId spId,Reason reason)); /** @brief Bind Confirmation from MAC to RLC for the bind and unbind * request for the interface SAPs * @param pst Pointer to the post structure. @@ -152,7 +152,7 @@ EXTERN S16 RgUiRgmUbndReq ARGS((Pst* pst,SpId spId,Reason reason)); * @param status Status of the bind request. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgmBndCfm ARGS((Pst* pst,SuId suId,uint8_t status)); +S16 RgUiRgmBndCfm ARGS((Pst* pst,SuId suId,uint8_t status)); /** @brief Data Request from RLC to MAC for forwarding SDUs on common * channel for transmission * @param pst Pointer to the post structure. @@ -160,7 +160,7 @@ EXTERN S16 RgUiRgmBndCfm ARGS((Pst* pst,SuId suId,uint8_t status)); * @param prbRprtCfg Data request for common channels (BCCH, PCCH and CCCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRgmCfgPrbRprt ARGS((Pst* pst,SuId suId,RgmPrbRprtCfg *prbRprtCfg)); +S16 RgUiRgmCfgPrbRprt ARGS((Pst* pst,SuId suId,RgmPrbRprtCfg *prbRprtCfg)); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels * @param pst Pointer to the post structure. @@ -168,47 +168,47 @@ EXTERN S16 RgUiRgmCfgPrbRprt ARGS((Pst* pst,SuId suId,RgmPrbRprtCfg *prbRprtCfg) * @param prbRprtInd Data indication on CCCH. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgmPrbRprtInd ARGS((Pst* pst,SuId suId,RgmPrbRprtInd *prbRprtInd)); +S16 RgUiRgmPrbRprtInd ARGS((Pst* pst,SuId suId,RgmPrbRprtInd *prbRprtInd)); #endif #ifdef RM_INTF /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 RmLiRgmBndReq ARGS(( +S16 RmLiRgmBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 RmLiRgmUbndReq ARGS(( +S16 RmLiRgmUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 RmLiRgmBndCfm ARGS(( +S16 RmLiRgmBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 RmLiRgmCfgPrbRprt ARGS(( +S16 RmLiRgmCfgPrbRprt ARGS(( Pst* pst, SpId spId, RgmPrbRprtCfg* prbRprtCfg )); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 RmLiRgmPrbRprtInd ARGS(( +S16 RmLiRgmPrbRprtInd ARGS(( Pst* pst, SuId suId, RgmPrbRprtInd* prbRprtInd )); /** @brief Data Indication from MAC to RRM to * change the transmission mode*/ -EXTERN S16 RmLiRgmTransModeInd ARGS(( +S16 RmLiRgmTransModeInd ARGS(( Pst* pst, SuId suId, RgmTransModeInd* transModeInd @@ -217,67 +217,67 @@ EXTERN S16 RmLiRgmTransModeInd ARGS(( #ifdef RGM_LWLC /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 cmPkLwLcRgmBndReq ARGS(( +S16 cmPkLwLcRgmBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 cmUnpkLwLcRgmBndReq ARGS(( +S16 cmUnpkLwLcRgmBndReq ARGS(( RgmBndReq func, Pst* pst, Buffer *mBuf )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 cmPkLwLcRgmUbndReq ARGS(( +S16 cmPkLwLcRgmUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 cmUnpkLwLcRgmUbndReq ARGS(( +S16 cmUnpkLwLcRgmUbndReq ARGS(( RgmUbndReq func, Pst* pst, Buffer *mBuf )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 cmPkLwLcRgmBndCfm ARGS(( +S16 cmPkLwLcRgmBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 cmUnpkLwLcRgmBndCfm ARGS(( +S16 cmUnpkLwLcRgmBndCfm ARGS(( RgmBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 cmPkLwLcRgmCfgPrbRprt ARGS(( +S16 cmPkLwLcRgmCfgPrbRprt ARGS(( Pst* pst, SpId spId, RgmPrbRprtCfg * prbRprtCfg )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 cmUnpkLwLcRgmCfgPrbRprt ARGS(( +S16 cmUnpkLwLcRgmCfgPrbRprt ARGS(( RgmCfgPrbRprtFptr func, Pst* pst, Buffer *mBuf )); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 cmPkLwLcRgmPrbRprtInd ARGS(( +S16 cmPkLwLcRgmPrbRprtInd ARGS(( Pst* pst, SuId suId, RgmPrbRprtInd * prbRprtInd )); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 cmUnpkLwLcRgmPrbRprtInd ARGS(( +S16 cmUnpkLwLcRgmPrbRprtInd ARGS(( RgmPrbRprtIndFptr func, Pst* pst, Buffer *mBuf @@ -286,106 +286,106 @@ EXTERN S16 cmUnpkLwLcRgmPrbRprtInd ARGS(( /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 cmPkRgmBndReq ARGS(( +S16 cmPkRgmBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 cmUnpkRgmBndReq ARGS(( +S16 cmUnpkRgmBndReq ARGS(( RgmBndReq func, Pst* pst, Buffer *mBuf )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 cmPkRgmUbndReq ARGS(( +S16 cmPkRgmUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 cmUnpkRgmUbndReq ARGS(( +S16 cmUnpkRgmUbndReq ARGS(( RgmUbndReq func, Pst* pst, Buffer *mBuf )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 cmPkRgmBndCfm ARGS(( +S16 cmPkRgmBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 cmUnpkRgmBndCfm ARGS(( +S16 cmUnpkRgmBndCfm ARGS(( RgmBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 cmPkRgmCfgPrbRprt ARGS(( +S16 cmPkRgmCfgPrbRprt ARGS(( Pst* pst, SpId spId, RgmPrbRprtCfg * prbRprtCfg )); -EXTERN S16 cmPkCfgPrbRprt ARGS(( +S16 cmPkCfgPrbRprt ARGS(( RgmPrbRprtCfg * prbRprtCfg, Buffer *mBuf )); -EXTERN S16 cmPkPrbRprtInd ARGS(( +S16 cmPkPrbRprtInd ARGS(( RgmPrbRprtInd * prbRprtInd, Buffer *mBuf )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 cmUnpkRgmCfgPrbRprt ARGS(( +S16 cmUnpkRgmCfgPrbRprt ARGS(( RgmCfgPrbRprtFptr func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmUnPkCfgPrbRprt ARGS(( +S16 cmUnPkCfgPrbRprt ARGS(( RgmPrbRprtCfg * prbRprtCfg, Buffer *mBuf )); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 cmPkRgmPrbRprtInd ARGS(( +S16 cmPkRgmPrbRprtInd ARGS(( Pst* pst, SuId suId, RgmPrbRprtInd * prbRprtInd )); -EXTERN S16 cmUnpkPrbRprtInd ARGS(( +S16 cmUnpkPrbRprtInd ARGS(( RgmPrbRprtInd * prbRprtInd, Buffer *mBuf )); -EXTERN S16 cmPkTransModeInd ARGS(( +S16 cmPkTransModeInd ARGS(( RgmTransModeInd *transModeInd, Buffer *mBuf )); -EXTERN S16 cmUnpkTransModeInd ARGS(( +S16 cmUnpkTransModeInd ARGS(( RgmTransModeInd *transModeInd, Buffer *mBuf )); -EXTERN S16 cmPkRgmTransModeInd ARGS(( +S16 cmPkRgmTransModeInd ARGS(( Pst* pst, SuId suId, RgmTransModeInd *transModeInd )); -EXTERN S16 cmUnpkRgmTransModeInd ARGS(( +S16 cmUnpkRgmTransModeInd ARGS(( RgmTransModeIndFptr func, Pst* pst, Buffer *mBuf @@ -393,18 +393,18 @@ EXTERN S16 cmUnpkRgmTransModeInd ARGS(( /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 cmUnpkRgmPrbRprtInd ARGS(( +S16 cmUnpkRgmPrbRprtInd ARGS(( RgmPrbRprtIndFptr func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgmPrbQciRpt ARGS(( +S16 cmPkRgmPrbQciRpt ARGS(( RgmPrbRptPerQci *qciPrbRprt, Buffer *mBuf )); -EXTERN S16 cmUnpkRgmPrbQciRpt ARGS(( +S16 cmUnpkRgmPrbQciRpt ARGS(( RgmPrbRptPerQci *qciPrbRprt, Buffer *mBuf )); diff --git a/src/cm/rgr.c b/src/cm/rgr.c index 8436719e5..743f07ca7 100755 --- a/src/cm/rgr.c +++ b/src/cm/rgr.c @@ -3514,13 +3514,13 @@ Buffer *mBuf * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkRgrLteUCellCfg +static S16 cmPkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkRgrLteUCellCfg(param, mBuf) +static S16 cmPkRgrLteUCellCfg(param, mBuf) RgrLteUCfg *param; Buffer *mBuf; #endif @@ -3547,13 +3547,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkRgrLteUCellCfg +static S16 cmUnpkRgrLteUCellCfg ( RgrLteUCfg *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRgrLteUCellCfg(param, mBuf) +static S16 cmUnpkRgrLteUCellCfg(param, mBuf) RgrLteUCfg *param; Buffer *mBuf; #endif @@ -8139,7 +8139,7 @@ RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf) +static S16 cmPkRgrUeDlSecCellRelInfo(param, mBuf) RgrUeDlSecCellRelInfo *param; Buffer *mBuf; #endif @@ -8276,7 +8276,7 @@ RgrUeDlSecCellRelInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf) +static S16 cmUnpkRgrUeDlSecCellRelInfo(param, mBuf) RgrUeDlSecCellRelInfo *param; Buffer *mBuf; #endif @@ -8648,13 +8648,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnPkRgrSCellActDeactInfo +static S16 cmUnPkRgrSCellActDeactInfo ( RgrSCellActDeactInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnPkRgrSCellActInfo(param, mBuf) +static S16 cmUnPkRgrSCellActInfo(param, mBuf) RgrSCellActDeactInfo *param; Buffer *mBuf; #endif @@ -8722,13 +8722,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkRgrSCellActDeactInfo +static S16 cmPkRgrSCellActDeactInfo ( RgrSCellActDeactInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkRgrSCellActDeactInfo(param, mBuf) +static S16 cmPkRgrSCellActDeactInfo(param, mBuf) RgrSCellActDeactInfo *param; Buffer *mBuf; #endif @@ -11162,13 +11162,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkRgrUeUlPwrDedSCellCfg +static S16 cmPkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf) +static S16 cmPkRgrUeUlPwrDedSCellCfg(param, mBuf) RgrUeUlPwrDedSCellCfg *param; Buffer *mBuf; #endif @@ -11197,13 +11197,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkRgrUeUlPwrDedSCellCfg +static S16 cmUnpkRgrUeUlPwrDedSCellCfg ( RgrUeUlPwrDedSCellCfg *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf) +static S16 cmUnpkRgrUeUlPwrDedSCellCfg(param, mBuf) RgrUeUlPwrDedSCellCfg *param; Buffer *mBuf; #endif @@ -11236,13 +11236,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkRgrUeSecCellCfg +static S16 cmPkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkRgrUeSecCellCfg(param, mBuf) +static S16 cmPkRgrUeSecCellCfg(param, mBuf) RgrUeSecCellCfg *param; Buffer *mBuf; #endif @@ -11321,13 +11321,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkRgrUeSecCellCfg +static S16 cmUnpkRgrUeSecCellCfg ( RgrUeSecCellCfg *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkRgrUeSecCellCfg(param, mBuf) +static S16 cmUnpkRgrUeSecCellCfg(param, mBuf) RgrUeSecCellCfg *param; Buffer *mBuf; #endif diff --git a/src/cm/rgr.x b/src/cm/rgr.x index cba74208b..4df0d92e6 100755 --- a/src/cm/rgr.x +++ b/src/cm/rgr.x @@ -2777,7 +2777,7 @@ typedef S16 (*RgrCfgReq) ARGS(( RgrCfgTransId transId, RgrCfgReqInfo * cfgReqInfo)); -EXTERN S16 cmPkRgrCfgCfm ARGS(( +S16 cmPkRgrCfgCfm ARGS(( Pst* pst, RgrCfgTransId transId, uint8_t status @@ -2942,7 +2942,7 @@ typedef S16 (*RgrUeStaInd) ARGS(( *@param[in] spId SAP Id of the Service Provider. *@return ROK/RFAILED */ -EXTERN S16 RgUiRgrBndReq ARGS(( +S16 RgUiRgrBndReq ARGS(( Pst* pst, SuId suId, SpId spId @@ -2959,7 +2959,7 @@ EXTERN S16 RgUiRgrBndReq ARGS(( * @param[in] ttiInd Parameters containing the information on TTI Indication. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrTtiInd ARGS(( +S16 RgUiRgrTtiInd ARGS(( Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd @@ -2967,61 +2967,61 @@ EXTERN S16 RgUiRgrTtiInd ARGS(( #endif /** @} */ /*rgr_x_001.main_9 - Added support for SPS*/ -EXTERN S16 cmPkRgrSpsCellCfg ARGS(( +S16 cmPkRgrSpsCellCfg ARGS(( RgrSpsCellCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSpsDlCellCfg ARGS(( +S16 cmUnpkRgrSpsDlCellCfg ARGS(( RgrSpsCellCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeSpsDlCfg ARGS(( +S16 cmPkRgrUeSpsDlCfg ARGS(( RgrUeSpsDlCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSpsDlCfg ARGS(( +S16 cmUnpkRgrUeSpsDlCfg ARGS(( RgrUeSpsDlCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeSpsUlCfg ARGS(( +S16 cmPkRgrUeSpsUlCfg ARGS(( RgrUeSpsUlCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSpsUlCfg ARGS(( +S16 cmUnpkRgrUeSpsUlCfg ARGS(( RgrUeSpsUlCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeSpsCfg ARGS(( +S16 cmPkRgrUeSpsCfg ARGS(( RgrUeSpsCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSpsCfg ARGS(( +S16 cmUnpkRgrUeSpsCfg ARGS(( RgrUeSpsCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrLchSpsCfg ARGS(( +S16 cmPkRgrLchSpsCfg ARGS(( RgrLchSpsCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLchSpsCfg ARGS(( +S16 cmUnpkRgrLchSpsCfg ARGS(( RgrLchSpsCfg *param, Buffer *mBuf )); /*rgr_x_001.main_11 ADD added changes for L2 measurements*/ -EXTERN S16 cmPkRgrUlLchCfg ARGS(( +S16 cmPkRgrUlLchCfg ARGS(( RgrUlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUlLchCfg ARGS(( +S16 cmUnpkRgrUlLchCfg ARGS(( RgrUlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUlLchQciCfg ARGS(( +S16 cmPkRgrUlLchQciCfg ARGS(( RgrUlLchQciCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUlLchQciCfg ARGS(( +S16 cmUnpkRgrUlLchQciCfg ARGS(( RgrUlLchQciCfg *param, Buffer *mBuf )); @@ -3030,88 +3030,88 @@ EXTERN S16 cmUnpkRgrUlLchQciCfg ARGS(( /*rgr_x_001.main_11 ccpu00117452 - MOD - Changed macro name from RGR_RRM_DLPWR_CNTRL to RGR_CQI_REPT */ #ifdef RGR_CQI_REPT -EXTERN S16 cmPkRgrUeCqiReptCfg ARGS(( +S16 cmPkRgrUeCqiReptCfg ARGS(( RgrUeCqiReptCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeCqiReptCfg ARGS(( +S16 cmUnpkRgrUeCqiReptCfg ARGS(( RgrUeCqiReptCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSubBandCqiInfo ARGS(( +S16 cmUnpkRgrSubBandCqiInfo ARGS(( RgrSubBandCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrStaInd ARGS(( +S16 cmPkRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo* staInd )); -EXTERN S16 cmUnpkRgrStaInd ARGS(( +S16 cmUnpkRgrStaInd ARGS(( RgrStaInd func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrStaIndInfo ARGS(( +S16 cmPkRgrStaIndInfo ARGS(( RgrStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrStaIndInfo ARGS(( +S16 cmUnpkRgrStaIndInfo ARGS(( RgrStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeCqiInfo ARGS(( +S16 cmPkRgrUeCqiInfo ARGS(( RgrUeCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeCqiInfo ARGS(( +S16 cmUnpkRgrUeCqiInfo ARGS(( RgrUeCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeCqiRept ARGS(( +S16 cmPkRgrUeCqiRept ARGS(( RgrUeCqiRept *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSubBandCqiInfo ARGS(( +S16 cmPkRgrSubBandCqiInfo ARGS(( RgrSubBandCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeCqiRept ARGS(( +S16 cmUnpkRgrUeCqiRept ARGS(( RgrUeCqiRept *param, Buffer *mBuf )); #endif /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 cmPkRgrLoadInfInd ARGS(( +S16 cmPkRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo* loadInfInd )); -EXTERN S16 cmUnpkRgrLoadInfInd ARGS(( +S16 cmUnpkRgrLoadInfInd ARGS(( RgrLoadInfInd func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrLoadInfIndInfo ARGS(( +S16 cmPkRgrLoadInfIndInfo ARGS(( RgrLoadInfIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLoadInfIndInfo ARGS(( +S16 cmUnpkRgrLoadInfIndInfo ARGS(( RgrLoadInfIndInfo *param, Pst *pst, /* dsfr_pal_fixes ** 21-March-2013 ** SKS */ Buffer *mBuf @@ -3119,65 +3119,65 @@ Buffer *mBuf /* LTE_ADV_FLAG_REMOVED_END */ #ifdef TFU_UPGRADE -EXTERN S16 cmPkRgrUePdschDedCfg ARGS(( +S16 cmPkRgrUePdschDedCfg ARGS(( RgrUePdschDedCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUePdschDedCfg ARGS(( +S16 cmUnpkRgrUePdschDedCfg ARGS(( RgrUePdschDedCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUepACfg ARGS(( +S16 cmPkRgrUepACfg ARGS(( RgrUepACfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUepACfg ARGS(( +S16 cmUnpkRgrUepACfg ARGS(( RgrUepACfg *param, Buffer *mBuf )); #endif #ifdef LTE_ADV -EXTERN S16 cmPkRgrUeSecCellInfo ARGS(( +S16 cmPkRgrUeSecCellInfo ARGS(( RgrUeSecCellInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSecCellInfo ARGS(( +S16 cmUnpkRgrUeSecCellInfo ARGS(( RgrUeSecCellInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeDlSecCellRelInfo ARGS(( +S16 cmPkRgrUeDlSecCellRelInfo ARGS(( RgrUeDlSecCellRelInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeDlSecCellRelInfo ARGS(( +S16 cmUnpkRgrUeDlSecCellRelInfo ARGS(( RgrUeDlSecCellRelInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeSecCellRelInfo ARGS(( +S16 cmPkRgrUeSecCellRelInfo ARGS(( RgrUeSecCellRelInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSecCellRelInfo ARGS(( +S16 cmUnpkRgrUeSecCellRelInfo ARGS(( RgrUeSecCellRelInfo *param, Buffer *mBuf )); /* Sprint 3 */ -EXTERN S16 cmPkRgrUeSCellAckPucchCfg ARGS(( +S16 cmPkRgrUeSCellAckPucchCfg ARGS(( RgrUeSCellAckPucchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSCellAckPucchCfg ARGS(( +S16 cmUnpkRgrUeSCellAckPucchCfg ARGS(( RgrUeSCellAckPucchCfg *param, Buffer *mBuf )); @@ -3193,7 +3193,7 @@ Buffer *mBuf * @param[in] status Confirmation status for the RGR User. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrBndCfm ARGS(( +S16 RgUiRgrBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status @@ -3209,7 +3209,7 @@ EXTERN S16 RgUiRgrBndCfm ARGS(( * @param[in] reason Cause for the Unbinding. * @return ROK/RFAILED. */ -EXTERN S16 RgUiRgrUbndReq ARGS(( +S16 RgUiRgrUbndReq ARGS(( Pst* pst, SpId spId, Reason reason @@ -3225,7 +3225,7 @@ EXTERN S16 RgUiRgrUbndReq ARGS(( * @param[in] status Status indication from the MAC. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrCfgCfm ARGS(( +S16 RgUiRgrCfgCfm ARGS(( Pst* pst, RgrCfgTransId transId, uint8_t status @@ -3247,7 +3247,7 @@ EXTERN S16 RgUiRgrCfgCfm ARGS(( * @param[in] siCfgReq Parameters used for specifying SI. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrSiCfgReq ARGS(( +S16 RgUiRgrSiCfgReq ARGS(( Pst *pst, SpId spId, RgrCfgTransId transId, @@ -3264,7 +3264,7 @@ EXTERN S16 RgUiRgrSiCfgReq ARGS(( * @param[in] status Confirmation status . * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrSiCfgCfm ARGS(( +S16 RgUiRgrSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3282,7 +3282,7 @@ EXTERN S16 RgUiRgrSiCfgCfm ARGS(( * @param[in] status Confirmation status . * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrWarningSiCfgReq ARGS(( +S16 RgUiRgrWarningSiCfgReq ARGS(( Pst *pst, SpId spId, RgrCfgTransId transId, @@ -3302,7 +3302,7 @@ EXTERN S16 RgUiRgrWarningSiCfgReq ARGS(( * @param[in] status Confirmation status . * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrWarningSiCfgCfm ARGS(( +S16 RgUiRgrWarningSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3320,7 +3320,7 @@ EXTERN S16 RgUiRgrWarningSiCfgCfm ARGS(( * @param[in] siId SI Index * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrWarningSiStopReq ARGS(( +S16 RgUiRgrWarningSiStopReq ARGS(( Pst *pst, SpId spId, RgrCfgTransId transId, @@ -3345,7 +3345,7 @@ EXTERN S16 RgUiRgrWarningSiStopReq ARGS(( * @param[in] loadInfReq Parameters used for specifying LOAD INF. * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrLoadInfReq ARGS(( +S16 RgUiRgrLoadInfReq ARGS(( Pst *pst, SpId spId, RgrCfgTransId transId, @@ -3369,13 +3369,13 @@ EXTERN S16 RgUiRgrLoadInfReq ARGS(( * @param[in] staInd Status Indication . * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrStaInd ARGS(( +S16 RgUiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd )); #endif -EXTERN S16 RgUiRgrUeStaInd ARGS(( +S16 RgUiRgrUeStaInd ARGS(( Pst *pst, SuId suId, RgrUeStaIndInfo *ueStaInd @@ -3395,7 +3395,7 @@ RgrUeStaIndInfo *ueStaInd * @param[in] loadInfInd LOAD INF Indication . * @return ROK/RFAILED */ -EXTERN S16 RgUiRgrLoadInfInd ARGS(( +S16 RgUiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd @@ -3415,7 +3415,7 @@ EXTERN S16 RgUiRgrLoadInfInd ARGS(( * @param[in] spId Service Provider SAP Id * @return ROK/RFAILED */ -EXTERN S16 NxLiRgrBndReq ARGS(( +S16 NxLiRgrBndReq ARGS(( Pst* pst, SuId suId, SpId spId @@ -3434,7 +3434,7 @@ EXTERN S16 NxLiRgrBndReq ARGS(( * @param[in] RgrTtiIndInfo* ttiInd Information passed as a part of TTI indication from PHY to MAC. * @return ROK/RFAILED */ -EXTERN S16 NxLiRgrTtiInd ARGS(( +S16 NxLiRgrTtiInd ARGS(( Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd @@ -3450,7 +3450,7 @@ EXTERN S16 NxLiRgrTtiInd ARGS(( * @param[in] uint8_t status An information on status confirmation. * @return S16 */ -EXTERN S16 NxLiRgrBndCfm ARGS(( +S16 NxLiRgrBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status @@ -3465,7 +3465,7 @@ EXTERN S16 NxLiRgrBndCfm ARGS(( * @param[in] Reason reason A cause for unbinding the SAPs. * @return S16 */ -EXTERN S16 NxLiRgrUbndReq ARGS(( +S16 NxLiRgrUbndReq ARGS(( Pst* pst, SpId spId, Reason reason @@ -3481,7 +3481,7 @@ EXTERN S16 NxLiRgrUbndReq ARGS(( * @param[in] RgrCfgReqInfo* cfgReqInfo A structure containing the configuration information. * @return S16 */ -EXTERN S16 NxLiRgrCfgReq ARGS(( +S16 NxLiRgrCfgReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, @@ -3497,7 +3497,7 @@ EXTERN S16 NxLiRgrCfgReq ARGS(( * @param[in] RgrCfgTransId transId RRM to MAC transaction Id. * @return S16 */ -EXTERN S16 NxLiRgrCfgCfm ARGS(( +S16 NxLiRgrCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3518,7 +3518,7 @@ EXTERN S16 NxLiRgrCfgCfm ARGS(( * @param[in] uint8_t status An information on confirmation status. * @return S16 */ -EXTERN S16 NxLiRgrSiCfgCfm ARGS(( +S16 NxLiRgrSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3527,7 +3527,7 @@ EXTERN S16 NxLiRgrSiCfgCfm ARGS(( /* PH04_CMAS */ -EXTERN S16 NxLiRgrWrngSiCfgCfm ARGS(( +S16 NxLiRgrWrngSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3537,7 +3537,7 @@ uint8_t status -EXTERN S16 NxLiRgrStopWrngSiCfgCfm ARGS(( +S16 NxLiRgrStopWrngSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3558,7 +3558,7 @@ EXTERN S16 NxLiRgrStopWrngSiCfgCfm ARGS(( * @param[in] uint8_t status An information on confirmation status. * @return S16 */ -EXTERN S16 NxLiRgrWarningSiCfgCfm ARGS(( +S16 NxLiRgrWarningSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3577,7 +3577,7 @@ EXTERN S16 NxLiRgrWarningSiCfgCfm ARGS(( * @param[in] RgrSiCfgReqInfo* cfgReqInfo Parameters corresponding to the SI Configuration . * @return S16 */ -EXTERN S16 NxLiRgrSiCfgReq ARGS(( +S16 NxLiRgrSiCfgReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, @@ -3597,7 +3597,7 @@ EXTERN S16 NxLiRgrSiCfgReq ARGS(( * @param[in] RgrWarningSiCfgReqInfo *warningSiCfgReq SI Configuration * @return S16 */ -EXTERN S16 NxLiRgrWarningSiCfgReq ARGS(( +S16 NxLiRgrWarningSiCfgReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, @@ -3615,7 +3615,7 @@ EXTERN S16 NxLiRgrWarningSiCfgReq ARGS(( * @param[in] SpId spId Service Provider SAP Id. * @param[in] uint8_t siId SI Index */ -EXTERN S16 NxLiRgrWarningSiStopReq ARGS(( +S16 NxLiRgrWarningSiStopReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, @@ -3639,7 +3639,7 @@ EXTERN S16 NxLiRgrWarningSiStopReq ARGS(( * @param[in] RgrLoadInfReqInfo* loadInfReq Parameters corresponding to the LOAD INF Config. * @return S16 */ -EXTERN S16 NxLiRgrLoadInfReq ARGS(( +S16 NxLiRgrLoadInfReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, @@ -3662,7 +3662,7 @@ EXTERN S16 NxLiRgrLoadInfReq ARGS(( * @param[in] suId Service User SAP Id * @param[in] staInd Status Indication . */ -EXTERN S16 NxLiRgrStaInd ARGS(( +S16 NxLiRgrStaInd ARGS(( Pst* pst, SuId suId, RgrStaIndInfo *staInd @@ -3680,7 +3680,7 @@ EXTERN S16 NxLiRgrStaInd ARGS(( * @param[in] suId Service User SAP Id * @param[in] loadInfInd LOAD INF Indication . */ -EXTERN S16 NxLiRgrLoadInfInd ARGS(( +S16 NxLiRgrLoadInfInd ARGS(( Pst* pst, SuId suId, RgrLoadInfIndInfo *loadInfInd @@ -3691,13 +3691,13 @@ EXTERN S16 NxLiRgrLoadInfInd ARGS(( #endif #if defined(LCRGR) /** @brief Request from RRM to MAC to bind the interface SAPs */ -EXTERN S16 cmPkRgrBndReq ARGS(( +S16 cmPkRgrBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RRM to MAC to bind the interface SAPs */ -EXTERN S16 cmUnpkRgrBndReq ARGS(( +S16 cmUnpkRgrBndReq ARGS(( RgrBndReq func, Pst* pst, Buffer *mBuf @@ -3706,232 +3706,232 @@ EXTERN S16 cmUnpkRgrBndReq ARGS(( /** @name RGR_RRM_TICK */ /** @{ */ /** @brief Pack function for TTI indication from scheduler to RRM */ -EXTERN S16 cmPkRgrTtiInd ARGS(( +S16 cmPkRgrTtiInd ARGS(( Pst* pst, SuId suId, RgrTtiIndInfo *ttiInd )); -EXTERN S16 cmPkRgrTtiIndInfo ARGS(( +S16 cmPkRgrTtiIndInfo ARGS(( RgrTtiIndInfo *ttiInd, Buffer *mBuf)); /** @brief Unpack function for TTI indication from scheduler to RRM */ -EXTERN S16 cmUnpkRgrTtiInd ARGS(( +S16 cmUnpkRgrTtiInd ARGS(( RgrTtiInd func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrTtiIndInfo ARGS(( +S16 cmUnpkRgrTtiIndInfo ARGS(( RgrTtiIndInfo *param, Buffer *mBuf )); /** @} */ -EXTERN S16 cmPkRgrBndCfm ARGS(( +S16 cmPkRgrBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); -EXTERN S16 cmUnpkRgrBndCfm ARGS(( +S16 cmUnpkRgrBndCfm ARGS(( RgrBndCfm func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrUbndReq ARGS(( +S16 cmPkRgrUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); -EXTERN S16 cmUnpkRgrUbndReq ARGS(( +S16 cmUnpkRgrUbndReq ARGS(( RgrUbndReq func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrCfgReq ARGS(( +S16 cmPkRgrCfgReq ARGS(( Pst* pst, RgrCfgTransId transId, RgrCfgReqInfo * cfgReqInfo )); -EXTERN S16 cmUnpkRgrCfgReq ARGS(( +S16 cmUnpkRgrCfgReq ARGS(( RgrCfgReq func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCfgCfm ARGS(( +S16 cmUnpkRgrCfgCfm ARGS(( RgrCfgCfm func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrCfgTransId ARGS(( +S16 cmPkRgrCfgTransId ARGS(( RgrCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCfgTransId ARGS(( +S16 cmUnpkRgrCfgTransId ARGS(( RgrCfgTransId *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDlHqCfg ARGS(( +S16 cmPkRgrDlHqCfg ARGS(( RgrDlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDlHqCfg ARGS(( +S16 cmUnpkRgrDlHqCfg ARGS(( RgrDlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrRntiCfg ARGS(( +S16 cmPkRgrRntiCfg ARGS(( RgrRntiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrRntiCfg ARGS(( +S16 cmUnpkRgrRntiCfg ARGS(( RgrRntiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDlCmnCodeRateCfg ARGS(( +S16 cmPkRgrDlCmnCodeRateCfg ARGS(( RgrDlCmnCodeRateCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDlCmnCodeRateCfg ARGS(( +S16 cmUnpkRgrDlCmnCodeRateCfg ARGS(( RgrDlCmnCodeRateCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCfiCfg ARGS(( +S16 cmPkRgrCfiCfg ARGS(( RgrCfiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCfiCfg ARGS(( +S16 cmUnpkRgrCfiCfg ARGS(( RgrCfiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrPuschSubBandCfg ARGS(( +S16 cmPkRgrPuschSubBandCfg ARGS(( RgrPuschSubBandCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrPuschSubBandCfg ARGS(( +S16 cmUnpkRgrPuschSubBandCfg ARGS(( RgrPuschSubBandCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUlCmnCodeRateCfg ARGS(( +S16 cmPkRgrUlCmnCodeRateCfg ARGS(( RgrUlCmnCodeRateCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUlCmnCodeRateCfg ARGS(( +S16 cmUnpkRgrUlCmnCodeRateCfg ARGS(( RgrUlCmnCodeRateCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUlTrgCqiCfg ARGS(( +S16 cmPkRgrUlTrgCqiCfg ARGS(( RgrUlTrgCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUlTrgCqiCfg ARGS(( +S16 cmUnpkRgrUlTrgCqiCfg ARGS(( RgrUlTrgCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrBwCfg ARGS(( +S16 cmPkRgrBwCfg ARGS(( RgrBwCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrBwCfg ARGS(( +S16 cmUnpkRgrBwCfg ARGS(( RgrBwCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrPhichCfg ARGS(( +S16 cmPkRgrPhichCfg ARGS(( RgrPhichCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrPhichCfg ARGS(( +S16 cmUnpkRgrPhichCfg ARGS(( RgrPhichCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrPucchCfg ARGS(( +S16 cmPkRgrPucchCfg ARGS(( RgrPucchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrPucchCfg ARGS(( +S16 cmUnpkRgrPucchCfg ARGS(( RgrPucchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSrsCfg ARGS(( +S16 cmPkRgrSrsCfg ARGS(( RgrSrsCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSrsCfg ARGS(( +S16 cmUnpkRgrSrsCfg ARGS(( RgrSrsCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrRachCfg ARGS(( +S16 cmPkRgrRachCfg ARGS(( RgrRachCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrRachCfg ARGS(( +S16 cmUnpkRgrRachCfg ARGS(( RgrRachCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSiCfg ARGS(( +S16 cmPkRgrSiCfg ARGS(( RgrSiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSiCfg ARGS(( +S16 cmUnpkRgrSiCfg ARGS(( RgrSiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrTpcRntiCfg ARGS(( +S16 cmPkRgrTpcRntiCfg ARGS(( RgrTpcRntiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrTpcRntiCfg ARGS(( +S16 cmUnpkRgrTpcRntiCfg ARGS(( RgrTpcRntiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUlPwrCfg ARGS(( +S16 cmPkRgrUlPwrCfg ARGS(( RgrUlPwrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUlPwrCfg ARGS(( +S16 cmUnpkRgrUlPwrCfg ARGS(( RgrUlPwrCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrPuschCfg ARGS(( +S16 cmPkRgrPuschCfg ARGS(( RgrPuschCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrPuschCfg ARGS(( +S16 cmUnpkRgrPuschCfg ARGS(( RgrPuschCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCodeBookRstCfg ARGS(( +S16 cmPkRgrCodeBookRstCfg ARGS(( RgrCodeBookRstCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCodeBookRstCfg ARGS(( +S16 cmUnpkRgrCodeBookRstCfg ARGS(( RgrCodeBookRstCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrPreambleSetCfg ARGS(( +S16 cmPkRgrPreambleSetCfg ARGS(( RgrPreambleSetCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrPreambleSetCfg ARGS(( +S16 cmUnpkRgrPreambleSetCfg ARGS(( RgrPreambleSetCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCmnLchCfg ARGS(( +S16 cmPkRgrCmnLchCfg ARGS(( RgrCmnLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCmnLchCfg ARGS(( +S16 cmUnpkRgrCmnLchCfg ARGS(( RgrCmnLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDlfsCfg ARGS(( +S16 cmPkRgrDlfsCfg ARGS(( RgrDlfsCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDlfsCfg ARGS(( +S16 cmUnpkRgrDlfsCfg ARGS(( RgrDlfsCfg *param, Buffer *mBuf )); @@ -3940,46 +3940,46 @@ EXTERN S16 cmUnpkRgrDlfsCfg ARGS(( /** @name RGR_SI_SCH */ /** @{ */ #ifdef RGR_SI_SCH -EXTERN S16 cmPkRgrWarningSiCfgReq ARGS(( +S16 cmPkRgrWarningSiCfgReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo )); -EXTERN S16 cmUnpkRgrWarningSiCfgReq ARGS(( +S16 cmUnpkRgrWarningSiCfgReq ARGS(( RgrWarningSiCfgReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrWarningSiCfgReqInfo ARGS(( +S16 cmPkRgrWarningSiCfgReqInfo ARGS(( Pst *pst, RgrWarningSiCfgReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrWarningSiCfgReqInfo ARGS(( +S16 cmUnpkRgrWarningSiCfgReqInfo ARGS(( Pst *pst, RgrWarningSiCfgReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrWarningSiStopReq ARGS(( +S16 cmPkRgrWarningSiStopReq ARGS(( Pst *pst, SpId spId, RgrCfgTransId transId, uint8_t siId )); -EXTERN S16 cmUnpkRgrWarningSiStopReq ARGS(( +S16 cmUnpkRgrWarningSiStopReq ARGS(( RgrWarningSiStopReq func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrWarningSiCfgCfm ARGS(( +S16 cmPkRgrWarningSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -3987,44 +3987,44 @@ EXTERN S16 cmPkRgrWarningSiCfgCfm ARGS(( uint8_t status )); -EXTERN S16 cmUnpkRgrWarningSiCfgCfm ARGS(( +S16 cmUnpkRgrWarningSiCfgCfm ARGS(( RgrWarningSiCfgCfm func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrSiCfgReq ARGS(( +S16 cmPkRgrSiCfgReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, RgrSiCfgReqInfo * cfgReqInfo )); -EXTERN S16 cmUnpkRgrSiCfgReq ARGS(( +S16 cmUnpkRgrSiCfgReq ARGS(( RgrSiCfgReq func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrSiCfgReqInfo ARGS(( +S16 cmPkRgrSiCfgReqInfo ARGS(( RgrSiCfgReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSiCfgReqInfo ARGS(( +S16 cmUnpkRgrSiCfgReqInfo ARGS(( RgrSiCfgReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSiCfgCfm ARGS(( +S16 cmPkRgrSiCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, uint8_t status )); -EXTERN S16 cmUnpkRgrSiCfgCfm ARGS(( +S16 cmUnpkRgrSiCfgCfm ARGS(( RgrSiCfgCfm func, Pst* pst, Buffer *mBuf @@ -4034,25 +4034,25 @@ EXTERN S16 cmUnpkRgrSiCfgCfm ARGS(( /** @{ */ /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 cmPkRgrLoadInfReq ARGS(( +S16 cmPkRgrLoadInfReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, RgrLoadInfReqInfo * loadInfReq )); -EXTERN S16 cmUnpkRgrLoadInfReq ARGS(( +S16 cmUnpkRgrLoadInfReq ARGS(( RgrLoadInfReq func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrLoadInfReqInfo ARGS(( +S16 cmPkRgrLoadInfReqInfo ARGS(( RgrLoadInfReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLoadInfReqInfo ARGS(( +S16 cmUnpkRgrLoadInfReqInfo ARGS(( RgrLoadInfReqInfo *param, Buffer *mBuf )); @@ -4062,166 +4062,166 @@ EXTERN S16 cmUnpkRgrLoadInfReqInfo ARGS(( /** @name LTE_TDD */ /** @{ */ #ifdef LTE_TDD -EXTERN S16 cmPkRgrTddPrachInfo ARGS(( +S16 cmPkRgrTddPrachInfo ARGS(( RgrTddPrachInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrTddPrachInfo ARGS(( +S16 cmUnpkRgrTddPrachInfo ARGS(( RgrTddPrachInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrTddPrachRscInfo ARGS(( +S16 cmPkRgrTddPrachRscInfo ARGS(( RgrTddPrachRscInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrTddPrachRscInfo ARGS(( +S16 cmUnpkRgrTddPrachRscInfo ARGS(( RgrTddPrachRscInfo *param, Buffer *mBuf )); #endif /* LTE_TDD*/ /** @} */ -EXTERN S16 cmPkRgrEnbPfs ARGS(( +S16 cmPkRgrEnbPfs ARGS(( RgrEnbPfs *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrEnbPfs ARGS(( +S16 cmUnpkRgrEnbPfs ARGS(( RgrEnbPfs *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCellCfg ARGS(( +S16 cmPkRgrCellCfg ARGS(( RgrCellCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCellCfg ARGS(( +S16 cmUnpkRgrCellCfg ARGS(( RgrCellCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeAprdDlCqiCfg ARGS(( +S16 cmPkRgrUeAprdDlCqiCfg ARGS(( RgrUeAprdDlCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeAprdDlCqiCfg ARGS(( +S16 cmUnpkRgrUeAprdDlCqiCfg ARGS(( RgrUeAprdDlCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSchedGnbCfg ARGS(( +S16 cmPkRgrSchedGnbCfg ARGS(( RgrSchedEnbCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSchedGnbCfg ARGS(( +S16 cmUnpkRgrSchedGnbCfg ARGS(( RgrSchedEnbCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUePrdDlCqiCfg ARGS(( +S16 cmPkRgrUePrdDlCqiCfg ARGS(( RgrUePrdDlCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUePrdDlCqiCfg ARGS(( +S16 cmUnpkRgrUePrdDlCqiCfg ARGS(( RgrUePrdDlCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeDlCqiCfg ARGS(( +S16 cmPkRgrUeDlCqiCfg ARGS(( RgrUeDlCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeDlCqiCfg ARGS(( +S16 cmUnpkRgrUeDlCqiCfg ARGS(( RgrUeDlCqiCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeMeasGapCfg ARGS(( +S16 cmPkRgrUeMeasGapCfg ARGS(( RgrUeMeasGapCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeMeasGapCfg ARGS(( +S16 cmUnpkRgrUeMeasGapCfg ARGS(( RgrUeMeasGapCfg *param, Buffer *mBuf )); /*rgr_x_001.main_11 ADD added changes for DRX*/ -EXTERN S16 cmPkRgrDrxLongCycleOffst ARGS(( +S16 cmPkRgrDrxLongCycleOffst ARGS(( RgrDrxLongCycleOffst *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDrxLongCycleOffst ARGS(( +S16 cmUnpkRgrDrxLongCycleOffst ARGS(( RgrDrxLongCycleOffst *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDrxShortDrx ARGS(( +S16 cmPkRgrDrxShortDrx ARGS(( RgrDrxShortDrx *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDrxShortDrx ARGS(( +S16 cmUnpkRgrDrxShortDrx ARGS(( RgrDrxShortDrx *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeDrxCfg ARGS(( +S16 cmPkRgrUeDrxCfg ARGS(( RgrUeDrxCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeDrxCfg ARGS(( +S16 cmUnpkRgrUeDrxCfg ARGS(( RgrUeDrxCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeCapCfg ARGS(( +S16 cmPkRgrUeCapCfg ARGS(( RgrUeCapCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeCapCfg ARGS(( +S16 cmUnpkRgrUeCapCfg ARGS(( RgrUeCapCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeAckNackRepCfg ARGS(( +S16 cmPkRgrUeAckNackRepCfg ARGS(( RgrUeAckNackRepCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeAckNackRepCfg ARGS(( +S16 cmUnpkRgrUeAckNackRepCfg ARGS(( RgrUeAckNackRepCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeTxModeCfg ARGS(( +S16 cmPkRgrUeTxModeCfg ARGS(( RgrUeTxModeCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeTxModeCfg ARGS(( +S16 cmUnpkRgrUeTxModeCfg ARGS(( RgrUeTxModeCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeUlHqCfg ARGS(( +S16 cmPkRgrUeUlHqCfg ARGS(( RgrUeUlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeUlHqCfg ARGS(( +S16 cmUnpkRgrUeUlHqCfg ARGS(( RgrUeUlHqCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeGrpPwrCfg ARGS(( +S16 cmPkRgrUeGrpPwrCfg ARGS(( RgrUeGrpPwrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeGrpPwrCfg ARGS(( +S16 cmUnpkRgrUeGrpPwrCfg ARGS(( RgrUeGrpPwrCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeUlPwrCfg ARGS(( +S16 cmPkRgrUeUlPwrCfg ARGS(( RgrUeUlPwrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeUlPwrCfg ARGS(( +S16 cmUnpkRgrUeUlPwrCfg ARGS(( RgrUeUlPwrCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeQosCfg ARGS(( +S16 cmPkRgrUeQosCfg ARGS(( RgrUeQosCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeQosCfg ARGS(( +S16 cmUnpkRgrUeQosCfg ARGS(( RgrUeQosCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeTaTmrCfg ARGS(( +S16 cmPkRgrUeTaTmrCfg ARGS(( RgrUeTaTmrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeTaTmrCfg ARGS(( +S16 cmUnpkRgrUeTaTmrCfg ARGS(( RgrUeTaTmrCfg *param, Buffer *mBuf )); @@ -4230,247 +4230,247 @@ EXTERN S16 cmUnpkRgrUeTaTmrCfg ARGS(( #ifdef RGR_V1 /* rgr_x_001.main_7: [ccpu00112398] Added periodicBSR-Timer and retxBSR-Timer */ -EXTERN S16 cmPkRgrUeBsrTmrCfg ARGS(( +S16 cmPkRgrUeBsrTmrCfg ARGS(( RgrUeBsrTmrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeBsrTmrCfg ARGS(( +S16 cmUnpkRgrUeBsrTmrCfg ARGS(( RgrUeBsrTmrCfg *param, Buffer *mBuf )); #endif /** @} */ -EXTERN S16 cmPkRgrUeCfg ARGS(( +S16 cmPkRgrUeCfg ARGS(( RgrUeCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeCfg ARGS(( +S16 cmUnpkRgrUeCfg ARGS(( RgrUeCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrLchQosCfg ARGS(( +S16 cmPkRgrLchQosCfg ARGS(( RgrLchQosCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLchQosCfg ARGS(( +S16 cmUnpkRgrLchQosCfg ARGS(( RgrLchQosCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDlLchCfg ARGS(( +S16 cmPkRgrDlLchCfg ARGS(( RgrDlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDlLchCfg ARGS(( +S16 cmUnpkRgrDlLchCfg ARGS(( RgrDlLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUlLcgCfg ARGS(( +S16 cmPkRgrUlLcgCfg ARGS(( RgrUlLcgCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUlLcgCfg ARGS(( +S16 cmUnpkRgrUlLcgCfg ARGS(( RgrUlLcgCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrLchCfg ARGS(( +S16 cmPkRgrLchCfg ARGS(( RgrLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLchCfg ARGS(( +S16 cmUnpkRgrLchCfg ARGS(( RgrLchCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrLcgCfg ARGS(( +S16 cmPkRgrLcgCfg ARGS(( RgrLcgCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLcgCfg ARGS(( +S16 cmUnpkRgrLcgCfg ARGS(( RgrLcgCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCfg ARGS(( +S16 cmPkRgrCfg ARGS(( RgrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCfg ARGS(( +S16 cmUnpkRgrCfg ARGS(( RgrCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrActvTime ARGS(( +S16 cmPkRgrActvTime ARGS(( RgrActvTime *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrActvTime ARGS(( +S16 cmUnpkRgrActvTime ARGS(( RgrActvTime *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCellRecfg ARGS(( +S16 cmPkRgrCellRecfg ARGS(( RgrCellRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCellRecfg ARGS(( +S16 cmUnpkRgrCellRecfg ARGS(( RgrCellRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeRecfg ARGS(( +S16 cmPkRgrUeRecfg ARGS(( RgrUeRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeRecfg ARGS(( +S16 cmUnpkRgrUeRecfg ARGS(( RgrUeRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrLchRecfg ARGS(( +S16 cmPkRgrLchRecfg ARGS(( RgrLchRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLchRecfg ARGS(( +S16 cmUnpkRgrLchRecfg ARGS(( RgrLchRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrLcgRecfg ARGS(( +S16 cmPkRgrLcgRecfg ARGS(( RgrLcgRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLcgRecfg ARGS(( +S16 cmUnpkRgrLcgRecfg ARGS(( RgrLcgRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrRecfg ARGS(( +S16 cmPkRgrRecfg ARGS(( RgrRecfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrRecfg ARGS(( +S16 cmUnpkRgrRecfg ARGS(( RgrRecfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDel ARGS(( +S16 cmPkRgrDel ARGS(( RgrDel *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDel ARGS(( +S16 cmUnpkRgrDel ARGS(( RgrDel *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrRst ARGS(( +S16 cmPkRgrRst ARGS(( RgrRst *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrRst ARGS(( +S16 cmUnpkRgrRst ARGS(( RgrRst *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSonCfg ARGS(( +S16 cmPkRgrSonCfg ARGS(( RgrSonCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSonCfg ARGS(( +S16 cmUnpkRgrSonCfg ARGS(( RgrSonCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSonPrbCfg ARGS(( +S16 cmPkRgrSonPrbCfg ARGS(( RgrPrbCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSonPrbCfg ARGS(( +S16 cmUnpkRgrSonPrbCfg ARGS(( RgrPrbCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCfgReqInfo ARGS(( +S16 cmPkRgrCfgReqInfo ARGS(( RgrCfgReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCfgReqInfo ARGS(( +S16 cmUnpkRgrCfgReqInfo ARGS(( RgrCfgReqInfo *param, Buffer *mBuf )); #ifdef LTE_ADV -EXTERN S16 cmUnPkRgrSCellActDeactEvnt ARGS(( +S16 cmUnPkRgrSCellActDeactEvnt ARGS(( RgrSCellActDeactEvnt *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSCellActDeactEvnt ARGS(( +S16 cmPkRgrSCellActDeactEvnt ARGS(( RgrSCellActDeactEvnt *param, Buffer *mBuf )); #endif /* LTE_ADV */ -EXTERN S16 cmPkRgrUeTxAntSelCfg ARGS(( +S16 cmPkRgrUeTxAntSelCfg ARGS(( RgrUeTxAntSelCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeTxAntSelCfg ARGS(( +S16 cmUnpkRgrUeTxAntSelCfg ARGS(( RgrUeTxAntSelCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUePuschDedCfg ARGS(( +S16 cmPkRgrUePuschDedCfg ARGS(( RgrUePuschDedCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUePuschDedCfg ARGS(( +S16 cmUnpkRgrUePuschDedCfg ARGS(( RgrUePuschDedCfg *param, Buffer *mBuf )); #ifdef TFU_UPGRADE -EXTERN S16 cmPkRgrUeDlPCqiSetup ARGS +S16 cmPkRgrUeDlPCqiSetup ARGS (( RgrUeDlPCqiSetup *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeDlPCqiSetup ARGS +S16 cmUnpkRgrUeDlPCqiSetup ARGS (( RgrUeDlPCqiSetup *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeUlSrsSetupCfg ARGS +S16 cmPkRgrUeUlSrsSetupCfg ARGS (( RgrUeUlSrsSetupCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeUlSrsSetupCfg ARGS +S16 cmUnpkRgrUeUlSrsSetupCfg ARGS (( RgrUeUlSrsSetupCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeSrSetupCfg ARGS +S16 cmPkRgrUeSrSetupCfg ARGS (( RgrUeSrSetupCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSrSetupCfg ARGS +S16 cmUnpkRgrUeSrSetupCfg ARGS (( RgrUeSrSetupCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeSrCfg ARGS + S16 cmPkRgrUeSrCfg ARGS (( RgrUeSrCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeSrCfg ARGS +S16 cmUnpkRgrUeSrCfg ARGS (( RgrUeSrCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeUlSrsCfg ARGS +S16 cmPkRgrUeUlSrsCfg ARGS (( RgrUeUlSrsCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeUlSrsCfg ARGS +S16 cmUnpkRgrUeUlSrsCfg ARGS (( RgrUeUlSrsCfg *param, Buffer *mBuf @@ -4481,34 +4481,34 @@ Buffer *mBuf #ifdef DM /** @brief Request from RRM to MAC to bind the interface SAPs */ -EXTERN S16 DmUiRgrBndReq ARGS(( +S16 DmUiRgrBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Confirmation from MAC to RRM for the bind/unbind * request for the interface SAPs */ -EXTERN S16 DmUiRgrBndCfm ARGS(( +S16 DmUiRgrBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RRM to MAC to unbind the interface SAPs */ -EXTERN S16 DmUiRgrUbndReq ARGS(( +S16 DmUiRgrUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Configuration request from RRM to MAC for * configuring Cell/UE/LC */ -EXTERN S16 DmUiRgrCfgReq ARGS(( +S16 DmUiRgrCfgReq ARGS(( Pst* pst, SpId spId, RgrCfgTransId transId, RgrCfgReqInfo * cfgReqInfo )); /** @brief Configuration confirm from MAC to RRM */ -EXTERN S16 DmUiRgrCfgCfm ARGS(( +S16 DmUiRgrCfgCfm ARGS(( Pst* pst, SuId suId, RgrCfgTransId transId, @@ -4524,34 +4524,34 @@ EXTERN S16 DmUiRgrCfgCfm ARGS(( * @param[in] suId Service User SAP Id * @param[in] staInd Status Indication . */ -EXTERN S16 NxLiRgrUeStaInd ARGS(( +S16 NxLiRgrUeStaInd ARGS(( Pst* pst, SuId suId, RgrUeStaIndInfo *ueStaInd )); -EXTERN S16 cmPkRgrUeStaInd ARGS +S16 cmPkRgrUeStaInd ARGS (( Pst* pst, SuId suId, RgrUeStaIndInfo* ueStaInd )); -EXTERN S16 cmUnpkRgrUeStaInd ARGS +S16 cmUnpkRgrUeStaInd ARGS (( RgrUeStaInd func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRgrUeStaIndInfo ARGS +S16 cmPkRgrUeStaIndInfo ARGS (( RgrUeStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrUeStaIndInfo ARGS +S16 cmUnpkRgrUeStaIndInfo ARGS (( RgrUeStaIndInfo *param, Buffer *mBuf @@ -4559,80 +4559,80 @@ Buffer *mBuf /* LTE_ADV_FLAG_REMOVED_START */ -EXTERN S16 cmPkRgrLteAdvancedUeConfig ARGS(( +S16 cmPkRgrLteAdvancedUeConfig ARGS(( RgrLteAdvancedUeConfig *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrLteAdvancedUeConfig ARGS(( +S16 cmUnpkRgrLteAdvancedUeConfig ARGS(( RgrLteAdvancedUeConfig *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrAbsConfig ARGS(( +S16 cmPkRgrAbsConfig ARGS(( RgrAbsConfig *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrAbsConfig ARGS(( +S16 cmUnpkRgrAbsConfig ARGS(( RgrAbsConfig *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrSfrConfig ARGS(( +S16 cmPkRgrSfrConfig ARGS(( RgrSfrConfig *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrSfrConfig ARGS(( +S16 cmUnpkRgrSfrConfig ARGS(( RgrSfrConfig *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCellLteAdvancedFeatureCfg ARGS(( +S16 cmPkRgrCellLteAdvancedFeatureCfg ARGS(( RgrLteAdvancedCellConfig *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCellLteAdvancedFeatureCfg ARGS(( +S16 cmUnpkRgrCellLteAdvancedFeatureCfg ARGS(( RgrLteAdvancedCellConfig *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrDsfrConfig ARGS(( +S16 cmPkRgrDsfrConfig ARGS(( RgrDsfrConfig *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrDsfrConfig ARGS(( +S16 cmUnpkRgrDsfrConfig ARGS(( RgrDsfrConfig *param, Buffer *mBuf )); /* LTE_ADV_FLAG_REMOVED_END */ -EXTERN S16 cmPkRgrCellCsgParamCfg ARGS(( +S16 cmPkRgrCellCsgParamCfg ARGS(( RgrCellCsgParamCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCellCsgParamCfg ARGS(( +S16 cmUnpkRgrCellCsgParamCfg ARGS(( RgrCellCsgParamCfg *param, Buffer *mBuf )); -EXTERN S16 cmPkRgrCellCntrlCmdCfg ARGS(( +S16 cmPkRgrCellCntrlCmdCfg ARGS(( RgrCellCntrlCmdCfg *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRgrCellCntrlCmdCfg ARGS(( +S16 cmUnpkRgrCellCntrlCmdCfg ARGS(( RgrCellCntrlCmdCfg *param, Buffer *mBuf )); #ifdef RLC_MAC_DAT_REQ_RBUF -EXTERN S16 rgDlDatReqBatchProc ARGS(( +S16 rgDlDatReqBatchProc ARGS(( Void)); #endif #ifdef RLC_MAC_STA_RSP_RBUF -EXTERN S16 rgDlStaRspBatchProc ARGS(( +S16 rgDlStaRspBatchProc ARGS(( Void)); #endif #ifdef __cplusplus diff --git a/src/cm/rgu.x b/src/cm/rgu.x index a696af22d..86186816f 100755 --- a/src/cm/rgu.x +++ b/src/cm/rgu.x @@ -498,14 +498,14 @@ typedef S16 (*RguL2MUlThrpMeasReq) ARGS(( * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -EXTERN S16 RgUiRguBndReq ARGS((Pst* pst,SuId suId,SpId spId)); +S16 RgUiRguBndReq ARGS((Pst* pst,SuId suId,SpId spId)); /** @brief Unbind Request from RLC to MAC to unbind the interface SAPs * @param pst Pointer to the post structure. * @param spId SAP ID of the service provider. * @param reason Reason for unbind request. * @return ROK/RFAILED */ -EXTERN S16 RgUiRguUbndReq ARGS((Pst* pst,SpId spId,Reason reason)); +S16 RgUiRguUbndReq ARGS((Pst* pst,SpId spId,Reason reason)); /** @brief Bind Confirmation from MAC to RLC for the bind and unbind * request for the interface SAPs * @param pst Pointer to the post structure. @@ -513,7 +513,7 @@ EXTERN S16 RgUiRguUbndReq ARGS((Pst* pst,SpId spId,Reason reason)); * @param status Status of the bind request. * @return ROK/RFAILED */ -EXTERN S16 RgUiRguBndCfm ARGS((Pst* pst,SuId suId,uint8_t status)); +S16 RgUiRguBndCfm ARGS((Pst* pst,SuId suId,uint8_t status)); /** @brief Data Request from RLC to MAC for forwarding SDUs on common * channel for transmission * @param pst Pointer to the post structure. @@ -521,7 +521,7 @@ EXTERN S16 RgUiRguBndCfm ARGS((Pst* pst,SuId suId,uint8_t status)); * @param datReq Data request for common channels (BCCH, PCCH and CCCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguCDatReq ARGS((Pst* pst,SpId spId,RguCDatReqInfo *datReq)); +S16 RgUiRguCDatReq ARGS((Pst* pst,SpId spId,RguCDatReqInfo *datReq)); /** @brief Data Request from RLC to MAC for forwarding SDUs on * dedicated channel for transmission * @param pst Pointer to the post structure. @@ -529,7 +529,7 @@ EXTERN S16 RgUiRguCDatReq ARGS((Pst* pst,SpId spId,RguCDatReqInfo *datReq)); * @param datReq Data request for dedicated channels (DCCH and DTCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguDDatReq ARGS((Pst* pst,SpId spId,RguDDatReqInfo *datReq)); +S16 RgUiRguDDatReq ARGS((Pst* pst,SpId spId,RguDDatReqInfo *datReq)); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels @@ -538,7 +538,7 @@ EXTERN S16 RgUiRguDDatReq ARGS((Pst* pst,SpId spId,RguDDatReqInfo *datReq)); * @param datInd Data indication on CCCH. * @return ROK/RFAILED */ -EXTERN S16 RgUiRguCDatInd ARGS((Pst* pst,SuId suId,RguCDatIndInfo *datInd)); +S16 RgUiRguCDatInd ARGS((Pst* pst,SuId suId,RguCDatIndInfo *datInd)); /** @brief Data Indication from MAC to RLC to * forward the data received for dedicated channels * @param pst Pointer to the post structure. @@ -546,7 +546,7 @@ EXTERN S16 RgUiRguCDatInd ARGS((Pst* pst,SuId suId,RguCDatIndInfo *datInd)); * @param datInd Data indication on dedicated channels (DCCH and DTCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguDDatInd ARGS((Pst* pst,SuId suId,RguDDatIndInfo *datInd)); +S16 RgUiRguDDatInd ARGS((Pst* pst,SuId suId,RguDDatIndInfo *datInd)); /** @brief Status Response from RLC to MAC to * inform the BO report for common channels * @param pst Pointer to the post structure. @@ -554,7 +554,7 @@ EXTERN S16 RgUiRguDDatInd ARGS((Pst* pst,SuId suId,RguDDatIndInfo *datInd)); * @param staRsp Status response for common channels (BCCH, PCCH and CCCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguCStaRsp ARGS((Pst* pst,SpId spId,RguCStaRspInfo *staRsp)); +S16 RgUiRguCStaRsp ARGS((Pst* pst,SpId spId,RguCStaRspInfo *staRsp)); /** @brief Status Response from RLC to MAC to * inform the BO report for dedicated channels * @param pst Pointer to the post structure. @@ -562,7 +562,7 @@ EXTERN S16 RgUiRguCStaRsp ARGS((Pst* pst,SpId spId,RguCStaRspInfo *staRsp)); * @param staRsp Status response for dedicated channels (DCCH and DTCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguDStaRsp ARGS((Pst* pst,SpId spId,RguDStaRspInfo *staRsp)); +S16 RgUiRguDStaRsp ARGS((Pst* pst,SpId spId,RguDStaRspInfo *staRsp)); /** @brief Status Indication from MAC to RLC * as a response to the staRsp primitive from RLC. @@ -571,7 +571,7 @@ EXTERN S16 RgUiRguDStaRsp ARGS((Pst* pst,SpId spId,RguDStaRspInfo *staRsp)); * @param staInd Status indication on common channels (BCCH, PCCH and CCCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguCStaInd ARGS((Pst* pst,SuId suId,RguCStaIndInfo *staInd)); +S16 RgUiRguCStaInd ARGS((Pst* pst,SuId suId,RguCStaIndInfo *staInd)); /** @brief Status Indication from MAC to RLC * as a response to the staRsp primitive from RLC. * @param pst Pointer to the post structure. @@ -579,16 +579,16 @@ EXTERN S16 RgUiRguCStaInd ARGS((Pst* pst,SuId suId,RguCStaIndInfo *staInd)); * @param staInd Status indication on dedicated channels (DCCH and DTCH). * @return ROK/RFAILED */ -EXTERN S16 RgUiRguDStaInd ARGS((Pst* pst,SuId suId,RguDStaIndInfo *staInd)); +S16 RgUiRguDStaInd ARGS((Pst* pst,SuId suId,RguDStaIndInfo *staInd)); /** @brief flow control indication from MAC to RLC */ -EXTERN S16 RgUiRguFlowCntrlInd ARGS((Pst *pst, SuId suId, +S16 RgUiRguFlowCntrlInd ARGS((Pst *pst, SuId suId, RguFlowCntrlInd *flowCntrlInd)); /*rgu_x_001.main_3 - ADD - L2M & R9 Support */ #ifdef LTE_L2_MEAS /** @brief HARQ Status Indication from MAC to RLC * as a response to the Data Req from RLC. * Informs HARQ feedback for the TB with sn mapping info. */ -EXTERN S16 RgUiRguHqStaInd ARGS((Pst* pst,SuId suId, +S16 RgUiRguHqStaInd ARGS((Pst* pst,SuId suId, RguHarqStatusInd *harqStatusInd)); @@ -596,7 +596,7 @@ RguHarqStatusInd *harqStatusInd)); /** @brief Request for measuring the timing Info for a LC from RLC to MAC * When the status is ON then Timing Info for data bursts * shall be captured and provided to RLC on DDatInd. */ -EXTERN S16 RgUiRguL2MUlThrpMeasReq ARGS((Pst* pst,SpId spId, +S16 RgUiRguL2MUlThrpMeasReq ARGS((Pst* pst,SpId spId, RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq)); #endif /* LTE_L2_MEAS */ @@ -605,27 +605,27 @@ RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq)); #ifdef KW /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 RlcLiRguBndReq ARGS(( +S16 RlcLiRguBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 RlcLiRguUbndReq ARGS(( +S16 RlcLiRguUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 RlcLiRguBndCfm ARGS(( +S16 RlcLiRguBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 RlcLiRguCDatReq ARGS(( +S16 RlcLiRguCDatReq ARGS(( Pst* pst, SpId spId, RguCDatReqInfo * datReq @@ -633,7 +633,7 @@ EXTERN S16 RlcLiRguCDatReq ARGS(( /** @brief Primitive invoked from RLC to MAC to * inform the BO report for common channels*/ -EXTERN S16 RlcLiRguCStaRsp ARGS(( +S16 RlcLiRguCStaRsp ARGS(( Pst* pst, SpId spId, RguCStaRspInfo * staRsp @@ -643,7 +643,7 @@ EXTERN S16 RlcLiRguCStaRsp ARGS(( /** @brief HARQ Status Indication from MAC to RLC * as a response to the Data Req from RLC. * Informs HARQ feedback for the PDU with sn. */ -EXTERN S16 RlcLiRguHqStaInd ARGS(( +S16 RlcLiRguHqStaInd ARGS(( Pst* pst, SuId suId, RguHarqStatusInd *harqStatusInd)); @@ -652,7 +652,7 @@ EXTERN S16 RlcLiRguHqStaInd ARGS(( /** @brief Request for measuring the timing Info for a LC from RLC to MAC * When the status is ON then Timing Info for data bursts * shall be captured and provided to RLC on DDatInd. */ -EXTERN S16 RlcLiRguL2MUlThrpMeasReq ARGS(( +S16 RlcLiRguL2MUlThrpMeasReq ARGS(( Pst* pst, SpId spId, RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq)); @@ -660,7 +660,7 @@ EXTERN S16 RlcLiRguL2MUlThrpMeasReq ARGS(( #endif /* LTE_L2_MEAS */ /** @brief flowCntrl Indication from MAC to RLC */ -EXTERN S16 RlcLiRguFlowCntrlInd ARGS(( +S16 RlcLiRguFlowCntrlInd ARGS(( Pst *pst, SuId suId, RguFlowCntrlInd *flowCntrlInd @@ -669,53 +669,53 @@ RguFlowCntrlInd *flowCntrlInd #ifdef LCRGU /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 cmPkRguBndReq ARGS(( +S16 cmPkRguBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief Request from RLC to MAC to bind the interface saps */ -EXTERN S16 cmUnpkRguBndReq ARGS(( +S16 cmUnpkRguBndReq ARGS(( RguBndReq func, Pst* pst, Buffer *mBuf )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 cmPkRguUbndReq ARGS(( +S16 cmPkRguUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief Request from RLC to MAC to Unbind the interface saps */ -EXTERN S16 cmUnpkRguUbndReq ARGS(( +S16 cmUnpkRguUbndReq ARGS(( RguUbndReq func, Pst* pst, Buffer *mBuf )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 cmPkRguBndCfm ARGS(( +S16 cmPkRguBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief Confirmation from MAC to RLC for the bind/Unbind * request for the interface saps */ -EXTERN S16 cmUnpkRguBndCfm ARGS(( +S16 cmUnpkRguBndCfm ARGS(( RguBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 cmPkRguCDatReq ARGS(( +S16 cmPkRguCDatReq ARGS(( Pst* pst, SpId spId, RguCDatReqInfo * datReq )); /** @brief Request from RLC to MAC for forwarding SDUs on common * channel for transmission */ -EXTERN S16 cmUnpkRguCDatReq ARGS(( +S16 cmUnpkRguCDatReq ARGS(( RguCDatReq func, Pst* pst, Buffer *mBuf @@ -723,14 +723,14 @@ EXTERN S16 cmUnpkRguCDatReq ARGS(( /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 cmPkRguCDatInd ARGS(( +S16 cmPkRguCDatInd ARGS(( Pst* pst, SuId suId, RguCDatIndInfo * datInd )); /** @brief Data Indication from MAC to RLC to * forward the data received for common channels*/ -EXTERN S16 cmUnpkRguCDatInd ARGS(( +S16 cmUnpkRguCDatInd ARGS(( RguCDatInd func, Pst* pst, Buffer *mBuf @@ -738,14 +738,14 @@ EXTERN S16 cmUnpkRguCDatInd ARGS(( /** @brief Primitive invoked from RLC to MAC to * inform the BO report for common channels*/ -EXTERN S16 cmPkRguCStaRsp ARGS(( +S16 cmPkRguCStaRsp ARGS(( Pst* pst, SpId spId, RguCStaRspInfo * staRsp )); /** @brief Primitive invoked from RLC to MAC to * inform the BO report for common channels*/ -EXTERN S16 cmUnpkRguCStaRsp ARGS(( +S16 cmUnpkRguCStaRsp ARGS(( RguCStaRsp func, Pst* pst, Buffer *mBuf @@ -755,7 +755,7 @@ EXTERN S16 cmUnpkRguCStaRsp ARGS(( * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on common channels. */ -EXTERN S16 cmPkRguCStaInd ARGS(( +S16 cmPkRguCStaInd ARGS(( Pst* pst, SuId suId, RguCStaIndInfo * staInd @@ -764,152 +764,152 @@ EXTERN S16 cmPkRguCStaInd ARGS(( * as a response to the staRsp primitive from RLC. * Informs RLC of the totalBufferSize and Timing Info * for the transmission on common channels. */ -EXTERN S16 cmUnpkRguCStaInd ARGS(( +S16 cmUnpkRguCStaInd ARGS(( RguCStaInd func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRguFlowCntrlInfo ARGS(( +S16 cmPkRguFlowCntrlInfo ARGS(( RguFlowCntrlInd *param, Buffer *mBuf )); -EXTERN S16 cmPkRguUeFlowCntrlInfo ARGS(( +S16 cmPkRguUeFlowCntrlInfo ARGS(( RguUeFlowCntrlInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRguLcFlowCntrlInfo ARGS(( +S16 cmPkRguLcFlowCntrlInfo ARGS(( RguLcFlowCntrlInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguLcFlowCntrlInfo ARGS(( +S16 cmUnpkRguLcFlowCntrlInfo ARGS(( RguLcFlowCntrlInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguUeFlowCntrlInfo ARGS(( +S16 cmUnpkRguUeFlowCntrlInfo ARGS(( RguUeFlowCntrlInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguFlowCntrlInfo ARGS(( +S16 cmUnpkRguFlowCntrlInfo ARGS(( RguFlowCntrlInd *param, Buffer *mBuf )); -EXTERN S16 cmPkRguPduInfo ARGS(( +S16 cmPkRguPduInfo ARGS(( RguPduInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguPduInfo ARGS(( +S16 cmUnpkRguPduInfo ARGS(( RguPduInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRguDBoReport ARGS(( +S16 cmPkRguDBoReport ARGS(( RguDBoReport *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguDBoReport ARGS(( +S16 cmUnpkRguDBoReport ARGS(( RguDBoReport *param, Buffer *mBuf )); -EXTERN S16 cmPkRguCDatReqInfo ARGS(( +S16 cmPkRguCDatReqInfo ARGS(( RguCDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguCDatReqInfo ARGS(( +S16 cmUnpkRguCDatReqInfo ARGS(( RguCDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRguLchDatReq ARGS(( +S16 cmPkRguLchDatReq ARGS(( RguLchDatReq *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguLchDatReq ARGS(( +S16 cmUnpkRguLchDatReq ARGS(( RguLchDatReq *param, Buffer *mBuf )); -EXTERN S16 cmPkRguDatReqTb ARGS(( +S16 cmPkRguDatReqTb ARGS(( RguDatReqTb *param, Buffer *mBuf )); -EXTERN S16 cmPkRguStaIndTb ARGS(( +S16 cmPkRguStaIndTb ARGS(( RguStaIndTb *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguStaIndTb ARGS(( +S16 cmUnpkRguStaIndTb ARGS(( RguStaIndTb *param, Buffer *mBuf )); /* rgu_x_001.main_3 - ADD - L2M Support */ #ifdef LTE_L2_MEAS -EXTERN S16 cmPkRguDDatReqInfo ARGS(( +S16 cmPkRguDDatReqInfo ARGS(( Pst *pst, RguDDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguDDatReqInfo ARGS(( +S16 cmUnpkRguDDatReqInfo ARGS(( Pst *pst, RguDDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguDatReqTb ARGS(( +S16 cmUnpkRguDatReqTb ARGS(( Pst *pst, RguDatReqTb *param, Buffer *mBuf )); #else -EXTERN S16 cmPkRguDDatReqInfo ARGS(( +S16 cmPkRguDDatReqInfo ARGS(( RguDDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguDDatReqInfo ARGS(( +S16 cmUnpkRguDDatReqInfo ARGS(( RguDDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguDatReqTb ARGS(( +S16 cmUnpkRguDatReqTb ARGS(( RguDatReqTb *param, Buffer *mBuf )); #endif -EXTERN S16 cmPkRguCDatIndInfo ARGS(( +S16 cmPkRguCDatIndInfo ARGS(( RguCDatIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguCDatIndInfo ARGS(( +S16 cmUnpkRguCDatIndInfo ARGS(( RguCDatIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRguLchDatInd ARGS(( +S16 cmPkRguLchDatInd ARGS(( RguLchDatInd *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguLchDatInd ARGS(( +S16 cmUnpkRguLchDatInd ARGS(( RguLchDatInd *param, Buffer *mBuf )); -EXTERN S16 cmPkRguCStaRspInfo ARGS(( +S16 cmPkRguCStaRspInfo ARGS(( RguCStaRspInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguCStaRspInfo ARGS(( +S16 cmUnpkRguCStaRspInfo ARGS(( RguCStaRspInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRguCStaIndInfo ARGS(( +S16 cmPkRguCStaIndInfo ARGS(( RguCStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguCStaIndInfo ARGS(( +S16 cmUnpkRguCStaIndInfo ARGS(( RguCStaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkRguLchStaInd ARGS(( +S16 cmPkRguLchStaInd ARGS(( RguLchStaInd *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguLchStaInd ARGS(( +S16 cmUnpkRguLchStaInd ARGS(( RguLchStaInd *param, Buffer *mBuf )); @@ -918,13 +918,13 @@ EXTERN S16 cmUnpkRguLchStaInd ARGS(( #ifdef LTE_L2_MEAS /** @brief Request from MAC to RLC for forwarding HARQ Status */ -EXTERN S16 cmPkRguHqStaInd ARGS(( +S16 cmPkRguHqStaInd ARGS(( Pst* pst, SpId spId, RguHarqStatusInd *harqStatusInd)); /** @brief Request from MAC to RLC forwarding HARQ status */ -EXTERN S16 cmUnpkRguHqStaInd ARGS(( +S16 cmUnpkRguHqStaInd ARGS(( RguHqStaInd func, Pst* pst, Buffer *mBuf @@ -932,7 +932,7 @@ EXTERN S16 cmUnpkRguHqStaInd ARGS(( /** @brief Primitive invoked from RLC to MAC to * * inform the On/Off Status of LC Id*/ -EXTERN S16 cmPkRguL2MUlThrpMeasReq ARGS(( +S16 cmPkRguL2MUlThrpMeasReq ARGS(( Pst* pst, SpId spId, RguL2MUlThrpMeasReqInfo* measReq @@ -940,30 +940,30 @@ EXTERN S16 cmPkRguL2MUlThrpMeasReq ARGS(( /** @brief Primitive invoked from RLC to MAC to * * inform the On/Off Status of LC Id*/ -EXTERN S16 cmUnpkRguL2MUlThrpMeasReq ARGS(( +S16 cmUnpkRguL2MUlThrpMeasReq ARGS(( RguL2MUlThrpMeasReq func, Pst* pst, Buffer *mBuf )); -EXTERN S16 cmPkRguL2MUlThrpMeasReqInfo ARGS(( +S16 cmPkRguL2MUlThrpMeasReqInfo ARGS(( RguL2MUlThrpMeasReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkRguL2MUlThrpMeasReqInfo ARGS(( +S16 cmUnpkRguL2MUlThrpMeasReqInfo ARGS(( RguL2MUlThrpMeasReqInfo *param, Buffer *mBuf )); #endif /* LTE_L2_MEAS */ -EXTERN S16 cmUnpkRguFlowCntrlInd ARGS(( +S16 cmUnpkRguFlowCntrlInd ARGS(( RguFlowCntrlIndInfo func, Pst *pst, Buffer *mBuf )); -EXTERN S16 cmPkRguFlowCntrlInd ARGS(( +S16 cmPkRguFlowCntrlInd ARGS(( Pst* pst, SuId suId, RguFlowCntrlInd *flowCntrlInd diff --git a/src/cm/ssi.h b/src/cm/ssi.h index d7cebf4c9..eaeff336e 100755 --- a/src/cm/ssi.h +++ b/src/cm/ssi.h @@ -2365,7 +2365,7 @@ #define GetTIMETICK() 0 #endif #ifdef PHY_SHUTDOWN_ENABLE -#define stop_printf(...) do {EXTERN uint8_t sndPhyShutDwn;printf(__VA_ARGS__); mtStopHndlr(); sndPhyShutDwn = 1;} while (0) +#define stop_printf(...) do {uint8_t sndPhyShutDwn;printf(__VA_ARGS__); mtStopHndlr(); sndPhyShutDwn = 1;} while (0) #else #define stop_printf(...) do {printf(__VA_ARGS__); mtStopHndlr(); exit(-1);} while (0) #endif @@ -2389,7 +2389,7 @@ #ifdef MS_MUBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ #define MS_BUF_ADD_CALLER()\ {\ - extern uint32_t cmFreeCaller[4];\ + uint32_t cmFreeCaller[4];\ if(cmFreeCaller[MxGetCpuID()] == NULLP)\ cmFreeCaller[MxGetCpuID()] = __return_address()-4;\ } @@ -2398,8 +2398,8 @@ #endif/* MSPD */ #ifdef BRDCM -extern char logBuf[100]; -extern int glbTime; +char logBuf[100]; +int glbTime; #define BRDCM_PROF(s) do {\ } while(0) diff --git a/src/cm/ssi.x b/src/cm/ssi.x index 2b686c204..9c599790b 100755 --- a/src/cm/ssi.x +++ b/src/cm/ssi.x @@ -187,10 +187,10 @@ struct ss_buffer /* buffer - typdef'd earlier */ } t; }; -EXTERN S16 msOptInd; -EXTERN S8 *msOptArg; -EXTERN Txt **msArgv; -EXTERN S16 msArgc; + S16 msOptInd; + S8 *msOptArg; + Txt **msArgv; + S16 msArgc; #else #ifdef MSVER2 /* mos version 2 */ @@ -283,10 +283,10 @@ struct sBuf /* static buffer - typedef'd earlier */ uint16_t spare2; /* spare 2 */ }; -EXTERN S16 msOptInd; -EXTERN S8 *msOptArg; -EXTERN Txt **msArgv; -EXTERN S16 msArgc; + S16 msOptInd; + S8 *msOptArg; + Txt **msArgv; + S16 msArgc; #else #ifdef PS /* psos version */ @@ -701,10 +701,10 @@ typedef Void (*PDPR) ARGS((PTR cxt)); /* pointer to DPR function handler */ #ifdef SS /* Common System Services */ /* for SGetOpt() */ -EXTERN S16 msOptInd; -EXTERN S8 *msOptArg; -EXTERN Txt **msArgv; -EXTERN S16 msArgc; + S16 msOptInd; + S8 *msOptArg; + Txt **msArgv; + S16 msArgc; /* task related stuff */ /* data range modified */ @@ -927,130 +927,130 @@ struct uProc /* functions */ -EXTERN S16 SChekMemUtilization ARGS((Region region,Bool *memAlarm)); - -EXTERN Void prntMem ARGS((Data *strtAdr,S16 len)); -EXTERN Void prntMsg ARGS((Buffer *mBuf)); -EXTERN Void prntMsg1 ARGS((Buffer *mBuf,S16 src,S16 dst)); -EXTERN uint8_t tst ARGS((void )); -EXTERN S16 rdConQ ARGS((Data data)); - -EXTERN S16 SPkS8 ARGS((S8 val,Buffer *mBuf)); -EXTERN S16 oduUnpackUInt8 ARGS((uint8_t val,Buffer *mBuf)); -EXTERN S16 SPkS16 ARGS((S16 val,Buffer *mBuf)); -EXTERN S16 oduUnpackUInt16 ARGS((uint16_t val,Buffer *mBuf)); -EXTERN S16 SPkS32 ARGS((S32 val,Buffer *mBuf)); -EXTERN S16 oduUnpackUInt32 ARGS((uint32_t val,Buffer *mBuf)); +S16 SChekMemUtilization ARGS((Region region,Bool *memAlarm)); + +Void prntMem ARGS((Data *strtAdr,S16 len)); +Void prntMsg ARGS((Buffer *mBuf)); +Void prntMsg1 ARGS((Buffer *mBuf,S16 src,S16 dst)); +uint8_t tst ARGS((void )); +S16 rdConQ ARGS((Data data)); + +S16 SPkS8 ARGS((S8 val,Buffer *mBuf)); +S16 oduUnpackUInt8 ARGS((uint8_t val,Buffer *mBuf)); +S16 SPkS16 ARGS((S16 val,Buffer *mBuf)); +S16 oduUnpackUInt16 ARGS((uint16_t val,Buffer *mBuf)); +S16 SPkS32 ARGS((S32 val,Buffer *mBuf)); +S16 oduUnpackUInt32 ARGS((uint32_t val,Buffer *mBuf)); /* ssi_x_001.main_49 : added packing of F32 and F64*/ #ifdef SS_FLOAT -EXTERN S16 SPkF32 ARGS((F32 val,Buffer *mBuf)); -EXTERN S16 SPkF64 ARGS((F64 val,Buffer *mBuf)); +S16 SPkF32 ARGS((F32 val,Buffer *mBuf)); +S16 SPkF64 ARGS((F64 val,Buffer *mBuf)); #endif /* SS_FLOAT */ -EXTERN S16 SUnpkS8 ARGS((S8 *val,Buffer *mBuf)); -EXTERN S16 oduPackUInt8 ARGS((uint8_t *val,Buffer *mBuf)); -EXTERN S16 SUnpkS16 ARGS((S16 *val,Buffer *mBuf)); -EXTERN S16 oduPackUInt16 ARGS((uint16_t *val,Buffer *mBuf)); -EXTERN S16 SUnpkS32 ARGS((S32 *val,Buffer *mBuf)); -EXTERN S16 oduPackUInt32 ARGS((uint32_t *val,Buffer *mBuf)); +S16 SUnpkS8 ARGS((S8 *val,Buffer *mBuf)); +S16 oduPackUInt8 ARGS((uint8_t *val,Buffer *mBuf)); +S16 SUnpkS16 ARGS((S16 *val,Buffer *mBuf)); +S16 oduPackUInt16 ARGS((uint16_t *val,Buffer *mBuf)); +S16 SUnpkS32 ARGS((S32 *val,Buffer *mBuf)); +S16 oduPackUInt32 ARGS((uint32_t *val,Buffer *mBuf)); /* ssi_x_001.main_49 : added unpacking of F32 and F64*/ #ifdef SS_FLOAT -EXTERN S16 SUnpkF32 ARGS((F32 *val,Buffer *mBuf)); -EXTERN S16 SUnpkF64 ARGS((F64 *val,Buffer *mBuf)); +S16 SUnpkF32 ARGS((F32 *val,Buffer *mBuf)); +S16 SUnpkF64 ARGS((F64 *val,Buffer *mBuf)); #endif /* SS_FLOAT */ -EXTERN S16 SPrint ARGS((Txt *buf)); -EXTERN S16 SDisplay ARGS((S16 chan,Txt *buf)); -EXTERN S16 SPrntMsg ARGS((Buffer *mBuf,S16 src,S16 dst)); -EXTERN S16 SInitQueue ARGS((Queue *q)); +S16 SPrint ARGS((Txt *buf)); +S16 SDisplay ARGS((S16 chan,Txt *buf)); +S16 SPrntMsg ARGS((Buffer *mBuf,S16 src,S16 dst)); +S16 SInitQueue ARGS((Queue *q)); #ifndef SS_ENABLE_MACROS -EXTERN S16 SQueueFirst ARGS((Buffer *buf,Queue *q)); -EXTERN S16 SQueueLast ARGS((Buffer *buf,Queue *q)); -EXTERN S16 SDequeueFirst ARGS((Buffer * *bufPtr,Queue *q)); -EXTERN S16 SDequeueLast ARGS((Buffer * *bufPtr,Queue *q)); +S16 SQueueFirst ARGS((Buffer *buf,Queue *q)); +S16 SQueueLast ARGS((Buffer *buf,Queue *q)); +S16 SDequeueFirst ARGS((Buffer * *bufPtr,Queue *q)); +S16 SDequeueLast ARGS((Buffer * *bufPtr,Queue *q)); #endif /* SS_ENABLE_MACROS */ -EXTERN S16 SFlushQueue ARGS((Queue *q)); -EXTERN S16 SCatQueue ARGS((Queue *q1,Queue *q2,Order order)); -EXTERN S16 SFndLenQueue ARGS((Queue *q,QLen *lngPtr)); -EXTERN S16 SExamQueue ARGS((Buffer **bufPtr,Queue *q,QLen idx)); -EXTERN S16 SAddQueue ARGS((Buffer *buf,Queue *q,QLen idx)); -EXTERN S16 SRemQueue ARGS((Buffer **bufPtr,Queue *q,QLen idx)); +S16 SFlushQueue ARGS((Queue *q)); +S16 SCatQueue ARGS((Queue *q1,Queue *q2,Order order)); +S16 SFndLenQueue ARGS((Queue *q,QLen *lngPtr)); +S16 SExamQueue ARGS((Buffer **bufPtr,Queue *q,QLen idx)); +S16 SAddQueue ARGS((Buffer *buf,Queue *q,QLen idx)); +S16 SRemQueue ARGS((Buffer **bufPtr,Queue *q,QLen idx)); #ifndef SS_ENABLE_MACROS #ifdef T2K_MEM_LEAK_DBG #define SGetDBuf(region,pool,buf) SGetDBufNew(region,pool,buf,__FILE__,__LINE__) #define SPutDBuf(region,pool,buf) SPutDBufNew(region,pool,buf,file,line) -EXTERN S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,char*,uint32_t)); -EXTERN S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf,char*,uint32_t)); -EXTERN S16 SAttachPtrToBufNew ARGS((Region region, Pool pool, Data +S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,char*,uint32_t)); +S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf,char*,uint32_t)); +S16 SAttachPtrToBufNew ARGS((Region region, Pool pool, Data *ptr, MsgLen totalLen, Buffer** mBuf, char* file, uint32_t line)); #define SAttachPtrToBuf(region,pool,ptr,totalLen,mBuf) SAttachPtrToBufNew(region,pool,ptr,totalLen,mBuf,__FILE__,__LINE__) #define SPutZbcDBuf(region,buf) SPutZbcDBufNew(region,buf,__FILE__,__LINE__) #elif SS_LIGHT_MEM_LEAK_STS -EXTERN S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,uint32_t line,uint8_t *fnName)); -EXTERN S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf, uint32_t line, uint8_t *fnName)); +S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,uint32_t line,uint8_t *fnName)); +S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf, uint32_t line, uint8_t *fnName)); #else -EXTERN S16 SGetDBuf ARGS((Region region,Pool pool,Buffer * *bufPtr)); -EXTERN S16 SPutDBuf ARGS((Region region,Pool pool,Buffer *buf)); +S16 SGetDBuf ARGS((Region region,Pool pool,Buffer * *bufPtr)); +S16 SPutDBuf ARGS((Region region,Pool pool,Buffer *buf)); #endif #else /* SS_ENABLE_MACROS */ #ifdef T2K_MEM_LEAK_DBG #define SGetDBuf(region,pool,buf) SGetDBufNew(region,pool,buf,__FILE__,__LINE__) #define SPutDBuf(region,pool,buf) SPutDBufNew(region,pool,buf,__FILE__,__LINE__) -EXTERN S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,char*,uint32_t)); -EXTERN S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf,char*,uint32_t)); +S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,char*,uint32_t)); +S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf,char*,uint32_t)); #elif SS_LIGHT_MEM_LEAK_STS -EXTERN S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,uint32_t line,uint8_t *fnName)); -EXTERN S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf, uint32_t line, uint8_t *fnName)); +S16 SGetDBufNew ARGS((Region region,Pool pool,Buffer * *bufPtr,uint32_t line,uint8_t *fnName)); +S16 SPutDBufNew ARGS((Region region,Pool pool,Buffer *buf, uint32_t line, uint8_t *fnName)); #else -EXTERN S16 SGetDBuf ARGS((Region region,Pool pool,Buffer * *bufPtr)); -EXTERN S16 SPutDBuf ARGS((Region region,Pool pool,Buffer *buf)); +S16 SGetDBuf ARGS((Region region,Pool pool,Buffer * *bufPtr)); +S16 SPutDBuf ARGS((Region region,Pool pool,Buffer *buf)); #endif #endif /* SS_ENABLE_MACROS */ -EXTERN S16 SPutMsgToRegion ARGS((Region region, Buffer *buf)); +S16 SPutMsgToRegion ARGS((Region region, Buffer *buf)); #ifdef SS_USE_ICC_MEMORY -EXTERN Void *ssGetIccHdl ARGS((Region region)); +Void *ssGetIccHdl ARGS((Region region)); #endif /* SS_USE_ICC_MEMORY */ /* ssi_x_001.main_57 : Additions */ /* ssi_x_001.main_59 : Added compile time flag */ #ifdef SS_LIGHT_MEM_LEAK_STS -EXTERN S16 SGetMsgNew ARGS((Region region, Pool pool, Buffer * *mBufPtr, uint32_t line, uint8_t *fnName)); -EXTERN S16 SGetSBufNew ARGS((Region region,Pool pool, Data * *bufPtr, Size size, uint32_t line, uint8_t* fnName)); -EXTERN S16 SPutMsgNew ARGS((Buffer *mBuf, uint32_t line, uint8_t *fnName)); -EXTERN S16 SPutSBufNew ARGS((Region region, Pool pool, Data *buf, Size size, uint32_t line, uint8_t *fnName)); +S16 SGetMsgNew ARGS((Region region, Pool pool, Buffer * *mBufPtr, uint32_t line, uint8_t *fnName)); +S16 SGetSBufNew ARGS((Region region,Pool pool, Data * *bufPtr, Size size, uint32_t line, uint8_t* fnName)); +S16 SPutMsgNew ARGS((Buffer *mBuf, uint32_t line, uint8_t *fnName)); +S16 SPutSBufNew ARGS((Region region, Pool pool, Data *buf, Size size, uint32_t line, uint8_t *fnName)); #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SS_HISTOGRAM_SUPPORT -EXTERN S16 SPutMsgNew ARGS((Buffer *mBuf, uint32_t line, uint8_t *fileName)); -EXTERN S16 SGetMsgNew ARGS((Region region, Pool pool, Buffer * *mBufPtr, uint32_t line, uint8_t *fileName)); -EXTERN S16 SGetSBufNew ARGS((Region region,Pool pool, Data * *bufPtr, Size size, uint32_t line, uint8_t *fileName)); -EXTERN S16 SPutSBufNew ARGS((Region region, Pool pool, Data *buf, Size size, uint32_t line, uint8_t *fileName)); +S16 SPutMsgNew ARGS((Buffer *mBuf, uint32_t line, uint8_t *fileName)); +S16 SGetMsgNew ARGS((Region region, Pool pool, Buffer * *mBufPtr, uint32_t line, uint8_t *fileName)); +S16 SGetSBufNew ARGS((Region region,Pool pool, Data * *bufPtr, Size size, uint32_t line, uint8_t *fileName)); +S16 SPutSBufNew ARGS((Region region, Pool pool, Data *buf, Size size, uint32_t line, uint8_t *fileName)); #else /*ssi_x_001.main_67 : RMIOS specific changes*/ #ifndef SS_RMIOS #ifdef T2K_MEM_LEAK_DBG #define SPutMsg(mBuf) SPutMsgNew(mBuf,__FILE__,__LINE__) #define SGetMsg(region,pool,mBuf) SGetMsgNew(region,pool,mBuf,__FILE__,__LINE__) -EXTERN S16 SPutMsgNew ARGS((Buffer *mBuf,char*, uint32_t)); -EXTERN S16 SGetMsgNew ARGS((Region region, Pool pool, Buffer * *mBufPtr, char*,uint32_t)); +S16 SPutMsgNew ARGS((Buffer *mBuf,char*, uint32_t)); +S16 SGetMsgNew ARGS((Region region, Pool pool, Buffer * *mBufPtr, char*,uint32_t)); #else -EXTERN S16 SPutMsg ARGS((Buffer *mBuf)); -EXTERN S16 SGetMsg ARGS((Region region, Pool pool, Buffer * *mBufPtr)); +S16 SPutMsg ARGS((Buffer *mBuf)); +S16 SGetMsg ARGS((Region region, Pool pool, Buffer * *mBufPtr)); #endif #else #define SPutMsg(m) SPutMsgRmi(__FILE__, __LINE__, m) #define SGetMsg(r, p, m) SGetMsgRmi(__FILE__, __LINE__, r, p, m) -EXTERN S16 SPutMsgRmi ARGS((char *file, int line, Buffer *mBuf)); -EXTERN S16 SGetMsgRmi ARGS((char *file, int line, Region region, Pool pool, Buffer * *mBufPtr)); +S16 SPutMsgRmi ARGS((char *file, int line, Buffer *mBuf)); +S16 SGetMsgRmi ARGS((char *file, int line, Region region, Pool pool, Buffer * *mBufPtr)); #endif #if (defined(SSI_STATIC_MEM_LEAK_DETECTION)|| defined(T2K_MEM_LEAK_DBG)) #define SGetSBuf(region,pool,bufPtr,size) SGetSBuf1(region,pool,bufPtr,size,__FILE__,__LINE__) -EXTERN S16 SGetSBuf1 ARGS((Region region,Pool pool, Data * *bufPtr, Size size, char* file, uint32_t line)); -EXTERN void DumpStaticMemLeakFiles ARGS((void)); -EXTERN void DumpT2kMemLeakInfoToFile ARGS((void)); +S16 SGetSBuf1 ARGS((Region region,Pool pool, Data * *bufPtr, Size size, char* file, uint32_t line)); +void DumpStaticMemLeakFiles ARGS((void)); +void DumpT2kMemLeakInfoToFile ARGS((void)); #define SPutSBuf(region,pool,buf,size) SPutSBuf1(region,pool,buf,size,__FILE__,__LINE__) -EXTERN S16 SPutSBuf1 ARGS((Region region, Pool pool, Data *buf, Size size, char*, uint32_t)); +S16 SPutSBuf1 ARGS((Region region, Pool pool, Data *buf, Size size, char*, uint32_t)); #else -EXTERN S16 SGetSBuf ARGS((Region region,Pool pool, Data * *bufPtr, Size size)); -EXTERN S16 SPutSBuf ARGS((Region region, Pool pool, Data *buf, Size size)); +S16 SGetSBuf ARGS((Region region,Pool pool, Data * *bufPtr, Size size)); +S16 SPutSBuf ARGS((Region region, Pool pool, Data *buf, Size size)); #endif #endif /* SS_HISTOGRAM_SUPPORT */ #endif /*SS_LIGHT_MEM_LEAK_STS */ @@ -1058,160 +1058,160 @@ EXTERN S16 SPutSBuf ARGS((Region region, Pool pool, Data *buf, Size size)); #ifdef T2K_MEM_LEAK_DBG #define SGetSBufWls(region,pool,bufPtr,size) SGetSBufWls1(region,pool,bufPtr,size,__FILE__,__LINE__) #define SPutSBufWls(region,pool,bufPtr,size) SPutSBufWls1(region,pool,bufPtr,size,__FILE__,__LINE__) -EXTERN S16 SPutSBufWls1(Region region, Pool pool, Data *ptr, Size size,char* file, uint32_t line); -EXTERN S16 SGetSBufWls1(Region region, Pool pool, Data **ptr, Size size,char* file, uint32_t line); +S16 SPutSBufWls1(Region region, Pool pool, Data *ptr, Size size,char* file, uint32_t line); +S16 SGetSBufWls1(Region region, Pool pool, Data **ptr, Size size,char* file, uint32_t line); #define SAttachWlsPtrToMBuf(region,pool,bufPtr,rPtr,size,pLen,mBuf) SAttachWlsPtrToMBuf1(region,pool,bufPtr,rPtr,size,pLen,mBuf,__FILE__,__LINE__) -EXTERN S16 SAttachWlsPtrToMBuf1(Region region, Pool pool, Data *ptr, Data *readPtr, MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf,char* file, uint32_t line); +S16 SAttachWlsPtrToMBuf1(Region region, Pool pool, Data *ptr, Data *readPtr, MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf,char* file, uint32_t line); #define SAttachPtrToMBuf(region,pool,bufPtr,size,pLen,mBuf) SAttachPtrToMBuf1(region,pool,bufPtr,size,pLen,mBuf,__FILE__,__LINE__) #else -EXTERN S16 SPutSBufWls(Region region, Pool pool, Data *ptr, Size size); -EXTERN S16 SGetSBufWls(Region region, Pool pool, Data **ptr, Size size); -EXTERN S16 SAttachWlsPtrToMBuf(Region region, Pool pool, Data *ptr, Data *readPtr, MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf); +S16 SPutSBufWls(Region region, Pool pool, Data *ptr, Size size); +S16 SGetSBufWls(Region region, Pool pool, Data **ptr, Size size); +S16 SAttachWlsPtrToMBuf(Region region, Pool pool, Data *ptr, Data *readPtr, MsgLen totalLen, MsgLen ptrLen, Buffer** mBuf); #endif #endif -EXTERN S16 SGetStaticBuffer ARGS((Region region,Pool pool, Data * *bufPtr, Size size, uint8_t memType)); -EXTERN S16 SPutStaticBuffer ARGS((Region region, Pool pool, Data *buf, Size size, uint8_t memType)); +S16 SGetStaticBuffer ARGS((Region region,Pool pool, Data * *bufPtr, Size size, uint8_t memType)); +S16 SPutStaticBuffer ARGS((Region region, Pool pool, Data *buf, Size size, uint8_t memType)); /* ssi_x_001.main_65: Additions */ #ifdef SS_SEUM_CAVIUM -EXTERN S16 ssInitRcvWork ARGS((void)); -EXTERN S16 SConvPtrPhy ARGS(( Buffer **mBuf)); -EXTERN S16 SConvPhyPtr ARGS((Buffer **workPtr)); -EXTERN S16 SCpyFpaMsg ARGS((Buffer *srcBuf, Region dstRegion,Pool dstPool, Buffer **dstBuf)); -EXTERN S16 SCpyMsgFpa ARGS(( Buffer *srcBuf, Buffer **dstBuf)); -EXTERN S16 SPutFpaMsg ARGS(( Buffer *fpaBuf)); +S16 ssInitRcvWork ARGS((void)); +S16 SConvPtrPhy ARGS(( Buffer **mBuf)); +S16 SConvPhyPtr ARGS((Buffer **workPtr)); +S16 SCpyFpaMsg ARGS((Buffer *srcBuf, Region dstRegion,Pool dstPool, Buffer **dstBuf)); +S16 SCpyMsgFpa ARGS(( Buffer *srcBuf, Buffer **dstBuf)); +S16 SPutFpaMsg ARGS(( Buffer *fpaBuf)); #endif /* SS_SEUM_CAVIUM */ -EXTERN S16 SGetSMem ARGS((Region region,Size size,Pool *poolPtr)); -EXTERN S16 SPutSMem ARGS((Region region,Pool pool)); -EXTERN S16 SInitMsg ARGS((Buffer *mBuf)); -EXTERN S16 SAddPreMsg ARGS((Data data,Buffer *mBuf)); -EXTERN S16 SAddPstMsg ARGS((Data data,Buffer *mBuf)); +S16 SGetSMem ARGS((Region region,Size size,Pool *poolPtr)); +S16 SPutSMem ARGS((Region region,Pool pool)); +S16 SInitMsg ARGS((Buffer *mBuf)); +S16 SAddPreMsg ARGS((Data data,Buffer *mBuf)); +S16 SAddPstMsg ARGS((Data data,Buffer *mBuf)); /* ssi_x_001.main_70 - Added prototype for SAddPreMsgMultInOrder */ -EXTERN S16 SAddPreMsgMultInOrder ARGS((Data *src,MsgLen cnt,Buffer *mBuf)); -EXTERN S16 SRemPreMsg ARGS((Data *dataPtr,Buffer *mBuf)); -EXTERN S16 SRemPreMsgRegion ARGS((Region region, Data *dataPtr,Buffer *mBuf)); -EXTERN S16 SCatMsgRegion ARGS((Region region, Buffer *mBuf1,Buffer *mBuf2,Order order)); -EXTERN S16 SSegMsgRegion ARGS((Region region, Buffer *mBuf1,MsgLen idx,Buffer **mBuf2)); -EXTERN int SCreatePThread ARGS((pthread_t* tid, pthread_attr_t* attr, void *(*start_routine) (void *), void* arg)); -EXTERN S16 SRemPstMsg ARGS((Data *dataPtr,Buffer *mBuf)); +S16 SAddPreMsgMultInOrder ARGS((Data *src,MsgLen cnt,Buffer *mBuf)); +S16 SRemPreMsg ARGS((Data *dataPtr,Buffer *mBuf)); +S16 SRemPreMsgRegion ARGS((Region region, Data *dataPtr,Buffer *mBuf)); +S16 SCatMsgRegion ARGS((Region region, Buffer *mBuf1,Buffer *mBuf2,Order order)); +S16 SSegMsgRegion ARGS((Region region, Buffer *mBuf1,MsgLen idx,Buffer **mBuf2)); +int SCreatePThread ARGS((pthread_t* tid, pthread_attr_t* attr, void *(*start_routine) (void *), void* arg)); +S16 SRemPstMsg ARGS((Data *dataPtr,Buffer *mBuf)); #ifdef T2K_MEM_LEAK_DBG #define SAddPreMsgMult(src, cnt, mBuf) SAddPreMsgMult1(src, cnt, mBuf, __FILE__,__LINE__) #define SAddPstMsgMult(src, cnt, mBuf) SAddPstMsgMult1(src, cnt, mBuf, __FILE__,__LINE__) -EXTERN S16 SAddPreMsgMult1 ARGS((Data *src,MsgLen cnt,Buffer *mBuf, char *file, uint32_t line)); -EXTERN S16 SAddPstMsgMult1 ARGS((Data *src,MsgLen cnt,Buffer *mBuf, char *file, uint32_t line)); +S16 SAddPreMsgMult1 ARGS((Data *src,MsgLen cnt,Buffer *mBuf, char *file, uint32_t line)); +S16 SAddPstMsgMult1 ARGS((Data *src,MsgLen cnt,Buffer *mBuf, char *file, uint32_t line)); #else -EXTERN S16 SAddPreMsgMult ARGS((Data *src,MsgLen cnt,Buffer *mBuf)); -EXTERN S16 SAddPstMsgMult ARGS((Data *src,MsgLen cnt,Buffer *mBuf)); +S16 SAddPreMsgMult ARGS((Data *src,MsgLen cnt,Buffer *mBuf)); +S16 SAddPstMsgMult ARGS((Data *src,MsgLen cnt,Buffer *mBuf)); #endif -EXTERN S16 SGetPstMsgMult ARGS((MsgLen cnt,Buffer *mBuf)); -EXTERN S16 SRemPreMsgMult ARGS((Data *dst,MsgLen cnt,Buffer *mBuf)); -EXTERN S16 SRemPstMsgMult ARGS((Data *dst,MsgLen cnt,Buffer *mBuf)); -EXTERN S16 SRepMsg ARGS((Data data,Buffer *mBuf,MsgLen idx)); -EXTERN S16 SExamMsg ARGS((Data *dataPtr,Buffer *mBuf,MsgLen idx)); +S16 SGetPstMsgMult ARGS((MsgLen cnt,Buffer *mBuf)); +S16 SRemPreMsgMult ARGS((Data *dst,MsgLen cnt,Buffer *mBuf)); +S16 SRemPstMsgMult ARGS((Data *dst,MsgLen cnt,Buffer *mBuf)); +S16 SRepMsg ARGS((Data data,Buffer *mBuf,MsgLen idx)); +S16 SExamMsg ARGS((Data *dataPtr,Buffer *mBuf,MsgLen idx)); /*ssi_x_001.main_60 */ -EXTERN S16 SGetDataFrmMsg ARGS ((Buffer *mBuf, Data *dataPtr, MsgLen idx, MsgLen dataLen)); -EXTERN S16 SFndLenMsg ARGS((Buffer *mBuf,MsgLen *lngPtr)); -EXTERN S16 SCatMsg ARGS((Buffer *mBuf1,Buffer *mBuf2,Order order)); +S16 SGetDataFrmMsg ARGS ((Buffer *mBuf, Data *dataPtr, MsgLen idx, MsgLen dataLen)); +S16 SFndLenMsg ARGS((Buffer *mBuf,MsgLen *lngPtr)); +S16 SCatMsg ARGS((Buffer *mBuf1,Buffer *mBuf2,Order order)); #ifdef T2K_MEM_LEAK_DBG #define SSegMsg(mBuf1, idx, mBuf2) SSegMsgNew(mBuf1, idx, mBuf2, __FILE__, __LINE__) -EXTERN S16 SSegMsgNew ARGS((Buffer *mBuf1,MsgLen idx,Buffer **mBuf2,char*,uint32_t)); +S16 SSegMsgNew ARGS((Buffer *mBuf1,MsgLen idx,Buffer **mBuf2,char*,uint32_t)); #else -EXTERN S16 SSegMsg ARGS((Buffer *mBuf1,MsgLen idx,Buffer **mBuf2)); +S16 SSegMsg ARGS((Buffer *mBuf1,MsgLen idx,Buffer **mBuf2)); #endif -EXTERN S16 SSwapMsg ARGS((Buffer *mBuf1, Buffer *mBuf2)); -EXTERN S16 SCpyMsgFix ARGS((Buffer *srcMbuf,MsgLen srcIdx,MsgLen cnt, +S16 SSwapMsg ARGS((Buffer *mBuf1, Buffer *mBuf2)); +S16 SCpyMsgFix ARGS((Buffer *srcMbuf,MsgLen srcIdx,MsgLen cnt, Data *dstBuf,MsgLen *cCnt)); -EXTERN S16 SCpyFixMsg ARGS((Data *srcBuf,Buffer *dstMbuf, +S16 SCpyFixMsg ARGS((Data *srcBuf,Buffer *dstMbuf, MsgLen dstIdx,MsgLen cnt,MsgLen *cCnt)); -EXTERN S16 SCompressMsg ARGS((Buffer *mBuf)); +S16 SCompressMsg ARGS((Buffer *mBuf)); #ifdef T2K_MEM_LEAK_DBG #define SAddMsgRef(mBuf,region,pool,dstBuf) SAddMsgRefNew(mBuf,region,pool,dstBuf,__FILE__,__LINE__) #define SCpyMsgMsg(mBuf,region,pool, dstBuf) SCpyMsgMsgNew(mBuf,region,pool, dstBuf, __FILE__, __LINE__) -EXTERN S16 SAddMsgRefNew ARGS((Buffer *mBuf, Region region, Pool pool, +S16 SAddMsgRefNew ARGS((Buffer *mBuf, Region region, Pool pool, Buffer **dstBuf,char*,uint32_t)); -EXTERN S16 SCpyMsgMsgNew ARGS((Buffer *mBuf, Region region, Pool pool, +S16 SCpyMsgMsgNew ARGS((Buffer *mBuf, Region region, Pool pool, Buffer **dstBuf,char* , uint32_t)); #else -EXTERN S16 SCpyMsgMsg ARGS((Buffer *mBuf, Region region, Pool pool, +S16 SCpyMsgMsg ARGS((Buffer *mBuf, Region region, Pool pool, Buffer **dstBuf)); -EXTERN S16 SAddMsgRef ARGS((Buffer *mBuf, Region region, Pool pool, +S16 SAddMsgRef ARGS((Buffer *mBuf, Region region, Pool pool, Buffer **dstBuf)); -EXTERN S16 SIncMsgRef(Buffer *srcBuf, Region dstRegion, Pool dstPool, Buffer **dstBuf); +S16 SIncMsgRef(Buffer *srcBuf, Region dstRegion, Pool dstPool, Buffer **dstBuf); #ifdef SS_RBUF -/* EXTERN S16 SIncMsgRef ARGS((Buffer *srcBuf, Buffer **dstBuf)); */ -EXTERN Void SIncMsgLen ARGS((Buffer *mBuf)); +/* S16 SIncMsgRef ARGS((Buffer *srcBuf, Buffer **dstBuf)); */ +Void SIncMsgLen ARGS((Buffer *mBuf)); #endif #endif -EXTERN S16 SChkRes ARGS((Region region,Pool pool,Status *status)); -EXTERN S16 SChkResUtl ARGS((Region region,uint8_t *wSum)); -EXTERN S16 SSetDateTime ARGS((DateTime *dt)); -EXTERN S16 SGetDateTime ARGS((DateTime *dt)); +S16 SChkRes ARGS((Region region,Pool pool,Status *status)); +S16 SChkResUtl ARGS((Region region,uint8_t *wSum)); +S16 SSetDateTime ARGS((DateTime *dt)); +S16 SGetDateTime ARGS((DateTime *dt)); #ifdef L2_OPTMZ -EXTERN Void SResetMBuf ARGS ((Buffer *mBuf)); +Void SResetMBuf ARGS ((Buffer *mBuf)); #endif - /* ssi_x_001.main_57 : Additions */ - /* ssi_x_001.main_58 : Additions */ - /* ssi_x_001.main_60 : Modifications */ -EXTERN S16 SGetEpcTime ARGS((EpcTime *et)); +/* ssi_x_001.main_57 : Additions */ +/* ssi_x_001.main_58 : Additions */ +/* ssi_x_001.main_60 : Modifications */ +S16 SGetEpcTime ARGS((EpcTime *et)); /* ssi_x_001.main_48: Added Timestamp changes */ -EXTERN S16 SGetTimeStamp ARGS(( S8 *ts)); -EXTERN S16 SGetSysTime ARGS((Ticks *sysTime)); -EXTERN S16 SGetRefTime ARGS((uint32_t refTime, uint32_t *sec, uint32_t *usec)); -EXTERN S16 SRandom ARGS((Random *value)); -EXTERN S16 SError ARGS((Seq seq,Reason reason)); -EXTERN Void SLogError ARGS((Ent ent, Inst inst, ProcId procId, Txt *file, +S16 SGetTimeStamp ARGS(( S8 *ts)); +S16 SGetSysTime ARGS((Ticks *sysTime)); +S16 SGetRefTime ARGS((uint32_t refTime, uint32_t *sec, uint32_t *usec)); +S16 SRandom ARGS((Random *value)); +S16 SError ARGS((Seq seq,Reason reason)); +Void SLogError ARGS((Ent ent, Inst inst, ProcId procId, Txt *file, S32 line, ErrCls errCls, ErrCode errCode, ErrVal errVal, Txt *errDesc)); /* ssi_x_001.main_49 : added prototype for SGetSystemTsk() */ -EXTERN uint32_t SGetSystemTsk ARGS ((Void)); +uint32_t SGetSystemTsk ARGS ((Void)); /* changes to support multiple processors in single SSI */ /* multiple proc id changes: these functions are not supported with multiple proc Ids */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SRegInit ARGS((Ent ent,Inst inst,PAIFS16 initFnct)); -EXTERN S16 SRegActvTsk ARGS((Ent ent,Inst inst,Ttype ttype,Prior prior, +S16 SRegInit ARGS((Ent ent,Inst inst,PAIFS16 initFnct)); +S16 SRegActvTsk ARGS((Ent ent,Inst inst,Ttype ttype,Prior prior, ActvTsk actvTsk)); #endif /* SS_MULTIPLE_PROCS */ /* multiple proc id changes: procId added and time function type modified */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SRegCfgTmr ARGS((Ent ent, +S16 SRegCfgTmr ARGS((Ent ent, Inst inst, S16 period, S16 units, PFS16 tmrFnct)); #ifdef SS_MT_TMR /* ssi_x_001.main_53 */ -EXTERN S16 SRegCfgTmrMt ARGS((Ent ent, +S16 SRegCfgTmrMt ARGS((Ent ent, Inst inst, S16 period, S16 units, PAIFTMRS16 tmrFnctMt)); #endif -EXTERN S16 SDeregCfgTmr ARGS((Ent ent, +S16 SDeregCfgTmr ARGS((Ent ent, Inst inst, S16 period, S16 units, PFS16 tmrFnct)); #ifdef SS_MT_TMR /* ssi_x_001.main_53 */ -EXTERN S16 SDeregCfgTmrMt ARGS((Ent ent, +S16 SDeregCfgTmrMt ARGS((Ent ent, Inst inst, S16 period, S16 units, PAIFTMRS16 tmrFnctMt)); #endif #else -EXTERN S16 SRegCfgTmr ARGS((ProcId proc, +S16 SRegCfgTmr ARGS((ProcId proc, Ent ent, Inst inst, S16 period, S16 units, PAIFTMRS16 tmrFnct)); -EXTERN S16 SDeregCfgTmr ARGS((ProcId proc, +S16 SDeregCfgTmr ARGS((ProcId proc, Ent ent, Inst inst, S16 period, @@ -1219,26 +1219,26 @@ EXTERN S16 SDeregCfgTmr ARGS((ProcId proc, PAIFTMRS16 tmrFnct)); #endif /* SS_MULTIPLE_PROCS */ -EXTERN S16 SPstTsk ARGS((Pst *pst, Buffer *mBuf)); +S16 SPstTsk ARGS((Pst *pst, Buffer *mBuf)); #ifdef SS_ROUTE_MSG_CORE1 -EXTERN S16 SPstTskIcpu ARGS((Pst *pst, Buffer *mBuf)); +S16 SPstTskIcpu ARGS((Pst *pst, Buffer *mBuf)); #endif #ifdef ENB_RELAY -EXTERN S16 SRegDrvrTsk ARGS((Inst inst, ProcId low, ProcId high, +S16 SRegDrvrTsk ARGS((Inst inst, ProcId low, ProcId high, ActvTsk actvTsk, ISTsk isTsk)); /*ssi_x_001.main_56*/ -EXTERN S16 SDeregDrvrTsk ARGS((Inst channel)); +S16 SDeregDrvrTsk ARGS((Inst channel)); #endif /* ENB_RELAY */ #ifdef SS_RTR_SUPPORT -EXTERN S16 SRegRtrTsk ARGS((Route *, Cntr, ActvTsk)); -EXTERN S16 SDeregRtrTsk ARGS((Route *, Cntr)); +S16 SRegRtrTsk ARGS((Route *, Cntr, ActvTsk)); +S16 SDeregRtrTsk ARGS((Route *, Cntr)); #endif /* SS_RTR_SUPPORT */ #ifdef SS_USE_ZBC_MEMORY -EXTERN S16 SAttachPtrToBuf ARGS(( +S16 SAttachPtrToBuf ARGS(( Region region, Pool pool, Data *ptr, @@ -1259,71 +1259,71 @@ typedef struct { uint32_t threadRegister[SS_MAX_CORES]; /* available threads per core */ } SCpuInfo; -EXTERN S16 SRegCpuInfo ARGS((SCpuInfo *cpuInfo)); -EXTERN S16 SSetAffinity ARGS((SSTskId *tskId, SsAffinityMode mode, uint32_t coreId, SSTskId *tskAssociatedTskId)); -EXTERN S16 SGetAffinity ARGS((SSTskId *tskId, uint32_t *coreId)); +S16 SRegCpuInfo ARGS((SCpuInfo *cpuInfo)); +S16 SSetAffinity ARGS((SSTskId *tskId, SsAffinityMode mode, uint32_t coreId, SSTskId *tskAssociatedTskId)); +S16 SGetAffinity ARGS((SSTskId *tskId, uint32_t *coreId)); #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT*/ #ifdef SS_AEHDPR_SUPPORT -EXTERN S16 SSetAehDpr ARGS((ProcId procId, VectNmb vectNmb,PISR pisr,PTR ptr1,PDPR pdpr,PTR ptr2)); -EXTERN S16 SRemoveAehDpr ARGS((ProcId chipNum, VectNmb vectNmb)); +S16 SSetAehDpr ARGS((ProcId procId, VectNmb vectNmb,PISR pisr,PTR ptr1,PDPR pdpr,PTR ptr2)); +S16 SRemoveAehDpr ARGS((ProcId chipNum, VectNmb vectNmb)); #endif -EXTERN S16 SAddDBufPst ARGS((Buffer *mBuf, Buffer *dBuf)); -EXTERN S16 SAddDBufPre ARGS((Buffer *mBuf, Buffer *dBuf)); -EXTERN S16 SRemDBufPst ARGS((Buffer *mBuf, Buffer **dBuf)); -EXTERN S16 SRemDBufPre ARGS((Buffer *mBuf, Buffer **dBuf)); -EXTERN S16 SGetDataRx ARGS((Buffer *dBuf, MsgLen pad, Data **dat, MsgLen *mLen)); -EXTERN S16 SGetDataTx ARGS((Buffer *dBuf, Data **dat, MsgLen *mLen)); -EXTERN S16 SUpdMsg ARGS((Buffer *mBuf, Buffer *dBuf, MsgLen mLen)); -EXTERN S16 SCacheFlush ARGS( (uint16_t cache_type, Data *addr, Size size)); -EXTERN S16 SCacheInvalidate ARGS( (uint16_t cache_type, Data *addr, Size size)); -EXTERN S16 SAlignDBufEven ARGS((Buffer *dBuf)); -EXTERN S16 SAlignDBuf ARGS((Buffer *dBuf, uint32_t align)); -EXTERN S16 SInitNxtDBuf ARGS((Buffer *mBuf)); -EXTERN S16 SGetNxtDBuf ARGS((Buffer *mBuf, Buffer **dBuf)); -EXTERN S16 SChkNxtDBuf ARGS((Buffer *mBuf)); -EXTERN S16 SSetIntPend ARGS((uint16_t id, Bool flag)); -EXTERN S16 SChkMsg ARGS((Buffer *mBuf)); -EXTERN S16 SDeregInitTskTmr ARGS((Ent ent,Inst inst)); -EXTERN S16 SExitTsk ARGS((void )); -EXTERN S16 SExitInt ARGS((void )); -EXTERN S16 SHoldInt ARGS((void )); -EXTERN S16 SRelInt ARGS((void )); -EXTERN S16 SEnbInt ARGS((void )); -EXTERN S16 SDisInt ARGS((void )); -EXTERN S16 SGetVect ARGS((VectNmb vectNmb,PIF *vectFnct)); -EXTERN S16 SPutVect ARGS((VectNmb vectNmb,PIF vectFnct)); +S16 SAddDBufPst ARGS((Buffer *mBuf, Buffer *dBuf)); +S16 SAddDBufPre ARGS((Buffer *mBuf, Buffer *dBuf)); +S16 SRemDBufPst ARGS((Buffer *mBuf, Buffer **dBuf)); +S16 SRemDBufPre ARGS((Buffer *mBuf, Buffer **dBuf)); +S16 SGetDataRx ARGS((Buffer *dBuf, MsgLen pad, Data **dat, MsgLen *mLen)); +S16 SGetDataTx ARGS((Buffer *dBuf, Data **dat, MsgLen *mLen)); +S16 SUpdMsg ARGS((Buffer *mBuf, Buffer *dBuf, MsgLen mLen)); +S16 SCacheFlush ARGS( (uint16_t cache_type, Data *addr, Size size)); +S16 SCacheInvalidate ARGS( (uint16_t cache_type, Data *addr, Size size)); +S16 SAlignDBufEven ARGS((Buffer *dBuf)); +S16 SAlignDBuf ARGS((Buffer *dBuf, uint32_t align)); +S16 SInitNxtDBuf ARGS((Buffer *mBuf)); +S16 SGetNxtDBuf ARGS((Buffer *mBuf, Buffer **dBuf)); +S16 SChkNxtDBuf ARGS((Buffer *mBuf)); +S16 SSetIntPend ARGS((uint16_t id, Bool flag)); +S16 SChkMsg ARGS((Buffer *mBuf)); +S16 SDeregInitTskTmr ARGS((Ent ent,Inst inst)); +S16 SExitTsk ARGS((void )); +S16 SExitInt ARGS((void )); +S16 SHoldInt ARGS((void )); +S16 SRelInt ARGS((void )); +S16 SEnbInt ARGS((void )); +S16 SDisInt ARGS((void )); +S16 SGetVect ARGS((VectNmb vectNmb,PIF *vectFnct)); +S16 SPutVect ARGS((VectNmb vectNmb,PIF vectFnct)); #ifdef WINNT_KERN -EXTERN S16 SPutIsrDpr ARGS((VectNmb vectNmb, Void *context, PIF isrFnct, +S16 SPutIsrDpr ARGS((VectNmb vectNmb, Void *context, PIF isrFnct, PIF dprFnct)); -EXTERN S16 SSyncInt ARGS((uint16_t adapterNmb, PFVOID syncFnct, +S16 SSyncInt ARGS((uint16_t adapterNmb, PFVOID syncFnct, Void *syncContext)); #endif -EXTERN S16 SInitSema ARGS((Region region, Sema *sema)); -EXTERN S16 SRelSema ARGS((Region region, Sema sema)); -EXTERN S16 SGetSema ARGS((Region region, Sema sema)); -EXTERN S16 SActvInit ARGS((Ent ent,Inst inst,Region region,Reason reason)); -EXTERN S16 SActvTsk ARGS((Prior prior,Route route,Ent srcEnt, +S16 SInitSema ARGS((Region region, Sema *sema)); +S16 SRelSema ARGS((Region region, Sema sema)); +S16 SGetSema ARGS((Region region, Sema sema)); +S16 SActvInit ARGS((Ent ent,Inst inst,Region region,Reason reason)); +S16 SActvTsk ARGS((Prior prior,Route route,Ent srcEnt, Inst srcInst,Buffer *mBuf)); -EXTERN S16 SActvTmr ARGS((void )); -EXTERN S16 SGetOpt ARGS((int argc,char **argv,char *opts)); +S16 SActvTmr ARGS((void )); +S16 SGetOpt ARGS((int argc,char **argv,char *opts)); /* multiple proc id changes: These functions not supported with multiple procIds */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SGetEntInst ARGS((Ent *ent, Inst *inst)); -EXTERN S16 SSetEntInst ARGS((Ent ent, Inst inst)); -EXTERN ProcId SFndProcId ARGS((void)); -EXTERN Void SSetProcId ARGS((ProcId pId)); +S16 SGetEntInst ARGS((Ent *ent, Inst *inst)); +S16 SSetEntInst ARGS((Ent ent, Inst inst)); +ProcId SFndProcId ARGS((void)); +Void SSetProcId ARGS((ProcId pId)); #endif /* SS_MULTIPLE_PROCS */ -EXTERN S16 SGetDBufSiz ARGS((Region region, Pool pool, S16 *size)); -EXTERN S16 SGetStrtIdx ARGS((Region region, Pool pool, S16 *idx)); -EXTERN S16 SGetEndIdx ARGS((Region region, Pool pool, S16 *idx)); -EXTERN S16 SGetStrtPad ARGS((Region region, Pool pool, S16 *pad)); +S16 SGetDBufSiz ARGS((Region region, Pool pool, S16 *size)); +S16 SGetStrtIdx ARGS((Region region, Pool pool, S16 *idx)); +S16 SGetEndIdx ARGS((Region region, Pool pool, S16 *idx)); +S16 SGetStrtPad ARGS((Region region, Pool pool, S16 *pad)); /* multiple proc id changes: control block retrieval function */ #ifdef SS_MULTIPLE_PROCS -EXTERN S16 SGetXxCb ARGS((ProcId proc, Ent ent, Inst inst, Void **xxCb)); +S16 SGetXxCb ARGS((ProcId proc, Ent ent, Inst inst, Void **xxCb)); #endif /* SS_MULTIPLE_PROCS */ #ifdef MT @@ -1331,202 +1331,202 @@ EXTERN S16 SGetXxCb ARGS((ProcId proc, Ent ent, Inst inst, Void **xxCb)); * These routines are only available for multi-threaded * system service implementations */ -EXTERN S16 SGetMutex ARGS((MtMtxId *mId)); -EXTERN S16 SPutMutex ARGS((MtMtxId mId)); -EXTERN S16 SLockMutex ARGS((MtMtxId mId)); -EXTERN S16 SUnlockMutex ARGS((MtMtxId mId)); -EXTERN S16 SGetCond ARGS((MtCondId *cId)); -EXTERN S16 SPutCond ARGS((MtCondId cId)); -EXTERN S16 SCondWait ARGS((MtMtxId mId,MtCondId cId)); -EXTERN S16 SCondSignal ARGS((MtCondId cId)); -EXTERN S16 SCondBroadcast ARGS((MtCondId cId)); -EXTERN S16 SGetThread ARGS((MtThrd thrd, MtThrdFlags thr_flgs, +S16 SGetMutex ARGS((MtMtxId *mId)); +S16 SPutMutex ARGS((MtMtxId mId)); +S16 SLockMutex ARGS((MtMtxId mId)); +S16 SUnlockMutex ARGS((MtMtxId mId)); +S16 SGetCond ARGS((MtCondId *cId)); +S16 SPutCond ARGS((MtCondId cId)); +S16 SCondWait ARGS((MtMtxId mId,MtCondId cId)); +S16 SCondSignal ARGS((MtCondId cId)); +S16 SCondBroadcast ARGS((MtCondId cId)); +S16 SGetThread ARGS((MtThrd thrd, MtThrdFlags thr_flgs, Ptr arg, MtThrdId *thrdId)); -EXTERN S16 SPutThread ARGS((MtThrdId thrdId)); -EXTERN Void SThreadYield ARGS((void)); -EXTERN Void SThreadExit ARGS((Ptr *status)); -EXTERN Void SSetThrdPrior ARGS((MtThrdId tId, MtThrdPrior tPr)); -EXTERN Void SGetThrdPrior ARGS((MtThrdId tId, MtThrdPrior *tPr)); +S16 SPutThread ARGS((MtThrdId thrdId)); +Void SThreadYield ARGS((void)); +Void SThreadExit ARGS((Ptr *status)); +Void SSetThrdPrior ARGS((MtThrdId tId, MtThrdPrior tPr)); +Void SGetThrdPrior ARGS((MtThrdId tId, MtThrdPrior *tPr)); #endif /* MT */ -EXTERN Void SExit ARGS((Void)); +Void SExit ARGS((Void)); #ifdef SS /* multiple proc id changes: procId added */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SRegTTsk ARGS((Ent ent, +S16 SRegTTsk ARGS((Ent ent, Inst inst, Ttype type, Prior prior, PAIFS16 initTsk, ActvTsk actvTsk)); /* ssi_x_001.main_60 */ -EXTERN S16 SRegCbTsk ARGS((Ent ent, +S16 SRegCbTsk ARGS((Ent ent, Inst inst, ActvTsk actvTsk)); -EXTERN S16 SDeregTTsk ARGS((Ent ent, Inst inst)); +S16 SDeregTTsk ARGS((Ent ent, Inst inst)); #else -EXTERN S16 SRegTTsk ARGS((ProcId proc, +S16 SRegTTsk ARGS((ProcId proc, Ent ent, Inst inst, Ttype type, Prior prior, PAIFS16 initTsk, ActvTsk actvTsk)); -EXTERN S16 SDeregTTsk ARGS((ProcId proc, Ent ent, Inst inst)); +S16 SDeregTTsk ARGS((ProcId proc, Ent ent, Inst inst)); -EXTERN S16 SRegCbTsk ARGS((ProcId proc, +S16 SRegCbTsk ARGS((ProcId proc, Ent ent, Inst inst, ActvTsk actvTsk)); #endif /* SS_MULTIPLE_PROCS */ -EXTERN S16 SCreateSTsk ARGS((SSTskPrior tskPrior, SSTskId *tskId)); -EXTERN S16 SDestroySTsk ARGS((SSTskId tskId)); +S16 SCreateSTsk ARGS((SSTskPrior tskPrior, SSTskId *tskId)); +S16 SDestroySTsk ARGS((SSTskId tskId)); /* multiple proc id changes: procId added */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SAttachTTsk ARGS((Ent ent, Inst inst, SSTskId tskId)); -EXTERN S16 SDetachTTsk ARGS((Ent ent, Inst inst)); +S16 SAttachTTsk ARGS((Ent ent, Inst inst, SSTskId tskId)); +S16 SDetachTTsk ARGS((Ent ent, Inst inst)); #else -EXTERN S16 SAttachTTsk ARGS((ProcId proc, Ent ent, Inst inst, SSTskId tskId)); -EXTERN S16 SDetachTTsk ARGS((ProcId proc, Ent ent, Inst inst)); +S16 SAttachTTsk ARGS((ProcId proc, Ent ent, Inst inst, SSTskId tskId)); +S16 SDetachTTsk ARGS((ProcId proc, Ent ent, Inst inst)); #endif /* SS_MULTIPLE_PROCS */ -EXTERN S16 SRegRegion ARGS((Region region, SRegInfo *regInfo)); -EXTERN S16 SDeregRegion ARGS((Region region)); -EXTERN S16 SRegDynRegion ARGS((Region region, SRegInfo *regInfo)); +S16 SRegRegion ARGS((Region region, SRegInfo *regInfo)); +S16 SDeregRegion ARGS((Region region)); +S16 SRegDynRegion ARGS((Region region, SRegInfo *regInfo)); /*ssi_x_001.main_62-prototype for SAlloc and SFree, gaurded under flag*/ #ifndef SS_FAP /* ssi_x_001.main_57 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT -EXTERN S16 SAlloc ARGS((Region region, Size *size, uint32_t flags, Data **ptr,uint32_t line, uint8_t *fileName, uint8_t entId)); -EXTERN S16 SFree ARGS((Region region, Data *ptr, Size size, uint32_t line, uint8_t *fileName, uint8_t entId)); +S16 SAlloc ARGS((Region region, Size *size, uint32_t flags, Data **ptr,uint32_t line, uint8_t *fileName, uint8_t entId)); +S16 SFree ARGS((Region region, Data *ptr, Size size, uint32_t line, uint8_t *fileName, uint8_t entId)); #else #ifdef T2K_MEM_LEAK_DBG #define SAlloc(region,size,flags,ptr) SAllocNew(region,size,flags,ptr,file,line) #define SFree(region,ptr,size) SFreeNew(region,ptr,size,file,line) -EXTERN S16 SAllocNew ARGS((Region region, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); -EXTERN S16 SFreeNew ARGS((Region region, Data *ptr, Size size,char*,uint32_t)); +S16 SAllocNew ARGS((Region region, Size *size, uint32_t flags, Data **ptr,char*,uint32_t)); +S16 SFreeNew ARGS((Region region, Data *ptr, Size size,char*,uint32_t)); #elif defined(SS_LIGHT_MEM_LEAK_STS) -EXTERN S16 SAlloc ARGS((Region region, Size *size, uint32_t flags, Data **ptr,uint32_t line, uint8_t *fnName)); -EXTERN S16 SFree ARGS((Region region, Data *ptr, Size size, uint32_t line, uint8_t *fnName)); +S16 SAlloc ARGS((Region region, Size *size, uint32_t flags, Data **ptr,uint32_t line, uint8_t *fnName)); +S16 SFree ARGS((Region region, Data *ptr, Size size, uint32_t line, uint8_t *fnName)); #else -EXTERN S16 SAlloc ARGS((Region region, Size *size, uint32_t flags, Data **ptr)); -EXTERN S16 SFree ARGS((Region region, Data *ptr, Size size)); +S16 SAlloc ARGS((Region region, Size *size, uint32_t flags, Data **ptr)); +S16 SFree ARGS((Region region, Data *ptr, Size size)); #endif #endif -EXTERN S16 SGetBufRegionPool ARGS((Buffer *mBuf, Region *region, Pool *pool)); +S16 SGetBufRegionPool ARGS((Buffer *mBuf, Region *region, Pool *pool)); #endif /* SS_ENABLE_MACROS */ #ifdef SS_OLD_THREAD -EXTERN S16 SGetMutex ARGS((SMtxId *mId)); -EXTERN S16 SPutMutex ARGS((SMtxId mId)); -EXTERN S16 SLockMutex ARGS((SMtxId mId)); -EXTERN S16 SUnlockMutex ARGS((SMtxId mId)); -EXTERN S16 SGetCond ARGS((SCondId *cId)); -EXTERN S16 SPutCond ARGS((SCondId cId)); -EXTERN S16 SCondWait ARGS((SMtxId mId,SCondId cId)); -EXTERN S16 SCondSignal ARGS((SCondId cId)); -EXTERN S16 SCondBroadcast ARGS((SCondId cId)); -EXTERN S16 SGetThread ARGS((SThrd thrd, S32 thr_flgs, +S16 SGetMutex ARGS((SMtxId *mId)); +S16 SPutMutex ARGS((SMtxId mId)); +S16 SLockMutex ARGS((SMtxId mId)); +S16 SUnlockMutex ARGS((SMtxId mId)); +S16 SGetCond ARGS((SCondId *cId)); +S16 SPutCond ARGS((SCondId cId)); +S16 SCondWait ARGS((SMtxId mId,SCondId cId)); +S16 SCondSignal ARGS((SCondId cId)); +S16 SCondBroadcast ARGS((SCondId cId)); +S16 SGetThread ARGS((SThrd thrd, S32 thr_flgs, Ptr arg, SThrdId *thrdId)); -EXTERN S16 SPutThread ARGS((SThrdId thrdId)); -EXTERN Void SThreadYield ARGS((void)); -EXTERN Void SThreadExit ARGS((Ptr status)); -EXTERN Void SSetThrdPrior ARGS((SThrdId tId, S32 tPr)); -EXTERN Void SGetThrdPrior ARGS((SThrdId tId, S32 *tPr)); -EXTERN Void SExit ARGS((void)); +S16 SPutThread ARGS((SThrdId thrdId)); +Void SThreadYield ARGS((void)); +Void SThreadExit ARGS((Ptr status)); +Void SSetThrdPrior ARGS((SThrdId tId, S32 tPr)); +Void SGetThrdPrior ARGS((SThrdId tId, S32 *tPr)); +Void SExit ARGS((void)); #else /* SS_OLD_THREAD */ -EXTERN S16 SThreadYield ARGS((void)); +S16 SThreadYield ARGS((void)); #endif /* SS_OLD_THREAD */ -EXTERN S16 SInitLock ARGS((SLockId *lock,uint8_t type)); -EXTERN S16 SLock ARGS((SLockId *lock)); -EXTERN S16 SUnlock ARGS((SLockId *lock)); -EXTERN S16 SDestroyLock ARGS((SLockId *lock)); +S16 SInitLock ARGS((SLockId *lock,uint8_t type)); +S16 SLock ARGS((SLockId *lock)); +S16 SUnlock ARGS((SLockId *lock)); +S16 SDestroyLock ARGS((SLockId *lock)); -EXTERN S16 SInitSemaphore ARGS((SsSemaId *sem, uint8_t value)); -EXTERN S16 SWaitSemaphore ARGS((SsSemaId *sem)); -EXTERN S16 SPostSemaphore ARGS((SsSemaId *sem)); -EXTERN S16 SDestroySemaphore ARGS((SsSemaId *sem)); +S16 SInitSemaphore ARGS((SsSemaId *sem, uint8_t value)); +S16 SWaitSemaphore ARGS((SsSemaId *sem)); +S16 SPostSemaphore ARGS((SsSemaId *sem)); +S16 SDestroySemaphore ARGS((SsSemaId *sem)); /* multiple proc id changes: new function required to implement multiple procIds */ #ifdef SS_MULTIPLE_PROCS -EXTERN S16 SAddProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); -EXTERN S16 SRemProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); -EXTERN S16 SGetProcIdLst ARGS((uint16_t *numPIds, ProcId *pIdLst)); +S16 SAddProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); +S16 SRemProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); +S16 SGetProcIdLst ARGS((uint16_t *numPIds, ProcId *pIdLst)); #endif /* SS_MULTIPLE_PROCS */ #endif /* SS */ #ifdef SS_SEGV_SIG_HDLR #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SRegIntrptHdlr ARGS((Ent ent, Inst inst, PFS16 intrptActvFn)); +S16 SRegIntrptHdlr ARGS((Ent ent, Inst inst, PFS16 intrptActvFn)); #else -EXTERN S16 SRegIntrptHdlr ARGS((ProcId proc, Ent ent, Inst inst, PFS16 intrptActvFn)); +S16 SRegIntrptHdlr ARGS((ProcId proc, Ent ent, Inst inst, PFS16 intrptActvFn)); #endif/*SS_MULTIPLE_PROCS*/ #endif /* SS_SEGV_SIG_HDLR */ #ifdef PORTVER /* procId added */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 SRegTTsk ARGS((Ent ent, +S16 SRegTTsk ARGS((Ent ent, Inst inst, Ttype type, Prior prior, PAIFS16 initTsk, ActvTsk actvTsk)); /* ssi_x_001.main_60 */ -EXTERN S16 SRegCbTsk ARGS((Ent ent, +S16 SRegCbTsk ARGS((Ent ent, Inst inst, ActvTsk actvTsk)); -EXTERN S16 SDeregTTsk ARGS((Ent ent, Inst inst)); -EXTERN S16 SAttachTTsk ARGS((Ent ent, Inst inst, SSTskId tskId)); -EXTERN S16 SDetachTTsk ARGS((Ent ent, Inst inst)); +S16 SDeregTTsk ARGS((Ent ent, Inst inst)); +S16 SAttachTTsk ARGS((Ent ent, Inst inst, SSTskId tskId)); +S16 SDetachTTsk ARGS((Ent ent, Inst inst)); #else -EXTERN S16 SRegTTsk ARGS((ProcId proc, +S16 SRegTTsk ARGS((ProcId proc, Ent ent, Inst inst, Ttype type, Prior prior, PAIFS16 initTsk, ActvTsk actvTsk)); -EXTERN S16 SRegCbTsk ARGS((ProcId proc, +S16 SRegCbTsk ARGS((ProcId proc, Ent ent, Inst inst, ActvTsk actvTsk)); -EXTERN S16 SDeregTTsk ARGS((ProcId proc, Ent ent, Inst inst)); -EXTERN S16 SAttachTTsk ARGS((ProcId proc, Ent ent, Inst inst, SSTskId tskId)); -EXTERN S16 SDetachTTsk ARGS((ProcId proc, Ent ent, Inst inst)); +S16 SDeregTTsk ARGS((ProcId proc, Ent ent, Inst inst)); +S16 SAttachTTsk ARGS((ProcId proc, Ent ent, Inst inst, SSTskId tskId)); +S16 SDetachTTsk ARGS((ProcId proc, Ent ent, Inst inst)); #endif /* SS_MULTIPLE_PROCS */ -EXTERN S16 SCreateSTsk ARGS((SSTskPrior tskPrior, SSTskId *tskId)); -EXTERN S16 SDestroySTsk ARGS((SSTskId tskId)); +S16 SCreateSTsk ARGS((SSTskPrior tskPrior, SSTskId *tskId)); +S16 SDestroySTsk ARGS((SSTskId tskId)); #ifndef SS_ENABLE_MACROS -EXTERN S16 SGetBufRegionPool ARGS((Buffer *mBuf, Region *region, Pool *pool)); +S16 SGetBufRegionPool ARGS((Buffer *mBuf, Region *region, Pool *pool)); #endif /* SS_ENABLE_MACROS */ -EXTERN S16 SInitLock ARGS((SLockId *lock,uint8_t type)); -EXTERN S16 SLock ARGS((SLockId *lock)); -EXTERN S16 SUnlock ARGS((SLockId *lock)); -EXTERN S16 SDestroyLock ARGS((SLockId *lock)); +S16 SInitLock ARGS((SLockId *lock,uint8_t type)); +S16 SLock ARGS((SLockId *lock)); +S16 SUnlock ARGS((SLockId *lock)); +S16 SDestroyLock ARGS((SLockId *lock)); -EXTERN S16 SInitSemaphore ARGS((SsSemaId *sem, uint8_t value)); -EXTERN S16 SWaitSemaphore ARGS((SsSemaId *sem)); -EXTERN S16 SPostSemaphore ARGS((SsSemaId *sem)); -EXTERN S16 SDestroySemaphore ARGS((SsSemaId *sem)); +S16 SInitSemaphore ARGS((SsSemaId *sem, uint8_t value)); +S16 SWaitSemaphore ARGS((SsSemaId *sem)); +S16 SPostSemaphore ARGS((SsSemaId *sem)); +S16 SDestroySemaphore ARGS((SsSemaId *sem)); /* functions required to implement multiple procIds */ #ifdef SS_MULTIPLE_PROCS -EXTERN S16 SAddProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); -EXTERN S16 SRemProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); -EXTERN S16 SGetProcIdLst ARGS((uint16_t *numPIds, ProcId *pIdLst)); +S16 SAddProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); +S16 SRemProcIdLst ARGS((uint16_t numPIds, ProcId *pIdLst)); +S16 SGetProcIdLst ARGS((uint16_t *numPIds, ProcId *pIdLst)); #endif /* SS_MULTIPLE_PROCS */ #endif /* PORTVER */ @@ -1537,9 +1537,9 @@ EXTERN S16 SGetProcIdLst ARGS((uint16_t *numPIds, ProcId *pIdLst)); /* stack manager initialization function */ /* multiple proc id changes: procId added */ #ifndef SS_MULTIPLE_PROCS -EXTERN S16 smActvInit ARGS((Ent ent, Inst inst, Region region, Reason reason)); +S16 smActvInit ARGS((Ent ent, Inst inst, Region region, Reason reason)); #else /* SS_MULTIPLE_PROCS */ -EXTERN S16 smActvInit ARGS((ProcId proc, +S16 smActvInit ARGS((ProcId proc, Ent ent, Inst inst, Region region, @@ -1548,16 +1548,16 @@ EXTERN S16 smActvInit ARGS((ProcId proc, #endif /* SS_MULTIPLE_PROCS */ /* stack manager external initialization function */ -EXTERN S16 smInitExt ARGS((void)); +S16 smInitExt ARGS((void)); /* stack manager activation function */ -EXTERN S16 smActvTsk ARGS((Pst *pst, Buffer *mBuf)); +S16 smActvTsk ARGS((Pst *pst, Buffer *mBuf)); /* ssi_x_001.main_54 */ #ifdef SS_SID_CHANGE /* ssi_x_001.main_53 */ -EXTERN S16 SGetInDepSId ARGS((SystemId *s)); -EXTERN S16 SGetDepSId ARGS((SystemId *s)); +S16 SGetInDepSId ARGS((SystemId *s)); +S16 SGetDepSId ARGS((SystemId *s)); #endif /* Macros... */ @@ -1573,41 +1573,41 @@ EXTERN S16 SGetDepSId ARGS((SystemId *s)); */ /* ssi_x_001.main_51 : Added control flag as these are only used by windows */ #ifdef SS_WIN -EXTERN S16 WTInitLock ARGS((SLockId *lock,uint8_t type)); -EXTERN S16 WTLock ARGS((SLockId *lock)); -EXTERN S16 WTUnlock ARGS((SLockId *lock)); -EXTERN S16 WTDestroyLock ARGS((SLockId *lock)); +S16 WTInitLock ARGS((SLockId *lock,uint8_t type)); +S16 WTLock ARGS((SLockId *lock)); +S16 WTUnlock ARGS((SLockId *lock)); +S16 WTDestroyLock ARGS((SLockId *lock)); #endif /* End of SS_WIN */ /* ssi_x_001.main_57 : Additions */ #ifdef SS_LOGGER_SUPPORT -EXTERN S16 SRegLogCfg ARGS(( uint8_t mode, S8 *path, uint32_t size, S8 *IPA, uint16_t port)); -EXTERN S16 SWrtLogBuf ARGS(( Txt *buf )); +S16 SRegLogCfg ARGS(( uint8_t mode, S8 *path, uint32_t size, S8 *IPA, uint16_t port)); +S16 SWrtLogBuf ARGS(( Txt *buf )); /* ssi_x_001.main_60 */ -EXTERN S16 SDeregLogCfg ARGS((Void )); +S16 SDeregLogCfg ARGS((Void )); #endif /* SS_LOGGER_SUPPORT */ #ifdef SS_HISTOGRAM_SUPPORT -EXTERN S16 SRegForHstGrm ARGS((Ent ent)); -EXTERN S16 SHstGrmInfoShow ARGS((Ent *entId)); -EXTERN S16 SFillEntIds ARGS((Void)); -EXTERN S16 SGetEntInd ARGS((Ent *entId, uint8_t *fileName)); +S16 SRegForHstGrm ARGS((Ent ent)); +S16 SHstGrmInfoShow ARGS((Ent *entId)); +S16 SFillEntIds ARGS((Void)); +S16 SGetEntInd ARGS((Ent *entId, uint8_t *fileName)); #endif /* SS_HISTOGRAM_SUPPORT */ /* ssi_x_001.main_68 Multiple declaration removed , one already in cm_task.x */ /* ssi_x_001.main_61: Lock support guraded under the flag */ #ifdef SS_LOCK_SUPPORT -EXTERN S16 SLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); -EXTERN S16 SInitLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); -EXTERN S16 SUnlockNew ARGS((SLockInfo *LockId, uint8_t lockType)); -EXTERN S16 SDestroyLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 SLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 SInitLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 SUnlockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 SDestroyLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); #endif /* SS_LOCK_SUPPORT */ -EXTERN S8* SGetConfigPath ARGS((Void)); +S8* SGetConfigPath ARGS((Void)); /* ssi_x_001.main_66 : Added new Buffer manegement APIs */ -EXTERN S16 SCpyPartMsg ARGS((Buffer *srcBuf, MsgLen idx, MsgLen cnt, Buffer *dstBuf)); -EXTERN S16 SRepPartMsg ARGS((Buffer *srcBuf, MsgLen idx, MsgLen cnt, Buffer *dstBuf)); -EXTERN S16 SMovPartMsg ARGS((Buffer *srcBuf, MsgLen idx, Buffer *dstBuf)); -EXTERN S16 SPkMsgMult ARGS((Data *src, MsgLen cnt, Buffer *mBuf)); -EXTERN S16 SGetReadPtr ARGS((Buffer *mBuf, uint8_t** data, MsgLen *len)); +S16 SCpyPartMsg ARGS((Buffer *srcBuf, MsgLen idx, MsgLen cnt, Buffer *dstBuf)); +S16 SRepPartMsg ARGS((Buffer *srcBuf, MsgLen idx, MsgLen cnt, Buffer *dstBuf)); +S16 SMovPartMsg ARGS((Buffer *srcBuf, MsgLen idx, Buffer *dstBuf)); +S16 SPkMsgMult ARGS((Data *src, MsgLen cnt, Buffer *mBuf)); +S16 SGetReadPtr ARGS((Buffer *mBuf, uint8_t** data, MsgLen *len)); typedef enum { @@ -1615,25 +1615,25 @@ typedef enum SS_NON_SHARABLE_MEMORY }ssMemoryType; #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN S16 SReInitTmr ARGS((Void )); +S16 SReInitTmr ARGS((Void )); #endif /* ssi_x_001.main_69: Added MSPD debug macro */ #ifdef MSPD -extern uint32_t ysGT; -extern char ys_global_printbuf[256]; -EXTERN Void rbCallstackShow ARGS((Void)); -EXTERN Void rbCallstackShowForCore ARGS((uint32_t coreId)); -EXTERN uint32_t MacGetTick ARGS ((void)); +uint32_t ysGT; +char ys_global_printbuf[256]; +Void rbCallstackShow ARGS((Void)); +Void rbCallstackShowForCore ARGS((uint32_t coreId)); +uint32_t MacGetTick ARGS ((void)); #endif /* MSPD */ #ifdef LTE_L2_MEAS -extern uint64_t glblTtiCnt; +uint64_t glblTtiCnt; #endif -EXTERN S16 SStartTask ARGS((VOLATILE uint32_t *startTime, uint32_t tarkId)); -EXTERN S16 SStopTask ARGS((VOLATILE uint32_t startTime,uint32_t taskId)); +S16 SStartTask ARGS((volatile uint32_t *startTime, uint32_t tarkId)); +S16 SStopTask ARGS((volatile uint32_t startTime,uint32_t taskId)); #ifdef MSPD_MLOG_NEW /* Removed for C++ Compilation -EXTERN unsigned int MLogTask (unsigned int taskid, unsigned int resourceid , +unsigned int MLogTask (unsigned int taskid, unsigned int resourceid , unsigned int ticksstart,unsigned int ticksstop); --*/ #endif @@ -1694,11 +1694,11 @@ EXTERN unsigned int MLogTask (unsigned int taskid, unsigned int resourceid , #endif -EXTERN Void ssMlogInit(Void); -EXTERN Void ssMlogIncrCounter(Void); -EXTERN Void ssMemlogInit(Void); -EXTERN Void ssMemlog(char *, uint32_t size); -EXTERN Void ssMemlogWrite(Void); +Void ssMlogInit(Void); +Void ssMlogIncrCounter(Void); +Void ssMemlogInit(Void); +Void ssMemlog(char *, uint32_t size); +Void ssMemlogWrite(Void); #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #endif @@ -1707,31 +1707,31 @@ EXTERN Void ssMemlogWrite(Void); } #endif -EXTERN Void SIncrementTtiCount(Void); -EXTERN Ticks SGetTtiCount(Void); +Void SIncrementTtiCount(Void); +Ticks SGetTtiCount(Void); #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN Void mtStopHndlr(Void); +Void mtStopHndlr(Void); #endif #ifdef TENB_RTLIN_CHANGES -EXTERN Void ysPrntBkTrace(Void); -EXTERN Void ssMlogInit(Void); -EXTERN Void ssMlogIncrCounter(Void); +Void ysPrntBkTrace(Void); +Void ssMlogInit(Void); +Void ssMlogIncrCounter(Void); #endif #ifdef SS_THR_REG_MAP -EXTERN Void ssRegMainThread(Void); +Void ssRegMainThread(Void); #endif #ifdef T2K_MEM_LEAK_DBG #define ssGetDBufOfSize(region,size,dBuf) ssGetDBufOfSizeNew(region,size,dBuf,__FILE__,__LINE__) S16 ssGetDBufOfSizeNew ARGS((Region region, Size size, Buffer **dBuf,char*,uint32_t)); #else -EXTERN S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); +S16 ssGetDBufOfSize(Region region,Size size,Buffer **dBuf); #endif /* ssi_x_001.main_69: Added MSPD debug macro */ #ifdef MSPD -EXTERN void SEND_DBG_MSG(uint8_t *str, ...); +void SEND_DBG_MSG(uint8_t *str, ...); #endif #endif /* __SSIX__ */ diff --git a/src/cm/tfu.c b/src/cm/tfu.c index 7e4a0532a..9865334d6 100755 --- a/src/cm/tfu.c +++ b/src/cm/tfu.c @@ -5254,13 +5254,13 @@ Buffer *mBuf; ************************************************************/ #ifdef ANSI -PRIVATE S16 cmPkTfuDciFormat60aInfo +static S16 cmPkTfuDciFormat60aInfo ( TfuDciFormat60aInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkTfuDciFormat60aInfo(param, mBuf) +static S16 cmPkTfuDciFormat60aInfo(param, mBuf) TfuDciFormat60aInfo *param; Buffer *mBuf; #endif @@ -5301,13 +5301,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkTfuPdcchOrderInfoEmtc +static S16 cmPkTfuPdcchOrderInfoEmtc ( TfuPdcchOrderInfoEmtc *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkTfuPdcchOrderInfoEmtc(param, mBuf) +static S16 cmPkTfuPdcchOrderInfoEmtc(param, mBuf) TfuPdcchOrderInfoEmtc *param; Buffer *mBuf; #endif @@ -5338,13 +5338,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkTfudciformat61aPdsch +static S16 cmPkTfudciformat61aPdsch ( Tfudciformat61aPdsch *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkTfudciformat61aPdsch(param, mBuf) +static S16 cmPkTfudciformat61aPdsch(param, mBuf) Tfudciformat61aPdsch *param; Buffer *mBuf; #endif @@ -5435,13 +5435,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkTfuDciFormat60aInfo +static S16 cmUnpkTfuDciFormat60aInfo ( TfuDciFormat60aInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkTfuDciFormat60aInfo(param, mBuf) +static S16 cmUnpkTfuDciFormat60aInfo(param, mBuf) TfuDciFormat60aInfo *param; Buffer *mBuf; #endif @@ -5484,13 +5484,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkTfuPdcchOrderInfoEmtc +static S16 cmUnpkTfuPdcchOrderInfoEmtc ( TfuPdcchOrderInfoEmtc *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkTfuPdcchOrderInfoEmtc(param, mBuf) +static S16 cmUnpkTfuPdcchOrderInfoEmtc(param, mBuf) TfuPdcchOrderInfoEmtc *param; Buffer *mBuf; #endif @@ -6244,13 +6244,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkTfuDirectIndication +static S16 cmUnpkTfuDirectIndication ( TfuDirectIndication *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkTfuDirectIndication(param, mBuf) +static S16 cmUnpkTfuDirectIndication(param, mBuf) TfuDirectIndication *param; Buffer *mBuf; #endif @@ -6318,13 +6318,13 @@ S16 cmUnpkTfuDciFormat62AllocInfo(param, mBuf) * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkTfudciformat62Pdsch +static S16 cmUnpkTfudciformat62Pdsch ( Tfudciformat62Pdsch *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkTfudciformat62Pdsch(param, mBuf) +static S16 cmUnpkTfudciformat62Pdsch(param, mBuf) Tfudciformat62Pdsch *param; Buffer *mBuf; #endif @@ -6413,13 +6413,13 @@ S16 cmUnpkTfuDciFormat62Info(param, mBuf) * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkTfuDirectIndication +static S16 cmPkTfuDirectIndication ( TfuDirectIndication *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkTfuDirectIndication(param, mBuf) +static S16 cmPkTfuDirectIndication(param, mBuf) TfuDirectIndication *param; Buffer *mBuf; #endif @@ -6492,13 +6492,13 @@ S16 cmPkTfuDciFormat62AllocInfo(param, mBuf) * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkTfudciformat62Pdsch +static S16 cmPkTfudciformat62Pdsch ( Tfudciformat62Pdsch *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkTfudciformat62Pdsch(param, mBuf) +static S16 cmPkTfudciformat62Pdsch(param, mBuf) Tfudciformat62Pdsch *param; Buffer *mBuf; #endif @@ -14734,13 +14734,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmPkTfuErrIndInfo +static S16 cmPkTfuErrIndInfo ( TfuErrIndInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmPkTfuErrIndInfo(param, mBuf) +static S16 cmPkTfuErrIndInfo(param, mBuf) TfuErrIndInfo *param; Buffer *mBuf; #endif @@ -14768,13 +14768,13 @@ Buffer *mBuf; * **********************************************************/ #ifdef ANSI -PRIVATE S16 cmUnpkTfuErrIndInfo +static S16 cmUnpkTfuErrIndInfo ( TfuErrIndInfo *param, Buffer *mBuf ) #else -PRIVATE S16 cmUnpkTfuErrIndInfo(param, mBuf) +static S16 cmUnpkTfuErrIndInfo(param, mBuf) TfuErrIndInfo *param; Buffer *mBuf; #endif diff --git a/src/cm/tfu.x b/src/cm/tfu.x index 4484b1eaf..e8745b864 100755 --- a/src/cm/tfu.x +++ b/src/cm/tfu.x @@ -128,7 +128,7 @@ struct _rgSchUlAllocCntr uint32_t taZero; }; -EXTERN RgSchUlAllocCntr rgSchUlAllocCntr; +RgSchUlAllocCntr rgSchUlAllocCntr; #endif //Chandan @@ -2644,7 +2644,7 @@ typedef S16 (*TfuErrInd) ARGS(( * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); +S16 TfUiTfuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); /** @brief This API is used to send a Bind Request from Scheduler to PHY. * @param pst Pointer to the post structure. @@ -2652,7 +2652,7 @@ EXTERN S16 TfUiTfuBndReq ARGS((Pst *pst, SuId suId, SpId spId)); * @param spId SAP ID of the service provider. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuSchBndReq ARGS((Pst *pst, SuId suId, SpId spId)); +S16 TfUiTfuSchBndReq ARGS((Pst *pst, SuId suId, SpId spId)); /** @brief This API is used to receive a Bind Confirm from PHY to MAC. @@ -2661,7 +2661,7 @@ EXTERN S16 TfUiTfuSchBndReq ARGS((Pst *pst, SuId suId, SpId spId)); * @param status Status of the bind request. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); +S16 TfUiTfuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); /** @brief This API is used to receive a Bind Confirm from PHY to Scheduler. * @param pst Pointer to the post structure. @@ -2669,7 +2669,7 @@ EXTERN S16 TfUiTfuBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); * @param status Status of the bind request. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuSchBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); +S16 TfUiTfuSchBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); /** @brief This API is used to send an Unbind Request from MAC to PHY. @@ -2678,7 +2678,7 @@ EXTERN S16 TfUiTfuSchBndCfm ARGS((Pst *pst, SuId suId, uint8_t status)); * @param reason Reason for Unbind request. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); +S16 TfUiTfuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); /** @brief This API is used to send an Unbind Request from Scheduler to PHY. * @param pst Pointer to the post structure. @@ -2686,7 +2686,7 @@ EXTERN S16 TfUiTfuUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); * @param reason Reason for Unbind request. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuSchUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); +S16 TfUiTfuSchUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); /** @brief This API is used to indication Random Access Request reception from @@ -2699,7 +2699,7 @@ EXTERN S16 TfUiTfuSchUbndReq ARGS((Pst *pst, SpId spId, Reason reason)); * @param raReqInd Pointer to the TfuRaReqIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuRaReqInd ARGS((Pst *pst, SuId suId, TfuRaReqIndInfo +S16 TfUiTfuRaReqInd ARGS((Pst *pst, SuId suId, TfuRaReqIndInfo *raReqInd)); @@ -2723,7 +2723,7 @@ EXTERN S16 TfUiTfuRaReqInd ARGS((Pst *pst, SuId suId, TfuRaReqIndInfo * @param recpReq Pointer to the TfuRecpReqInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuRecpReq ARGS((Pst *pst, SpId spId, TfuRecpReqInfo *recpReq)); +S16 TfUiTfuRecpReq ARGS((Pst *pst, SpId spId, TfuRecpReqInfo *recpReq)); /** @brief This primitive is sent from Scheduler to PHY. It provides PHY with * all the control information. @@ -2738,7 +2738,7 @@ EXTERN S16 TfUiTfuRecpReq ARGS((Pst *pst, SpId spId, TfuRecpReqInfo *recpReq)); * @param cntrlReq pointer to TfuCntrlReqInfo * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuCntrlReq ARGS((Pst *pst, SpId spId, TfuCntrlReqInfo *cntrlReq)); +S16 TfUiTfuCntrlReq ARGS((Pst *pst, SpId spId, TfuCntrlReqInfo *cntrlReq)); /** @brief This primitive carries the Data PDUs from MAC to PHY for transmission. * @details The data being sent in this primitive is meant to be transmitted on @@ -2751,7 +2751,7 @@ EXTERN S16 TfUiTfuCntrlReq ARGS((Pst *pst, SpId spId, TfuCntrlReqInfo *cntrlReq) * @param datReq pointer to TfuDatReqInfo * @return */ -EXTERN S16 TfUiTfuDatReq ARGS((Pst *pst, SpId spId, TfuDatReqInfo *datReq)); +S16 TfUiTfuDatReq ARGS((Pst *pst, SpId spId, TfuDatReqInfo *datReq)); #ifdef L2_OPTMZ /** @brief This primitive carries the cellId and UeId for which datReq need to @@ -2766,7 +2766,7 @@ EXTERN S16 TfUiTfuDatReq ARGS((Pst *pst, SpId spId, TfuDatReqInfo *datReq)); * @return */ -EXTERN S16 TfUiTfuDelDatReq ARGS((Pst *pst, SpId spId, TfuDelDatReqInfo *datReq)); +S16 TfUiTfuDelDatReq ARGS((Pst *pst, SpId spId, TfuDelDatReqInfo *datReq)); #endif /** @brief This Primitive carries the Data PDUs from PHY to MAC. @@ -2778,7 +2778,7 @@ EXTERN S16 TfUiTfuDelDatReq ARGS((Pst *pst, SpId spId, TfuDelDatReqInfo *datReq) * @param datInd pointer to TfuDatIndInfo * @return */ -EXTERN S16 TfUiTfuDatInd ARGS((Pst *pst, SuId suId, TfuDatIndInfo *datInd)); +S16 TfUiTfuDatInd ARGS((Pst *pst, SuId suId, TfuDatIndInfo *datInd)); /** @brief This primitive carries the HARQ Feedback from PHY to Scheduler. * @details HARQ feedback is sent by the UE to the eNodeB, an ACK is sent if UE @@ -2790,7 +2790,7 @@ EXTERN S16 TfUiTfuDatInd ARGS((Pst *pst, SuId suId, TfuDatIndInfo *datInd)); * @param hqInd pointer to TfuHqIndInfo * @return */ -EXTERN S16 TfUiTfuHqInd ARGS((Pst *pst, SuId suId, TfuHqIndInfo *hqInd)); +S16 TfUiTfuHqInd ARGS((Pst *pst, SuId suId, TfuHqIndInfo *hqInd)); /** @brief This primitive carries the SR Indication from PHY to Scheduler. * @details Scheduling Request (SR) is sent by the UE to the eNodeB to request @@ -2801,7 +2801,7 @@ EXTERN S16 TfUiTfuHqInd ARGS((Pst *pst, SuId suId, TfuHqIndInfo *hqInd)); * @param srInd pointer to TfuSrIndInfo * @return */ -EXTERN S16 TfUiTfuSrInd ARGS((Pst *pst, SuId suId, TfuSrIndInfo *srInd)); +S16 TfUiTfuSrInd ARGS((Pst *pst, SuId suId, TfuSrIndInfo *srInd)); /** @brief This API is used to indicate CQI reporting from PHY to Scheduler. * @details This primitive carries an estimate of the Uplink Channel Quality @@ -2814,7 +2814,7 @@ EXTERN S16 TfUiTfuSrInd ARGS((Pst *pst, SuId suId, TfuSrIndInfo *srInd)); * @param ulCqiInd Pointer to the TfuUlCqiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuUlCqiInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuUlCqiInd ARGS((Pst *pst, SuId suId, TfuUlCqiIndInfo *ulCqiInd)); /** @brief This API is used by the Physical layer to indicate if the CRC Check @@ -2830,7 +2830,7 @@ EXTERN S16 TfUiTfuUlCqiInd ARGS((Pst *pst, SuId suId, * @param crcIndInfo Pointer to the TfuCrcIndInfo. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuCrcInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuCrcInd ARGS((Pst *pst, SuId suId, TfuCrcIndInfo *crcIndInfo)); /** @brief This API is used to indicate a Timing Advance from PHY to Scheduler. @@ -2843,7 +2843,7 @@ EXTERN S16 TfUiTfuCrcInd ARGS((Pst *pst, SuId suId, * @param timingAdvInd Pointer to the TfuTimingAdvIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuTimingAdvInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuTimingAdvInd ARGS((Pst *pst, SuId suId, TfuTimingAdvIndInfo *timingAdvInd)); /* CA dev Start */ @@ -2855,7 +2855,7 @@ EXTERN S16 TfUiTfuTimingAdvInd ARGS((Pst *pst, SuId suId, * @param ttiInd Pointer to the TfuTtiCellInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuTtiCell ARGS((Pst *pst, SuId suId, +S16 TfUiTfuTtiCell ARGS((Pst *pst, SuId suId, TfuTtiCellInfo *ttiInd)); /* CA dev End */ @@ -2867,7 +2867,7 @@ EXTERN S16 TfUiTfuTtiCell ARGS((Pst *pst, SuId suId, * @param ttiInd Pointer to the TfuTtiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuTtiInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuTtiInd ARGS((Pst *pst, SuId suId, TfuTtiIndInfo *ttiInd)); /** @brief This API is the TTI indication from PHY to Scheduler. @@ -2878,7 +2878,7 @@ EXTERN S16 TfUiTfuTtiInd ARGS((Pst *pst, SuId suId, * @param ttiInd Pointer to the TfuTtiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuSchTtiInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuSchTtiInd ARGS((Pst *pst, SuId suId, TfuTtiIndInfo *ttiInd)); @@ -2892,7 +2892,7 @@ EXTERN S16 TfUiTfuSchTtiInd ARGS((Pst *pst, SuId suId, * @param dlCqiInd Pointer to the TfuDlCqiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuDlCqiInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuDlCqiInd ARGS((Pst *pst, SuId suId, TfuDlCqiIndInfo *dlCqiInd)); /** @brief This API is used to indicate the calculated DOA value report from PHY to * Scheduler. @@ -2903,7 +2903,7 @@ EXTERN S16 TfUiTfuDlCqiInd ARGS((Pst *pst, SuId suId, * @param doaInd Pointer to the TfuDoaIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuDoaInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuDoaInd ARGS((Pst *pst, SuId suId, TfuDoaIndInfo *doaInd)); @@ -2917,7 +2917,7 @@ EXTERN S16 TfUiTfuDoaInd ARGS((Pst *pst, SuId suId, * @param pucchDeltaPwr Pointer to the TfuPucchDeltaPwrIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuPucchDeltaPwrInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuPucchDeltaPwrInd ARGS((Pst *pst, SuId suId, TfuPucchDeltaPwrIndInfo *pucchDeltaPwr)); /** @brief LAA:This primitive carries the Error Indication from PHY to Scheduler. @@ -2929,7 +2929,7 @@ EXTERN S16 TfUiTfuPucchDeltaPwrInd ARGS((Pst *pst, SuId suId, * @return */ -EXTERN S16 TfUiTfuErrInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuErrInd ARGS((Pst *pst, SuId suId, TfuErrIndInfo *errInd)); /* tfu_x_001.main_8. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE @@ -2944,7 +2944,7 @@ EXTERN S16 TfUiTfuErrInd ARGS((Pst *pst, SuId suId, * @param srsInd Pointer to the TfuSrIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuSrsInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuSrsInd ARGS((Pst *pst, SuId suId, TfuSrsIndInfo *srsInd)); @@ -2959,82 +2959,82 @@ EXTERN S16 TfUiTfuSrsInd ARGS((Pst *pst, SuId suId, * @param cqiInd Pointer to the TfuRawCqiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 TfUiTfuRawCqiInd ARGS((Pst *pst, SuId suId, +S16 TfUiTfuRawCqiInd ARGS((Pst *pst, SuId suId, TfuRawCqiIndInfo *cqiInd)); #endif /* TFU_UPGRADE */ #ifdef RG -EXTERN S16 RgLiTfuBndReq ARGS(( +S16 RgLiTfuBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); -EXTERN S16 RgLiTfuBndCfm ARGS(( +S16 RgLiTfuBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); -EXTERN S16 RgLiTfuUbndReq ARGS(( +S16 RgLiTfuUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); -EXTERN S16 RgLiTfuSchBndReq ARGS(( +S16 RgLiTfuSchBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); -EXTERN S16 RgLiTfuSchBndCfm ARGS(( +S16 RgLiTfuSchBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); -EXTERN S16 RgLiTfuSchUbndReq ARGS(( +S16 RgLiTfuSchUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); -EXTERN S16 RgLiTfuRaReqInd ARGS(( +S16 RgLiTfuRaReqInd ARGS(( Pst * pst, SpId spId, TfuRaReqIndInfo * raReq )); -EXTERN S16 RgLiTfuRecpReq ARGS(( +S16 RgLiTfuRecpReq ARGS(( Pst * pst, SpId spId, TfuRecpReqInfo * recpReq )); -EXTERN S16 RgLiTfuUlCqiInd ARGS(( +S16 RgLiTfuUlCqiInd ARGS(( Pst * pst, SuId suId, TfuUlCqiIndInfo * ulCqiInd )); -EXTERN S16 RgLiTfuDoaInd ARGS(( +S16 RgLiTfuDoaInd ARGS(( Pst * pst, SuId suId, TfuDoaIndInfo * doaInd )); -EXTERN S16 RgLiTfuHqInd ARGS(( +S16 RgLiTfuHqInd ARGS(( Pst * pst, SuId suId, TfuHqIndInfo * hqInd )); -EXTERN S16 RgLiTfuSrInd ARGS(( +S16 RgLiTfuSrInd ARGS(( Pst * pst, SuId suId, TfuSrIndInfo * srInd )); -EXTERN S16 RgLiTfuDlCqiInd ARGS(( +S16 RgLiTfuDlCqiInd ARGS(( Pst * pst, SuId suId, TfuDlCqiIndInfo * dlCqiInd @@ -3042,61 +3042,61 @@ EXTERN S16 RgLiTfuDlCqiInd ARGS(( /* tfu_x_001.main_8. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN S16 RgLiTfuRawCqiInd ARGS(( +S16 RgLiTfuRawCqiInd ARGS(( Pst *pst, SuId suId, TfuRawCqiIndInfo *rawCqiInd )); -EXTERN S16 RgLiTfuSrsInd ARGS(( +S16 RgLiTfuSrsInd ARGS(( Pst *pst, SuId suId, TfuSrsIndInfo *srsIndInfo )); #endif -EXTERN S16 RgLiTfuDatInd ARGS(( +S16 RgLiTfuDatInd ARGS(( Pst * pst, SuId suId, TfuDatIndInfo * datInd )); -EXTERN S16 RgLiTfuCrcInd ARGS(( +S16 RgLiTfuCrcInd ARGS(( Pst * pst, SuId suId, TfuCrcIndInfo * crcInd )); -EXTERN S16 RgLiTfuTimingAdvInd ARGS(( +S16 RgLiTfuTimingAdvInd ARGS(( Pst * pst, SuId suId, TfuTimingAdvIndInfo * timingAdvInd )); -EXTERN S16 RgLiTfuDatReq ARGS(( +S16 RgLiTfuDatReq ARGS(( Pst * pst, SpId spId, TfuDatReqInfo * datReq )); -EXTERN S16 RgLiTfuCntrlReq ARGS(( +S16 RgLiTfuCntrlReq ARGS(( Pst * pst, SpId spId, TfuCntrlReqInfo * cntrlReq )); -EXTERN S16 RgLiTfuTtiInd ARGS(( +S16 RgLiTfuTtiInd ARGS(( Pst * pst, SuId suId, TfuTtiIndInfo * ttiInd )); #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) -EXTERN S16 RgLiTfuNonRtInd ARGS(( +S16 RgLiTfuNonRtInd ARGS(( Pst * pst, SuId suId )); #endif -EXTERN S16 RgLiTfuPucchDeltaPwrInd ARGS(( +S16 RgLiTfuPucchDeltaPwrInd ARGS(( Pst * pst, SuId suId, TfuPucchDeltaPwrIndInfo *pucchDeltaPwr @@ -3111,7 +3111,7 @@ EXTERN S16 RgLiTfuPucchDeltaPwrInd ARGS(( * @param errInd pointer to TfuErrIndInfo * @return */ -EXTERN S16 RgLiTfuErrInd ARGS((Pst *pst, SuId suId, TfuErrIndInfo *errInd)); +S16 RgLiTfuErrInd ARGS((Pst *pst, SuId suId, TfuErrIndInfo *errInd)); #ifdef L2_OPTMZ /** @brief This primitive carries the cellId and UeId for which datReq need to @@ -3125,133 +3125,133 @@ EXTERN S16 RgLiTfuErrInd ARGS((Pst *pst, SuId suId, TfuErrIndInfo *errInd)); * @param datReq pointer to TfuDelDatReqInfo * @return */ -EXTERN S16 RgLiTfuDelDatReq ARGS((Pst *pst, SuId suId, TfuDelDatReqInfo *delDatReq)); +S16 RgLiTfuDelDatReq ARGS((Pst *pst, SuId suId, TfuDelDatReqInfo *delDatReq)); #endif #if (defined(LCTFU)) /** @brief This API is used to send a Bind Request from MAC to PHY. */ #ifdef TFU_5GTF -EXTERN S16 cmPkTfuRbAssignA1Val324 ARGS(( +S16 cmPkTfuRbAssignA1Val324 ARGS(( TfuRbAssignA1Val324 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRbAssignB1Val324 ARGS(( +S16 cmPkTfuRbAssignB1Val324 ARGS(( TfuRbAssignB1Val324 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRbAssignVal326 ARGS(( +S16 cmPkTfuRbAssignVal326 ARGS(( TfuRbAssignVal326 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRbAssignA1Val324 ARGS(( +S16 cmUnpkTfuRbAssignA1Val324 ARGS(( TfuRbAssignA1Val324 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRbAssignB1Val324 ARGS(( +S16 cmUnpkTfuRbAssignB1Val324 ARGS(( TfuRbAssignB1Val324 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRbAssignVal326 ARGS(( +S16 cmUnpkTfuRbAssignVal326 ARGS(( TfuRbAssignVal326 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormatA1A2Info ARGS(( +S16 cmPkTfuDciFormatA1A2Info ARGS(( TfuDciFormatA1Info *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormatB1B2Info ARGS(( +S16 cmPkTfuDciFormatB1B2Info ARGS(( TfuDciFormatB1Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormatA1A2Info ARGS(( +S16 cmUnpkTfuDciFormatA1A2Info ARGS(( TfuDciFormatA1Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormatB1B2Info ARGS(( +S16 cmUnpkTfuDciFormatB1B2Info ARGS(( TfuDciFormatB1Info *param, Buffer *mBuf )); #endif /* TFU_5GTF */ -EXTERN S16 cmPkTfuBndReq ARGS(( +S16 cmPkTfuBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief This API is used to send a Bind Request from MAC to PHY. */ -EXTERN S16 cmUnpkTfuBndReq ARGS(( +S16 cmUnpkTfuBndReq ARGS(( TfuBndReq func, Pst* pst, Buffer *mBuf )); /** @brief This API is used to receive a Bind Confirm from PHY to MAC. */ -EXTERN S16 cmPkTfuBndCfm ARGS(( +S16 cmPkTfuBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief This API is used to receive a Bind Confirm from PHY to MAC. */ -EXTERN S16 cmUnpkTfuBndCfm ARGS(( +S16 cmUnpkTfuBndCfm ARGS(( TfuBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief This API is used to send an Unbind Request from MAC to PHY. */ -EXTERN S16 cmPkTfuUbndReq ARGS(( +S16 cmPkTfuUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief This API is used to send an Unbind Request from MAC to PHY. */ -EXTERN S16 cmUnpkTfuUbndReq ARGS(( +S16 cmUnpkTfuUbndReq ARGS(( TfuUbndReq func, Pst* pst, Buffer *mBuf )); /** @brief This API is used to send a Bind Request from SCH to PHY. */ -EXTERN S16 cmPkTfuSchBndReq ARGS(( +S16 cmPkTfuSchBndReq ARGS(( Pst* pst, SuId suId, SpId spId )); /** @brief This API is used to send a Bind Request from SCH to PHY. */ -EXTERN S16 cmUnpkTfuSchBndReq ARGS(( +S16 cmUnpkTfuSchBndReq ARGS(( TfuSchBndReq func, Pst* pst, Buffer *mBuf )); /** @brief This API is used to receive a Bind Confirm from PHY to SCH. */ -EXTERN S16 cmPkTfuSchBndCfm ARGS(( +S16 cmPkTfuSchBndCfm ARGS(( Pst* pst, SuId suId, uint8_t status )); /** @brief This API is used to receive a Bind Confirm from PHY to SCH. */ -EXTERN S16 cmUnpkTfuSchBndCfm ARGS(( +S16 cmUnpkTfuSchBndCfm ARGS(( TfuSchBndCfm func, Pst* pst, Buffer *mBuf )); /** @brief This API is used to send an Unbind Request from SCH to PHY. */ -EXTERN S16 cmPkTfuSchUbndReq ARGS(( +S16 cmPkTfuSchUbndReq ARGS(( Pst* pst, SpId spId, Reason reason )); /** @brief This API is used to send an Unbind Request from SCH to PHY. */ -EXTERN S16 cmUnpkTfuSchUbndReq ARGS(( +S16 cmUnpkTfuSchUbndReq ARGS(( TfuSchUbndReq func, Pst* pst, Buffer *mBuf @@ -3259,7 +3259,7 @@ EXTERN S16 cmUnpkTfuSchUbndReq ARGS(( /** @brief This API is used to indication Random Access Request reception from * PHY to MAC. */ -EXTERN S16 cmPkTfuRaReqInd ARGS(( +S16 cmPkTfuRaReqInd ARGS(( Pst * pst, SuId suId, TfuRaReqIndInfo * raReqInd @@ -3267,7 +3267,7 @@ EXTERN S16 cmPkTfuRaReqInd ARGS(( /** @brief This API is used to indication Random Access Request reception from * PHY to MAC. */ -EXTERN S16 cmUnpkTfuRaReqInd ARGS(( +S16 cmUnpkTfuRaReqInd ARGS(( TfuRaReqInd func, Pst * pst, Buffer *mBuf @@ -3275,7 +3275,7 @@ EXTERN S16 cmUnpkTfuRaReqInd ARGS(( /** @brief This API is used to indication Random Access Request reception from * PHY to MAC. */ -EXTERN S16 cmPkTfuRecpReq ARGS(( +S16 cmPkTfuRecpReq ARGS(( Pst * pst, SpId spId, TfuRecpReqInfo * recpReq @@ -3283,47 +3283,47 @@ EXTERN S16 cmPkTfuRecpReq ARGS(( /** @brief This API is used to indication Random Access Request reception from * PHY to MAC. */ -EXTERN S16 cmUnpkTfuRecpReq ARGS(( +S16 cmUnpkTfuRecpReq ARGS(( TfuRecpReq func, Pst * pst, Buffer *mBuf )); /** @brief This API is used to indicate CQI reporting from PHY to MAC. */ -EXTERN S16 cmPkTfuUlCqiInd ARGS(( +S16 cmPkTfuUlCqiInd ARGS(( Pst * pst, SuId suId, TfuUlCqiIndInfo * ulCqiInd )); /** @brief This API is used to indicate CQI reporting from PHY to MAC. */ -EXTERN S16 cmUnpkTfuUlCqiInd ARGS(( +S16 cmUnpkTfuUlCqiInd ARGS(( TfuUlCqiInd func, Pst * pst, Buffer *mBuf )); -EXTERN S16 cmPkTfuHqInd ARGS(( +S16 cmPkTfuHqInd ARGS(( Pst * pst, SuId suId, TfuHqIndInfo * hqInd )); -EXTERN S16 cmUnpkTfuHqInd ARGS(( +S16 cmUnpkTfuHqInd ARGS(( TfuHqInd func, Pst * pst, Buffer *mBuf )); /** @brief This API is used to indicate a SR reception from PHY to MAC. */ -EXTERN S16 cmPkTfuSrInd ARGS(( +S16 cmPkTfuSrInd ARGS(( Pst * pst, SuId suId, TfuSrIndInfo * srInd )); /** @brief This API is used to indicate a SR reception from PHY to MAC. */ -EXTERN S16 cmUnpkTfuSrInd ARGS(( +S16 cmUnpkTfuSrInd ARGS(( TfuSrInd func, Pst * pst, Buffer *mBuf @@ -3331,7 +3331,7 @@ EXTERN S16 cmUnpkTfuSrInd ARGS(( /** @brief This API is used to indicate the reception of CQI report from PHY to * MAC. */ -EXTERN S16 cmPkTfuDlCqiInd ARGS(( +S16 cmPkTfuDlCqiInd ARGS(( Pst * pst, SuId suId, TfuDlCqiIndInfo * dlCqiInd @@ -3339,7 +3339,7 @@ EXTERN S16 cmPkTfuDlCqiInd ARGS(( /** @brief This API is used to indicate the reception of CQI report from PHY to * MAC. */ -EXTERN S16 cmUnpkTfuDlCqiInd ARGS(( +S16 cmUnpkTfuDlCqiInd ARGS(( TfuDlCqiInd func, Pst * pst, Buffer *mBuf @@ -3347,7 +3347,7 @@ EXTERN S16 cmUnpkTfuDlCqiInd ARGS(( /** @brief This API is used to indicate the Calculated DOA value report from PHY to * MAC.*/ -EXTERN S16 cmUnpkTfuDoaInd ARGS(( +S16 cmUnpkTfuDoaInd ARGS(( TfuDoaInd func, Pst * pst, Buffer *mBuf @@ -3355,7 +3355,7 @@ EXTERN S16 cmUnpkTfuDoaInd ARGS(( /** @brief This API is used to indicate the calculated DOA Value report from PHY to * MAC. */ -EXTERN S16 cmPkTfuDoaInd ARGS(( +S16 cmPkTfuDoaInd ARGS(( Pst * pst, SuId suId, TfuDoaIndInfo * doaInd @@ -3363,68 +3363,68 @@ EXTERN S16 cmPkTfuDoaInd ARGS(( /** @brief This API is used to indicate Data Reception from PHY to MAC. */ -EXTERN S16 cmPkTfuDatInd ARGS(( +S16 cmPkTfuDatInd ARGS(( Pst * pst, SuId suId, TfuDatIndInfo * datInd )); /** @brief This API is used to indicate Data Reception from PHY to MAC. */ -EXTERN S16 cmUnpkTfuDatInd ARGS(( +S16 cmUnpkTfuDatInd ARGS(( TfuDatInd func, Pst * pst, Buffer *mBuf )); /** @brief This API is used to indicate Decode failure from PHY to MAC. */ -EXTERN S16 cmPkTfuCrcInd ARGS(( +S16 cmPkTfuCrcInd ARGS(( Pst * pst, SuId suId, TfuCrcIndInfo * crcInd )); /** @brief This API is used to indicate Decode failure from PHY to MAC. */ -EXTERN S16 cmUnpkTfuCrcInd ARGS(( +S16 cmUnpkTfuCrcInd ARGS(( TfuCrcInd func, Pst * pst, Buffer *mBuf )); -EXTERN S16 cmPkTfuCntrlReq ARGS(( +S16 cmPkTfuCntrlReq ARGS(( Pst * pst, SpId spId, TfuCntrlReqInfo * cntrlReq )); -EXTERN S16 cmUnpkTfuCntrlReq ARGS(( +S16 cmUnpkTfuCntrlReq ARGS(( TfuCntrlReq func, Pst * pst, Buffer *mBuf )); /** @brief This API is used to indicate a Timing Advance from PHY to MAC. */ -EXTERN S16 cmPkTfuTimingAdvInd ARGS(( +S16 cmPkTfuTimingAdvInd ARGS(( Pst * pst, SuId suId, TfuTimingAdvIndInfo * timingAdvInd )); /** @brief This API is used to indicate a Timing Advance from PHY to MAC. */ -EXTERN S16 cmUnpkTfuTimingAdvInd ARGS(( +S16 cmUnpkTfuTimingAdvInd ARGS(( TfuTimingAdvInd func, Pst * pst, Buffer *mBuf )); /** @brief This API is used to send Data Request from MAC to PHY. */ -EXTERN S16 cmPkTfuDatReq ARGS(( +S16 cmPkTfuDatReq ARGS(( Pst * pst, SpId spId, TfuDatReqInfo * datReq )); /** @brief This API is used to send Data Request from MAC to PHY. */ -EXTERN S16 cmUnpkTfuDatReq ARGS(( +S16 cmUnpkTfuDatReq ARGS(( TfuDatReq func, Pst * pst, Buffer *mBuf @@ -3432,14 +3432,14 @@ EXTERN S16 cmUnpkTfuDatReq ARGS(( /* CA dev Start */ /** @brief This API is the TTI indication from CL to MAC and SCH. */ -EXTERN S16 cmPkTfuTtiCell ARGS(( +S16 cmPkTfuTtiCell ARGS(( Pst * pst, SuId suId, TfuTtiCellInfo * ttiInd )); /** @brief This API is the TTI indication from CL to MAC and SCH. */ -EXTERN S16 cmUnpkTfuTtiCell ARGS(( +S16 cmUnpkTfuTtiCell ARGS(( TfuTtiCell func, Pst * pst, Buffer *mBuf @@ -3448,14 +3448,14 @@ EXTERN S16 cmUnpkTfuTtiCell ARGS(( /** @brief This API is the TTI indication from PHY to MAC. */ -EXTERN S16 cmPkTfuTtiInd ARGS(( +S16 cmPkTfuTtiInd ARGS(( Pst * pst, SuId suId, TfuTtiIndInfo * ttiInd )); /** @brief This API is the TTI indication from PHY to MAC. */ -EXTERN S16 cmUnpackSlotInd ARGS(( +S16 cmUnpackSlotInd ARGS(( TfuTtiInd func, Pst * pst, Buffer *mBuf @@ -3464,14 +3464,14 @@ EXTERN S16 cmUnpackSlotInd ARGS(( #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) /** @brief This API is the non-rt indication from PHY to MAC. */ -EXTERN S16 cmPkTfuNonRtInd ARGS(( +S16 cmPkTfuNonRtInd ARGS(( Pst * pst, SuId suId )); /** @brief This API is the non-rt indication from PHY to MAC. */ -EXTERN S16 cmUnpkTfuNonRtInd ARGS(( +S16 cmUnpkTfuNonRtInd ARGS(( TfuNonRtInd func, Pst * pst, Buffer *mBuf @@ -3480,21 +3480,21 @@ EXTERN S16 cmUnpkTfuNonRtInd ARGS(( /** @brief This API is the TTI indication from PHY to SCH. */ -EXTERN S16 cmPkTfuSchTtiInd ARGS(( +S16 cmPkTfuSchTtiInd ARGS(( Pst * pst, SuId suId, TfuTtiIndInfo * ttiInd )); /** @brief This API is used to convey the PUCCH delta power from PHY to SCH. */ -EXTERN S16 cmPkTfuPucchDeltaPwrInd ARGS(( +S16 cmPkTfuPucchDeltaPwrInd ARGS(( Pst * pst, SuId suId, TfuPucchDeltaPwrIndInfo * pucchDeltaPwr )); /** @brief This API is used to indicate Decode failure from PHY to MAC. */ -EXTERN S16 cmUnpkTfuPucchDeltaPwrInd ARGS(( +S16 cmUnpkTfuPucchDeltaPwrInd ARGS(( TfuPucchDeltaPwrInd func, Pst * pst, Buffer *mBuf @@ -3504,417 +3504,417 @@ EXTERN S16 cmUnpkTfuPucchDeltaPwrInd ARGS(( #ifdef TFU_PHASE_2 /** @brief This API is used to send Group Power Control Request from MAC to PHY. */ -EXTERN S16 cmPkTfuGrpPwrCntrlReq ARGS(( +S16 cmPkTfuGrpPwrCntrlReq ARGS(( Pst * pst, SpId spId, TfuGrpPwrCntrlReqInfo * grpPwrCntrlReq )); /** @brief This API is used to send Group Power Control Request from MAC to PHY. */ -EXTERN S16 cmUnpkTfuGrpPwrCntrlReq ARGS(( +S16 cmUnpkTfuGrpPwrCntrlReq ARGS(( TfuGrpPwrCntrlReq func, Pst * pst, Buffer *mBuf )); #endif -EXTERN S16 cmPkTfuDciFormat0Info ARGS(( +S16 cmPkTfuDciFormat0Info ARGS(( TfuDciFormat0Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat0Info ARGS(( +S16 cmUnpkTfuDciFormat0Info ARGS(( TfuDciFormat0Info *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuAllocMapOrRiv ARGS(( +S16 cmPkTfuAllocMapOrRiv ARGS(( TfuAllocMapOrRiv *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuAllocMapOrRiv ARGS(( +S16 cmUnpkTfuAllocMapOrRiv ARGS(( TfuAllocMapOrRiv *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1AllocInfo ARGS(( +S16 cmPkTfuDciFormat1AllocInfo ARGS(( TfuDciFormat1AllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1AllocInfo ARGS(( +S16 cmUnpkTfuDciFormat1AllocInfo ARGS(( TfuDciFormat1AllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1Info ARGS(( +S16 cmPkTfuDciFormat1Info ARGS(( TfuDciFormat1Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1Info ARGS(( +S16 cmUnpkTfuDciFormat1Info ARGS(( TfuDciFormat1Info *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormatTbInfo ARGS(( +S16 cmPkTfuDciFormatTbInfo ARGS(( TfuDciFormatTbInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormatTbInfo ARGS(( +S16 cmUnpkTfuDciFormatTbInfo ARGS(( TfuDciFormatTbInfo *param, Buffer *mBuf )); /** @} */ -EXTERN S16 cmPkTfuDciFormat2AAllocInfo ARGS(( +S16 cmPkTfuDciFormat2AAllocInfo ARGS(( TfuDciFormat2AAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat2AAllocInfo ARGS(( +S16 cmUnpkTfuDciFormat2AAllocInfo ARGS(( TfuDciFormat2AAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat2AInfo ARGS(( +S16 cmPkTfuDciFormat2AInfo ARGS(( TfuDciFormat2AInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat2AInfo ARGS(( +S16 cmUnpkTfuDciFormat2AInfo ARGS(( TfuDciFormat2AInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat2AllocInfo ARGS(( +S16 cmPkTfuDciFormat2AllocInfo ARGS(( TfuDciFormat2AllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat2AllocInfo ARGS(( +S16 cmUnpkTfuDciFormat2AllocInfo ARGS(( TfuDciFormat2AllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat2Info ARGS(( +S16 cmPkTfuDciFormat2Info ARGS(( TfuDciFormat2Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat2Info ARGS(( +S16 cmUnpkTfuDciFormat2Info ARGS(( TfuDciFormat2Info *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat3Info ARGS(( +S16 cmPkTfuDciFormat3Info ARGS(( TfuDciFormat3Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat3Info ARGS(( +S16 cmUnpkTfuDciFormat3Info ARGS(( TfuDciFormat3Info *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat3AInfo ARGS(( +S16 cmPkTfuDciFormat3AInfo ARGS(( TfuDciFormat3AInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat3AInfo ARGS(( +S16 cmUnpkTfuDciFormat3AInfo ARGS(( TfuDciFormat3AInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1dAllocInfo ARGS(( +S16 cmPkTfuDciFormat1dAllocInfo ARGS(( TfuDciFormat1dAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1dAllocInfo ARGS(( +S16 cmUnpkTfuDciFormat1dAllocInfo ARGS(( TfuDciFormat1dAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1dInfo ARGS(( +S16 cmPkTfuDciFormat1dInfo ARGS(( TfuDciFormat1dInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1dInfo ARGS(( +S16 cmUnpkTfuDciFormat1dInfo ARGS(( TfuDciFormat1dInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1cInfo ARGS(( +S16 cmPkTfuDciFormat1cInfo ARGS(( TfuDciFormat1cInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1cInfo ARGS(( +S16 cmUnpkTfuDciFormat1cInfo ARGS(( TfuDciFormat1cInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1bAllocInfo ARGS(( +S16 cmPkTfuDciFormat1bAllocInfo ARGS(( TfuDciFormat1bAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1bAllocInfo ARGS(( +S16 cmUnpkTfuDciFormat1bAllocInfo ARGS(( TfuDciFormat1bAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuPdcchOrderInfo ARGS(( +S16 cmPkTfuPdcchOrderInfo ARGS(( TfuPdcchOrderInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPdcchOrderInfo ARGS(( +S16 cmUnpkTfuPdcchOrderInfo ARGS(( TfuPdcchOrderInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1aAllocInfo ARGS(( +S16 cmPkTfuDciFormat1aAllocInfo ARGS(( TfuDciFormat1aAllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1aAllocInfo ARGS(( +S16 cmUnpkTfuDciFormat1aAllocInfo ARGS(( TfuDciFormat1aAllocInfo *param, Buffer *mBuf )); /*tfu_x_001.main_6 - Added for SPS support*/ -EXTERN S16 cmPkTfudciformat1aPdsch ARGS(( +S16 cmPkTfudciformat1aPdsch ARGS(( Tfudciformat1aPdsch *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfudciformat1aPdsch ARGS(( +S16 cmUnpkTfudciformat1aPdsch ARGS(( Tfudciformat1aPdsch *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1aInfo ARGS(( +S16 cmPkTfuDciFormat1aInfo ARGS(( TfuDciFormat1aInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1aInfo ARGS(( +S16 cmUnpkTfuDciFormat1aInfo ARGS(( TfuDciFormat1aInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat1bInfo ARGS(( +S16 cmPkTfuDciFormat1bInfo ARGS(( TfuDciFormat1bInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat1bInfo ARGS(( +S16 cmUnpkTfuDciFormat1bInfo ARGS(( TfuDciFormat1bInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciInfo ARGS(( +S16 cmPkTfuDciInfo ARGS(( TfuDciInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciInfo ARGS(( +S16 cmUnpkTfuDciInfo ARGS(( TfuDciInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSubbandInfo ARGS(( +S16 cmPkTfuSubbandInfo ARGS(( TfuSubbandInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSubbandInfo ARGS(( +S16 cmUnpkTfuSubbandInfo ARGS(( TfuSubbandInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSubbandDlCqiInfo ARGS(( +S16 cmPkTfuSubbandDlCqiInfo ARGS(( TfuSubbandDlCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSubbandDlCqiInfo ARGS(( +S16 cmUnpkTfuSubbandDlCqiInfo ARGS(( TfuSubbandDlCqiInfo *param, Buffer *mBuf )); /** @} */ -EXTERN S16 cmPkTfuSubbandCqiInfo ARGS(( +S16 cmPkTfuSubbandCqiInfo ARGS(( TfuSubbandCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSubbandCqiInfo ARGS(( +S16 cmUnpkTfuSubbandCqiInfo ARGS(( TfuSubbandCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuPdcchCceInfo ARGS(( +S16 cmPkTfuPdcchCceInfo ARGS(( TfuPdcchCceInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPdcchCceInfo ARGS(( +S16 cmUnpkTfuPdcchCceInfo ARGS(( TfuPdcchCceInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPucchMode10 ARGS(( +S16 cmPkTfuCqiPucchMode10 ARGS(( TfuCqiPucchMode10 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPucchMode10 ARGS(( +S16 cmUnpkTfuCqiPucchMode10 ARGS(( TfuCqiPucchMode10 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiMode11Cqi ARGS(( +S16 cmPkTfuCqiMode11Cqi ARGS(( TfuCqiMode11Cqi *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiMode11Cqi ARGS(( +S16 cmUnpkTfuCqiMode11Cqi ARGS(( TfuCqiMode11Cqi *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPucchMode11 ARGS(( +S16 cmPkTfuCqiPucchMode11 ARGS(( TfuCqiPucchMode11 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPucchMode11 ARGS(( +S16 cmUnpkTfuCqiPucchMode11 ARGS(( TfuCqiPucchMode11 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiMode20SubCqi ARGS(( +S16 cmPkTfuCqiMode20SubCqi ARGS(( TfuCqiMode20SubCqi *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiMode20SubCqi ARGS(( +S16 cmUnpkTfuCqiMode20SubCqi ARGS(( TfuCqiMode20SubCqi *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiMode20Cqi ARGS(( +S16 cmPkTfuCqiMode20Cqi ARGS(( TfuCqiMode20Cqi *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiMode20Cqi ARGS(( +S16 cmUnpkTfuCqiMode20Cqi ARGS(( TfuCqiMode20Cqi *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPucchMode20 ARGS(( +S16 cmPkTfuCqiPucchMode20 ARGS(( TfuCqiPucchMode20 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPucchMode20 ARGS(( +S16 cmUnpkTfuCqiPucchMode20 ARGS(( TfuCqiPucchMode20 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiMode21SubCqi ARGS(( +S16 cmPkTfuCqiMode21SubCqi ARGS(( TfuCqiMode21SubCqi *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiMode21SubCqi ARGS(( +S16 cmUnpkTfuCqiMode21SubCqi ARGS(( TfuCqiMode21SubCqi *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiMode21WideCqi ARGS(( +S16 cmPkTfuCqiMode21WideCqi ARGS(( TfuCqiMode21WideCqi *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiMode21WideCqi ARGS(( +S16 cmUnpkTfuCqiMode21WideCqi ARGS(( TfuCqiMode21WideCqi *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiMode21Cqi ARGS(( +S16 cmPkTfuCqiMode21Cqi ARGS(( TfuCqiMode21Cqi *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiMode21Cqi ARGS(( +S16 cmUnpkTfuCqiMode21Cqi ARGS(( TfuCqiMode21Cqi *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPucchMode21 ARGS(( +S16 cmPkTfuCqiPucchMode21 ARGS(( TfuCqiPucchMode21 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPucchMode21 ARGS(( +S16 cmUnpkTfuCqiPucchMode21 ARGS(( TfuCqiPucchMode21 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDlCqiPucch ARGS(( +S16 cmPkTfuDlCqiPucch ARGS(( TfuDlCqiPucch *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDlCqiPucch ARGS(( +S16 cmUnpkTfuDlCqiPucch ARGS(( TfuDlCqiPucch *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSubbandMode12 ARGS(( +S16 cmPkTfuSubbandMode12 ARGS(( TfuSubbandMode12 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSubbandMode12 ARGS(( +S16 cmUnpkTfuSubbandMode12 ARGS(( TfuSubbandMode12 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPuschMode12 ARGS(( +S16 cmPkTfuCqiPuschMode12 ARGS(( TfuCqiPuschMode12 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPuschMode12 ARGS(( +S16 cmUnpkTfuCqiPuschMode12 ARGS(( TfuCqiPuschMode12 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPuschMode20 ARGS(( +S16 cmPkTfuCqiPuschMode20 ARGS(( TfuCqiPuschMode20 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPuschMode20 ARGS(( +S16 cmUnpkTfuCqiPuschMode20 ARGS(( TfuCqiPuschMode20 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPuschMode22 ARGS(( +S16 cmPkTfuCqiPuschMode22 ARGS(( TfuCqiPuschMode22 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPuschMode22 ARGS(( +S16 cmUnpkTfuCqiPuschMode22 ARGS(( TfuCqiPuschMode22 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSubbandMode30 ARGS(( +S16 cmPkTfuSubbandMode30 ARGS(( TfuSubbandMode30 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSubbandMode30 ARGS(( +S16 cmUnpkTfuSubbandMode30 ARGS(( TfuSubbandMode30 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPuschMode30 ARGS(( +S16 cmPkTfuCqiPuschMode30 ARGS(( TfuCqiPuschMode30 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPuschMode30 ARGS(( +S16 cmUnpkTfuCqiPuschMode30 ARGS(( TfuCqiPuschMode30 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSubbandMode31 ARGS(( +S16 cmPkTfuSubbandMode31 ARGS(( TfuSubbandMode31 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSubbandMode31 ARGS(( +S16 cmUnpkTfuSubbandMode31 ARGS(( TfuSubbandMode31 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCqiPuschMode31 ARGS(( +S16 cmPkTfuCqiPuschMode31 ARGS(( TfuCqiPuschMode31 *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCqiPuschMode31 ARGS(( +S16 cmUnpkTfuCqiPuschMode31 ARGS(( TfuCqiPuschMode31 *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDlCqiPusch ARGS(( +S16 cmPkTfuDlCqiPusch ARGS(( TfuDlCqiPusch *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDlCqiPusch ARGS(( +S16 cmUnpkTfuDlCqiPusch ARGS(( TfuDlCqiPusch *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDlCqiPuschInfo ARGS(( +S16 cmPkTfuDlCqiPuschInfo ARGS(( TfuDlCqiPuschInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDlCqiPuschInfo ARGS(( +S16 cmUnpkTfuDlCqiPuschInfo ARGS(( TfuDlCqiPuschInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDoaRpt ARGS(( +S16 cmPkTfuDoaRpt ARGS(( TfuDoaRpt *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDoaRpt ARGS(( +S16 cmUnpkTfuDoaRpt ARGS(( TfuDoaRpt *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDoaIndInfo ARGS(( +S16 cmPkTfuDoaIndInfo ARGS(( TfuDoaIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDoaIndInfo ARGS(( +S16 cmUnpkTfuDoaIndInfo ARGS(( TfuDoaIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuDlCqiInfo ARGS(( +S16 cmPkTfuDlCqiInfo ARGS(( uint8_t selector, TfuDlCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDlCqiInfo ARGS(( +S16 cmUnpkTfuDlCqiInfo ARGS(( uint8_t selector, TfuDlCqiInfo *param, Buffer *mBuf @@ -3923,11 +3923,11 @@ EXTERN S16 cmUnpkTfuDlCqiInfo ARGS(( /* tfu_x_001.main_8. Added changes of TFU_UPGRADE */ #ifndef TFU_UPGRADE -EXTERN S16 cmPkTfuUeMsg3RecpReq ARGS(( +S16 cmPkTfuUeMsg3RecpReq ARGS(( TfuUeMsg3RecpReq *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUeMsg3RecpReq ARGS(( +S16 cmUnpkTfuUeMsg3RecpReq ARGS(( TfuUeMsg3RecpReq *param, Buffer *mBuf )); @@ -3935,324 +3935,324 @@ EXTERN S16 cmUnpkTfuUeMsg3RecpReq ARGS(( /*tfu_x_001.main_8 - ADD - Prototype for TfuUePuschRecpReq Pk/Unpk functions */ -EXTERN S16 cmPkTfuUePuschRecpReq ARGS(( +S16 cmPkTfuUePuschRecpReq ARGS(( TfuUePuschRecpReq *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePuschRecpReq ARGS(( +S16 cmUnpkTfuUePuschRecpReq ARGS(( TfuUePuschRecpReq *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUePucchRecpReq ARGS(( +S16 cmPkTfuUePucchRecpReq ARGS(( TfuUePucchRecpReq *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePucchRecpReq ARGS(( +S16 cmUnpkTfuUePucchRecpReq ARGS(( TfuUePucchRecpReq *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRecpReqInfo ARGS(( +S16 cmPkTfuRecpReqInfo ARGS(( TfuRecpReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRecpReqInfo ARGS(( +S16 cmUnpkTfuRecpReqInfo ARGS(( TfuRecpReqInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuPdcchInfo ARGS(( +S16 cmPkTfuPdcchInfo ARGS(( TfuPdcchInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPdcchInfo ARGS(( +S16 cmUnpkTfuPdcchInfo ARGS(( TfuPdcchInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuPhichInfo ARGS(( +S16 cmPkTfuPhichInfo ARGS(( TfuPhichInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPhichInfo ARGS(( +S16 cmUnpkTfuPhichInfo ARGS(( TfuPhichInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCntrlReqInfo ARGS(( +S16 cmPkTfuCntrlReqInfo ARGS(( TfuCntrlReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCntrlReqInfo ARGS(( +S16 cmUnpkTfuCntrlReqInfo ARGS(( TfuCntrlReqInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuPdschDciInfo ARGS(( +S16 cmPkTfuPdschDciInfo ARGS(( TfuPdschDciInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPdschDciInfo ARGS(( +S16 cmUnpkTfuPdschDciInfo ARGS(( TfuPdschDciInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDatReqPduInfo ARGS(( +S16 cmPkTfuDatReqPduInfo ARGS(( TfuDatReqPduInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDatReqPduInfo ARGS(( +S16 cmUnpkTfuDatReqPduInfo ARGS(( TfuDatReqPduInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDatReqInfo ARGS(( +S16 cmPkTfuDatReqInfo ARGS(( TfuDatReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDatReqInfo ARGS(( +S16 cmUnpkTfuDatReqInfo ARGS(( TfuDatReqInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuDatInfo ARGS(( +S16 cmPkTfuDatInfo ARGS(( TfuDatInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDatInfo ARGS(( +S16 cmUnpkTfuDatInfo ARGS(( TfuDatInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDatIndInfo ARGS(( +S16 cmPkTfuDatIndInfo ARGS(( TfuDatIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDatIndInfo ARGS(( +S16 cmUnpkTfuDatIndInfo ARGS(( TfuDatIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuSrInfo ARGS(( +S16 cmPkTfuSrInfo ARGS(( TfuSrInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSrInfo ARGS(( +S16 cmUnpkTfuSrInfo ARGS(( TfuSrInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSrIndInfo ARGS(( +S16 cmPkTfuSrIndInfo ARGS(( TfuSrIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSrIndInfo ARGS(( +S16 cmUnpkTfuSrIndInfo ARGS(( TfuSrIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuHqInfo ARGS(( +S16 cmPkTfuHqInfo ARGS(( TfuHqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuHqInfo ARGS(( +S16 cmUnpkTfuHqInfo ARGS(( TfuHqInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuHqIndInfo ARGS(( +S16 cmPkTfuHqIndInfo ARGS(( TfuHqIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuHqIndInfo ARGS(( +S16 cmUnpkTfuHqIndInfo ARGS(( TfuHqIndInfo *param, Ptr memCpm, Buffer *mBuf )); -EXTERN S16 cmPkTfuUlCqiInfo ARGS(( +S16 cmPkTfuUlCqiInfo ARGS(( TfuUlCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUlCqiInfo ARGS(( +S16 cmUnpkTfuUlCqiInfo ARGS(( TfuUlCqiInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUlCqiRpt ARGS(( +S16 cmPkTfuUlCqiRpt ARGS(( TfuUlCqiRpt *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUlCqiRpt ARGS(( +S16 cmUnpkTfuUlCqiRpt ARGS(( TfuUlCqiRpt *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUlCqiIndInfo ARGS(( +S16 cmPkTfuUlCqiIndInfo ARGS(( TfuUlCqiIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUlCqiIndInfo ARGS(( +S16 cmUnpkTfuUlCqiIndInfo ARGS(( TfuUlCqiIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuDlCqiRpt ARGS(( +S16 cmPkTfuDlCqiRpt ARGS(( TfuDlCqiRpt *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDlCqiRpt ARGS(( +S16 cmUnpkTfuDlCqiRpt ARGS(( TfuDlCqiRpt *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDlCqiIndInfo ARGS(( +S16 cmPkTfuDlCqiIndInfo ARGS(( TfuDlCqiIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDlCqiIndInfo ARGS(( +S16 cmUnpkTfuDlCqiIndInfo ARGS(( TfuDlCqiIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuPucchDeltaPwr ARGS(( +S16 cmPkTfuPucchDeltaPwr ARGS(( Pst * pst, SuId suId, TfuPucchDeltaPwrIndInfo * pucchDeltaPwr)); -EXTERN S16 cmPkTfuPucchDeltaPwrInfo ARGS(( +S16 cmPkTfuPucchDeltaPwrInfo ARGS(( TfuPucchDeltaPwr *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPucchDeltaPwr ARGS(( +S16 cmUnpkTfuPucchDeltaPwr ARGS(( TfuPucchDeltaPwrInd func, Pst * pst, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPucchDeltaPwrInfo ARGS(( +S16 cmUnpkTfuPucchDeltaPwrInfo ARGS(( TfuPucchDeltaPwr *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCrcInfo ARGS(( +S16 cmPkTfuCrcInfo ARGS(( TfuCrcInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCrcInfo ARGS(( +S16 cmUnpkTfuCrcInfo ARGS(( TfuCrcInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuCrcIndInfo ARGS(( +S16 cmPkTfuCrcIndInfo ARGS(( TfuCrcIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuCrcIndInfo ARGS(( +S16 cmUnpkTfuCrcIndInfo ARGS(( TfuCrcIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuPucchDeltaPwrIndInfo ARGS(( +S16 cmPkTfuPucchDeltaPwrIndInfo ARGS(( TfuPucchDeltaPwrIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuPucchDeltaPwrIndInfo ARGS(( +S16 cmUnpkTfuPucchDeltaPwrIndInfo ARGS(( TfuPucchDeltaPwrIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuTimingAdvInfo ARGS(( +S16 cmPkTfuTimingAdvInfo ARGS(( TfuTimingAdvInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuTimingAdvInfo ARGS(( +S16 cmUnpkTfuTimingAdvInfo ARGS(( TfuTimingAdvInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuTimingAdvIndInfo ARGS(( +S16 cmPkTfuTimingAdvIndInfo ARGS(( TfuTimingAdvIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuTimingAdvIndInfo ARGS(( +S16 cmUnpkTfuTimingAdvIndInfo ARGS(( TfuTimingAdvIndInfo *param, Ptr memCp, Buffer *mBuf )); /* CA dev Start */ -EXTERN S16 cmPkTfuTtiCellInfo ARGS(( +S16 cmPkTfuTtiCellInfo ARGS(( TfuTtiCellInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuTtiCellInfo ARGS(( +S16 cmUnpkTfuTtiCellInfo ARGS(( TfuTtiCellInfo *param, Buffer *mBuf )); /* CA dev End */ -EXTERN S16 cmPkTfuTtiIndInfo ARGS(( +S16 cmPkTfuTtiIndInfo ARGS(( TfuTtiIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpackSlotIndInfo ARGS(( +S16 cmUnpackSlotIndInfo ARGS(( SlotIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRaReqInfo ARGS(( +S16 cmPkTfuRaReqInfo ARGS(( TfuRaReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRaReqInfo ARGS(( +S16 cmUnpkTfuRaReqInfo ARGS(( TfuRaReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRachInfo ARGS(( +S16 cmPkTfuRachInfo ARGS(( CmMemListCp memCp, TfuRachInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRachInfo ARGS(( +S16 cmUnpkTfuRachInfo ARGS(( CmMemListCp memCp, TfuRachInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRaReqIndInfo ARGS(( +S16 cmPkTfuRaReqIndInfo ARGS(( TfuRaReqIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRaReqIndInfo ARGS(( +S16 cmUnpkTfuRaReqIndInfo ARGS(( TfuRaReqIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkBuffer ARGS(( +S16 cmPkBuffer ARGS(( Buffer **param, Buffer *mBuf )); -EXTERN S16 cmUnpkBuffer ARGS(( +S16 cmUnpkBuffer ARGS(( Buffer **param, Buffer *mBuf )); /* tfu_x_001.main_8. Added changes of TFU_UPGRADE */ #ifdef TFU_UPGRADE -EXTERN S16 cmPkTfuSrsRpt ARGS(( +S16 cmPkTfuSrsRpt ARGS(( TfuSrsRpt *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSrsRpt ARGS(( +S16 cmUnpkTfuSrsRpt ARGS(( TfuSrsRpt *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuSrsIndInfo ARGS(( +S16 cmPkTfuSrsIndInfo ARGS(( TfuSrsIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuSrsIndInfo ARGS(( +S16 cmUnpkTfuSrsIndInfo ARGS(( TfuSrsIndInfo *param, Ptr memCp, Buffer *mBuf )); -EXTERN S16 cmPkTfuRawCqiRpt ARGS(( +S16 cmPkTfuRawCqiRpt ARGS(( TfuRawCqiRpt *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRawCqiRpt ARGS(( +S16 cmUnpkTfuRawCqiRpt ARGS(( TfuRawCqiRpt *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuRawCqiIndInfo ARGS(( +S16 cmPkTfuRawCqiIndInfo ARGS(( TfuRawCqiIndInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuRawCqiIndInfo ARGS(( +S16 cmUnpkTfuRawCqiIndInfo ARGS(( TfuRawCqiIndInfo *param, Ptr memCp, Buffer *mBuf @@ -4260,11 +4260,11 @@ EXTERN S16 cmUnpkTfuRawCqiIndInfo ARGS(( #ifdef TFU_TDD -EXTERN S16 cmPkTfuUePucchHqRecpInfo ARGS(( +S16 cmPkTfuUePucchHqRecpInfo ARGS(( TfuUePucchHqRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePucchHqRecpInfo ARGS(( +S16 cmUnpkTfuUePucchHqRecpInfo ARGS(( TfuUePucchHqRecpInfo *param, Buffer *mBuf )); @@ -4273,82 +4273,82 @@ EXTERN S16 cmUnpkTfuUePucchHqRecpInfo ARGS(( #ifndef TFU_TDD /* else of TFU_TDD */ -EXTERN S16 cmPkTfuUePucchHqRecpInfo ARGS(( +S16 cmPkTfuUePucchHqRecpInfo ARGS(( TfuUePucchHqRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePucchHqRecpInfo ARGS(( +S16 cmUnpkTfuUePucchHqRecpInfo ARGS(( TfuUePucchHqRecpInfo *param, Buffer *mBuf )); #endif -EXTERN S16 cmPkTfuUePucchSrRecpInfo ARGS(( +S16 cmPkTfuUePucchSrRecpInfo ARGS(( TfuUePucchSrRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePucchSrRecpInfo ARGS(( +S16 cmUnpkTfuUePucchSrRecpInfo ARGS(( TfuUePucchSrRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUePucchCqiRecpInfo ARGS(( +S16 cmPkTfuUePucchCqiRecpInfo ARGS(( TfuUePucchCqiRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePucchCqiRecpInfo ARGS(( +S16 cmUnpkTfuUePucchCqiRecpInfo ARGS(( TfuUePucchCqiRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUePucchSrsRecpInfo ARGS(( +S16 cmPkTfuUePucchSrsRecpInfo ARGS(( TfuUePucchSrsRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePucchSrsRecpInfo ARGS(( +S16 cmUnpkTfuUePucchSrsRecpInfo ARGS(( TfuUePucchSrsRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUeUlSchRecpInfo ARGS(( +S16 cmPkTfuUeUlSchRecpInfo ARGS(( TfuUeUlSchRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUeUlSchRecpInfo ARGS(( +S16 cmUnpkTfuUeUlSchRecpInfo ARGS(( TfuUeUlSchRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUePuschCqiRecpInfo ARGS(( +S16 cmPkTfuUePuschCqiRecpInfo ARGS(( TfuUePuschCqiRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePuschCqiRecpInfo ARGS(( +S16 cmUnpkTfuUePuschCqiRecpInfo ARGS(( TfuUePuschCqiRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuUePuschHqRecpInfo ARGS(( +S16 cmPkTfuUePuschHqRecpInfo ARGS(( TfuUePuschHqRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUePuschHqRecpInfo ARGS(( +S16 cmUnpkTfuUePuschHqRecpInfo ARGS(( TfuUePuschHqRecpInfo *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuBfVectorInfo ARGS (( +S16 cmPkTfuBfVectorInfo ARGS (( TfuBfVectorInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuBfVectorInfo ARGS (( +S16 cmUnpkTfuBfVectorInfo ARGS (( TfuBfVectorInfo *param, Buffer *mBuf )); #endif /* TFU_UPGRADE */ /* tfu_x_001.main_8. Added changes of TFU_UPGRADE */ -EXTERN S16 cmPkTfuUeRecpReqInfo ARGS(( +S16 cmPkTfuUeRecpReqInfo ARGS(( TfuUeRecpReqInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuUeRecpReqInfo ARGS(( +S16 cmUnpkTfuUeRecpReqInfo ARGS(( TfuUeRecpReqInfo *param, Buffer *mBuf )); @@ -4366,7 +4366,7 @@ EXTERN S16 cmUnpkTfuUeRecpReqInfo ARGS(( * @param cqiInd Pointer to the TfuRawCqiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 cmPkTfuRawCqiInd ARGS(( +S16 cmPkTfuRawCqiInd ARGS(( Pst * pst, SuId suId, TfuRawCqiIndInfo * rawCqiInd @@ -4382,7 +4382,7 @@ EXTERN S16 cmPkTfuRawCqiInd ARGS(( * @param cqiInd Pointer to the TfuRawCqiIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 cmUnpkTfuRawCqiInd ARGS(( +S16 cmUnpkTfuRawCqiInd ARGS(( TfuRawCqiInd func, Pst * pst, Buffer *mBuf @@ -4397,7 +4397,7 @@ EXTERN S16 cmUnpkTfuRawCqiInd ARGS(( * @param srsInd Pointer to the TfuSrIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 cmPkTfuSrsInd ARGS(( +S16 cmPkTfuSrsInd ARGS(( Pst * pst, SuId suId, TfuSrsIndInfo * srsInd @@ -4412,7 +4412,7 @@ EXTERN S16 cmPkTfuSrsInd ARGS(( * @param srsInd Pointer to the TfuSrIndInfo structure. * @return ROK/RFAILED */ -EXTERN S16 cmUnpkTfuSrsInd ARGS(( +S16 cmUnpkTfuSrsInd ARGS(( TfuSrsInd func, Pst * pst, Buffer *mBuf @@ -4421,37 +4421,37 @@ EXTERN S16 cmUnpkTfuSrsInd ARGS(( /*tfu_x_001.main_6 - Added for SPS support*/ #ifdef LTEMAC_SPS -EXTERN S16 cmPkTfuAllocMap ARGS(( +S16 cmPkTfuAllocMap ARGS(( TfuAllocMap *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuAllocMap ARGS(( +S16 cmUnpkTfuAllocMap ARGS(( TfuAllocMap *param, Buffer *mBuf )); #ifdef EMTC_ENABLE -EXTERN S16 cmPkTfuDciFormat6AAllocInfo ARGS(( +S16 cmPkTfuDciFormat6AAllocInfo ARGS(( TfuDciFormat61AllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat6AAllocInfo ARGS(( +S16 cmUnpkTfuDciFormat6AAllocInfo ARGS(( TfuDciFormat61AllocInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat61aInfo ARGS(( +S16 cmUnpkTfuDciFormat61aInfo ARGS(( TfuDciFormat61aInfo *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfuDciFormat62Info ARGS(( +S16 cmUnpkTfuDciFormat62Info ARGS(( TfuDciFormat62Info *param, Buffer *mBuf )); -EXTERN S16 cmUnpkTfudciformat61aPdsch ARGS(( +S16 cmUnpkTfudciformat61aPdsch ARGS(( Tfudciformat61aPdsch *param, Buffer *mBuf )); -EXTERN S16 cmPkTfuDciFormat61aInfo ARGS(( +S16 cmPkTfuDciFormat61aInfo ARGS(( TfuDciFormat61aInfo *param, Buffer *mBuf )); @@ -4461,13 +4461,13 @@ EXTERN S16 cmPkTfuDciFormat61aInfo ARGS(( #endif /* LTE_UNLICENSED */ -EXTERN S16 cmPkTfuErrInd ARGS(( +S16 cmPkTfuErrInd ARGS(( Pst * pst, SuId suId, TfuErrIndInfo * errInd )); -EXTERN S16 cmUnpkTfuErrInd ARGS(( +S16 cmUnpkTfuErrInd ARGS(( TfuErrInd func, Pst * pst, Buffer *mBuf diff --git a/src/cu_stub/cu_stub_egtp.h b/src/cu_stub/cu_stub_egtp.h index cdc65a9d4..02b11d475 100644 --- a/src/cu_stub/cu_stub_egtp.h +++ b/src/cu_stub/cu_stub_egtp.h @@ -124,7 +124,7 @@ typedef struct egtpGlobalCb EgtpTptSrvr recvTptSrvr; /* Transport server for receiving UDP msg */ EgtpDstCb dstCb; /* Destination endpoint */ }EgtpGlobalCb; -extern EgtpGlobalCb egtpCb; /* EGTP global control block */ +EgtpGlobalCb egtpCb; /* EGTP global control block */ S16 egtpActvInit(); S16 cuEgtpCfgReq(); diff --git a/src/cu_stub/cu_stub_sctp.h b/src/cu_stub/cu_stub_sctp.h index 50a455cad..8cb745615 100644 --- a/src/cu_stub/cu_stub_sctp.h +++ b/src/cu_stub/cu_stub_sctp.h @@ -64,10 +64,10 @@ typedef struct CmInetNetAddr destIpNetAddr; /* DU Ip address */ }CuSctpDestCb; -EXTERN S16 sctpActvInit(); -EXTERN S16 sctpStartReq(); -EXTERN S16 sctpSend(Buffer *mBuf); -EXTERN S16 sctpCfgReq(); +S16 sctpActvInit(); +S16 sctpStartReq(); +S16 sctpSend(Buffer *mBuf); +S16 sctpCfgReq(); S16 fillAddrLst(CmInetNetAddrLst *addrLstPtr, SctpIpAddr *ipAddr); S16 fillDestNetAddr(CmInetNetAddr *destAddrPtr, SctpIpAddr *dstIpPtr); diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index 655801fb9..4e22d3251 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -36,8 +36,8 @@ #include "du_cell_mgr.h" #include "du_f1ap_msg_hdl.h" -extern DuCfgParams duCfgParam; -uint8_t duBuildAndSendMacCellCfg(uint16_t cellId); +DuCfgParams duCfgParam; +uint8_t duBuildAndSendMacCellCfg(); /******************************************************************* * diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 3e821049a..a0b3fdc0f 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -52,8 +52,8 @@ #include "BWP-DownlinkCommon.h" #include "BWP-UplinkCommon.h" -extern DuCfgParams duCfgParam; -extern char encBuf[ENC_BUF_MAX_LEN]; +DuCfgParams duCfgParam; +char encBuf[ENC_BUF_MAX_LEN]; /* Filling Slot configuration as : diff --git a/src/du_app/du_egtp.h b/src/du_app/du_egtp.h index 3bcdbec13..5fb3d653c 100644 --- a/src/du_app/du_egtp.h +++ b/src/du_app/du_egtp.h @@ -72,7 +72,7 @@ typedef struct egtpGlobalCb EgtpTptSrvr recvTptSrvr; /* Transport server for receiving UDP msg */ EgtpDstCb dstCb; /* Destination endpoint */ }EgtpGlobalCb; -extern EgtpGlobalCb egtpCb; /* EGTP global control block */ +EgtpGlobalCb egtpCb; /* EGTP global control block */ uint8_t duHdlEgtpDlData(EgtpMsg *egtpMsg); uint8_t egtpActvInit(Ent entity, Inst inst, Region region, Reason reason); diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c index d8aebb717..8456b8f70 100644 --- a/src/du_app/du_f1ap_msg_hdl.c +++ b/src/du_app/du_f1ap_msg_hdl.c @@ -76,7 +76,7 @@ #include "du_mgr.h" #include "du_f1ap_msg_hdl.h" -extern DuCfgParams duCfgParam; +DuCfgParams duCfgParam; uint8_t procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg); uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg); diff --git a/src/du_app/du_f1ap_msg_hdl.h b/src/du_app/du_f1ap_msg_hdl.h index cb3c1fd08..c83a77133 100644 --- a/src/du_app/du_f1ap_msg_hdl.h +++ b/src/du_app/du_f1ap_msg_hdl.h @@ -42,6 +42,7 @@ uint8_t BuildAndSendUeCtxtRsp(uint8_t ueIdx, uint8_t cellId); uint8_t getDrbLcId(uint32_t *drbBitMap); void freeMacLcCfg(LcCfg *lcCfg); void freeRlcLcCfg(RlcBearerCfg *lcCfg); +uint8_t BuildAndSendRrcDeliveryReport(uint32_t gnbCuUeF1apId, uint32_t gnbDuUeF1apId, RrcDeliveryReport *rrcDelivery); /********************************************************************** End of file **********************************************************************/ diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c index c82904527..c834d2b08 100644 --- a/src/du_app/du_mgr_ex_ms.c +++ b/src/du_app/du_mgr_ex_ms.c @@ -40,11 +40,11 @@ #include "du_ue_mgr.h" #include "du_utils.h" -extern uint8_t unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf); -extern uint8_t cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf); -extern uint8_t cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf); -extern uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf); -extern uint8_t cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf); +uint8_t unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf); +uint8_t cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf); +uint8_t cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf); +uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf); +uint8_t cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf); /************************************************************************** * @brief Task Initiation callback function. * diff --git a/src/du_app/du_mgr_main.c b/src/du_app/du_mgr_main.c index 2f7e12873..e7a08216d 100644 --- a/src/du_app/du_mgr_main.c +++ b/src/du_app/du_mgr_main.c @@ -30,12 +30,12 @@ #include "du_sctp.h" #include "du_egtp.h" -extern uint8_t rlcUlActvTsk (Pst *, Buffer *); -extern uint8_t rlcUlActvInit (Ent, Inst, Region, Reason); -extern uint8_t rlcDlActvTsk (Pst *, Buffer *); -extern uint8_t rlcDlActvInit (Ent, Inst, Region, Reason); -extern uint8_t rgActvTsk (Pst *, Buffer *); -extern uint8_t rgActvInit (Ent, Inst, Region, Reason); +uint8_t rlcUlActvTsk (Pst *, Buffer *); +uint8_t rlcUlActvInit (Ent, Inst, Region, Reason); +uint8_t rlcDlActvTsk (Pst *, Buffer *); +uint8_t rlcDlActvInit (Ent, Inst, Region, Reason); +uint8_t rgActvTsk (Pst *, Buffer *); +uint8_t rgActvInit (Ent, Inst, Region, Reason); /* Global variable */ DuCfgParams duCfgParam; diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c index 81cc51664..2a677d1c2 100644 --- a/src/du_app/du_msg_hdl.c +++ b/src/du_app/du_msg_hdl.c @@ -46,16 +46,15 @@ uint8_t numRlcMacSaps = 0; uint8_t macCfg = 0; uint8_t macCfgInst = 0; -extern DuCfgParams duCfgParam; -extern uint8_t packRlcConfigReq(Pst *pst, RlcMngmt *cfg); -extern uint8_t cmPkLkwCntrlReq(Pst *pst, RlcMngmt *cfg); -extern uint8_t cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg); -extern uint8_t BuildAndSendE2SetupReq(); -extern uint8_t egtpHdlDatInd(EgtpMsg egtpMsg); -extern uint8_t BuildAndSendDUConfigUpdate(); -extern uint16_t getTransId(); -extern uint8_t cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg); -uint8_t BuildAndSendRrcDeliveryReport(uint32_t gnbCuUeF1apId, uint32_t gnbDuUeF1apId, RrcDeliveryReport *rrcDelivery); +DuCfgParams duCfgParam; +uint8_t packRlcConfigReq(Pst *pst, RlcMngmt *cfg); +uint8_t cmPkLkwCntrlReq(Pst *pst, RlcMngmt *cfg); +uint8_t cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg); +uint8_t BuildAndSendE2SetupReq(); +uint8_t egtpHdlDatInd(EgtpMsg egtpMsg); +uint8_t BuildAndSendDUConfigUpdate(); +uint16_t getTransId(); +uint8_t cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg); packMacCellCfgReq packMacCellCfgOpts[] = { diff --git a/src/du_app/du_sys_info_hdl.h b/src/du_app/du_sys_info_hdl.h index 0fc8d7ac9..e93537355 100644 --- a/src/du_app/du_sys_info_hdl.h +++ b/src/du_app/du_sys_info_hdl.h @@ -32,8 +32,8 @@ uint8_t BuildMibPdu(); uint8_t BuildMibMsg(); uint8_t BuildSib1Msg(); -extern char encBuf[ENC_BUF_MAX_LEN]; -extern DuCfgParams duCfgParam; +char encBuf[ENC_BUF_MAX_LEN]; +DuCfgParams duCfgParam; /********************************************************************** End of file diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 725a850c4..4127603c5 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -159,18 +159,18 @@ #endif #ifdef INTEL_WLS -EXTERN void LwrMacRecvPhyMsg(); +void LwrMacRecvPhyMsg(); #endif #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -EXTERN S16 rgBatchProc (Void); +S16 rgBatchProc (Void); #endif #ifdef RLC_MAC_DAT_REQ_RBUF -EXTERN S16 rgDlDatReqBatchProc ARGS(( +S16 rgDlDatReqBatchProc ARGS(( Void)); #endif #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -EXTERN S16 rgBatchProc ARGS(( +S16 rgBatchProc ARGS(( Void)); #endif @@ -203,12 +203,12 @@ Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func)); void dump_external(void); #ifdef ANSI -PRIVATE Void mtDelSigals +static Void mtDelSigals ( Void ) #else -PRIVATE Void mtDelSignals() +static Void mtDelSignals() #endif { struct sigaction sa; @@ -324,18 +324,18 @@ void *pthreadCreateHdlr(void* arg); Buffer *mtTskBuffer1; Buffer *mtTskBuffer2; -EXTERN pthread_t tmpRegTidMap[20]; -EXTERN uint8_t stopBtInfo; -EXTERN S16 SGlobMemInfoShow(void); +pthread_t tmpRegTidMap[20]; +uint8_t stopBtInfo; + S16 SGlobMemInfoShow(void); #endif /* SS_LOCKLESS_MEMORY */ #ifdef L2_L3_SPLIT -EXTERN APP_CONTEXT AppContext; -EXTERN S32 clusterMode; +APP_CONTEXT AppContext; +S32 clusterMode; #endif #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN unsigned int tlPost(void *handle); +unsigned int tlPost(void *handle); #endif /* forward references */ @@ -346,56 +346,56 @@ Void *mtTskHdlrT2kL2 ARGS((Void*)); void mtSigUsr2Hndlr ARGS((void)); #endif -PRIVATE S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); -PRIVATE Void *mtTskHdlr ARGS((void *)); -PRIVATE S16 mtTskHdlMsg ARGS((SsSTskEntry *sTsk)); +static S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); +static Void *mtTskHdlr ARGS((void *)); +static S16 mtTskHdlMsg ARGS((SsSTskEntry *sTsk)); -PRIVATE Void *mtTmrHdlr ARGS((void *)); -PRIVATE Void mtTimeout ARGS((PTR tCb, S16 evnt)); +static Void *mtTmrHdlr ARGS((void *)); +static Void mtTimeout ARGS((PTR tCb, S16 evnt)); /*mt010.301 Fix for core when run with -o option and when killed with SIGINT*/ -PRIVATE Void mtIntSigHndlr ARGS((int)); -PRIVATE Void mtExitClnup ARGS((void)); +static Void mtIntSigHndlr ARGS((int)); +static Void mtExitClnup ARGS((void)); #ifdef CONAVL -PRIVATE Void *mtConHdlr ARGS((void *)); +static Void *mtConHdlr ARGS((void *)); #endif #ifndef L2_L3_SPLIT #ifdef SS_DRVR_SUPPORT -PRIVATE Void *mtIsTskHdlr ARGS((void *)); +static Void *mtIsTskHdlr ARGS((void *)); #endif #endif /* mt020.201 - Addition for no command line available */ #ifndef NOCMDLINE -PRIVATE Void mtGetOpts ARGS((void)); +static Void mtGetOpts ARGS((void)); /* mt003.301 Additions - File Based task registration made * common for both MULTICORE and NON-MULTICORE */ -PRIVATE Bool fileBasedMemCfg = FALSE; +static Bool fileBasedMemCfg = FALSE; #endif /* mt033.201 - addition of local function to print the statistics such as * (size vs. numAttempts) and (allocations vs. deallocations) */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 SPrintRegMemStats ARGS((Region region)); +static S16 SPrintRegMemStats ARGS((Region region)); #endif /* SSI_DEBUG_LEVEL1 */ #ifdef SS_MULTICORE_SUPPORT -PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void); -PRIVATE SsSTskEntry* ssdReAddTmrSTsk ARGS((uint8_t idx)); +static SsSTskEntry* ssdAddTmrSTsk(Void); +static SsSTskEntry* ssdReAddTmrSTsk ARGS((uint8_t idx)); #ifndef SS_LOCKLESS_MEMORY #ifndef RGL_SPECIFIC_CHANGES -PRIVATE S16 ssdInitMemInfo ARGS((void)); +static S16 ssdInitMemInfo ARGS((void)); #endif #endif #endif /* mt005.301: Cavium changes */ #ifdef SS_SEUM_CAVIUM -PRIVATE Void *workRcvTsk ARGS((void *)); +static Void *workRcvTsk ARGS((void *)); #endif /* SS_SEUM_CAVIUM */ #ifdef SS_THR_REG_MAP @@ -719,14 +719,14 @@ typedef struct _MtRegMemSz uint8_t *startAddr; }MtRegMemSz; -PRIVATE MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; +static MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; #endif /* private variable declarations */ /* mt018.201 - change mtCMMRegCfg as array of pointers */ -PRIVATE CmMmRegCfg *mtCMMRegCfg[SS_MAX_REGS]; -PRIVATE CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; +static CmMmRegCfg *mtCMMRegCfg[SS_MAX_REGS]; +static CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; /* mt003.301 - Fixed compilation warnings */ /*mt004.301-addede new veriable for FAP*/ /*mt010.301 - removed veriable defined for FA*/ @@ -753,11 +753,11 @@ void * mtGetWlsHdl() } #ifdef XEON_MULTIPLE_CELL_CHANGES -EXTERN S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN]; -EXTERN S16 smWrReadWlsConfigParams (Void); +S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN]; +S16 smWrReadWlsConfigParams (Void); #endif -PRIVATE int SOpenWlsIntf() +static int SOpenWlsIntf() { void *hdl; #define WLS_DEVICE_NAME "/dev/wls" @@ -1375,7 +1375,7 @@ uint32_t doNotBlockForLock; /* Boolean whether to block for #define NUM_CALLS_TO_CHECK_MEM_DYN_AGAIN 100 uint32_t gDynMemAlrm[4]; -PRIVATE uint32_t memoryCheckCounter; +static uint32_t memoryCheckCounter; #ifdef ANSI uint32_t isMemThreshReached( @@ -1473,7 +1473,7 @@ Region region; #endif /* SS_USE_ICC_MEMORY */ #ifdef T2K_MEM_LEAK_DBG -extern RegionMemLeakInfo regMemLeakInfo; +RegionMemLeakInfo regMemLeakInfo; #endif /* T2K_MEM_LEAK_DBG */ #ifdef INTEL_WLS @@ -2918,12 +2918,12 @@ uint32_t type; * */ #ifdef ANSI -PRIVATE Void mtGetOpts +static Void mtGetOpts ( void ) #else -PRIVATE Void mtGetOpts() +static Void mtGetOpts() #endif { S32 argc; @@ -3781,13 +3781,13 @@ void* arg; */ #ifdef ANSI -PRIVATE S16 ssdSetPthreadAttr +static S16 ssdSetPthreadAttr ( S32 tskPrior, pthread_attr_t *attr ) #else -PRIVATE S16 ssdSetPthreadAttr(sTsk, attr) +static S16 ssdSetPthreadAttr(sTsk, attr) S32 tskPrior, pthread_attr_t *attr #endif @@ -4691,9 +4691,9 @@ SsIdx idx; //#ifndef SPLIT_RLC_DL_TASK #ifdef TENB_T2K3K_SPECIFIC_CHANGES #if defined (L2_L3_SPLIT) && defined(SPLIT_RLC_DL_TASK) -EXTERN Void ysMtTskHdlr(Void); -EXTERN Void ysMtPollPhyMsg(uint8_t region); -EXTERN Void ysMtRcvPhyMsg(Void); +Void ysMtTskHdlr(Void); +Void ysMtPollPhyMsg(uint8_t region); +Void ysMtRcvPhyMsg(Void); #ifdef ANSI Void *mtTskHdlrT2kL2 ( @@ -4728,8 +4728,8 @@ Ptr tskPtr; /* pointer to task entry */ return (NULLP); } #else -EXTERN Void ysMtTskHdlr(Void); -EXTERN Void YsPhyRecvMsg(); +Void ysMtTskHdlr(Void); +Void YsPhyRecvMsg(); #ifdef ANSI Void *mtTskHdlrT2kL2 ( @@ -5344,13 +5344,13 @@ Void mtTmrHdlrPublic() */ /*mt041.201 Modified SSI tick handling in mtTmrHdlr() */ #ifdef ANSI -PRIVATE Void *mtTmrHdlr +static Void *mtTmrHdlr ( void *parm /* unused */ ) #else /* mt009.21: addition */ -PRIVATE Void *mtTmrHdlr(parm) +static Void *mtTmrHdlr(parm) void *parm; /* unused */ #endif { @@ -5366,7 +5366,7 @@ void *parm; /* unused */ S16 ret; /* mt039.201 changes for nanosleep */ struct timespec tsN; - PRIVATE uint32_t err_in_usec; + static uint32_t err_in_usec; /*mt013.301 : doesn't need TRC macro ,as this will never return*/ @@ -5743,13 +5743,13 @@ S16 evnt; /* event */ * */ #ifdef ANSI -PRIVATE Void *mtConHdlr +static Void *mtConHdlr ( Ptr parm /* unused */ ) #else /* mt009.21: addition */ -PRIVATE Void *mtConHdlr(parm) +static Void *mtConHdlr(parm) Ptr parm; /* unused */ #endif { @@ -5812,13 +5812,13 @@ Ptr parm; /* unused */ */ #ifdef ANSI /* mt009.21: addition */ -PRIVATE Void *mtIsTskHdlr +static Void *mtIsTskHdlr ( Ptr tskPtr /* pointer to task entry */ ) #else /* mt009.21: addition */ -PRIVATE Void *mtIsTskHdlr(tskPtr) +static Void *mtIsTskHdlr(tskPtr) Ptr tskPtr; /* pointer to task entry */ #endif { @@ -6251,7 +6251,7 @@ EpcTime *et; /* date and time */ #endif { /* mt003.301 Modifications */ -PRIVATE uint64_t now; +static uint64_t now; uint64_t to_sec = 1000000; uint64_t to_nsec = 1000; #ifndef SS_LINUX @@ -6582,12 +6582,12 @@ S16 SRelInt() * */ #ifdef ANSI -INLINE S16 SEnbInt +inline S16 SEnbInt ( void ) #else -INLINE S16 SEnbInt() +inline S16 SEnbInt() #endif { @@ -6611,12 +6611,12 @@ INLINE S16 SEnbInt() * */ #ifdef ANSI -INLINE S16 SDisInt +inline S16 SDisInt ( void ) #else -INLINE S16 SDisInt() +inline S16 SDisInt() #endif { @@ -6867,13 +6867,13 @@ Inst inst; /* instance */ * */ #ifdef ANSI -INLINE S16 SSetIntPend +inline S16 SSetIntPend ( uint16_t id, /* driver task identifier */ Bool flag /* flag */ ) #else -INLINE S16 SSetIntPend(id, flag) +inline S16 SSetIntPend(id, flag) uint16_t id; /* driver task identifier */ Bool flag; /* flag */ #endif @@ -7132,13 +7132,13 @@ uint32_t SMemMidThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; uint32_t SMemLowThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; #ifdef ANSI -PRIVATE Void SInitMemThreshold +static Void SInitMemThreshold ( Region region, uint8_t maxBkt ) #else -PRIVATE Void SInitMemThreshold(region, maxBkt) +static Void SInitMemThreshold(region, maxBkt) Region region; uint8_t maxBkt; #endif @@ -7167,7 +7167,7 @@ uint8_t maxBkt; { uint8_t idx = 0; uint8_t memStatus = 3; - PRIVATE uint8_t initFlag = 1; + static uint8_t initFlag = 1; if(initFlag) { initFlag = 0; @@ -7425,12 +7425,12 @@ uint8_t typeFlag; * */ #ifdef ANSI -PRIVATE S16 SPrintRegMemStats +static S16 SPrintRegMemStats ( Region region ) #else -PRIVATE S16 SPrintRegMemStats(region) +static S16 SPrintRegMemStats(region) Region region; #endif { @@ -7911,9 +7911,9 @@ uint32_t SGetSystemTsk() * --*/ #ifdef ANSI -PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void) +static SsSTskEntry* ssdAddTmrSTsk(Void) #else -PRIVATE SsSTskEntry* ssdAddTmrSTsk() +static SsSTskEntry* ssdAddTmrSTsk() #endif { SsSTskEntry *sTsk; @@ -8420,12 +8420,12 @@ S16 ssInitRcvWork() **/ #ifdef ANSI -PRIVATE void *workRcvTsk +static void *workRcvTsk ( Ptr ptr ) #else -PRIVATE void *workRcvTsk (ptr) +static void *workRcvTsk (ptr) Ptr ptr; #endif { @@ -8593,9 +8593,9 @@ pthread_t threadId, /* Thread Id of system task */ Region region /* Region associated with thread */ ) { - PRIVATE uint32_t createdThreads; - PRIVATE pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; - uint32_t indx; + static uint32_t createdThreads; + static pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; + uint32_t indx; /* Here 0xFF is considered as invalid region and if the mapping table @@ -8710,13 +8710,13 @@ pthread_t threadId /* Thread Id of system task */ #ifdef ANSI S16 SStartTask ( -VOLATILE uint32_t *startTime, -uint32_t taskId +volatile uint32_t *startTime, +uint32_t taskId ) #else S16 SStartTask(startTime, taskId) -VOLATILE uint32_t *startTime; -uint32_t taskId; +volatile uint32_t *startTime; +uint32_t taskId; #endif { #ifdef MSPD_MLOG_NEW @@ -8743,13 +8743,13 @@ uint32_t taskId; #ifdef ANSI S16 SStopTask ( -VOLATILE uint32_t startTime, -uint32_t taskId +volatile uint32_t startTime, +uint32_t taskId ) #else S16 SStopTask(startTime, taskId) -VOLATILE uint32_t startTime; -uint32_t taskId; +volatile uint32_t startTime; +uint32_t taskId; #endif { /*uint32_t stopTime;*/ @@ -8792,13 +8792,13 @@ uint32_t taskId; #ifdef ANSI S16 SStartTask ( -VOLATILE uint32_t *startTime, -uint32_t taskId +volatile uint32_t * startTime, +uint32_t taskId ) #else S16 SStartTask(startTime, taskId) -VOLATILE uint32_t *startTime; -uint32_t taskId; +volatile uint32_t * startTime; +uint32_t taskId; #endif { *startTime = 0; @@ -8808,13 +8808,13 @@ uint32_t taskId; #ifdef ANSI S16 SStopTask ( -VOLATILE uint32_t startTime, -uint32_t taskId +volatile uint32_t startTime, +uint32_t taskId ) #else S16 SStopTask(startTime, taskId) -VOLATILE uint32_t startTime; -uint32_t taskId; +volatile uint32_t startTime; +uint32_t taskId; #endif { return ROK; @@ -8922,11 +8922,11 @@ uint8_t idx; * --*/ #ifdef ANSI -PRIVATE SsSTskEntry* ssdReAddTmrSTsk( +static SsSTskEntry* ssdReAddTmrSTsk( uint8_t idx ) #else -PRIVATE SsSTskEntry* ssdReAddTmrSTsk(idx) +static SsSTskEntry* ssdReAddTmrSTsk(idx) uint8_t idx; #endif { diff --git a/src/mt/mt_ss.h b/src/mt/mt_ss.h index cf9c32519..a39b78202 100755 --- a/src/mt/mt_ss.h +++ b/src/mt/mt_ss.h @@ -133,8 +133,10 @@ #ifndef TENB_RTLIN_CHANGES #define SInitLock(l, t) pthread_mutex_init(l, NULL) #endif -/*extern uint32_t gt[128]; */ -/*#define SLock(l) (((gt[0x000000FF &((uint32_t)pthread_self())]=MacGetTick())&&pthread_mutex_lock(l)&&MLogTask(30340, RESOURCE_LINL2, gt[0x000000FF &((uint32_t)pthread_self())], MacGetTick()))?0:0)*/ +/*uint32_t gt[128]; */ +/*#define SLock(l) (((gt[0x000000FF + * &((uint32_t)pthread_self())]=MacGetTick())&&pthread_mutex_lock(l)&&MLogTask(30340, RESOURCE_LINL2, gt[0x000000FF + * &((uint32_t)pthread_self())], MacGetTick()))?0:0)*/ #define SLock(l) pthread_mutex_lock(l) #define SUnlock(l) pthread_mutex_unlock(l) #define SDestroyLock(l) pthread_mutex_destroy(l) diff --git a/src/mt/mt_ss.x b/src/mt/mt_ss.x index 4f0529fb0..56bb92078 100755 --- a/src/mt/mt_ss.x +++ b/src/mt/mt_ss.x @@ -162,7 +162,7 @@ typedef struct sLockInfo }SLockInfo; #endif /* SS_LOCK_SUPPORT */ -extern uint32_t gt[128]; +uint32_t gt[128]; #endif /* __MTSSX__ */ diff --git a/src/mt/ss_gen.c b/src/mt/ss_gen.c index 83c06c07a..4029afa57 100644 --- a/src/mt/ss_gen.c +++ b/src/mt/ss_gen.c @@ -110,34 +110,34 @@ /*ss014.301: SSI-4GMX related changes*/ #ifdef SS_4GMX_LCORE -VOLATILE SsOs osCp; /* common OS control point */ +volatile SsOs osCp; /* common OS control point */ #else SsOs osCp; /* common OS control point */ #endif -EXTERN Cntr cfgNumRegs; -EXTERN SsRegCfg cfgRegInfo[SS_MAX_REGS]; +Cntr cfgNumRegs; +SsRegCfg cfgRegInfo[SS_MAX_REGS]; /* ss029.103: modification: multiple procId related changes */ #ifdef SS_MULTIPLE_PROCS -/* PRIVATE functions */ -PRIVATE S16 SInsProcId ARGS((ProcId proc)); -PRIVATE S16 SRemProcId ARGS((ProcId proc)); -PRIVATE S16 SLockOsCp ARGS((Void)); -PRIVATE S16 SULockOsCp ARGS((Void)); +/* static functions */ +static S16 SInsProcId ARGS((ProcId proc)); +static S16 SRemProcId ARGS((ProcId proc)); +static S16 SLockOsCp ARGS((Void)); +static S16 SULockOsCp ARGS((Void)); #endif /* SS_MULTIPLE_PROCS */ #ifdef SSI_STATIC_MEM_LEAK_DETECTION -PRIVATE void InitializeForStaticMemLeak ARGS((void)); -PRIVATE void InitializeStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo)); +static void InitializeForStaticMemLeak ARGS((void)); +static void InitializeStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo)); uint32_t GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo)); void FreeIdx ARGS((uint8_t* ptr, uint32_t idx, StaticMemAllocInfo* memAllocInfo,uint32_t size, char* file, uint32_t line)); void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* file, uint32_t line, uint32_t size, void* ptr, uint32_t idx)); -PRIVATE void PrintStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo, FILE +static void PrintStaticMemAllocInfo ARGS((StaticMemAllocInfo* memAllocInfo, FILE *opFile)); #endif /* ss001.301: additions */ @@ -1118,12 +1118,12 @@ ProcId proc; * */ #ifdef ANSI -PRIVATE S16 SInsProcId +static S16 SInsProcId ( ProcId proc ) #else -PRIVATE S16 SInsProcId(proc) +static S16 SInsProcId(proc) ProcId proc; #endif { @@ -1168,12 +1168,12 @@ ProcId proc; * */ #ifdef ANSI -PRIVATE S16 SRemProcId +static S16 SRemProcId ( ProcId proc ) #else -PRIVATE S16 SRemProcId(proc) +static S16 SRemProcId(proc) ProcId proc; #endif { @@ -1218,12 +1218,12 @@ ProcId proc; * */ #ifdef ANSI -PRIVATE S16 SLockOsCp +static S16 SLockOsCp ( Void ) #else -PRIVATE S16 SLockOsCp(Void) +static S16 SLockOsCp(Void) #endif { S16 ret; @@ -1277,12 +1277,12 @@ PRIVATE S16 SLockOsCp(Void) * */ #ifdef ANSI -PRIVATE S16 SULockOsCp +static S16 SULockOsCp ( Void ) #else -PRIVATE S16 SULockOsCp(Void) +static S16 SULockOsCp(Void) #endif { diff --git a/src/mt/ss_gen.x b/src/mt/ss_gen.x index 67d654d7a..bbd4f3197 100755 --- a/src/mt/ss_gen.x +++ b/src/mt/ss_gen.x @@ -70,9 +70,9 @@ typedef struct { /* ss002.301: Modifications */ #ifdef SS_THREAD_PROFILE #ifdef SS_MULTIPLE_PROCS -EXTERN S16 SGetThrdProf(SSTskId *sTskId,ProcId procId,Ent ent,Inst inst,Event *curEvent,uint32_t *curEvtTime,uint64_t *totTime); +S16 SGetThrdProf(SSTskId *sTskId,ProcId procId,Ent ent,Inst inst,Event *curEvent,uint32_t *curEvtTime,uint64_t *totTime); #else -EXTERN S16 SGetThrdProf(SSTskId *sTskId,Ent ent,Inst inst,Event *curEvent,uint32_t *curEvtTime,uint64_t *totTime); +S16 SGetThrdProf(SSTskId *sTskId,Ent ent,Inst inst,Event *curEvent,uint32_t *curEvtTime,uint64_t *totTime); #endif /* SS_MULTIPLE_PROCS */ #endif /* SS_THERAD_PROFILE */ @@ -116,11 +116,11 @@ typedef struct ssWdCp{ SsWd globWd; SLockId wdLock; } SsWdCp; -EXTERN S16 SInitWatchdog(uint16_t port); -EXTERN S16 SRegCfgWd(uint32_t numNodes, uint8_t *addr[], uint16_t port[], uint32_t timeout, WdUserCallback callback, void *data); -EXTERN S16 SDeregCfgWd(void); -EXTERN S16 SStartHrtBt(uint8_t timeInterval); -EXTERN S16 SStopHrtBt(void); +S16 SInitWatchdog(uint16_t port); +S16 SRegCfgWd(uint32_t numNodes, uint8_t *addr[], uint16_t port[], uint32_t timeout, WdUserCallback callback, void *data); +S16 SDeregCfgWd(void); +S16 SStartHrtBt(uint8_t timeInterval); +S16 SStopHrtBt(void); #endif /* SS_WATCHDOG */ #ifdef SS_LOGGER_SUPPORT @@ -309,118 +309,118 @@ typedef struct ssRegCfg /* external variable declaration */ -/*ss014.301 EXTERN osCp as VOLATILE for SSI-4GMX*/ +/*ss014.301 osCp as volatile for SSI-4GMX*/ #ifdef SS_4GMX_LCORE -EXTERN VOLATILE SsOs osCp; +volatile SsOs osCp; #else -EXTERN SsOs osCp; +SsOs osCp; #endif /* functions */ -EXTERN S16 SInit ARGS((void)); +S16 SInit ARGS((void)); /*ss009.301*/ -EXTERN S16 SFini ARGS((void)); +S16 SFini ARGS((void)); /* ss034.103 */ -EXTERN S16 SDeInit ARGS((void)); +S16 SDeInit ARGS((void)); /* implementation-specific functions */ -EXTERN S16 ssdInitGen ARGS((void)); -EXTERN S16 ssdInitMem ARGS((void)); -EXTERN S16 ssdInitTsk ARGS((void)); -EXTERN S16 ssdInitDrvr ARGS((void)); -EXTERN S16 ssdInitTmr ARGS((void)); -EXTERN S16 ssdReInitTmr ARGS((void)); +S16 ssdInitGen ARGS((void)); +S16 ssdInitMem ARGS((void)); +S16 ssdInitTsk ARGS((void)); +S16 ssdInitDrvr ARGS((void)); +S16 ssdInitTmr ARGS((void)); +S16 ssdReInitTmr ARGS((void)); /* ss005.301: ssdInitFinal changed to ssdInitLog */ -EXTERN S16 ssdInitLog ARGS((void)); +S16 ssdInitLog ARGS((void)); -EXTERN Void ssdDeinitGen ARGS((void)); -EXTERN Void ssdDeinitMem ARGS((void)); -EXTERN Void ssdDeinitTsk ARGS((void)); -EXTERN Void ssdDeinitDrvr ARGS((void)); -EXTERN Void ssdDeinitTmr ARGS((void)); +Void ssdDeinitGen ARGS((void)); +Void ssdDeinitMem ARGS((void)); +Void ssdDeinitTsk ARGS((void)); +Void ssdDeinitDrvr ARGS((void)); +Void ssdDeinitTmr ARGS((void)); /* ss005.301: ssdDeinitFinal changed to ssdDeinitLog */ -EXTERN Void ssdDeinitLog ARGS((void)); - -EXTERN Void ssdStart ARGS((void)); - -EXTERN S16 ssdAttachTTsk ARGS((SsTTskEntry *)); -EXTERN S16 ssdDetachTTsk ARGS((SsTTskEntry *)); -EXTERN S16 ssdCreateSTsk ARGS((SsSTskEntry *)); -EXTERN S16 ssdDestroySTsk ARGS((SsSTskEntry *)); -EXTERN S16 ssdPstTsk ARGS((Pst *, Buffer *, SsTTskEntry *)); -EXTERN S16 ssdRegTmr ARGS((SsTmrEntry *)); -EXTERN S16 ssdDeregTmr ARGS((SsTmrEntry *)); -EXTERN S16 ssdError ARGS((Seq, Reason)); -EXTERN Void ssdLogError ARGS((Ent, Inst, ProcId, Txt *, S32, \ +Void ssdDeinitLog ARGS((void)); + +Void ssdStart ARGS((void)); + +S16 ssdAttachTTsk ARGS((SsTTskEntry *)); +S16 ssdDetachTTsk ARGS((SsTTskEntry *)); +S16 ssdCreateSTsk ARGS((SsSTskEntry *)); +S16 ssdDestroySTsk ARGS((SsSTskEntry *)); +S16 ssdPstTsk ARGS((Pst *, Buffer *, SsTTskEntry *)); +S16 ssdRegTmr ARGS((SsTmrEntry *)); +S16 ssdDeregTmr ARGS((SsTmrEntry *)); +S16 ssdError ARGS((Seq, Reason)); +Void ssdLogError ARGS((Ent, Inst, ProcId, Txt *, S32, \ ErrCls, ErrCode, ErrVal, Txt *)); -EXTERN Void mtTmrHdlrPublic ARGS ((void)); +Void mtTmrHdlrPublic ARGS ((void)); /* * SDeRegTTsk patch */ /* for TTask Dereg */ #ifdef SS_MULTIPLE_PROCS -EXTERN S16 ssdProcTTskTerm ARGS((ProcId proc, SsTTskEntry *tTsk, SsIdx idx)); +S16 ssdProcTTskTerm ARGS((ProcId proc, SsTTskEntry *tTsk, SsIdx idx)); #else -EXTERN S16 ssdProcTTskTerm ARGS((SsTTskEntry *tTsk, SsIdx idx)); +S16 ssdProcTTskTerm ARGS((SsTTskEntry *tTsk, SsIdx idx)); #endif /* SS_MULTIPLE_PROCS */ #ifdef SS_DRVR_SUPPORT -EXTERN S16 ssdRegDrvrTsk ARGS((SsDrvrTskEntry *)); +S16 ssdRegDrvrTsk ARGS((SsDrvrTskEntry *)); /*ss001.301: Additions */ -EXTERN S16 ssdDeregDrvrTsk ARGS((SsDrvrTskEntry *)); +S16 ssdDeregDrvrTsk ARGS((SsDrvrTskEntry *)); #endif /* ss029.103: addition: support function to implement multiple procIds */ #ifdef SS_MULTIPLE_PROCS -EXTERN uint16_t SGetProcIdIdx ARGS((ProcId proc)); +uint16_t SGetProcIdIdx ARGS((ProcId proc)); #endif /* SS_MULTIPLE_PROCS */ /* multi-core support */ /*ss013.301 : changes for SS_AFFINITY_SUPPORT*/ #if defined(SS_MULTICORE_SUPPORT) || defined(SS_AFFINITY_SUPPORT) -EXTERN S16 ssdSetAffinity ARGS((SSTskId *tskId, uint32_t coreId)); -EXTERN S16 ssdGetAffinity ARGS((SSTskId *tskId, uint32_t *coreId)); +S16 ssdSetAffinity ARGS((SSTskId *tskId, uint32_t coreId)); +S16 ssdGetAffinity ARGS((SSTskId *tskId, uint32_t *coreId)); #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ /* ss001.301: additions */ #ifdef SS_LOGGER_SUPPORT -EXTERN S16 ssdInitLogger ARGS((void)); -EXTERN S16 SFlushBufToLog ARGS (( S8 *logBuf)); +S16 ssdInitLogger ARGS((void)); +S16 SFlushBufToLog ARGS (( S8 *logBuf)); /* ss02.301: additions */ -EXTERN S16 SCleanUp ARGS ((Void )); -EXTERN Void SStartLogger ARGS ((Void )); -EXTERN Void SStopLogger ARGS ((Void )); +S16 SCleanUp ARGS ((Void )); +Void SStartLogger ARGS ((Void )); +Void SStopLogger ARGS ((Void )); #endif /* SS_LOGGER_SUPPORT */ /* ss02.301: additions */ #ifdef SS_WATCHDOG #ifdef SS_MULTIPLE_PROCS -EXTERN S16 ssdWatchDgActvTmr ARGS(( ProcId proc, Ent ent, Inst instVoid)); +S16 ssdWatchDgActvTmr ARGS(( ProcId proc, Ent ent, Inst instVoid)); #else -EXTERN S16 ssdWatchDgActvTmr ARGS(( Void )); +S16 ssdWatchDgActvTmr ARGS(( Void )); #endif /* SS_MULTIPLE_PROCS */ -EXTERN Void ssdWatchDgTmrEvt ARGS(( PTR cb, S16 event )); -EXTERN S16 watchDgActvTsk ARGS(( Pst *pst, Buffer *mBuf)); -EXTERN S16 watchDgRcvrActvTsk ARGS(( Pst *pst, Buffer *mBuf )); -EXTERN S16 ssdSndHrtBtMsg ARGS(( Bool restart, uint32_t type)); -EXTERN Void ssdStartWatchDgTmr ARGS(( void *cb, S16 event, uint16_t wait)); -EXTERN Void ssdStopWatchDgTmr ARGS(( void *cb, S16 event)); -EXTERN S16 ssdInitWatchDgPst ARGS((Pst *pst)); -EXTERN S16 ssdInitWatchDog ARGS((uint16_t port)); +Void ssdWatchDgTmrEvt ARGS(( PTR cb, S16 event )); +S16 watchDgActvTsk ARGS(( Pst *pst, Buffer *mBuf)); +S16 watchDgRcvrActvTsk ARGS(( Pst *pst, Buffer *mBuf )); +S16 ssdSndHrtBtMsg ARGS(( Bool restart, uint32_t type)); +Void ssdStartWatchDgTmr ARGS(( void *cb, S16 event, uint16_t wait)); +Void ssdStopWatchDgTmr ARGS(( void *cb, S16 event)); +S16 ssdInitWatchDgPst ARGS((Pst *pst)); +S16 ssdInitWatchDog ARGS((uint16_t port)); #endif #ifdef SS_FBSED_TSK_REG -EXTERN S16 SRegTskInfo ARGS((uint8_t *cfgFile)); +S16 SRegTskInfo ARGS((uint8_t *cfgFile)); #endif /* ss002.301 Readwrite lock additions */ #ifdef SS_LOCK_SUPPORT -EXTERN S16 ssdLockNew ARGS((SLockInfo *LockId, uint8_t locktype)); -EXTERN S16 ssdInitLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); -EXTERN S16 ssdUnlockNew ARGS((SLockInfo *LockId, uint8_t lockType)); -EXTERN S16 ssdDestroyLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 ssdLockNew ARGS((SLockInfo *LockId, uint8_t locktype)); +S16 ssdInitLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 ssdUnlockNew ARGS((SLockInfo *LockId, uint8_t lockType)); +S16 ssdDestroyLockNew ARGS((SLockInfo *LockId, uint8_t lockType)); #endif /* SS_LOCK_SUPPORT */ #ifdef SSI_STATIC_MEM_LEAK_DETECTION @@ -459,9 +459,9 @@ FILE* StaticMemLeakFileArr[4]; } #endif -EXTERN void DumpSSIDemandQDebugInformation ARGS((void)); -EXTERN void mtSigSegvHndlr ARGS((void)); -EXTERN void mtSigUsr2Hndlr ARGS((void)); +void DumpSSIDemandQDebugInformation ARGS((void)); +void mtSigSegvHndlr ARGS((void)); +void mtSigUsr2Hndlr ARGS((void)); #endif /* __SSGENX__ */ diff --git a/src/mt/ss_mem.x b/src/mt/ss_mem.x index 76ce8963f..c947e4ea8 100755 --- a/src/mt/ss_mem.x +++ b/src/mt/ss_mem.x @@ -88,21 +88,21 @@ typedef struct ssMemDbgInfo }SsMemDbgInfo; /* ss036.103 - Addition of prototypes for memory statistics */ -EXTERN S16 SRegInfoShow ARGS((Region region, uint32_t *availmem)); -EXTERN S16 SGetRegInfo ARGS((Region region, SsMemDbgInfo *dbgInfo)); +S16 SRegInfoShow ARGS((Region region, uint32_t *availmem)); +S16 SGetRegInfo ARGS((Region region, SsMemDbgInfo *dbgInfo)); #ifdef XEON_SPECIFIC_CHANGES -EXTERN S16 SRegReachedMemThreshold ARGS((Region region, uint8_t maxBkt)); +S16 SRegReachedMemThreshold ARGS((Region region, uint8_t maxBkt)); #endif #ifdef SSI_DEBUG_LEVEL1 -EXTERN S16 SPrintRegMemStatusInfo ARGS((Region region, uint8_t typeFlag)); -EXTERN Void SRegMemErrHdlr ARGS((Region region, Data *ptr, S16 errCode)); -EXTERN S16 SPrintRegMemProfile ARGS((Region region)); +S16 SPrintRegMemStatusInfo ARGS((Region region, uint8_t typeFlag)); +Void SRegMemErrHdlr ARGS((Region region, Data *ptr, S16 errCode)); +S16 SPrintRegMemProfile ARGS((Region region)); #endif /* SSI_DEBUG_LEVEL1 */ /* ss001.301: additions */ #ifdef SS_HISTOGRAM_SUPPORT -EXTERN S16 SGetTapaTskEntIds ARGS((Ent *ent)); -EXTERN S16 SGetHstGrmInfo ARGS((Ent *entId, Bool *hstReg)); +S16 SGetTapaTskEntIds ARGS((Ent *ent)); +S16 SGetHstGrmInfo ARGS((Ent *entId, Bool *hstReg)); #endif /* SS_HISTOGRAM_SUPPORT */ #ifdef __cplusplus diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c index 54dcdb678..67f1be91a 100644 --- a/src/mt/ss_msg.c +++ b/src/mt/ss_msg.c @@ -92,7 +92,7 @@ #include #ifdef XEON_SPECIFIC_CHANGES uint32_t startMemLeak=0; -extern pthread_mutex_t memLock; +pthread_mutex_t memLock; #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) @@ -107,19 +107,19 @@ extern pthread_mutex_t memLock; S16 ssGetDBufOfSize ARGS((Region region, Size size, Buffer **dBuf)); S16 SIncMsgRef(Buffer *srcBuf,Region dstRegion, Pool dstPool,Buffer **dstBuf); #ifdef SSI_STATIC_MEM_LEAK_DETECTION -EXTERN uint32_t GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo)); -EXTERN void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* +uint32_t GetNextFreeIdx ARGS((StaticMemAllocInfo * memAllocInfo)); +void LogForStaticMemLeak ARGS((StaticMemAllocInfo* memAllocInfo, char* file, uint32_t line, uint32_t size, void* ptr, uint32_t idx)); -EXTERN void FreeIdx ARGS((uint8_t* ptr, uint32_t idx, StaticMemAllocInfo* +void FreeIdx ARGS((uint8_t* ptr, uint32_t idx, StaticMemAllocInfo* memAllocInfo,uint32_t size, char* file, uint32_t line)); #endif #ifdef SS_USE_ZBC_MEMORY #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,uint32_t)); +static S16 SPutZbcDBufNew ARGS((Region region, Buffer *buf,char*,uint32_t)); #else -PRIVATE S16 SPutZbcDBuf ARGS((Region region, Buffer *buf)); +static S16 SPutZbcDBuf ARGS((Region region, Buffer *buf)); S16 SAttachPtrToBuf ARGS(( Region region, Pool pool, Data *ptr, MsgLen totalLen, Buffer** mBuf)); #endif @@ -129,7 +129,7 @@ S16 SAttachPtrToBuf ARGS(( Region region, Pool pool, Data *ptr, #ifdef SS_M_PROTO_REGION #ifdef T2K_MEM_LEAK_DBG #define DupMsg(region,buffer) DupMsgNew(region,buffer,file,line) -PRIVATE Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,uint32_t)); +static Buffer *DupMsgNew ARGS((Region region, Buffer *buffer,char*,uint32_t)); #else #ifdef INTEL_WLS #ifdef T2K_MEM_LEAK_DBG @@ -157,7 +157,7 @@ S16 SPutSBufDpdk ARGS(( Data *ptr)); #endif /* INTEL_WLS */ -PRIVATE Buffer *DupMsg ARGS((Region region, Buffer *buffer)); +static Buffer *DupMsg ARGS((Region region, Buffer *buffer)); #endif #endif /* SS_M_PROTO_REGION */ @@ -213,7 +213,7 @@ PRIVATE Buffer *DupMsg ARGS((Region region, Buffer *buffer)); } -EXTERN pthread_t tmpRegTidMap[20]; +pthread_t tmpRegTidMap[20]; #define CM_MEM_GET_REGION(_region) \ { \ uint8_t _regCnt; \ @@ -230,7 +230,7 @@ EXTERN pthread_t tmpRegTidMap[20]; } #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF) || defined(L2_OPTMZ)) -extern S32 clusterMode; +S32 clusterMode; #endif /* * @@ -638,8 +638,8 @@ Buffer *mBuf; #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) { - extern pthread_t gMacTId,gRlcTId; - extern S32 clusterMode; + pthread_t gMacTId,gRlcTId; + S32 clusterMode; if(clusterMode == RADIO_CLUSTER_MODE) { @@ -814,7 +814,7 @@ uint8_t memType; /* memory type used if shareable or not */ #endif #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) { - extern pthread_t gMacTId,gRlcTId; + pthread_t gMacTId,gRlcTId; if(clusterMode == RADIO_CLUSTER_MODE) { @@ -4085,7 +4085,7 @@ Buffer **dstBuf; * */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE Buffer *DupMsgNew +static Buffer *DupMsgNew ( Region region, /* region id */ Buffer *mp, /* message block */ @@ -4094,13 +4094,13 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE Buffer *DupMsg +static Buffer *DupMsg ( Region region, /* region id */ Buffer *mp /* message block */ ) #else -PRIVATE Buffer *DupMsg(region, mp) +static Buffer *DupMsg(region, mp) Region region; /* region id */ Buffer *mp; /* message block */ #endif @@ -8083,7 +8083,7 @@ Buffer** mBuf; */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 SPutZbcDBufNew +static S16 SPutZbcDBufNew ( Region region, Buffer *buf, @@ -8092,13 +8092,13 @@ uint32_t line ) #else #ifdef ANSI -PRIVATE S16 SPutZbcDBuf +static S16 SPutZbcDBuf ( Region region, Buffer *buf ) #else -PRIVATE S16 SPutZbcDBuf(region, buf) +static S16 SPutZbcDBuf(region, buf) Region region; Buffer *buf; #endif @@ -8474,7 +8474,7 @@ Buffer** mBuf; #ifdef TENB_DPDK_BUF -extern uint32_t numeTti; +uint32_t numeTti; S16 SGetSBufDpdk ( diff --git a/src/mt/ss_queue.c b/src/mt/ss_queue.c index aaedc191d..91fc3018c 100644 --- a/src/mt/ss_queue.c +++ b/src/mt/ss_queue.c @@ -708,13 +708,13 @@ QLen idx; /* index */ * */ #ifdef ANSI -INLINE S16 SQueueFirst +inline S16 SQueueFirst ( Buffer *buf, /* buffer */ Queue *q /* queue */ ) #else -INLINE S16 SQueueFirst(buf, q) +inline S16 SQueueFirst(buf, q) Buffer *buf; /* buffer */ Queue *q; /* queue */ #endif @@ -746,13 +746,13 @@ Queue *q; /* queue */ * */ #ifdef ANSI -INLINE S16 SDequeueFirst +inline S16 SDequeueFirst ( Buffer **bufPtr, /* pointer to buffer */ Queue *q /* queue */ ) #else -INLINE S16 SDequeueFirst(bufPtr, q) +inline S16 SDequeueFirst(bufPtr, q) Buffer **bufPtr; /* pointer to buffer */ Queue *q; /* queue */ #endif diff --git a/src/mt/ss_queue.x b/src/mt/ss_queue.x index 0dc0af2df..388bd9464 100755 --- a/src/mt/ss_queue.x +++ b/src/mt/ss_queue.x @@ -52,15 +52,15 @@ typedef struct ssDmndQ /* functions */ -EXTERN S16 ssInitDmndQ ARGS((SsDmndQ *queue)); -EXTERN S16 ssDestroyDmndQ ARGS((SsDmndQ *queue)); -EXTERN S16 ssDmndQPut ARGS((SsDmndQ *queue, Buffer *mBuf, \ +S16 ssInitDmndQ ARGS((SsDmndQ *queue)); +S16 ssDestroyDmndQ ARGS((SsDmndQ *queue)); +S16 ssDmndQPut ARGS((SsDmndQ *queue, Buffer *mBuf, \ Prior prior, Order order)); -EXTERN S16 ssDmndQGet ARGS((SsDmndQ *queue, Buffer **mBuf, \ +S16 ssDmndQGet ARGS((SsDmndQ *queue, Buffer **mBuf, \ Order order)); -EXTERN S16 ssDmndQWait ARGS((SsDmndQ *queue)); +S16 ssDmndQWait ARGS((SsDmndQ *queue)); -EXTERN S16 ssFndLenDmndQ ARGS((SsDmndQ *queue, Prior prior, QLen *len)); +S16 ssFndLenDmndQ ARGS((SsDmndQ *queue, Prior prior, QLen *len)); #ifdef __cplusplus diff --git a/src/mt/ss_rbuf.x b/src/mt/ss_rbuf.x index 0d3468cd8..f2a06bd63 100755 --- a/src/mt/ss_rbuf.x +++ b/src/mt/ss_rbuf.x @@ -40,23 +40,23 @@ #ifdef __cplusplus extern "C" { #endif -extern Void SsRngBufEnable ARGS((Void)); -extern Void SsRngBufDisable ARGS((Void)); -extern S16 SCreateSRngBuf ARGS((uint32_t id, Region region, Pool pool, uint32_t elmSize, uint32_t rngSize)); -extern S16 SDestroySRngBuf ARGS((uint32_t id, Region region, Pool pool)); -extern S16 SAttachSRngBuf ARGS((uint32_t id, uint32_t ent, uint32_t txRx)); -extern S16 SEnqSRngBuf ARGS((uint32_t id, Void* elem)); -extern S16 SDeqSRngBuf ARGS((uint32_t id, Void* elem)); -extern Void* SRngGetWIndx ARGS((uint32_t rngId)); -extern Void* SRngGetRIndx ARGS((uint32_t rngId)); -extern Void SRngIncrRIndx ARGS((uint32_t rngId)); -extern Void SRngIncrWIndx ARGS((uint32_t rngId)); -extern S16 isRngEmpty ARGS((uint32_t rngId)); -extern S16 SConnectSRngBuf ARGS((uint32_t id, uint32_t rxEnt)); -EXTERN S16 SGetNumElemInRng ARGS(( uint32_t id)); -extern S16 SPrintSRngStats ARGS((Void)); -extern S16 pjBatchProc ARGS((Void)); -extern uint32_t ssRngBufStatus; +Void SsRngBufEnable ARGS((Void)); +Void SsRngBufDisable ARGS((Void)); +S16 SCreateSRngBuf ARGS((uint32_t id, Region region, Pool pool, uint32_t elmSize, uint32_t rngSize)); +S16 SDestroySRngBuf ARGS((uint32_t id, Region region, Pool pool)); +S16 SAttachSRngBuf ARGS((uint32_t id, uint32_t ent, uint32_t txRx)); +S16 SEnqSRngBuf ARGS((uint32_t id, Void* elem)); +S16 SDeqSRngBuf ARGS((uint32_t id, Void* elem)); +Void* SRngGetWIndx ARGS((uint32_t rngId)); +Void* SRngGetRIndx ARGS((uint32_t rngId)); +Void SRngIncrRIndx ARGS((uint32_t rngId)); +Void SRngIncrWIndx ARGS((uint32_t rngId)); +S16 isRngEmpty ARGS((uint32_t rngId)); +S16 SConnectSRngBuf ARGS((uint32_t id, uint32_t rxEnt)); +S16 SGetNumElemInRng ARGS(( uint32_t id)); +S16 SPrintSRngStats ARGS((Void)); +S16 pjBatchProc ARGS((Void)); +uint32_t ssRngBufStatus; #define SS_RNG_BUF_STATUS() ssRngBufStatus /* Ring Buffer Structure */ @@ -205,10 +205,10 @@ typedef struct Buffer* mBuf; } SsRngBufElem; -EXTERN SsRngBufTbl SsRngInfoTbl[SS_RNG_BUF_MAX]; + SsRngBufTbl SsRngInfoTbl[SS_RNG_BUF_MAX]; #if (defined (MAC_FREE_RING_BUF) || defined (RLC_FREE_RING_BUF)) -extern S16 mtAddBufToRing(SsRngBufId ringId,void *bufPtr,uint8_t freeType); +S16 mtAddBufToRing(SsRngBufId ringId,void *bufPtr,uint8_t freeType); #ifdef XEON_SPECIFIC_CHANGES typedef struct rgKwBufFreeInfo { diff --git a/src/mt/ss_strm.c b/src/mt/ss_strm.c index 9d8798fec..ad3ec5208 100644 --- a/src/mt/ss_strm.c +++ b/src/mt/ss_strm.c @@ -76,7 +76,7 @@ /* private variable declarations */ -PRIVATE struct +static struct { Region mdRegion; /* region for message and data blocks */ Region datRegion; /* region for data buffers */ diff --git a/src/mt/ss_task.c b/src/mt/ss_task.c index 0134babb6..8a63958c4 100644 --- a/src/mt/ss_task.c +++ b/src/mt/ss_task.c @@ -131,15 +131,15 @@ #include "signal.h" #include "mt_plat_t33.h" #include "mt_4gmx.x" -EXTERN S32 clusterMode; +S32 clusterMode; #endif pthread_t tmpRegTidMap[20]; #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN unsigned int tlPost(void *handle); +unsigned int tlPost(void *handle); #ifdef XEON_SPECIFIC_CHANGES -EXTERN int WLS_WakeUp(void* h); +int WLS_WakeUp(void* h); #endif #endif @@ -1977,7 +1977,7 @@ S8 *logBuf #endif { S8 *buffer; - PRIVATE uint16_t logFileCnt = 0; + static uint16_t logFileCnt = 0; S8 newFileName[SS_MAX_PATH]; #ifdef WIN32 size_t writeNum; @@ -4280,7 +4280,7 @@ Buffer *mBuf; /* message to post */ ((prior * SS_MAX_MSG_PRI) + tempPst.prior)); #ifdef TENB_T2K3K_SPECIFIC_CHANGES { - extern Bool g_usettitmr; + Bool g_usettitmr; if (g_usettitmr) { if (tTsk->sTsk->tskPrior == PRIOR0) diff --git a/src/mt/ss_timer.c b/src/mt/ss_timer.c index 2f29263c7..21013e581 100644 --- a/src/mt/ss_timer.c +++ b/src/mt/ss_timer.c @@ -78,7 +78,7 @@ * functions are enclosed in a union. */ #ifndef SS_MULTIPLE_PROCS -PRIVATE S16 STmrRegHndlr ARGS(( +static S16 STmrRegHndlr ARGS(( Ent ent, Inst inst, S16 period, @@ -89,7 +89,7 @@ PRIVATE S16 STmrRegHndlr ARGS(( * handled mtFlag in existing timer handlers. */ #else /* SS_MULTIPLE_PROCS */ -PRIVATE S16 STmrRegHndlr ARGS(( +static S16 STmrRegHndlr ARGS(( ProcId proc, Ent ent, Inst inst, @@ -101,7 +101,7 @@ PRIVATE S16 STmrRegHndlr ARGS(( /* ss041.103 Declaration for STmrDeregHndlr */ #ifndef SS_MULTIPLE_PROCS -PRIVATE S16 STmrDeregHndlr ARGS(( +static S16 STmrDeregHndlr ARGS(( Ent ent, Inst inst, S16 period, @@ -112,7 +112,7 @@ PRIVATE S16 STmrDeregHndlr ARGS(( * handled mtFlag in existing timer handlers. */ #else /* SS_MULTIPLE_PROCS */ -PRIVATE S16 STmrDeregHndlr ARGS(( +static S16 STmrDeregHndlr ARGS(( ProcId proc, Ent ent, Inst inst, @@ -292,7 +292,7 @@ PAIFTMRS16 tmrFnctMt; /* timer function, typically SActvTmr */ #ifndef SS_MULTIPLE_PROCS #ifdef ANSI -PRIVATE S16 STmrRegHndlr +static S16 STmrRegHndlr ( Ent ent, /* entity */ Inst inst, /* instance */ @@ -301,7 +301,7 @@ S16 units, /* period units */ SsTmrActvFn ssTmrActvFn /* timer function, typically SActvTmr */ ) #else -PRIVATE S16 STmrRegHndlr(ent, inst, period, units, ssTmrActvFn) +static S16 STmrRegHndlr(ent, inst, period, units, ssTmrActvFn) Ent ent; /* entity */ Inst inst; /* instance */ S16 period; /* period */ @@ -315,7 +315,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function, typically SActvTmr */ #else /* SS_MULTIPLE_PROCS */ #ifdef ANSI -PRIVATE S16 STmrRegHndlr +static S16 STmrRegHndlr ( ProcId proc, /* processor */ Ent ent, /* entity */ @@ -325,7 +325,7 @@ S16 units, /* period units */ SsTmrActvFn ssTmrActvFn /* timer function */ ) #else -PRIVATE S16 STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn) +static S16 STmrRegHndlr(proc, ent, inst, period, units, ssTmrActvFn) ProcId proc; /* processor */ Ent ent; /* entity */ Inst inst; /* instance */ @@ -756,7 +756,7 @@ PAIFTMRS16 tmrFnctMt; /* timer function */ */ #ifndef SS_MULTIPLE_PROCS #ifdef ANSI -PRIVATE S16 STmrDeregHndlr +static S16 STmrDeregHndlr ( Ent ent, /* entity */ Inst inst, /* instance */ @@ -768,7 +768,7 @@ SsTmrActvFn ssTmrActvFn /* timer function */ /* ss017.301: Modified the prototype of STmrDeregHndlr for Non-ANSI * compilation. */ -PRIVATE S16 STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn) +static S16 STmrDeregHndlr(ent, inst, period, units, ssTmrActvFn) Ent ent; /* entity */ Inst inst; /* instance */ S16 period; /* period */ @@ -782,7 +782,7 @@ SsTmrActvFn ssTmrActvFn; /* timer function */ #else /* SS_MULTIPLE_PROCS */ #ifdef ANSI -PRIVATE S16 STmrDeregHndlr +static S16 STmrDeregHndlr ( ProcId proc, /* processor */ Ent ent, /* entity */ @@ -792,7 +792,7 @@ S16 units, /* period units */ SsTmrActvFn ssTmrActvFn /* timer function */ ) #else -PRIVATE S16 STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn) +static S16 STmrDeregHndlr(proc, ent, inst, period, units, ssTmrActvFn) ProcId proc; /* processor */ Ent ent; /* entity */ Inst inst; /* instance */ diff --git a/src/ric_stub/ric_stub_sctp.h b/src/ric_stub/ric_stub_sctp.h index 19e9b2132..fd72abbda 100644 --- a/src/ric_stub/ric_stub_sctp.h +++ b/src/ric_stub/ric_stub_sctp.h @@ -54,8 +54,8 @@ typedef struct CmInetNetAddr destIpNetAddr; /* DU Ip address */ }CuSctpDestCb; -EXTERN S16 sctpActvInit(); -EXTERN S16 sctpSend(Buffer *mBuf); +S16 sctpActvInit(); +S16 sctpSend(Buffer *mBuf); S16 sctpCfgReq(); S16 sctpStartReq(); S16 sctpSetSockOpts(CmInetFd *sock_Fd); diff --git a/src/rlog/rl_interface.h b/src/rlog/rl_interface.h index b60b397d0..51e0ab6c8 100755 --- a/src/rlog/rl_interface.h +++ b/src/rlog/rl_interface.h @@ -106,24 +106,24 @@ void rlEnaBleBufferedIO(void); /////////////////////////////////////////////////////////////////////////////// // This API updates the RLOG Tti count baed on this time stamp will be updated -extern void rlUpdateRlogTti(void); +void rlUpdateRlogTti(void); /////////////////////////////////////////////////////////////////////////////// // This API reset the RLOG rate control count and enable logging every 10 ms -extern void rlResetLogRateLmt(void); +void rlResetLogRateLmt(void); /////////////////////////////////////////////////////////////////////////////// // This API reset the RLOG rate control count and enable logging every 10 ms -extern void rlResetLogRateLmt(void); +void rlResetLogRateLmt(void); /////////////////////////////////////////////////////////////////////////////// // This API Start the limit the number of logs loggd into circular buffer every // 10ms -extern void rlStartLogCountLimit(void); +void rlStartLogCountLimit(void); /////////////////////////////////////////////////////////////////////////////// // This API stops restriciton of limiting number of logs every 10 ms -extern void rlStopLogCountLimit(void); +void rlStopLogCountLimit(void); #ifdef WR_DBG_CIRLOG diff --git a/src/rlog/rl_platform.c b/src/rlog/rl_platform.c index 587fa1215..6aa39c75b 100644 --- a/src/rlog/rl_platform.c +++ b/src/rlog/rl_platform.c @@ -53,8 +53,8 @@ framework. /* Thread-specific data key visible to all threads */ static pthread_key_t g_threadkey; -extern pthread_mutex_t g_logmutex; -extern THREAD_DATA* g_pCirList[RLOG_MAX_THREADS]; +pthread_mutex_t g_logmutex; +THREAD_DATA* g_pCirList[RLOG_MAX_THREADS]; void* rlAlloc(size_t mem_size) { return malloc(mem_size); diff --git a/src/rlog/rl_rlog.c b/src/rlog/rl_rlog.c index d8e9034ad..d43526b5d 100644 --- a/src/rlog/rl_rlog.c +++ b/src/rlog/rl_rlog.c @@ -163,7 +163,7 @@ static int g_kIdx, g_action, g_storeKeys; static char g_keyBuf[32]; /* Standard C library, timezone */ -extern char *tzname[2]; +char *tzname[2]; /////////////////////////////////////////////////////////////////////////////// // FUNCTION DECLARATIONS // /////////////////////////////////////////////////////////////////////////////// @@ -186,7 +186,7 @@ void userAction(void); void handleSigIO(int sig); void rlPrintConfiguration(void); THREAD_DATA* rlRegisterThread(const char* taskName); -extern void (*rlSigHandler)(int); +void (*rlSigHandler)(int); /* L2 Logging */ void rlInitL2Log(void); uint32_t g_rlogWriteCount = 0; diff --git a/src/rlog/rl_rlog.h b/src/rlog/rl_rlog.h index 855f824e0..a9c53ba9b 100755 --- a/src/rlog/rl_rlog.h +++ b/src/rlog/rl_rlog.h @@ -163,27 +163,27 @@ typedef struct { } THREAD_DATA; -extern void readL2LogBuff(void); -extern void processL2LogBuff(void); -extern S16 sendL2LogBuftoL3(void); -extern void rlInitL2Log(void); +void readL2LogBuff(void); +void processL2LogBuff(void); +S16 sendL2LogBuftoL3(void); +void rlInitL2Log(void); /* Extern for soc specific file */ -extern void rlProcessLogBufFromL2(void *mBuf); -extern void rlInitL2SocSpecific(void); -//extern void processL2LogBuff(void); -extern void rlProcessTicks(void); -extern void rlGetL2LogBufPtr (void *mBuf, uint32_t *logLen,uint8_t **logPtr); -extern void rlInvalidateL2LogsInCache(uint8_t *ptr,uint32_t len); - -extern uint8_t *g_l2rlogBuf; /* buffer pointer for shared memory allocation */ -extern uint8_t *g_l2LogBufStartPtr; /* buffer pointer where logs has to be written */ -extern uint8_t *g_l2LogBufBasePtr; /* Base pointer for log buffer */ -extern uint8_t *g_logBufRcvdFromL2; /* Buffer pointer received from L2 at L3*/ -extern uint8_t *g_l2LogBaseBuff; /* Base log buffer received at L3 */ -extern uint32_t g_l2LogBufLen; /* Log Buffer length written at L2 */ -extern uint32_t startL2Logging; /* flag to start processing of L2 logs */ -extern uint32_t g_l2logBuffPos; /* Log Buffer block which is in use for L2 logging */ -extern uint8_t g_writeCirBuf; /* Flag to indicate whether to write logs or not */ -//extern Pst g_rlog_pst; +void rlProcessLogBufFromL2(void *mBuf); +void rlInitL2SocSpecific(void); +//void processL2LogBuff(void); +void rlProcessTicks(void); +void rlGetL2LogBufPtr (void *mBuf, uint32_t *logLen,uint8_t **logPtr); +void rlInvalidateL2LogsInCache(uint8_t *ptr,uint32_t len); + +uint8_t *g_l2rlogBuf; /* buffer pointer for shared memory allocation */ +uint8_t *g_l2LogBufStartPtr; /* buffer pointer where logs has to be written */ +uint8_t *g_l2LogBufBasePtr; /* Base pointer for log buffer */ +uint8_t *g_logBufRcvdFromL2; /* Buffer pointer received from L2 at L3*/ +uint8_t *g_l2LogBaseBuff; /* Base log buffer received at L3 */ +uint32_t g_l2LogBufLen; /* Log Buffer length written at L2 */ +uint32_t startL2Logging; /* flag to start processing of L2 logs */ +uint32_t g_l2logBuffPos; /* Log Buffer block which is in use for L2 logging */ +uint8_t g_writeCirBuf; /* Flag to indicate whether to write logs or not */ +//Pst g_rlog_pst; #endif /* __RL_H__*/ diff --git a/src/rlog/rl_soc.h b/src/rlog/rl_soc.h index 37d7527b6..dae83ca7f 100755 --- a/src/rlog/rl_soc.h +++ b/src/rlog/rl_soc.h @@ -41,9 +41,9 @@ void processL2LogBuff(void); void rlGetL2LogBufPtr(void *mBuf,uint32_t *logLen,Data **logPtr); void rlInvalidateL2LogsInCache(Data *ptr,uint32_t len); -extern void rlInitL2SocSpecific(void); -extern void processL2LogBuff(void); -extern void rlGetL2LogBufPtr(void *mBuf,uint32_t *logLen,Data **logPtr); +void rlInitL2SocSpecific(void); +void processL2LogBuff(void); +void rlGetL2LogBufPtr(void *mBuf,uint32_t *logLen,Data **logPtr); /********************************************************************** End of file -- 2.16.6