From b794516d0077b91f77e8352b01b5f1448c2a21b2 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Fri, 31 Jan 2014 10:26:13 +0000
Subject: [PATCH] Fixed sign and size issue for physical parameters.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4995 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/ENB_APP/enb_config.c | 6 +++---
openair2/ENB_APP/enb_config.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 5b95f968df..1989734f88 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -70,7 +70,7 @@ int enb_config_init(char* lib_config_file_name_pP) {
const char* default_drx;
const char* frame_type;
const char* prefix_type;
- long int downlink_frequency;
+ long long int downlink_frequency;
long int uplink_frequency_offset;
char* ipv4;
char* ipv6;
@@ -204,10 +204,10 @@ int enb_config_init(char* lib_config_file_name_pP) {
g_enb_properties[enb_properties_index]->prefix_type = NORMAL; // Default prefix type
}
- if(config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)) {
+ if(config_setting_lookup_int64(setting_enb, ENB_CONFIG_STRING_DOWNLINK_FREQUENCY, &downlink_frequency)) {
g_enb_properties[enb_properties_index]->downlink_frequency = downlink_frequency;
} else {
- g_enb_properties[enb_properties_index]->downlink_frequency = 2680000000; // Default downlink frequency
+ g_enb_properties[enb_properties_index]->downlink_frequency = 2680000000UL; // Default downlink frequency
}
if(config_setting_lookup_int(setting_enb, ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET, &uplink_frequency_offset)) {
diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h
index f58c0d6104..89d18d9ec2 100755
--- a/openair2/ENB_APP/enb_config.h
+++ b/openair2/ENB_APP/enb_config.h
@@ -99,7 +99,7 @@ typedef struct Enb_properties_s {
lte_frame_type_t frame_type;
lte_prefix_type_t prefix_type;
uint32_t downlink_frequency;
- uint32_t uplink_frequency_offset;
+ int32_t uplink_frequency_offset;
/* Nb of MME to connect to */
uint8_t nb_mme;
--
GitLab