From 5aef666ce912123bc08157f78240648f70b83786 Mon Sep 17 00:00:00 2001 From: Lionel Gauthier Date: Tue, 10 Jun 2014 14:09:41 +0000 Subject: [PATCH] get_int64 does not work on my machine ubuntu 12.04 x32 git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5385 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/ENB_APP/enb_config.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index ec9e58555f..8ee5598d15 100755 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -237,8 +237,8 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) { long int tdd_config_s; const char* prefix_type; long int eutra_band; - long long downlink_frequency; - long long uplink_frequency_offset; + long int downlink_frequency; + long int uplink_frequency_offset; char* ipv4 = NULL; char* ipv6 = NULL; char* active = NULL; @@ -428,12 +428,12 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) { enb_properties.properties[enb_properties_index]->eutra_band = 7; // Default band } - if(config_setting_lookup_int64(setting_enb, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)) { - enb_properties.properties[enb_properties_index]->downlink_frequency = (unsigned int) downlink_frequency; + if(config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)) { + enb_properties.properties[enb_properties_index]->downlink_frequency = (unsigned int) downlink_frequency; } else { - enb_properties.properties[enb_properties_index]->downlink_frequency = 2680000000UL; // Default downlink frequency + enb_properties.properties[enb_properties_index]->downlink_frequency = 2680000000UL; // Default downlink frequency } - if(config_setting_lookup_int64(setting_enb, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)) { + if(config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)) { enb_properties.properties[enb_properties_index]->uplink_frequency_offset = (unsigned int) uplink_frequency_offset; } else { // Default uplink frequency offset @@ -443,7 +443,7 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP) { enb_properties.properties[enb_properties_index]->uplink_frequency_offset = 0; } } - + parse_errors += enb_check_band_frequencies(lib_config_file_name_pP, enb_properties_index, enb_properties.properties[enb_properties_index]->eutra_band,