maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hard-coded PUSCH/PDSCH-Config-Common-v1310, harmonization of configuration file with eMTC config from samples of Verizon network

Browse Source
This commit is contained in:
islam.galal
2017-08-16 13:18:51 +02:00
parent c0b0ed5a57
commit 91beb110f0
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+13 -2
View File
@@ -1332,8 +1332,17 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13 = NULL; (*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13 = NULL;
} }
(*sib2)->radioResourceConfigCommon.ext4->pdsch_ConfigCommon_v1310 = NULL; (*sib2)->radioResourceConfigCommon.ext4->pdsch_ConfigCommon_v1310 = calloc(1,sizeof(PDSCH_ConfigCommon_v1310_t));
(*sib2)->radioResourceConfigCommon.ext4->pusch_ConfigCommon_v1310 = NULL; (*sib2)->radioResourceConfigCommon.ext4->pdsch_ConfigCommon_v1310->pdsch_maxNumRepetitionCEmodeA_r13 = calloc(1,sizeof(long));
*(*sib2)->radioResourceConfigCommon.ext4->pdsch_ConfigCommon_v1310->pdsch_maxNumRepetitionCEmodeA_r13 = 0;
(*sib2)->radioResourceConfigCommon.ext4->pdsch_ConfigCommon_v1310->pdsch_maxNumRepetitionCEmodeB_r13 = NULL;
(*sib2)->radioResourceConfigCommon.ext4->pusch_ConfigCommon_v1310 = calloc(1,sizeof(PUSCH_ConfigCommon_v1310_t));
(*sib2)->radioResourceConfigCommon.ext4->pusch_ConfigCommon_v1310->pusch_maxNumRepetitionCEmodeA_r13 = calloc(1,sizeof(long));
*(*sib2)->radioResourceConfigCommon.ext4->pusch_ConfigCommon_v1310->pusch_maxNumRepetitionCEmodeA_r13 = 0;
(*sib2)->radioResourceConfigCommon.ext4->pusch_ConfigCommon_v1310->pusch_maxNumRepetitionCEmodeB_r13 = NULL;
(*sib2)->radioResourceConfigCommon.ext4->pusch_ConfigCommon_v1310->pusch_HoppingOffset_v1310 = NULL;
if (rrconfig->prach_ConfigCommon_v1310) if (rrconfig->prach_ConfigCommon_v1310)
{ {
@@ -1456,6 +1465,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
{ {
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310 = NULL; (*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310 = NULL;
} }
(*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310 = calloc(1, sizeof(PUCCH_ConfigCommon_v1310_t)); (*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310 = calloc(1, sizeof(PUCCH_ConfigCommon_v1310_t));
memset((*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310, 0, sizeof(PUCCH_ConfigCommon_v1310_t)); memset((*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310, 0, sizeof(PUCCH_ConfigCommon_v1310_t));
(*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310->n1PUCCH_AN_InfoList_r13 = calloc(1, sizeof(N1PUCCH_AN_InfoList_r13_t)); (*sib2)->radioResourceConfigCommon.ext4->pucch_ConfigCommon_v1310->n1PUCCH_AN_InfoList_r13 = calloc(1, sizeof(N1PUCCH_AN_InfoList_r13_t));
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
+24 -24
View File
@@ -152,11 +152,11 @@ eNBs =
rach_CE_LevelInfoList_r13 = rach_CE_LevelInfoList_r13 =
( (
{ {
firstPreamble_r13 = 0; firstPreamble_r13 = 60;
lastPreamble_r13 = 63; lastPreamble_r13 = 63;
ra_ResponseWindowSize_r13 = 0; ra_ResponseWindowSize_r13 = 0;
mac_ContentionResolutionTimer_r13 = 0; mac_ContentionResolutionTimer_r13 = 0;
rar_HoppingConfig_r13 = 0; rar_HoppingConfig_r13 = 1;
} }
); );
@@ -166,7 +166,7 @@ eNBs =
rsrp_range_list = rsrp_range_list =
( (
{ {
rsrp_range_br = 60; rsrp_range_br = 0;
} }
); );
@@ -175,27 +175,27 @@ eNBs =
( (
{ {
prach_config_index_br = 3; prach_config_index_br = 3;
prach_freq_offset_br = 1; prach_freq_offset_br = 2;
prach_StartingSubframe_r13 = 0; prach_StartingSubframe_r13 = 0;
maxNumPreambleAttemptCE_r13 = 0; maxNumPreambleAttemptCE_r13 = 6;
numRepetitionPerPreambleAttempt_r13 = 0; numRepetitionPerPreambleAttempt_r13 = 0;
mpdcch_NumRepetition_RA_r13 = 0; mpdcch_NumRepetition_RA_r13 = 0;
prach_HoppingConfig_r13 = 0; prach_HoppingConfig_r13 = 1;
max_available_narrow_band = [5]; max_available_narrow_band = [2];
} }
); );
n1PUCCH_AN_InfoList_r13 = n1PUCCH_AN_InfoList_r13 =
( (
{ {
pucch_info_value = 12; pucch_info_value = 0;
} }
); );
pcch_config_v1310 : pcch_config_v1310 :
{ {
paging_narrowbands_r13 = 5; paging_narrowbands_r13 = 1;
mpdcch_numrepetition_paging_r13 = 2; mpdcch_numrepetition_paging_r13 = 0;
nb_v1310 = 2; nb_v1310 = 2;
} }
@@ -207,32 +207,32 @@ eNBs =
sib2_freq_hoppingParameters_r13 : sib2_freq_hoppingParameters_r13 :
{ {
sib2_mpdcch_pdsch_hoppingNB_r13 = 0; # sib2_mpdcch_pdsch_hoppingNB_r13 = 0;
sib2_interval_DLHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD) # sib2_interval_DLHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD)
sib2_interval_DLHoppingConfigCommonModeA_r13_val = 0; # sib2_interval_DLHoppingConfigCommonModeA_r13_val = 0;
sib2_interval_DLHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD) # sib2_interval_DLHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD)
sib2_interval_DLHoppingConfigCommonModeB_r13_val = 0; # sib2_interval_DLHoppingConfigCommonModeB_r13_val = 0;
sib2_interval_ULHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD) sib2_interval_ULHoppingConfigCommonModeA_r13 = 0; # choice -> (0, FDD) (1, TDD)
sib2_interval_ULHoppingConfigCommonModeA_r13_val = 0; sib2_interval_ULHoppingConfigCommonModeA_r13_val = 2;
sib2_interval_ULHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD) # sib2_interval_ULHoppingConfigCommonModeB_r13 = 0; # choice -> (0, FDD) (1, TDD)
sib2_interval_ULHoppingConfigCommonModeB_r13_val = 0; # sib2_interval_ULHoppingConfigCommonModeB_r13_val = 0;
sib2_mpdcch_pdsch_hoppingOffset_r13 = 1; # sib2_mpdcch_pdsch_hoppingOffset_r13 = 1;
} }
mpdcch_startSF_CSS_RA_r13 = "fdd-r13" mpdcch_startSF_CSS_RA_r13 = "fdd-r13"
mpdcch_startSF_CSS_RA_r13_val = 5; mpdcch_startSF_CSS_RA_r13_val = 0;
#prach_HoppingOffset_r13 = ; prach_HoppingOffset_r13 = 0;
prach_root = 1; prach_root = 89;
prach_config_index = 0; prach_config_index = 3;
prach_high_speed = "DISABLE"; prach_high_speed = "DISABLE";
prach_zero_correlation = 1; prach_zero_correlation = 1;
prach_freq_offset = 3; prach_freq_offset = 3;
pucch_delta_shift = 1; pucch_delta_shift = 2;
pucch_nRB_CQI = 1; pucch_nRB_CQI = 1;
pucch_nCS_AN = 0; pucch_nCS_AN = 0;
pucch_n1_AN = 32; pucch_n1_AN = 32;