Skip to content

O
OpenXG-RAN
Commit 1b429a63 authored by kogo's avatar kogo
Browse files
Options

refactored config file, SIB1 & SIB2 are sent/received successfully

parent b6bc4bc8
Show whitespace changes
Inline Side-by-side
Showing with 1890 additions and 1147 deletions
openair2/COMMON/rrc_messages_types.h
View file @ 1b429a63
...@@ -234,6 +234,7 @@ typedef struct RrcConfigurationReq_s { ...@@ -234,6 +234,7 @@ typedef struct RrcConfigurationReq_s {
int rach_CE_LevelInfoList_r13_size [MAX_NUM_CCs]; int rach_CE_LevelInfoList_r13_size [MAX_NUM_CCs];
// end kogo // end kogo
// long pcch_defaultPagingCycle_br;
// +kogo -- rsrp_range_list // +kogo -- rsrp_range_list
long rsrp_range [MAX_NUM_CCs][3]; long rsrp_range [MAX_NUM_CCs][3];
......
openair2/ENB_APP/enb_config.c
View file @ 1b429a63
This source diff could not be displayed because it is too large. You can view the blob instead.
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @ 1b429a63
...@@ -1640,7 +1640,7 @@ uint8_t do_SIB23(uint8_t Mod_id, ...@@ -1640,7 +1640,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.pcch_Config.nB=PCCH_Config__nB_oneT; (*sib2)->radioResourceConfigCommon.pcch_Config.nB=PCCH_Config__nB_oneT;
// PRACH-Config // PRACH-Config
(*sib2)->radioResourceConfigCommon.prach_Config.rootSequenceIndex=Mod_id;//0;//384; (*sib2)->radioResourceConfigCommon.prach_Config.rootSequenceIndex = Mod_id;//0;//384;
(*sib2)->radioResourceConfigCommon.prach_Config.prach_ConfigInfo.prach_ConfigIndex = 0;//3; (*sib2)->radioResourceConfigCommon.prach_Config.prach_ConfigInfo.prach_ConfigIndex = 0;//3;
(*sib2)->radioResourceConfigCommon.prach_Config.prach_ConfigInfo.highSpeedFlag = 0; (*sib2)->radioResourceConfigCommon.prach_Config.prach_ConfigInfo.highSpeedFlag = 0;
(*sib2)->radioResourceConfigCommon.prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig = 1;//12; (*sib2)->radioResourceConfigCommon.prach_Config.prach_ConfigInfo.zeroCorrelationZoneConfig = 1;//12;
...@@ -1744,17 +1744,17 @@ uint8_t do_SIB23(uint8_t Mod_id, ...@@ -1744,17 +1744,17 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310->pucch_NumRepetitionCE_Msg4_Level3_r13 = NULL; (*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310->pucch_NumRepetitionCE_Msg4_Level3_r13 = NULL;
//----------------------------------------------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------------------------------------------
(*sib2)->ue_TimersAndConstants.t300=UE_TimersAndConstants__t300_ms1000; (*sib2)->ue_TimersAndConstants.t300 = UE_TimersAndConstants__t300_ms1000;
(*sib2)->ue_TimersAndConstants.t301=UE_TimersAndConstants__t301_ms1000; (*sib2)->ue_TimersAndConstants.t301 = UE_TimersAndConstants__t301_ms1000;
(*sib2)->ue_TimersAndConstants.t310=UE_TimersAndConstants__t310_ms1000; (*sib2)->ue_TimersAndConstants.t310 = UE_TimersAndConstants__t310_ms1000;
(*sib2)->ue_TimersAndConstants.n310=UE_TimersAndConstants__n310_n20; (*sib2)->ue_TimersAndConstants.n310 = UE_TimersAndConstants__n310_n20;
(*sib2)->ue_TimersAndConstants.t311=UE_TimersAndConstants__t311_ms10000; (*sib2)->ue_TimersAndConstants.t311 = UE_TimersAndConstants__t311_ms10000;
(*sib2)->ue_TimersAndConstants.n311=UE_TimersAndConstants__n311_n1; (*sib2)->ue_TimersAndConstants.n311 = UE_TimersAndConstants__n311_n1;
#endif #endif
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
View file @ 1b429a63
...@@ -81,7 +81,7 @@ eNBs = ...@@ -81,7 +81,7 @@ eNBs =
pucch_deltaF_Format2a = "deltaF0"; pucch_deltaF_Format2a = "deltaF0";
pucch_deltaF_Format2b = "deltaF0"; pucch_deltaF_Format2b = "deltaF0";
rach_numberOfRA_Preambles = 64; rach_numberOfRA_Preambles = "n64"; #64
rach_preamblesGroupAConfig = "DISABLE"; rach_preamblesGroupAConfig = "DISABLE";
/* /*
rach_sizeOfRA_PreamblesGroupA = ; rach_sizeOfRA_PreamblesGroupA = ;
...@@ -95,16 +95,16 @@ eNBs = ...@@ -95,16 +95,16 @@ eNBs =
rach_macContentionResolutionTimer = 48; rach_macContentionResolutionTimer = 48;
rach_maxHARQ_Msg3Tx = 4; rach_maxHARQ_Msg3Tx = 4;
pcch_default_PagingCycle = 128; pcch_default_PagingCycle = "rf128"; #128
pcch_nB = "oneT"; pcch_nB = "oneT";
bcch_modificationPeriodCoeff = 2; bcch_modificationPeriodCoeff = 2;
ue_TimersAndConstants_t300 = 1000; ue_TimersAndConstants_t300 = "ms1000";
ue_TimersAndConstants_t301 = 1000; ue_TimersAndConstants_t301 = "ms1000";
ue_TimersAndConstants_t310 = 1000; ue_TimersAndConstants_t310 = "ms1000";
ue_TimersAndConstants_t311 = 10000; ue_TimersAndConstants_t311 = "ms10000";
ue_TimersAndConstants_n310 = 20; ue_TimersAndConstants_n310 = "n20";
ue_TimersAndConstants_n311 = 1; ue_TimersAndConstants_n311 = "n1";
ue_TransmissionMode = 1; ue_TransmissionMode = "tm1";
# BR Parameters # BR Parameters
br_parameters : br_parameters :
...@@ -127,8 +127,8 @@ eNBs = ...@@ -127,8 +127,8 @@ eNBs =
cellSelectionInfoCE_r13 = "ENABLE"; cellSelectionInfoCE_r13 = "ENABLE";
q_RxLevMinCE_r13 = -70; q_RxLevMinCE_r13 = -70;
bandwidthReducedAccessRelatedInfo_r13 = "ENABLE" bandwidthReducedAccessRelatedInfo_r13 = "ENABLE"
si_WindowLength_BR_r13 = 0; si_WindowLength_BR_r13 = "ms20"; #0
si_RepetitionPattern_r13 = 0; si_RepetitionPattern_r13 = "everyRF"; #0
scheduling_info_br = scheduling_info_br =
( (
...@@ -141,11 +141,11 @@ eNBs = ...@@ -141,11 +141,11 @@ eNBs =
fdd_DownlinkOrTddSubframeBitmapBR_r13 = "subframePattern40-r13"; fdd_DownlinkOrTddSubframeBitmapBR_r13 = "subframePattern40-r13";
fdd_DownlinkOrTddSubframeBitmapBR_val_r13 = 0xFFFFFFFFFF; fdd_DownlinkOrTddSubframeBitmapBR_val_r13 = 0xFFFFFFFFFF;
startSymbolBR_r13 = 3; startSymbolBR_r13 = 3;
si_HoppingConfigCommon_r13 = 1; # Note: 1==OFF ! si_HoppingConfigCommon_r13 = "off"; #1; # Note: 1==OFF !
si_ValidityTime_r13 = 0; si_ValidityTime_r13 = "true"; #0
freqHoppingParametersDL_r13 = "DISABLE" freqHoppingParametersDL_r13 = "DISABLE"
mpdcch_pdsch_HoppingNB_r13 = 0; mpdcch_pdsch_HoppingNB_r13 = "nb2"; #0
interval_DLHoppingConfigCommonModeA_r13 = "interval-FDD-r13" interval_DLHoppingConfigCommonModeA_r13 = "interval-FDD-r13"
interval_DLHoppingConfigCommonModeA_r13_val = 0; interval_DLHoppingConfigCommonModeA_r13_val = 0;
interval_DLHoppingConfigCommonModeB_r13 = "interval-FDD-r13" interval_DLHoppingConfigCommonModeB_r13 = "interval-FDD-r13"
...@@ -155,9 +155,9 @@ eNBs = ...@@ -155,9 +155,9 @@ eNBs =
# SIB23 # SIB23
frame_type = "FDD"; frame_type = "FDD";
preambleTransMax_CE_r13 = 6; preambleTransMax_CE_r13 = "n10"; #6
rach_numberOfRA_Preambles = 60; rach_numberOfRA_Preambles = "n60"; #14
rach_powerRampingStep = 4; rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108; rach_preambleInitialReceivedTargetPower = -108;
rach_preambleTransMax = 10; rach_preambleTransMax = 10;
...@@ -171,9 +171,9 @@ eNBs = ...@@ -171,9 +171,9 @@ eNBs =
{ {
firstPreamble_r13 = 60; firstPreamble_r13 = 60;
lastPreamble_r13 = 63; lastPreamble_r13 = 63;
ra_ResponseWindowSize_r13 = 0; ra_ResponseWindowSize_r13 = "sf20"; #0
mac_ContentionResolutionTimer_r13 = 0; mac_ContentionResolutionTimer_r13 = "sf80"; #0
rar_HoppingConfig_r13 = 1; rar_HoppingConfig_r13 = "off"; #1;
} }
); );
...@@ -181,7 +181,7 @@ eNBs = ...@@ -181,7 +181,7 @@ eNBs =
bcch_modificationPeriodCoeff = 2; bcch_modificationPeriodCoeff = 2;
#PCCH Config #PCCH Config
pcch_default_PagingCycle = 128; pcch_default_PagingCycle = "rf128"; #128
pcch_nB = "oneT"; pcch_nB = "oneT";
#PRACH Config #PRACH Config
...@@ -189,7 +189,7 @@ eNBs = ...@@ -189,7 +189,7 @@ eNBs =
prach_config_index = 3; prach_config_index = 3;
prach_high_speed = "DISABLE"; prach_high_speed = "DISABLE";
prach_zero_correlation = 1; prach_zero_correlation = 1;
prach_freq_offset = 2; prach_freq_offset = 1;
#PDSCH Config Common #PDSCH Config Common
pdsch_referenceSignalPower = -27; pdsch_referenceSignalPower = -27;
...@@ -225,11 +225,11 @@ eNBs = ...@@ -225,11 +225,11 @@ eNBs =
prach_ConfigCommon_v1310 = "ENABLE"; prach_ConfigCommon_v1310 = "ENABLE";
pdsch_maxNumRepetitionCEmodeA_r13 = 0; pdsch_maxNumRepetitionCEmodeA_r13 = "r16"; #0
#pdsch_maxNumRepetitionCEmodeB_r13 = 2; # NULL #pdsch_maxNumRepetitionCEmodeB_r13 = "r384"; # NULL - 2
pusch_maxNumRepetitionCEmodeA_r13 = 0; pusch_maxNumRepetitionCEmodeA_r13 = "r8"; #0
#pusch_maxNumRepetitionCEmodeB_r13 = 4; #NULL #pusch_maxNumRepetitionCEmodeB_r13 = "r768"; #4 #NULL
#pusch_HoppingOffset_v1310 = 5; #NULL #pusch_HoppingOffset_v1310 = 5; #NULL
# max size for this array is 3 # max size for this array is 3
...@@ -241,7 +241,7 @@ eNBs = ...@@ -241,7 +241,7 @@ eNBs =
); );
mpdcch_startSF_CSS_RA_r13 = "fdd-r13"; mpdcch_startSF_CSS_RA_r13 = "fdd-r13";
mpdcch_startSF_CSS_RA_r13_val = 0; mpdcch_startSF_CSS_RA_r13_val = "v1"; #0
prach_HoppingOffset_r13 = 0; prach_HoppingOffset_r13 = 0;
# max size for this array is 4 # max size for this array is 4
...@@ -249,12 +249,12 @@ eNBs = ...@@ -249,12 +249,12 @@ eNBs =
( (
{ {
prach_config_index_br = 3; prach_config_index_br = 3;
prach_freq_offset_br = 2; prach_freq_offset_br = 1;
prach_StartingSubframe_r13 = 0; prach_StartingSubframe_r13 = 0;
maxNumPreambleAttemptCE_r13 = 6; maxNumPreambleAttemptCE_r13 = "n10"; #6
numRepetitionPerPreambleAttempt_r13 = 0; numRepetitionPerPreambleAttempt_r13 = "n1"; #0
mpdcch_NumRepetition_RA_r13 = 0; mpdcch_NumRepetition_RA_r13 = "r1"; #0
prach_HoppingConfig_r13 = 1; prach_HoppingConfig_r13 = "off"; #1
max_available_narrow_band = [2]; max_available_narrow_band = [2];
} }
); );
...@@ -267,39 +267,39 @@ eNBs = ...@@ -267,39 +267,39 @@ eNBs =
); );
ue_TimersAndConstants_t300 = 1000; ue_TimersAndConstants_t300 = "ms1000";
ue_TimersAndConstants_t301 = 400; ue_TimersAndConstants_t301 = "ms400";
ue_TimersAndConstants_t310 = 50; ue_TimersAndConstants_t310 = "ms50";
ue_TimersAndConstants_t311 = 30000; ue_TimersAndConstants_t311 = "ms30000";
ue_TimersAndConstants_n310 = 1; ue_TimersAndConstants_n310 = "n1";
ue_TimersAndConstants_n311 = 10; ue_TimersAndConstants_n311 = "n10";
ue_TransmissionMode = 1; ue_TransmissionMode = "tm1";
pcch_config_v1310 : pcch_config_v1310 :
{ {
paging_narrowbands_r13 = 1; paging_narrowbands_r13 = 1;
mpdcch_numrepetition_paging_r13 = 0; mpdcch_numrepetition_paging_r13 = "r1"; #0
#nb_v1310 = 2; #nb_v1310 = "one256thT"; #2
} }
pucch_NumRepetitionCE_Msg4_Level0_r13 = 0; pucch_NumRepetitionCE_Msg4_Level0_r13 = "n1"; #0
#pucch_NumRepetitionCE_Msg4_Level1_r13 = 1; #pucch_NumRepetitionCE_Msg4_Level1_r13 = "n2"; #1
#pucch_NumRepetitionCE_Msg4_Level2_r13 = 2; #pucch_NumRepetitionCE_Msg4_Level2_r13 = "n16"; #2
#pucch_NumRepetitionCE_Msg4_Level3_r13 = 3; #pucch_NumRepetitionCE_Msg4_Level3_r13 = "n32"; #3
sib2_freq_hoppingParameters_r13 : sib2_freq_hoppingParameters_r13 :
{ {
# sib2_mpdcch_pdsch_hoppingNB_r13 = 0; #sib2_mpdcch_pdsch_hoppingNB_r13 = "nb2"; #0
# sib2_interval_DLHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD) #sib2_interval_DLHoppingConfigCommonModeA_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
# sib2_interval_DLHoppingConfigCommonModeA_r13_val = 0; #sib2_interval_DLHoppingConfigCommonModeA_r13_val = "int1";
# sib2_interval_DLHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD) #sib2_interval_DLHoppingConfigCommonModeB_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
# sib2_interval_DLHoppingConfigCommonModeB_r13_val = 0; #sib2_interval_DLHoppingConfigCommonModeB_r13_val = "int2";
sib2_interval_ULHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD) sib2_interval_ULHoppingConfigCommonModeA_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
sib2_interval_ULHoppingConfigCommonModeA_r13_val = 2; sib2_interval_ULHoppingConfigCommonModeA_r13_val = "int4"; #2
# sib2_interval_ULHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD) # sib2_interval_ULHoppingConfigCommonModeB_r13 = "FDD"; # choice -> (0, FDD) (1, TDD)
# sib2_interval_ULHoppingConfigCommonModeB_r13_val = 0; # sib2_interval_ULHoppingConfigCommonModeB_r13_val = "int2"; #0
# sib2_mpdcch_pdsch_hoppingOffset_r13 = 1; # sib2_mpdcch_pdsch_hoppingOffset_r13 = 1;
} }
...@@ -364,9 +364,9 @@ eNBs = ...@@ -364,9 +364,9 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6:S1-C"; ENB_INTERFACE_NAME_FOR_S1_MME = "eth0:S1-C-eNB";
ENB_IPV4_ADDRESS_FOR_S1_MME = "172.17.0.21/24"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.17.0.21/24";
ENB_INTERFACE_NAME_FOR_S1U = "enp0s31f6:S1-U"; ENB_INTERFACE_NAME_FOR_S1U = "eth0:S1-U-eNB";
ENB_IPV4_ADDRESS_FOR_S1U = "172.16.0.21/24"; ENB_IPV4_ADDRESS_FOR_S1U = "172.16.0.21/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment