From d7ab6af32325240405fa43f524ec576ef8dc9341 Mon Sep 17 00:00:00 2001 From: Navid Nikaein Date: Fri, 20 Jun 2014 13:46:19 +0000 Subject: [PATCH] * EPC config file for sequence * EPC condif file for centos on ubuntu * minor adjustments for logs git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5417 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair1/SCHED/phy_procedures_lte_eNb.c | 6 +-- openair2/LAYER2/MAC/eNB_scheduler.c | 4 +- openair2/LAYER2/MAC/extern.h | 40 +++++++++++++-- openair2/LAYER2/MAC/main.c | 2 +- openair2/LAYER2/MAC/pre_processor.c | 10 ++-- openair2/LAYER2/RLC/rlc_mac.c | 2 +- openair2/RRC/LITE/L2_interface.c | 2 +- .../CONF/enb.centos.memphis.conf | 51 +++++++++++++++++++ .../GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf | 23 ++++++--- 9 files changed, 114 insertions(+), 26 deletions(-) create mode 100755 targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index 87f37d59d1..d271f933c8 100755 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -1425,7 +1425,7 @@ void phy_procedures_eNB_TX(unsigned char next_slot,PHY_VARS_eNB *phy_vars_eNB,ui DCI_pdu->nCCE = get_nCCE(num_pdcch_symbols, &phy_vars_eNB->lte_frame_parms, get_mi(&phy_vars_eNB->lte_frame_parms,next_slot>>1)); - LOG_D(PHY,"num_pdcch_symbols %d, nCCE %d\n",num_pdcch_symbols,DCI_pdu->nCCE); + LOG_T(PHY,"num_pdcch_symbols %d, nCCE %d\n",num_pdcch_symbols,DCI_pdu->nCCE); #if defined(SMBV) && !defined(EXMIMO) // Sets up PDCCH and DCI table @@ -1468,7 +1468,7 @@ void phy_procedures_eNB_TX(unsigned char next_slot,PHY_VARS_eNB *phy_vars_eNB,ui LOG_E(PHY,"[eNB %d] Frame %d subframe %d : No available CCE resources for common DCI (SI)!!!\n",phy_vars_eNB->Mod_id,phy_vars_eNB->frame,next_slot>>1); } else { - LOG_D(PHY,"[eNB %d] Frame %d subframe %d : CCE resource for common DCI (SI) => %d/%d\n",phy_vars_eNB->Mod_id,phy_vars_eNB->frame,next_slot>>1, + LOG_T(PHY,"[eNB %d] Frame %d subframe %d : CCE resource for common DCI (SI) => %d/%d\n",phy_vars_eNB->Mod_id,phy_vars_eNB->frame,next_slot>>1, phy_vars_eNB->dlsch_eNB_SI->nCCE[next_slot>>1],DCI_pdu->nCCE); #if defined(SMBV) && !defined(EXMIMO) @@ -1653,7 +1653,7 @@ void phy_procedures_eNB_TX(unsigned char next_slot,PHY_VARS_eNB *phy_vars_eNB,ui phy_vars_eNB->Mod_id,phy_vars_eNB->frame,next_slot>>1,DCI_pdu->nCCE,DCI_pdu->dci_alloc[i].rnti); } else { - LOG_D(PHY,"[eNB %d] Frame %d subframe %d : CCE resources for UE spec DCI (PUSCH %x) => %d/%d\n", + LOG_T(PHY,"[eNB %d] Frame %d subframe %d : CCE resources for UE spec DCI (PUSCH %x) => %d/%d\n", phy_vars_eNB->Mod_id,phy_vars_eNB->frame,next_slot>>1,DCI_pdu->dci_alloc[i].rnti, DCI_pdu->dci_alloc[i].nCCE,DCI_pdu->nCCE); diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c index 3f5cf0ba5c..dd163c4649 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler.c +++ b/openair2/LAYER2/MAC/eNB_scheduler.c @@ -2714,7 +2714,7 @@ uint32_t allocate_prbs_sub(int nb_rb, uint8_t *rballoc) { uint32_t rballoc_dci=0; //uint8_t number_of_subbands=13; - LOG_D(MAC,"*****Check1RBALLOC****: %d%d%d%d (nb_rb %d,N_RBGS %d)\n", + LOG_T(MAC,"*****Check1RBALLOC****: %d%d%d%d (nb_rb %d,N_RBGS %d)\n", rballoc[3],rballoc[2],rballoc[1],rballoc[0],nb_rb,mac_xface->lte_frame_parms->N_RBGS); while((nb_rb >0) && (check < mac_xface->lte_frame_parms->N_RBGS)){ //printf("rballoc[%d] %d\n",check,rballoc[check]); @@ -2745,7 +2745,7 @@ uint32_t allocate_prbs_sub(int nb_rb, uint8_t *rballoc) { // check1 = check1+2; } // rballoc_dci = (rballoc_dci)&(0x1fff); - LOG_D(MAC,"*********RBALLOC : %x\n",rballoc_dci); + LOG_T(MAC,"*********RBALLOC : %x\n",rballoc_dci); // exit(-1); return (rballoc_dci); } diff --git a/openair2/LAYER2/MAC/extern.h b/openair2/LAYER2/MAC/extern.h index 18027aefbc..8b029c08be 100644 --- a/openair2/LAYER2/MAC/extern.h +++ b/openair2/LAYER2/MAC/extern.h @@ -1,10 +1,40 @@ -/*________________________MAC/extern.h________________________ +/******************************************************************************* - Authors : Hicham Anouar, Raymond Knopp - Company : EURECOM - Emails : anouar@eurecom.fr, knopp@eurecom.fr -________________________________________________________________*/ + Eurecom OpenAirInterface + Copyright(c) 1999 - 2013 Eurecom + This program is free software; you can redistribute it and/or modify it + under the terms and conditions of the GNU General Public License, + version 2, as published by the Free Software Foundation. + + This program is distributed in the hope it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + + The full GNU General Public License is included in this distribution in + the file called "COPYING". + + Contact Information + Openair Admin: openair_admin@eurecom.fr + Openair Tech : openair_tech@eurecom.fr + Forums : http://forums.eurecom.fsr/openairinterface + Address : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis, France + +*******************************************************************************/ +/*! \file extern.h +* \brief mac externs +* \author Raymond Knopp, Navid Nikaein +* \date 2012 +* \version 1.0 +* \email navid.nikaein@eurecom.fr +* @ingroup _mac + +*/ #ifndef __MAC_EXTERN_H__ #define __MAC_EXTERN_H__ diff --git a/openair2/LAYER2/MAC/main.c b/openair2/LAYER2/MAC/main.c index b5de7566d2..f83918471c 100644 --- a/openair2/LAYER2/MAC/main.c +++ b/openair2/LAYER2/MAC/main.c @@ -183,7 +183,7 @@ int mac_top_init(int eMBMS_active, uint8_t cba_group_active, uint8_t HO_active){ #endif #endif - init_transport_channels(2); + //init_transport_channels(2); // Set up DCIs for TDD 5MHz Config 1..6 diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c index c1f38094f2..89ebeeafed 100644 --- a/openair2/LAYER2/MAC/pre_processor.c +++ b/openair2/LAYER2/MAC/pre_processor.c @@ -752,15 +752,15 @@ void dlsch_scheduler_pre_processor (module_id_t Mod_id, for(UE_id=0;UE_idmu_mimo_mode[UE_id].dl_pow_off = dl_pow_off[UE_id]; - LOG_D(PHY,"******************Scheduling Information for UE%d ************************\n",UE_id); - LOG_D(PHY,"dl power offset UE%d = %d \n",UE_id,dl_pow_off[UE_id]); - LOG_D(PHY,"***********RB Alloc for every subband for UE%d ***********\n",UE_id); + LOG_D(MAC,"******************Scheduling Information for UE%d ************************\n",UE_id); + LOG_D(MAC,"dl power offset UE%d = %d \n",UE_id,dl_pow_off[UE_id]); + LOG_D(MAC,"***********RB Alloc for every subband for UE%d ***********\n",UE_id); for(j=0;jmu_mimo_mode[UE_id].rballoc_sub[i] = rballoc_sub_UE[UE_id][i]; - LOG_D(PHY,"RB Alloc for UE%d and Subband%d = %d\n",UE_id,j,rballoc_sub_UE[UE_id][j]); + LOG_D(MAC,"RB Alloc for UE%d and Subband%d = %d\n",UE_id,j,rballoc_sub_UE[UE_id][j]); } //PHY_vars_eNB_g[Mod_id]->mu_mimo_mode[UE_id].pre_nb_available_rbs = pre_nb_available_rbs[UE_id]; - LOG_D(PHY,"Total RBs allocated for UE%d = %d\n",UE_id,pre_nb_available_rbs[UE_id]); + LOG_D(MAC,"Total RBs allocated for UE%d = %d\n",UE_id,pre_nb_available_rbs[UE_id]); } } diff --git a/openair2/LAYER2/RLC/rlc_mac.c b/openair2/LAYER2/RLC/rlc_mac.c index 06c2543ea0..cbf8551573 100644 --- a/openair2/LAYER2/RLC/rlc_mac.c +++ b/openair2/LAYER2/RLC/rlc_mac.c @@ -425,7 +425,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind( } else { rlc_mode = RLC_MODE_NONE; //LOG_W(RLC , "[%s] RLC not configured rb id %u lcid %u module %u!\n", __FUNCTION__, rb_id, channel_idP, ue_module_idP); - LOG_D(RLC , "[%s] RLC not configured rb id %u lcid %u module %u!\n", __FUNCTION__, rb_id, channel_idP, ue_module_idP); + //LOG_D(RLC , "[%s] RLC not configured rb id %u lcid %u module %u!\n", __FUNCTION__, rb_id, channel_idP, ue_module_idP); } switch (rlc_mode) { diff --git a/openair2/RRC/LITE/L2_interface.c b/openair2/RRC/LITE/L2_interface.c index fc5e3179dd..0f37cbca18 100644 --- a/openair2/RRC/LITE/L2_interface.c +++ b/openair2/RRC/LITE/L2_interface.c @@ -58,7 +58,7 @@ extern UE_MAC_INST *UE_mac_inst; #endif //#define RRC_DATA_REQ_DEBUG -#define DEBUG_RRC +//#define DEBUG_RRC mui_t mui=0; diff --git a/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf new file mode 100755 index 0000000000..20b613fb7b --- /dev/null +++ b/targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf @@ -0,0 +1,51 @@ +Active_eNBs = ( "eNB_Eurecom_LTEBox"); +# Asn1_verbosity, choice in: none, info, annoying +Asn1_verbosity = "none"; + +eNBs = +( + { + ////////// Identification parameters: + eNB_ID = 0xe00; + + cell_type = "CELL_MACRO_ENB"; + + eNB_name = "eNB_Eurecom_LTEBox"; + + // Tracking area code, 0x0000 and 0xfffe are reserved values + tracking_area_code = "15"; + + mobile_country_code = "208"; + + mobile_network_code = "92"; + + ////////// Channel parameters: + // Default Paging DRX of the eNB as defined in TS 36.304 + default_paging_drx = "PAGING_DRX_256"; + + ////////// Physical parameters: + frame_type = "FDD"; + prefix_type = "NORMAL"; + eutra_band = 7; + downlink_frequency = 2680000000L; + uplink_frequency_offset = -120000000; + + ////////// MME parameters: + mme_ip_address = ( { ipv4 = "192.168.14.11"; + ipv6 = "192:168:30::17"; + active = "yes"; + preference = "ipv4"; + } + ); + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.14.10/24"; + + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.14.10/24"; + }; + + } +); diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf index 98d1e4b345..5994e02fec 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf @@ -1,5 +1,6 @@ //Active_eNBs = ( "eNB_Eurecom_0", "eNB_Eurecom_1", "eNB_Eurecom_2", "eNB_Eurecom_3"); Active_eNBs = ( "eNB_Eurecom_0"); +Asn1_verbosity = "none"; eNBs = ( @@ -28,18 +29,24 @@ eNBs = eutra_band = 4; downlink_frequency = 2120000000; uplink_frequency_offset = -400000000; - + ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.12.31"; - ipv6 = "2192:168:30::17"; + + mme_ip_address = ( { ipv4 = "192.168.13.11"; + ipv6 = "192:168:30::17"; active = "yes"; preference = "ipv4"; - }, - { ipv4 = "192.168.12.86"; - ipv6 = "2192:168:30::18"; - active = "no"; - preference = "ipv4"; } ); + + NETWORK_INTERFACES : + { + ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.13.10/24"; + + ENB_INTERFACE_NAME_FOR_S1U = "eth0"; + ENB_IPV4_ADDRESS_FOR_S1U = "192.168.13.10/24"; + }; + } );