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

removed ambiguous 32/64-bit types in enb_config.c, lte-softmodem updates for CCids

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5743 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Raymond Knopp
2014-08-21 14:40:31 +00:00
parent 1c37b52fc2
commit 111c43ac4c
2 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/enb_config.c
+48 -48
View File
@@ -325,83 +325,83 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) {
int i;
int j;
int parse_errors = 0;
long int enb_id = 0;
int enb_id = 0;
const char* cell_type = NULL;
const char* tac = 0;
const char* enb_name = NULL;
const char* mcc = 0;
const char* mnc = 0;
const char* frame_type;
long int tdd_config;
long int tdd_config_s;
int tdd_config;
int tdd_config_s;
const char* prefix_type;
long int eutra_band;
long long int downlink_frequency;
long int uplink_frequency_offset;
long int Nid_cell;
long int Nid_cell_mbsfn;
long int N_RB_DL;
long int nb_antennas_tx;
long int nb_antennas_rx;
long int prach_root;
long int prach_config_index;
int eutra_band;
int64_t downlink_frequency;
int uplink_frequency_offset;
int Nid_cell;
int Nid_cell_mbsfn;
int N_RB_DL;
int nb_antennas_tx;
int nb_antennas_rx;
int prach_root;
int prach_config_index;
const char* prach_high_speed;
long int prach_zero_correlation;
long int prach_freq_offset;
long int pucch_delta_shift;
long int pucch_nRB_CQI;
long int pucch_nCS_AN;
int prach_zero_correlation;
int prach_freq_offset;
int pucch_delta_shift;
int pucch_nRB_CQI;
int pucch_nCS_AN;
#ifndef Rel10
long int pucch_n1_AN;
int pucch_n1_AN;
#endif
long int pdsch_referenceSignalPower;
long int pdsch_p_b;
long int pusch_n_SB;
int pdsch_referenceSignalPower;
int pdsch_p_b;
int pusch_n_SB;
const char * pusch_hoppingMode;
long int pusch_hoppingOffset;
int pusch_hoppingOffset;
const char* pusch_enable64QAM;
const char* pusch_groupHoppingEnabled;
long int pusch_groupAssignment;
int pusch_groupAssignment;
const char* pusch_sequenceHoppingEnabled;
long int pusch_nDMRS1;
int pusch_nDMRS1;
const char* phich_duration;
const char* phich_resource;
const char* srs_enable;
long int srs_BandwidthConfig;
long int srs_SubframeConfig;
int srs_BandwidthConfig;
int srs_SubframeConfig;
const char* srs_ackNackST;
const char* srs_MaxUpPts;
long int pusch_p0_Nominal;
int pusch_p0_Nominal;
const char* pusch_alpha;
long int pucch_p0_Nominal;
long int msg3_delta_Preamble;
long int ul_CyclicPrefixLength;
int pucch_p0_Nominal;
int msg3_delta_Preamble;
int ul_CyclicPrefixLength;
const char* pucch_deltaF_Format1;
const char* pucch_deltaF_Format1a;
const char* pucch_deltaF_Format1b;
const char* pucch_deltaF_Format2;
const char* pucch_deltaF_Format2a;
const char* pucch_deltaF_Format2b;
long rach_numberOfRA_Preambles;
int rach_numberOfRA_Preambles;
const char* rach_preamblesGroupAConfig;
long rach_sizeOfRA_PreamblesGroupA;
long rach_messageSizeGroupA;
int rach_sizeOfRA_PreamblesGroupA;
int rach_messageSizeGroupA;
const char* rach_messagePowerOffsetGroupB;
long rach_powerRampingStep;
long rach_preambleInitialReceivedTargetPower;
long rach_preambleTransMax;
long rach_raResponseWindowSize;
long rach_macContentionResolutionTimer;
long rach_maxHARQ_Msg3Tx;
long pcch_defaultPagingCycle;
int rach_powerRampingStep;
int rach_preambleInitialReceivedTargetPower;
int rach_preambleTransMax;
int rach_raResponseWindowSize;
int rach_macContentionResolutionTimer;
int rach_maxHARQ_Msg3Tx;
int pcch_defaultPagingCycle;
const char* pcch_nB;
long bcch_modificationPeriodCoeff;
long ue_TimersAndConstants_t300;
long ue_TimersAndConstants_t301;
long ue_TimersAndConstants_t310;
long ue_TimersAndConstants_t311;
long ue_TimersAndConstants_n310;
long ue_TimersAndConstants_n311;
int bcch_modificationPeriodCoeff;
int ue_TimersAndConstants_t300;
int ue_TimersAndConstants_t301;
int ue_TimersAndConstants_t310;
int ue_TimersAndConstants_t311;
int ue_TimersAndConstants_n310;
int ue_TimersAndConstants_n311;