Skip to content

O
OpenXG-RAN
Commit 7cecfa10 authored by mohamed.said's avatar mohamed.said
Browse files
Options

Stable version of configuration

parent 78408cc6
Hide whitespace changes
Inline Side-by-side
Showing with 953 additions and 1097 deletions
common/config/config_cmdline.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/config_load_configmodule.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/config_load_configmodule.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/config_paramdesc.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/config_userapi.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/config_userapi.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/libconfig/config_libconfig.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/libconfig/config_libconfig.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/config/libconfig/config_libconfig_private.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/T/tracer/extract_input_subframe.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/load_module_shlib.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/load_module_shlib.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/CMakeLists.txt 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/telnetsrv.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/telnetsrv.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/telnetsrv_phycmd.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/telnetsrv_phycmd.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/telnetsrv_proccmd.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
common/utils/telnetsrv/telnetsrv_proccmd.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
open-nfapi.oai.patch 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
openair1/SCHED/fapi_l1.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
openair1/SCHED/fapi_l1.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
openair2/COMMON/rrc_messages_types.h
View file @ 7cecfa10
......@@ -197,7 +197,6 @@ typedef struct RrcConfigurationReq_s {
long* q_QualMinRSRQ_CE_r13 [MAX_NUM_CCs];
BOOLEAN_t bandwidthReducedAccessRelatedInfo_r13 [MAX_NUM_CCs];
// +kogo -- FIXME -- size 10 is temporary
long si_Narrowband_r13 [MAX_NUM_CCs][32];
long si_TBS_r13 [MAX_NUM_CCs][32];
int scheduling_info_br_size [MAX_NUM_CCs];
......
openair2/ENB_APP/enb_config.c
View file @ 7cecfa10
This source diff could not be displayed because it is too large. You can view the blob instead.
openair2/ENB_APP/enb_paramdef.h
View file @ 7cecfa10
......@@ -383,6 +383,12 @@ static int DEFENBS[] = {0};
#define ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2 "pucch_deltaF_Format2"
#define ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A "pucch_deltaF_Format2a"
#define ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B "pucch_deltaF_Format2b"
#define ENB_CONFIG_STRING_PRACH_CONFIG_COMMON_V1310 "prach_ConfigCommon_v1310"
#define ENB_CONFIG_STRING_MPDCCH_START_SF_CSS_RA_R13 "mpdcch_startSF_CSS_RA_r13"
#define ENB_CONFIG_STRING_MPDCCH_START_SF_CSS_RA_R13_VAL "mpdcch_startSF_CSS_RA_r13_val"
#define ENB_CONFIG_STRING_PRACH_HOPPING_OFFSET_R13 "prach_HoppingOffset_r13"
#define ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES "rach_numberOfRA_Preambles"
#define ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG "rach_preamblesGroupAConfig"
#define ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA "rach_sizeOfRA_PreamblesGroupA"
......@@ -460,12 +466,18 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_PUSCH_ALPHA, NULL, 0, strptr:&pusch_alpha, defstrval:"AL1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_PO_NOMINAL, NULL, 0, iptr:&pucch_p0_Nominal, defintval:-96, TYPE_INT, 0}, \
{ENB_CONFIG_STRING_MSG3_DELTA_PREAMBLE, NULL, 0, iptr:&msg3_delta_Preamble, defintval:6, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_PRACH_CONFIG_COMMON_V1310, NULL, 0, strptr:&prach_ConfigCommon_v1310, defstrval:"ENABLE", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MPDCCH_START_SF_CSS_RA_R13, NULL, 0, strptr:&mpdcch_startSF_CSS_RA_r13, defstrval:"fdd-r13", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MPDCCH_START_SF_CSS_RA_R13_VAL, NULL, 0, strptr:&mpdcch_startSF_CSS_RA_r13_val, defstrval:"v1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PRACH_HOPPING_OFFSET_R13, NULL, 0, iptr:&prach_HoppingOffset_r13, defintval:0, TYPE_INT, 0}, \
{ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_A_R13, NULL, 0, strptr:&pdsch_maxNumRepetitionCEmodeA_r13, defstrval:"r16", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_A_R13, NULL, 0, strptr:&pusch_maxNumRepetitionCEmodeA_r13, defstrval:"r8", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1, NULL, 0, strptr:&pucch_deltaF_Format1, defstrval:"DELTAF2", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT1b, NULL, 0, strptr:&pucch_deltaF_Format1b, defstrval:"deltaF3", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, NULL, 0, strptr:&pucch_deltaF_Format2, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, NULL, 0, strptr:&pucch_deltaF_Format2a, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, NULL, 0, strptr:&pucch_deltaF_Format2b, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, NULL, 0, strptr:&rach_numberOfRA_Preambles, defstrval:"n64", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, NULL, 0, strptr:&rach_numberOfRA_Preambles, defstrval:"n64", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, NULL, 0, strptr:&rach_preamblesGroupAConfig, defstrval:"DISABLE", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, NULL, 0, iptr:&rach_sizeOfRA_PreamblesGroupA, defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, NULL, 0, iptr:&rach_messageSizeGroupA, defintval:56, TYPE_UINT, 0}, \
......@@ -513,6 +525,10 @@ static int DEFENBS[] = {0};
#define ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_OFFSET_R13 "mpdcch_pdsch_HoppingOffset_r13"
#define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pdsch_maxNumRepetitionCEmodeA_r13"
#define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pusch_maxNumRepetitionCEmodeA_r13"
#define ENB_CONFIG_STRING_BR_PARAMETERS "br_parameters"
#define BRPARAMS_DESC { \
......@@ -654,40 +670,42 @@ static int DEFENBS[] = {0};
#define ENB_CONFIG_STRING_PRACH_PARAMETERS_CE_R13 "prach_parameters_ce_r13"
#define PRACH_PARAMS_CE_R13_DESC { \
{ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR, NULL, 0, iptr:&prach_config_index_br, defintval:3, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR, NULL, 0, iptr:&prach_freq_offset_br, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13, NULL, 0, iptr:&prach_StartingSubframe_r13, defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_MAX_NUM_PER_PREAMBLE_ATTEMPT_CE_R13, NULL, 0, iptr:&maxNumPreambleAttemptCE_r13, defintval:"n10", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_NUM_REPETITION_PER_PREAMBLE_ATTEMPT_R13, NULL, 0, iptr:&numRepetitionPerPreambleAttempt_r13, defintval:"n1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13, NULL, 0, iptr:&mpdcch_NumRepetition_RA_r13, defintval:"r1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13, NULL, 0, iptr:&prach_HoppingConfig_r13, defintval:"off", TYPE_STRING, 0}, \
{ENB_CONFIG_SRING_MAX_AVAILABLE_NARROW_BAND, NULL, 0, iptr:&maxavailablenarrowband, defintval:2, TYPE_UINT, 0} \
{ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR, NULL, 0, iptr:&prach_config_index_br, defintval:3, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR, NULL, 0, iptr:&prach_freq_offset_br, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13, NULL, 0, iptr:&prach_StartingSubframe_r13, defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_MAX_NUM_PER_PREAMBLE_ATTEMPT_CE_R13, NULL, 0, strptr:&maxNumPreambleAttemptCE_r13, defstrval:"n10", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_NUM_REPETITION_PER_PREAMBLE_ATTEMPT_R13, NULL, 0, strptr:&numRepetitionPerPreambleAttempt_r13, defstrval:"n1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13, NULL, 0, strptr:&mpdcch_NumRepetition_RA_r13, defstrval:"r1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13, NULL, 0, strptr:&prach_HoppingConfig_r13, defstrval:"off", TYPE_STRING, 0}, \
{ENB_CONFIG_SRING_MAX_AVAILABLE_NARROW_BAND, NULL, 0, uptr:NULL, defintarrayval:NULL, TYPE_INTARRAY, 0} \
}
#define ENB_CONFIG_STRING_PUCCH_INFO_VALUE "pucch_info_value"
#define ENB_CONFIG_STRING_N1PUCCH_AN_INFOLIST_R13 "n1PUCCH_AN_InfoList_r13"
#define N1PUCCH_AN_INFOLIST_R13_DESC { \
"pucch_info_value", NULL, 0, iptr:&pucch_info_value, defintval:0, TYPE_UINT, 0} \
{ENB_CONFIG_STRING_PUCCH_INFO_VALUE, NULL, 0, iptr:&pucch_info_value, defintval:0, TYPE_UINT, 0} \
}
#define ENB_CONFIG_STRING_PCCH_CONFIG_V1310 "pcch_config_v1310"
#define PCCH_CONFIG_V1310_DESC { \
"paging_narrowbands_r13", NULL, 0, iptr:&paging_narrowbands_r13, defintval:1, TYPE_UINT, 0} \
"mpdcch_numrepetition_paging_r13", NULL, 0, iptr:&mpdcch_numrepetition_paging_r13, defintval:"r1", TYPE_STRING, 0} \
"nb_v1310", NULL, 0, iptr:&nb_v1310, defintval:"one256thT", TYPE_STRING, 0} \
}
{ENB_CONFIG_STRING_PAGING_NARROWBANDS_R13, NULL, 0, iptr:&paging_narrowbands_r13, defintval:1, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_MPDCCH_NUMREPETITION_PAGING_R13, NULL, 0, iptr:&mpdcch_numrepetition_paging_r13, defintval:"r1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_NB_V1310, NULL, 0, iptr:&nb_v1310, defintval:"one256thT", TYPE_STRING, 0} \
}
#define ENB_CONFIG_STRING_SIB2_FREQ_HOPPINGPARAMETERS_R13 "sib2_freq_hoppingParameters_r13"
#define SIB2_FREQ_HOPPING_R13_DESC { \
"sib2_mpdcch_pdsch_hoppingNB_r13", NULL, 0, iptr:&sib2_mpdcch_pdsch_hoppingNB_r13, defintval:"", TYPE_STRING, 0} \
"sib2_interval_DLHoppingConfigCommonModeA_r13", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeA_r13, defintval:"", TYPE_STRING, 0} \
"sib2_interval_DLHoppingConfigCommonModeA_r13_val", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeA_r13_val, defintval:"", TYPE_STRING, 0} \
"sib2_interval_DLHoppingConfigCommonModeB_r13", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeB_r13, defintval:"", TYPE_STRING, 0} \
"sib2_interval_DLHoppingConfigCommonModeB_r13_val", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeB_r13_val, defintval:"", TYPE_STRING, 0} \
"sib2_interval_ULHoppingConfigCommonModeA_r13", NULL, 0, iptr:&sib2_interval_ULHoppingConfigCommonModeA_r13, defintval:"FDD", TYPE_STRING, 0} \
"sib2_interval_ULHoppingConfigCommonModeA_r13_val", NULL, 0, iptr:&sib2_interval_ULHoppingConfigCommonModeA_r13_val, defintval:"int4", TYPE_STRING, 0} \
"sib2_interval_ULHoppingConfigCommonModeB_r13", NULL, 0, iptr:&sib2_interval_ULHoppingConfigCommonModeB_r13, defintval:"", TYPE_STRING, 0} \
"sib2_interval_ULHoppingConfigCommonModeB_r13_val", NULL, 0, iptr:&sib2_interval_UHoppingConfigCommonModeB_r13_val, defintval:"", TYPE_STRING, 0} \
"sib2_mpdcch_pdsch_hoppingOffset_r13", NULL, 0, iptr:&sib2_mpdcch_pdsch_hoppingOffset_r13, defintval:1, TYPE_UINT, 0} \
{ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_NB_R13, NULL, 0, strptr:&sib2_mpdcch_pdsch_hoppingNB_r13, defstrval:"", TYPE_STRING, 0}, \
{"sib2_interval_DLHoppingConfigCommonModeA_r13", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeA_r13, defintval:"", TYPE_STRING, 0}, \
{"sib2_interval_DLHoppingConfigCommonModeA_r13_val", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeA_r13_val, defintval:"", TYPE_STRING, 0}, \
{"sib2_interval_DLHoppingConfigCommonModeB_r13", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeB_r13, defintval:"", TYPE_STRING, 0}, \
{"sib2_interval_DLHoppingConfigCommonModeB_r13_val", NULL, 0, iptr:&sib2_interval_DLHoppingConfigCommonModeB_r13_val, defintval:"", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_INTERVAL_UL_HOPPING_CONFIG_COMMON_MODE_A_R13, NULL, 0, strptr:&sib2_interval_ULHoppingConfigCommonModeA_r13, defstrval:"FDD", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_INTERVAL_UL_HOPPING_CONFIG_COMMON_MODE_A_R13_VAL, NULL, 0, strptr:&sib2_interval_ULHoppingConfigCommonModeA_r13_val, defstrval:"int4", TYPE_STRING, 0}, \
{"sib2_interval_ULHoppingConfigCommonModeB_r13", NULL, 0, iptr:&sib2_interval_ULHoppingConfigCommonModeB_r13, defintval:"", TYPE_STRING, 0}, \
{"sib2_interval_ULHoppingConfigCommonModeB_r13_val", NULL, 0, iptr:&sib2_interval_ULHoppingConfigCommonModeB_r13_val, defintval:"", TYPE_STRING, 0}, \
{"sib2_mpdcch_pdsch_hoppingOffset_r13", NULL, 0, iptr:&sib2_mpdcch_pdsch_hoppingOffset_r13, defintval:1, TYPE_UINT, 0} \
}
/*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
......
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @ 7cecfa10
......@@ -558,6 +558,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
if (configuration->bandwidthReducedAccessRelatedInfo_r13[CC_id])
{
printf("[DEBUGGING][KOGO][TANY2]: bandwidthReducedAccessRelatedInfo_r13 = %d\n", configuration->bandwidthReducedAccessRelatedInfo_r13[CC_id]);
sib1_1310->bandwidthReducedAccessRelatedInfo_r13
= calloc(1, sizeof(struct SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13));
......@@ -572,6 +573,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->si_RepetitionPattern_r13
= configuration->si_RepetitionPattern_r13[CC_id]; // 0
printf("[DEBUGGING][KOGO][ASN1]: si_RepetitionPattern_r13 = %d\n", configuration->si_RepetitionPattern_r13[CC_id]);
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13 = calloc(1, sizeof(SchedulingInfoList_BR_r13_t));
SchedulingInfo_BR_r13_t *schedulinginfo_br_13 = calloc(1, sizeof(SchedulingInfo_BR_r13_t));
......@@ -584,6 +587,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
schedulinginfo_br_13->si_Narrowband_r13 = configuration->si_Narrowband_r13[CC_id][index];
schedulinginfo_br_13->si_TBS_r13 = configuration->si_TBS_r13[CC_id][index];
printf("[DEBUGGING][ASN1]: si_NarrowBand_r13: %d\n", configuration->si_Narrowband_r13[CC_id][index]);
printf("[DEBUGGING][ASN1]: si_TBS_r13: %d\n", configuration->si_TBS_r13[CC_id][index]);
LOG_I(RRC,"Adding (%d,%d) to scheduling_info_br_13\n",schedulinginfo_br_13->si_Narrowband_r13,schedulinginfo_br_13->si_TBS_r13);
ASN_SEQUENCE_ADD(&sib1_1310->bandwidthReducedAccessRelatedInfo_r13->schedulingInfoList_BR_r13->list, schedulinginfo_br_13);
}
......@@ -1276,14 +1281,18 @@ uint8_t do_SIB23(uint8_t Mod_id,
if (configuration->sib2_interval_ULHoppingConfigCommonModeA_r13[CC_id])
{
puts("[DEBUGGING][KOGO][ASN]: SIB2 Interval UL HOPPING CONFIG COMMON MODE A\n");
(*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13
= CALLOC(1, sizeof(struct FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13));
if (*configuration->sib2_interval_ULHoppingConfigCommonModeA_r13[CC_id] == 0)
{
printf("[DEBUGGING][KOGO][ASN]: FDD UL HOPPING CONFIG COMMON MODE A\n");
printf("[DEBUGGING][KOGO][ASN]: interval UL hopping config common: %d\n", configuration->sib2_interval_ULHoppingConfigCommonModeA_r13_val[CC_id]);
(*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13->present
= FreqHoppingParameters_r13__interval_ULHoppingConfigCommonModeA_r13_PR_interval_FDD_r13;
(*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13->choice.interval_FDD_r13
= configuration->sib2_interval_ULHoppingConfigCommonModeA_r13_val[CC_id];
}
else
{
......@@ -1296,6 +1305,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
}
else
{
printf("[DEBUGGING][KOGO][ALLOC ERROR] interval ul hopping: %d\n", configuration->sib2_interval_ULHoppingConfigCommonModeA_r13[CC_id]);
(*sib2)->radioResourceConfigCommon.ext4->freqHoppingParameters_r13->interval_ULHoppingConfigCommonModeA_r13 = NULL;
}
......@@ -1419,7 +1429,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
ASN_SEQUENCE_ADD(&(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->rsrp_ThresholdsPrachInfoList_r13.list, rsrp_range);
}
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13 = NULL;
if (rrconfig->mpdcch_startSF_CSS_RA_r13)
......@@ -1437,6 +1446,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->present = PRACH_ConfigSIB_v1310__mpdcch_startSF_CSS_RA_r13_PR_tdd_r13;
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->choice.tdd_r13 = rrconfig->mpdcch_startSF_CSS_RA_r13_val;
}
printf("[DEBUGGING][KOGO][SIB23]: mpdcch_startSF_CSS_RA_r13->choice.fdd_r13 = %d\n",
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->choice.fdd_r13);
}
if (rrconfig->prach_HoppingOffset_r13)
......@@ -1448,6 +1459,8 @@ uint8_t do_SIB23(uint8_t Mod_id,
{
(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_HoppingOffset_r13 = NULL;
}
printf("[DEBUGGING][KOGO][SIB23]: prach_HoppingOffset_r13 = %d\n",
*(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_HoppingOffset_r13);
PRACH_ParametersCE_r13_t *prach_parametersce_r13;
......@@ -1457,53 +1470,68 @@ uint8_t do_SIB23(uint8_t Mod_id,
for (prach_parameters_index = 0; prach_parameters_index < num_prach_parameters_ce; ++prach_parameters_index)
{
prach_parametersce_r13 = CALLOC(1, sizeof(PRACH_ParametersCE_r13_t));
prach_parametersce_r13->prach_ConfigIndex_r13 = configuration->prach_config_index[CC_id][prach_parameters_index];
prach_parametersce_r13->prach_FreqOffset_r13 = configuration->prach_freq_offset[CC_id][prach_parameters_index];
AssertFatal(configuration->prach_StartingSubframe_r13[CC_id][prach_parameters_index]!=NULL,
"configuration->prach_StartingSubframe_r13[%d][%d] is null",
(int)CC_id,(int)prach_parameters_index);
if (configuration->prach_StartingSubframe_r13[CC_id][prach_parameters_index])
{
prach_parametersce_r13->prach_StartingSubframe_r13 = CALLOC(1, sizeof(long));
*prach_parametersce_r13->prach_StartingSubframe_r13 = *configuration->prach_StartingSubframe_r13[CC_id][prach_parameters_index];
}
else
{
prach_parametersce_r13->prach_StartingSubframe_r13 = NULL;
}
prach_parametersce_r13 = CALLOC(1, sizeof(PRACH_ParametersCE_r13_t));
prach_parametersce_r13->prach_ConfigIndex_r13 = configuration->prach_config_index[CC_id][prach_parameters_index];
prach_parametersce_r13->prach_FreqOffset_r13 = configuration->prach_freq_offset[CC_id][prach_parameters_index];
AssertFatal(configuration->prach_StartingSubframe_r13[CC_id][prach_parameters_index]!=NULL,
"configuration->prach_StartingSubframe_r13[%d][%d] is null",
(int)CC_id,(int)prach_parameters_index);
if (configuration->prach_StartingSubframe_r13[CC_id][prach_parameters_index])
{
prach_parametersce_r13->prach_StartingSubframe_r13 = CALLOC(1, sizeof(long));
*prach_parametersce_r13->prach_StartingSubframe_r13 = *configuration->prach_StartingSubframe_r13[CC_id][prach_parameters_index];
}
else
{
prach_parametersce_r13->prach_StartingSubframe_r13 = NULL;
}
if (configuration->maxNumPreambleAttemptCE_r13[CC_id][prach_parameters_index])
{
prach_parametersce_r13->maxNumPreambleAttemptCE_r13 = CALLOC(1, sizeof(long));
*prach_parametersce_r13->maxNumPreambleAttemptCE_r13 = *configuration->maxNumPreambleAttemptCE_r13[CC_id][prach_parameters_index];
}
else
{
prach_parametersce_r13->maxNumPreambleAttemptCE_r13 = NULL;
}
if (configuration->maxNumPreambleAttemptCE_r13[CC_id][prach_parameters_index])
{
prach_parametersce_r13->maxNumPreambleAttemptCE_r13 = CALLOC(1, sizeof(long));
*prach_parametersce_r13->maxNumPreambleAttemptCE_r13 = *configuration->maxNumPreambleAttemptCE_r13[CC_id][prach_parameters_index];
}
else
{
prach_parametersce_r13->maxNumPreambleAttemptCE_r13 = NULL;
}
prach_parametersce_r13->numRepetitionPerPreambleAttempt_r13 = configuration->numRepetitionPerPreambleAttempt_r13[CC_id][prach_parameters_index];
prach_parametersce_r13->mpdcch_NumRepetition_RA_r13 = configuration->mpdcch_NumRepetition_RA_r13[CC_id][prach_parameters_index];
prach_parametersce_r13->prach_HoppingConfig_r13 = configuration->prach_HoppingConfig_r13[CC_id][prach_parameters_index];
printf("[DEBUGGING][KOGO][SIB23] : prach hopping config = %d\n", prach_parametersce_r13->prach_HoppingConfig_r13);
prach_parametersce_r13->numRepetitionPerPreambleAttempt_r13 = configuration->numRepetitionPerPreambleAttempt_r13[CC_id][prach_parameters_index];
prach_parametersce_r13->mpdcch_NumRepetition_RA_r13 = configuration->mpdcch_NumRepetition_RA_r13[CC_id][prach_parameters_index];
prach_parametersce_r13->prach_HoppingConfig_r13 = configuration->prach_HoppingConfig_r13[CC_id][prach_parameters_index];
long *maxavailablenarrowband;
int num_narrow_bands = configuration->max_available_narrow_band_size[CC_id][prach_parameters_index];
int narrow_band_index;
for (narrow_band_index = 0; narrow_band_index < num_narrow_bands; narrow_band_index++)
{
maxavailablenarrowband = CALLOC(1, sizeof(long));
*maxavailablenarrowband = configuration->max_available_narrow_band[CC_id][prach_parameters_index][narrow_band_index];
ASN_SEQUENCE_ADD(&prach_parametersce_r13->mpdcch_NarrowbandsToMonitor_r13.list, maxavailablenarrowband);
}
printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_ConfigIndex_r13 = %d\n", prach_parametersce_r13->prach_ConfigIndex_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_FreqOffset_r13 = %d\n", prach_parametersce_r13->prach_FreqOffset_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_StartingSubframe_r13 = %d\n", *prach_parametersce_r13->prach_StartingSubframe_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : maxNumPreambleAttemptCE_r13 = %d\n", *prach_parametersce_r13->maxNumPreambleAttemptCE_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : numRepetitionPerPreambleAttempt_r13 = %d\n", prach_parametersce_r13->numRepetitionPerPreambleAttempt_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : mpdcch_NumRepetition_RA_r13 = %d\n", prach_parametersce_r13->mpdcch_NumRepetition_RA_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_HoppingConfig_r13 = %d\n", prach_parametersce_r13->prach_HoppingConfig_r13);
long *maxavailablenarrowband;
int num_narrow_bands = configuration->max_available_narrow_band_size[CC_id][prach_parameters_index];
int narrow_band_index;
for (narrow_band_index = 0; narrow_band_index < num_narrow_bands; narrow_band_index++)
{
maxavailablenarrowband = CALLOC(1, sizeof(long));
*maxavailablenarrowband = configuration->max_available_narrow_band[CC_id][prach_parameters_index][narrow_band_index];
ASN_SEQUENCE_ADD(&prach_parametersce_r13->mpdcch_NarrowbandsToMonitor_r13.list, maxavailablenarrowband);
}
printf("[DEBUGGING][KOGO][SIB23][WTF] : maxavailablenarrowband = %d\n", *maxavailablenarrowband);
prach_parametersce_r13->mpdcch_NumRepetition_RA_r13 = PRACH_ParametersCE_r13__mpdcch_NumRepetition_RA_r13_r1;
prach_parametersce_r13->prach_HoppingConfig_r13 = PRACH_ParametersCE_r13__prach_HoppingConfig_r13_off;
printf("[DEBUGGING][KOGO][SIB23][WTF] : mpdcch_NumRepetition_RA_r13 = %d\n", prach_parametersce_r13->mpdcch_NumRepetition_RA_r13);
printf("[DEBUGGING][KOGO][SIB23][WTF] : prach_HoppingConfig_r13 = %d\n", prach_parametersce_r13->prach_HoppingConfig_r13);
prach_parametersce_r13->mpdcch_NumRepetition_RA_r13 = PRACH_ParametersCE_r13__mpdcch_NumRepetition_RA_r13_r1;
prach_parametersce_r13->prach_HoppingConfig_r13 = PRACH_ParametersCE_r13__prach_HoppingConfig_r13_off;
ASN_SEQUENCE_ADD(&(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_ParametersListCE_r13.list, prach_parametersce_r13);
ASN_SEQUENCE_ADD(&(*sib2)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->prach_ParametersListCE_r13.list, prach_parametersce_r13);
}
}
else
......
targets/ARCH/mobipass/interface.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
targets/ARCH/mobipass/mobipass.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
targets/ARCH/mobipass/mobipass.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
targets/ARCH/mobipass/queues.c 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
targets/ARCH/mobipass/queues.h 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
View file @ 7cecfa10
......@@ -133,14 +133,14 @@ eNBs =
scheduling_info_br =
(
{
si_Narrowband_r13 = 5;
si_Narrowband_r13 = 8;
si_TBS_r13 = 5;
}
);
fdd_DownlinkOrTddSubframeBitmapBR_r13 = "subframePattern40-r13";
fdd_DownlinkOrTddSubframeBitmapBR_val_r13 = 0xFFFFFFFFFF;
startSymbolBR_r13 = 3;
startSymbolBR_r13 = 2;
si_HoppingConfigCommon_r13 = "off"; #1; # Note: 1==OFF !
si_ValidityTime_r13 = "true"; #0
......@@ -159,10 +159,10 @@ eNBs =
rach_numberOfRA_Preambles = "n60"; #14
rach_powerRampingStep = 4;
rach_preambleInitialReceivedTargetPower = -108;
rach_preambleInitialReceivedTargetPower = -110;
rach_preambleTransMax = 10;
rach_raResponseWindowSize = 10;
rach_macContentionResolutionTimer = 48;
rach_macContentionResolutionTimer = 64;
rach_maxHARQ_Msg3Tx = 4;
# max size for this array is 4
......@@ -188,11 +188,11 @@ eNBs =
prach_root = 89;
prach_config_index = 3;
prach_high_speed = "DISABLE";
prach_zero_correlation = 1;
prach_freq_offset = 1;
prach_zero_correlation = 12;
prach_freq_offset = 2;
#PDSCH Config Common
pdsch_referenceSignalPower = -27;
pdsch_referenceSignalPower = 12; # was -27
pdsch_p_b = 0;
......@@ -214,7 +214,7 @@ eNBs =
pusch_p0_Nominal = -96;
pusch_alpha = "AL1";
pucch_p0_Nominal = -104;
pucch_deltaF_Format1 = "deltaF2";
pucch_deltaF_Format1 = "deltaF0";
pucch_deltaF_Format1b = "deltaF3";
pucch_deltaF_Format2 = "deltaF0";
pucch_deltaF_Format2a = "deltaF0";
......@@ -224,7 +224,12 @@ eNBs =
prach_ConfigCommon_v1310 = "ENABLE";
mpdcch_startSF_CSS_RA_r13 = "fdd-r13";
mpdcch_startSF_CSS_RA_r13_val = "v1"; #0
prach_HoppingOffset_r13 = 0;
pdsch_maxNumRepetitionCEmodeA_r13 = "r16"; #0
#pdsch_maxNumRepetitionCEmodeB_r13 = "r384"; # NULL - 2
......@@ -240,16 +245,12 @@ eNBs =
}
);
mpdcch_startSF_CSS_RA_r13 = "fdd-r13";
mpdcch_startSF_CSS_RA_r13_val = "v1"; #0
prach_HoppingOffset_r13 = 0;
# max size for this array is 4
prach_parameters_ce_r13 =
(
{
prach_config_index_br = 3;
prach_freq_offset_br = 1;
prach_freq_offset_br = 2;
prach_StartingSubframe_r13 = 0;
maxNumPreambleAttemptCE_r13 = "n10"; #6
numRepetitionPerPreambleAttempt_r13 = "n1"; #0
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/mobipass-standalone.conf 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpb210.conf 100644 → 100755
View file @ 7cecfa10
File mode changed from 100644 to 100755
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