From 451e626d5ac7c7e7586bab23358161230449af46 Mon Sep 17 00:00:00 2001 From: balajihands Date: Fri, 20 Mar 2020 02:59:47 +0530 Subject: [PATCH] macCellCfg Change-Id: I39156f478a89402d1787023bd03b33e66954cfa9 Signed-off-by: balajihands --- src/5gnrmac/lwr_mac.h | 2 +- src/5gnrmac/lwr_mac_cfg.c | 2 +- src/5gnrmac/{rg_cl_li.c => lwr_mac_li.c} | 2 +- src/5gnrmac/{rg_cl_phy.c => lwr_mac_phy.c} | 0 src/5gnrmac/{rg_cl_util.c => lwr_mac_util.c} | 0 src/5gnrmac/rg_cfg.c | 2 +- src/5gnrmac/rg_cl.h | 277 -------------------------- src/5gnrmac/rg_com.c | 2 +- src/5gnrmac/rg_dbm.c | 2 +- src/5gnrmac/rg_dhm.c | 2 +- src/5gnrmac/rg_dux.c | 2 +- src/5gnrmac/rg_ex_ms.c | 2 +- src/5gnrmac/rg_l2m.c | 2 +- src/5gnrmac/rg_lim.c | 2 +- src/5gnrmac/rg_lmm.c | 13 +- src/5gnrmac/rg_mux.c | 2 +- src/5gnrmac/rg_pom_scell.c | 2 +- src/5gnrmac/rg_prg.c | 2 +- src/5gnrmac/rg_prg_pt.c | 2 +- src/5gnrmac/rg_ram.c | 2 +- src/5gnrmac/rg_rom.c | 2 +- src/5gnrmac/rg_tom.c | 2 +- src/5gnrmac/rg_uhm.c | 2 +- src/5gnrmac/rg_uim.c | 2 +- src/5gnrmac/rg_utl.c | 2 +- src/cm/{du_mgr_mac_inf.c => du_app_mac_inf.c} | 53 ++--- src/cm/{du_mgr_mac_inf.h => du_app_mac_inf.h} | 0 src/du_app/du_cfg.h | 2 +- src/du_app/du_mgr.h | 2 +- src/du_app/du_mgr_ex_ms.c | 2 +- 30 files changed, 49 insertions(+), 342 deletions(-) rename src/5gnrmac/{rg_cl_li.c => lwr_mac_li.c} (99%) rename src/5gnrmac/{rg_cl_phy.c => lwr_mac_phy.c} (100%) rename src/5gnrmac/{rg_cl_util.c => lwr_mac_util.c} (100%) delete mode 100644 src/5gnrmac/rg_cl.h rename src/cm/{du_mgr_mac_inf.c => du_app_mac_inf.c} (84%) rename src/cm/{du_mgr_mac_inf.h => du_app_mac_inf.h} (100%) diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h index 422adbfba..c5791947e 100644 --- a/src/5gnrmac/lwr_mac.h +++ b/src/5gnrmac/lwr_mac.h @@ -31,7 +31,7 @@ #include "ssi.x" #include "cm_hash.x" #include "cm_lib.x" -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" typedef enum { diff --git a/src/5gnrmac/lwr_mac_cfg.c b/src/5gnrmac/lwr_mac_cfg.c index 350081457..4834162ec 100644 --- a/src/5gnrmac/lwr_mac_cfg.c +++ b/src/5gnrmac/lwr_mac_cfg.c @@ -28,7 +28,7 @@ #include "cm_hash.x" #include "cm_lib.x" -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "lwr_mac.h" EXTERN S16 rgClBldAndSndFAPICfgReq ARGS((ClCellCb *cellCb)); diff --git a/src/5gnrmac/rg_cl_li.c b/src/5gnrmac/lwr_mac_li.c similarity index 99% rename from src/5gnrmac/rg_cl_li.c rename to src/5gnrmac/lwr_mac_li.c index 95eab812a..06323b15a 100644 --- a/src/5gnrmac/rg_cl_li.c +++ b/src/5gnrmac/lwr_mac_li.c @@ -27,7 +27,7 @@ #include "ssi.x" #include "cm_hash.x" -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "lwr_mac.h" #include "rg_cl_phy.h" #include "fapi.h" diff --git a/src/5gnrmac/rg_cl_phy.c b/src/5gnrmac/lwr_mac_phy.c similarity index 100% rename from src/5gnrmac/rg_cl_phy.c rename to src/5gnrmac/lwr_mac_phy.c diff --git a/src/5gnrmac/rg_cl_util.c b/src/5gnrmac/lwr_mac_util.c similarity index 100% rename from src/5gnrmac/rg_cl_util.c rename to src/5gnrmac/lwr_mac_util.c diff --git a/src/5gnrmac/rg_cfg.c b/src/5gnrmac/rg_cfg.c index 9dc81b3c1..b83107f8c 100755 --- a/src/5gnrmac/rg_cfg.c +++ b/src/5gnrmac/rg_cfg.c @@ -73,7 +73,7 @@ static int RLOG_MODULE_ID=4096; #include "crg.x" /* CRG interface includes */ #include "rg_sch_inf.x" /* SCH interface typedefs */ #include "rg_prg.x" /* PRG (MAC-MAC) Interface typedefs */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ #ifdef LTE_ADV #include "rg_pom_scell.x" diff --git a/src/5gnrmac/rg_cl.h b/src/5gnrmac/rg_cl.h deleted file mode 100644 index 278c11c8e..000000000 --- a/src/5gnrmac/rg_cl.h +++ /dev/null @@ -1,277 +0,0 @@ -/******************************************************************************* -################################################################################ -# Copyright (c) [2017-2019] [Radisys] # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ -*******************************************************************************/ - -/* Contains definitions for MAC CL modules */ -#ifndef __RG_CL_H__ -#define __RG_CL_H__ - -#define MAX_NUM_CELL_SUPP 1 - -#include "envdep.h" -#include "gen.h" -#include "ssi.h" -#include "cm_hash.h" - -#include "gen.x" -#include "ssi.x" -#include "cm_hash.x" -#include "cm_lib.x" -#include "du_mgr_mac_inf.h" - -typedef enum -{ - PHY_STATE_IDLE, - PHY_STATE_CONFIGURED, - PHY_STATE_RUNNING, - MAX_STATE -}PhyState; - -/* Events in Lower Mac */ -typedef enum{ - PARAM_REQ, - PARAM_RSP, - CONFIG_REQ, - CONFIG_RSP, - START_REQ, - STOP_REQ, - MAX_EVENT -}EventState; - -typedef struct clCb -{ - Region region; - Pool pool; - Bool clCfgDone; /* CL configuration done */ - CmHashListCp cellCbLst; /* List of Cells configured */ - U8 numOfCells; /* Number of Cells configured */ - PhyState phyState; /* State of PHY */ - EventState event; /* State of Event */ -}ClCb; - -typedef struct cellCb -{ - U16 cellId; - MacCellCfg cellCfg; - PhyState phyState; -}ClCellCb; - -typedef enum -{ - RELEASE_15 -}ReleaseCapab; - -typedef enum -{ - NOT_SUPPORTED, - SUPPORTED -}ParamSupport; - -typedef enum -{ - NORMAL_CYCLIC_PREFIX_MASK, - EXTENDED_CYCLIC_PREFIX_MASK -}CyclicPrefix; - -typedef enum -{ - SPACING_15_KHZ, - SPACING_30_KHZ, - SPACING_60_KHZ, - SPACING_120_KHZ -}SubCarrierSpacing; - -typedef enum -{ - BW_5MHZ, - BW_10MHZ, - BW_15MHZ, - BW_20MHZ, - BW_40MHZ, - BW_50MHZ, - BW_60MHZ, - BW_70MHZ, - BW_80MHZ, - BW_90MHZ, - BW_100MHZ, - BW_200MHZ, - BW_400MHZ -}SupportedBandwidth; - -typedef enum -{ - CCE_MAPPING_INTERLEAVED_MASK, - CCE_MAPPING_NONINTERLVD_MASK -}CCEMappingType; - -typedef enum -{ - FORMAT_0, - FORMAT_1, - FORMAT_2, - FORMAT_3, - FORMAT_4 -}Formats; - -typedef enum -{ - MAPPING_TYPE_A, - MAPPING_TYPE_B, -}MappingType; - -typedef enum -{ - ALLOCATION_TYPE_0, - ALLOCATION_TYPE_1, -}AllocationType; - -typedef enum -{ - VRB_TO_PRB_MAP_NON_INTLV, - VRB_TO_PRB_MAP_INTLVD -}VrbToPrbMap; - -typedef enum -{ - DMRS_CONFIG_TYPE_1, - DMRS_CONFIG_TYPE_2 -}DmrsConfigType; - -typedef enum -{ - DMRS_MAX_LENGTH_1, - DMRS_MAX_LENGTH_2 -}DmrMaxLen; - -typedef enum -{ - DMRS_ADDITIONAL_POS_0, - DMRS_ADDITIONAL_POS_1, - DMRS_ADDITIONAL_POS_2, - DMRS_ADDITIONAL_POS_3 -}DmrsPos; - -typedef enum -{ - MOD_QPSK, - MOD_16QAM, - MOD_64QAM, - MOD_256QAM -}ModulationOrder; - -typedef enum -{ - AGG_FACTOR_1, - AGG_FACTOR_2, - AGG_FACTOR_4, - AGG_FACTOR_8 -}AggregationFactor; - -typedef enum -{ - SF_FORMAT_A1, - SF_FORMAT_A2, - SF_FORMAT_A3, - SF_FORMAT_B1, - SF_FORMAT_B2, - SF_FORMAT_B3, - SF_FORMAT_B4, - SF_FORMAT_C0, - SF_FORMAT_C2 -}ShortFormat; - -typedef enum -{ - PRACH_FD_OCC_IN_A_SLOT_1 = 1, - PRACH_FD_OCC_IN_A_SLOT_2 = 2, - PRACH_FD_OCC_IN_A_SLOT_4 = 4, - PRACH_FD_OCC_IN_A_SLOT_8 = 8 -}FdOccPerSlot; - -typedef enum -{ - RSSI_REPORT_DBM, - RSSI_REPORT_DBFS -}RssiMeasurement; - -typedef struct clCellParam -{ - ReleaseCapab releaseCapability; /* Release Capability */ - PhyState ParamPhystate; - ParamSupport skipBlankDlConfig; - ParamSupport skipBlankUlConfig; - ParamSupport numTlvsToReport; - CyclicPrefix cyclicPrefix; - SubCarrierSpacing supportedSubcarrierSpacingDl; - SupportedBandwidth supportedBandwidthDl; - SubCarrierSpacing supportedSubcarrierSpacingsUl; - SupportedBandwidth supportedBandwidthUl; - CCEMappingType cceMappingType; - ParamSupport coresetOutsideFirst3OfdmSymsOfSlot; - ParamSupport precoderGranularityCoreset; - ParamSupport pdcchMuMimo; - ParamSupport pdcchPrecoderCycling; - U8 maxPdcchsPerSlot; - Formats pucchFormats; - U8 maxPucchsPerSlot; - MappingType pdschMappingType; - AllocationType pdschAllocationTypes; - VrbToPrbMap pdschVrbToPrbMapping; - ParamSupport pdschCbg; - DmrsConfigType pdschDmrsConfigTypes; - DmrMaxLen pdschDmrsMaxLength; - DmrsPos pdschDmrsAdditionalPos; - U8 maxPdschsTBsPerSlot; - U8 maxNumberMimoLayersPdsch; - ModulationOrder supportedMaxModulationOrderDl; - U8 maxMuMimoUsersDl; - ParamSupport pdschDataInDmrsSymbols; - ParamSupport premptionSupport; - ParamSupport pdschNonSlotSupport; - ParamSupport uciMuxUlschInPusch; - ParamSupport uciOnlyPusch; - ParamSupport puschFrequencyHopping; - DmrsConfigType puschDmrsConfigTypes; - DmrMaxLen puschDmrsMaxLength; - DmrsPos puschDmrsAdditionalPos; - ParamSupport puschCbg; - MappingType puschMappingType; - AllocationType puschAllocationTypes; - VrbToPrbMap puschVrbToPrbMapping; - U8 puschMaxPtrsPorts; - U8 maxPduschsTBsPerSlot; - U8 maxNumberMimoLayersNonCbPusch; - ModulationOrder supportedModulationOrderUl; - U8 maxMuMimoUsersUl; - ParamSupport dftsOfdmSupport; - AggregationFactor puschAggregationFactor; - Formats prachLongFormats; - ShortFormat prachShortFormats; - ParamSupport prachRestrictedSets; - FdOccPerSlot maxPrachFdOccasionsInASlot; - RssiMeasurement rssiMeasurementSupport; -}ClCellParam; - - -EXTERN ClCb clGlobalCp; -EXTERN ClCellCb * rgClUtlGetCellCb ARGS((U16 cellId)); - -#endif - -/********************************************************************** - End of file -**********************************************************************/ diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c index 5957f3919..4e15d764d 100755 --- a/src/5gnrmac/rg_com.c +++ b/src/5gnrmac/rg_com.c @@ -73,7 +73,7 @@ static int RLOG_MODULE_ID=4096; #include "tfu.x" #include "rg_sch_inf.x" #include "rg_prg.x" /* PRG interface typedefs*/ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" #ifdef LTE_ADV #include "rg_pom_scell.x" diff --git a/src/5gnrmac/rg_dbm.c b/src/5gnrmac/rg_dbm.c index 76bf324d9..12bf63275 100755 --- a/src/5gnrmac/rg_dbm.c +++ b/src/5gnrmac/rg_dbm.c @@ -67,7 +67,7 @@ #include "tfu.x" #include "rg_sch_inf.x" #include "rg_prg.x" /* PRG interface typedefs*/ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" diff --git a/src/5gnrmac/rg_dhm.c b/src/5gnrmac/rg_dhm.c index 5185d5625..1d5d66d86 100755 --- a/src/5gnrmac/rg_dhm.c +++ b/src/5gnrmac/rg_dhm.c @@ -78,7 +78,7 @@ static int RLOG_MODULE_ID=4096; #include "tfu.x" #include "rg_sch_inf.x" #include "rg_prg.x" /* PRG interface typedefs */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" #ifdef L2_OPTMZ diff --git a/src/5gnrmac/rg_dux.c b/src/5gnrmac/rg_dux.c index 4b38e8264..5b16b3d2f 100755 --- a/src/5gnrmac/rg_dux.c +++ b/src/5gnrmac/rg_dux.c @@ -79,7 +79,7 @@ static int RLOG_MODULE_ID=4096; #include "rgu.x" /* RGU Interface includes */ #include "lrg.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index 743accabf..abb301489 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -73,7 +73,7 @@ registered with SSI during the LTE MAC Task initialization. #include "crg.x" /* CRG interface typedes */ #include "rg_sch_inf.x" /* SCH interface typedefs */ #include "rg_prg.x" /*PRG interface includes*/ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c index 4d0722634..a393f0819 100755 --- a/src/5gnrmac/rg_l2m.c +++ b/src/5gnrmac/rg_l2m.c @@ -69,7 +69,7 @@ #include "crg.x" /* layer management typedefs for MAC */ #include "rg_sch_inf.x" /* typedefs for Scheduler */ #include "rg_prg.x" /* typedefs for PRG interface */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC types */ #ifdef LTE_L2_MEAS diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c index ccead37e8..b728ac695 100755 --- a/src/5gnrmac/rg_lim.c +++ b/src/5gnrmac/rg_lim.c @@ -72,7 +72,7 @@ static int RLOG_MODULE_ID=4096; #include "crg.x" /* layer management typedefs for MAC */ #include "rg_sch_inf.x" /* SCH interface typedefs */ #include "rg_prg.x" /* PRG interface typedefs */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ /* local defines */ diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index 7205c6f38..0e7445856 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -75,7 +75,7 @@ static int RLOG_MODULE_ID=4096; #include "rg_prg.x" /* PRG Interface includes */ #include "lrg.x" /* LRG Interface includes */ #include "rgr.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ #ifdef SS_DIAG #include "ss_diag.h" /* Common log file */ @@ -83,7 +83,7 @@ static int RLOG_MODULE_ID=4096; #include "ss_rbuf.h" #include "ss_rbuf.x" -#include "rg_cl.h" /* MAC CL defines */ +#include "lwr_mac.h" /* MAC CL defines */ #ifdef __cplusplus extern "C" { @@ -130,14 +130,13 @@ RgMngmt *cfm, Pst *cfmPst )); -extern U16 cmPackLcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); -extern U16 cmPackLwlcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); +extern U16 cmPackMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); packMacCellCfgCfm packMacCellCfmOpts[] = { - cmPackLcMacCellCfgCfm, /* packing for loosely coupled */ + cmPackMacCellCfgCfm, /* packing for loosely coupled */ duHandleMacCellCfgCfm, /* packing for tightly coupled */ - cmPackLwlcMacCellCfgCfm, /* packing for light weight loosly coupled */ + cmPackMacCellCfgCfm, /* packing for light weight loosly coupled */ }; /** @@ -2139,7 +2138,7 @@ S16 MacHdlCellCfgReq macCellCfgFillCfmPst(pst,&cnfPst); macCellCfgCfm.transId = macCellCfg->transId; - //ret = cmPackLcMacCellCfgCfm(&cnfPst,&macCellCfgCfm); + ret = (*packMacCellCfmOpts[cnfPst.selector])(&cnfPst,&macCellCfgCfm); return ret; } /* end of MacHdlCellCfgReq */ diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index edb57c2a1..e1605abe9 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -79,7 +79,7 @@ static int RLOG_MODULE_ID=4096; #include "rgu.x" /* RGU Interface includes */ #include "lrg.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ #include "ss_queue.h" #include "ss_queue.x" diff --git a/src/5gnrmac/rg_pom_scell.c b/src/5gnrmac/rg_pom_scell.c index 021777d17..c8245f252 100755 --- a/src/5gnrmac/rg_pom_scell.c +++ b/src/5gnrmac/rg_pom_scell.c @@ -69,7 +69,7 @@ #include "tfu.x" #include "rg_sch_inf.x" #include "rg_prg.x" /* PRG interface typedefs*/ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" #ifdef LTE_ADV #include "rg_pom_scell.x" diff --git a/src/5gnrmac/rg_prg.c b/src/5gnrmac/rg_prg.c index 85d5318e2..4eb62ef0e 100755 --- a/src/5gnrmac/rg_prg.c +++ b/src/5gnrmac/rg_prg.c @@ -65,7 +65,7 @@ #include "crg.x" /* layer management typedefs for MAC */ #include "rg_sch_inf.x" /* layer management typedefs for MAC */ #include "rg_prg.x" /* Prg(MAC-MAC)interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ #ifdef LTE_ADV diff --git a/src/5gnrmac/rg_prg_pt.c b/src/5gnrmac/rg_prg_pt.c index 0b15ccd9a..efa914ff6 100755 --- a/src/5gnrmac/rg_prg_pt.c +++ b/src/5gnrmac/rg_prg_pt.c @@ -65,7 +65,7 @@ #include "crg.x" /* layer management typedefs for MAC */ #include "rg_sch_inf.x" /* layer management typedefs for MAC */ #include "rg_prg.x" /* PRG interface typedefs*/ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ #ifdef LTE_ADV diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c index c06b9b40b..e3a53c7cb 100755 --- a/src/5gnrmac/rg_ram.c +++ b/src/5gnrmac/rg_ram.c @@ -78,7 +78,7 @@ static int RLOG_MODULE_ID=4096; #include "rg_prg.x" /* PRG Interface includes */ #include "lrg.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ diff --git a/src/5gnrmac/rg_rom.c b/src/5gnrmac/rg_rom.c index 335273117..f015788ba 100755 --- a/src/5gnrmac/rg_rom.c +++ b/src/5gnrmac/rg_rom.c @@ -78,7 +78,7 @@ static int RLOG_MODULE_ID=4096; #include "rg_prg.x" /* PRG Interface includes */ #include "lrg.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ diff --git a/src/5gnrmac/rg_tom.c b/src/5gnrmac/rg_tom.c index ce4dd6096..d00219147 100755 --- a/src/5gnrmac/rg_tom.c +++ b/src/5gnrmac/rg_tom.c @@ -75,7 +75,7 @@ invoked by PHY towards MAC #include "rg_prg.x" /* PRG interface typedefs */ #include "rgm.x" /* layer management typedefs for MAC */ #include "rgm.h" /* layer management typedefs for MAC */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ #ifdef MAC_RLC_UL_RBUF diff --git a/src/5gnrmac/rg_uhm.c b/src/5gnrmac/rg_uhm.c index e795ef66c..8d880a7e2 100755 --- a/src/5gnrmac/rg_uhm.c +++ b/src/5gnrmac/rg_uhm.c @@ -74,7 +74,7 @@ #include "rg_prg.x" /* PRG Interface defines */ #include "lrg.x" /* LRG Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index cd47827a1..48cc4ad1a 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -78,7 +78,7 @@ static int RLOG_FILE_ID=178; #include "rgu.x" #include "rg_sch_inf.x" #include "rg_prg.x" /* PRG interface typedefs*/ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ #include "ss_rbuf.h" diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index e1b074fe6..d7b87b0ad 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -78,7 +78,7 @@ static int RLOG_FILE_ID=179; #include "lrg.x" /* LRG Interface includes */ #include "rg_prg.x" /* PRG(MAC-MAC) Interface includes */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ diff --git a/src/cm/du_mgr_mac_inf.c b/src/cm/du_app_mac_inf.c similarity index 84% rename from src/cm/du_mgr_mac_inf.c rename to src/cm/du_app_mac_inf.c index 1bfc52942..408d39528 100644 --- a/src/cm/du_mgr_mac_inf.c +++ b/src/cm/du_app_mac_inf.c @@ -34,7 +34,7 @@ #include "cm_hash.x" /* Common Hash List Definitions */ #include "cm_lte.x" /* Common LTE Defines */ -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" /************************************************************************** * @brief Function to pack Loose Coupled @@ -58,7 +58,7 @@ S16 packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg) if(pst->selector == DU_SELECTOR_LC) { /* we are now implemented only light wieght lossely coupled interface */ - return ROK; + return RFAILED; } else if(pst->selector == DU_SELECTOR_LWLC) { @@ -73,7 +73,6 @@ S16 packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg) CMCHKPK(cmPkPtr,(PTR)macCellCfg, mBuf); RETVALUE(SPstTsk(pst,mBuf)); - } } @@ -124,7 +123,7 @@ void unpackDuMacCellCfg( * * @details * - * Function : cmPackLcMacCellCfgCfm + * Function : cmPackMacCellCfgCfm * * Functionality: * packs the transaction ID @@ -135,40 +134,26 @@ void unpackDuMacCellCfg( * RFAILED - failure * ***************************************************************************/ -U16 cmPackLcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm) +U16 cmPackMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm) { - Buffer *mBuf = NULLP; - if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + if(pst->selector == DU_SELECTOR_LC) { - RETVALUE(RFAILED); - } + Buffer *mBuf = NULLP; + if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) + { + RETVALUE(RFAILED); + } - /* pack the transaction ID in CNF structure */ - CMCHKPK(SPkU16, macCellCfgCfm->transId, mBuf); + /* pack the transaction ID in CNF structure */ + CMCHKPK(SPkU16, macCellCfgCfm->transId, mBuf); - RETVALUE(SPstTsk(pst,mBuf)); -} - -/************************************************************************** - * @brief Function to pack light weight Loose Coupled - * MAC cell config confirm message - * - * @details - * - * Function : cmPackLwlcMacCellCfgCfm - * - * Functionality: - * packs the transaction ID - * - * @param[in] Pst *pst, Post structure of the primitive. - * @param[in] MacCellCfgCfm *macCellCfgCfm, mac cell config confirm. - * @return ROK - success - * RFAILED - failure - * - ***************************************************************************/ -U16 cmPackLwlcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm) -{ - return ROK; + RETVALUE(SPstTsk(pst,mBuf)); + } + else if(pst->selector == DU_SELECTOR_LWLC) + { + /* only LC is supported */ + return RFAILED; + } } /************************************************************************** diff --git a/src/cm/du_mgr_mac_inf.h b/src/cm/du_app_mac_inf.h similarity index 100% rename from src/cm/du_mgr_mac_inf.h rename to src/cm/du_app_mac_inf.h diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 6dbee7566..d99266c15 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -20,7 +20,7 @@ #define __DU_CONFIG_H__ #include "du_mgr.h" -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "du_log.h" #include "BIT_STRING.h" diff --git a/src/du_app/du_mgr.h b/src/du_app/du_mgr.h index 910154c7b..b0c553e54 100644 --- a/src/du_app/du_mgr.h +++ b/src/du_app/du_mgr.h @@ -37,7 +37,7 @@ #include "lkw.h" #include "lrg.h" #include "legtp.h" -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" #include "gen.x" /* General */ #include "ssi.x" /* System services */ diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c index d2240b37c..31a4b1d2a 100644 --- a/src/du_app/du_mgr_ex_ms.c +++ b/src/du_app/du_mgr_ex_ms.c @@ -22,7 +22,7 @@ #include "du_f1ap_msg_hdl.h" #include "lsctp.h" #include "legtp.h" -#include "du_mgr_mac_inf.h" +#include "du_app_mac_inf.h" extern S16 cmUnpkLkwCfgCfm(LkwCfgCfm func,Pst *pst, Buffer *mBuf); extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf); -- 2.16.6