Skip to content

O
OpenXG-RAN
Commit 18695eb2 authored by Eric's avatar Eric
Browse files
Options

fix enb_config.c enb_config_NB_IoT.c

parent 4be075b1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 200 deletions
openair2/ENB_APP/enb_config.c
View file @ 18695eb2
This diff is collapsed.
openair2/ENB_APP/enb_config_NB_IoT.c
View file @ 18695eb2
This diff is collapsed.
openair2/ENB_APP/enb_paramdef_NB_IoT.h
View file @ 18695eb2
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "common/config/config_paramdesc.h" #include "common/config/config_paramdesc.h"
#include "RRC_paramsvalues.h" #include "RRC_paramsvalues.h"
#include <libconfig.h>
#define ENB_CONFIG_STRING_NB_IoT_PARAMETERS "NBparameters" #define ENB_CONFIG_STRING_NB_IoT_PARAMETERS "NBparameters"
//RRC parameters in the config file of merge branch //RRC parameters in the config file of merge branch
...@@ -88,47 +88,47 @@ ...@@ -88,47 +88,47 @@
/* init for checkedparam_t structure */ /* init for checkedparam_t structure */
typedef struct ccparams_NB_IoT_s { typedef struct ccparams_NB_IoT_s {
int32_t NB_IoT_configured; int32_t NB_IoT_configured;
//RRC parameters in the config file of merge branch //RRC parameters in the config file of merge branch
libconfig_int rach_raResponseWindowSize_NB; int rach_raResponseWindowSize_NB;
libconfig_int rach_macContentionResolutionTimer_NB; int rach_macContentionResolutionTimer_NB;
libconfig_int rach_powerRampingStep_NB; int rach_powerRampingStep_NB;
libconfig_int rach_preambleInitialReceivedTargetPower_NB; int rach_preambleInitialReceivedTargetPower_NB;
libconfig_int rach_preambleTransMax_CE_NB; int rach_preambleTransMax_CE_NB;
libconfig_int bcch_modificationPeriodCoeff_NB; int bcch_modificationPeriodCoeff_NB;
libconfig_int pcch_defaultPagingCycle_NB; int pcch_defaultPagingCycle_NB;
libconfig_int nprach_CP_Length; int nprach_CP_Length;
libconfig_int nprach_rsrp_range; int nprach_rsrp_range;
libconfig_int npdsch_nrs_Power; int npdsch_nrs_Power;
libconfig_int npusch_ack_nack_numRepetitions_NB; int npusch_ack_nack_numRepetitions_NB;
libconfig_int npusch_srs_SubframeConfig_NB; int npusch_srs_SubframeConfig_NB;
libconfig_int npusch_threeTone_CyclicShift_r13; int npusch_threeTone_CyclicShift_r13;
libconfig_int npusch_sixTone_CyclicShift_r13; int npusch_sixTone_CyclicShift_r13;
const char* npusch_groupHoppingEnabled; const char* npusch_groupHoppingEnabled;
libconfig_int npusch_groupAssignmentNPUSCH_r13; int npusch_groupAssignmentNPUSCH_r13;
libconfig_int dl_GapThreshold_NB; int dl_GapThreshold_NB;
libconfig_int dl_GapPeriodicity_NB; int dl_GapPeriodicity_NB;
const char* dl_GapDurationCoeff_NB; const char* dl_GapDurationCoeff_NB;
libconfig_int npusch_p0_NominalNPUSCH; int npusch_p0_NominalNPUSCH;
const char* npusch_alpha; const char* npusch_alpha;
libconfig_int deltaPreambleMsg3; int deltaPreambleMsg3;
libconfig_int ue_TimersAndConstants_t300_NB; int ue_TimersAndConstants_t300_NB;
libconfig_int ue_TimersAndConstants_t301_NB; int ue_TimersAndConstants_t301_NB;
libconfig_int ue_TimersAndConstants_t310_NB; int ue_TimersAndConstants_t310_NB;
libconfig_int ue_TimersAndConstants_t311_NB; int ue_TimersAndConstants_t311_NB;
libconfig_int ue_TimersAndConstants_n310_NB; int ue_TimersAndConstants_n310_NB;
libconfig_int ue_TimersAndConstants_n311_NB; int ue_TimersAndConstants_n311_NB;
libconfig_int nprach_Periodicity; int nprach_Periodicity;
libconfig_int nprach_StartTime; int nprach_StartTime;
libconfig_int nprach_SubcarrierOffset; int nprach_SubcarrierOffset;
libconfig_int nprach_NumSubcarriers; int nprach_NumSubcarriers;
const char* nprach_SubcarrierMSG3_RangeStart; const char* nprach_SubcarrierMSG3_RangeStart;
libconfig_int maxNumPreambleAttemptCE_NB; int maxNumPreambleAttemptCE_NB;
libconfig_int numRepetitionsPerPreambleAttempt; int numRepetitionsPerPreambleAttempt;
libconfig_int npdcch_NumRepetitions_RA; int npdcch_NumRepetitions_RA;
libconfig_int npdcch_StartSF_CSS_RA; int npdcch_StartSF_CSS_RA;
const char* npdcch_Offset_RA; const char* npdcch_Offset_RA;
} ccparams_NB_IoT_t; } ccparams_NB_IoT_t;
...@@ -173,4 +173,4 @@ typedef struct ccparams_NB_IoT_s { ...@@ -173,4 +173,4 @@ typedef struct ccparams_NB_IoT_s {
{ENB_CONFIG_STRING_NPDCCH_NUMREPETITIONS_RA_NB_IOT NULL, 0, iptr:&NBconfig->npdcch_NumRepetitions_RA defintval:0, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_NPDCCH_NUMREPETITIONS_RA_NB_IOT NULL, 0, iptr:&NBconfig->npdcch_NumRepetitions_RA defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_NPDCCH_STARTSF_CSS_RA_NB_IOT NULL, 0, iptr:&NBconfig->npdcch_StartSF_CSS_RA defintval:0, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_NPDCCH_STARTSF_CSS_RA_NB_IOT NULL, 0, iptr:&NBconfig->npdcch_StartSF_CSS_RA defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_NPDCCH_OFFSET_RA_NB_IOT NULL, 0, strptr:&NBconfig->npdcch_Offset_RA defintval:"zero", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_NPDCCH_OFFSET_RA_NB_IOT NULL, 0, strptr:&NBconfig->npdcch_Offset_RA defintval:"zero", TYPE_STRING, 0}, \
} }
\ No newline at end of file
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