diff --git a/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf b/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf index cda4c0a461..c9d96f27b5 100644 --- a/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf +++ b/ci-scripts/conf_files/rcc.band7.tm1.mbms.if4p5.50PRB.lo.conf @@ -221,16 +221,6 @@ MCEs = ( NETWORK_INTERFACES : { - #ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; - #ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - #ENB_INTERFACE_NAME_FOR_S1U = "lo"; - #ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; - #ENB_IPV4_ADDRESS_FOR_S1U = "224.10.10.10/24"; - #ENB_PORT_FOR_S1U = 2152; # Spec 2152 - #ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; - #ENB_PORT_FOR_X2C = 36422; # Spec 36422 - #ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24"; - #ENB_PORT_FOR_M2C = 36443; # Spec 36443 MCE_INTERFACE_NAME_FOR_M2_ENB = "lo"; MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24"; MCE_PORT_FOR_M2C = 36443; # Spec 36443 @@ -238,9 +228,6 @@ MCEs = ( MCE_INTERFACE_NAME_FOR_M3_MME = "lo"; MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24"; MCE_PORT_FOR_M3C = 36444; # Spec 36444 - #MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.8/24"; - #MME_PORT_FOR_M3C = 36444; # Spec 36444 - }; plnm: @@ -272,7 +259,7 @@ MCEs = ( mnc_length = 2; } service_id=0; #keep this allways as 0 (workaround for TUN if) - lcid=6; #this must be properly defined lcid:8+service:0 -> rab_id:8 + lcid=6; #this must be properly defined lcid:6+service:0 -> rab_id:6 } ); } @@ -283,7 +270,7 @@ MCEs = ( radioframe_allocation_period=1; #n1(0) n2(1) n4(2) n8(3) n16(4) n32(5) radioframe_alloocation_offset=0; num_frame="oneFrame"; - subframe_allocation=57; #xx100000 + subframe_allocation=57; #xx111001 //num_frame="fourFrame"; //subframe_allocation=14548987; # } @@ -301,20 +288,9 @@ MCEs = ( repetition_period = 0; #rf32(0), rf64(1), rf128(2), rf256(3) offset = 0; modification_period = 0; #rf512(0; rf1024(1) - subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100101 + subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000 mcs = 1; #n2(0), n7(1), n13(2), n19(3) } - // , - // { - // mbsfn_area = 0; - // pdcch_length = 0; #s1(0), s2(1) - // repetition_period = 2; #rf32(0), rf64(1), rf128(2), rf256(3) - // offset = 0; - // modification_period = 1; #rf512(0; rf1024(1) - // subframe_allocation_info = 32; #BITSTRING (6bits -> one frame) xx100000 - // mcs = 0; #n2(0), n7(1), n13(2), n19(3) - // } - ); #); #end mbms_scheduling_info @@ -330,23 +306,7 @@ MMEs = ( enable_mme_m3 = "yes"; NETWORK_INTERFACES : { - #ENB_INTERFACE_NAME_FOR_S1_MME = "lo"; - #ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24"; - #ENB_INTERFACE_NAME_FOR_S1U = "lo"; - #ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24"; - #ENB_IPV4_ADDRESS_FOR_S1U = "224.10.10.10/24"; - #ENB_PORT_FOR_S1U = 2152; # Spec 2152 - #ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; - #ENB_PORT_FOR_X2C = 36422; # Spec 36422 - #ENB_IPV4_ADDRESS_FOR_M2C = "127.0.0.2/24"; - #ENB_PORT_FOR_M2C = 36443; # Spec 36443 - #MCE_INTERFACE_NAME_FOR_M2_ENB = "lo"; - #MCE_IPV4_ADDRESS_FOR_M2C = "127.0.0.7/24"; - #MCE_PORT_FOR_M2C = 36443; # Spec 36443 - MME_INTERFACE_NAME_FOR_M3_MCE = "lo"; - #MCE_IPV4_ADDRESS_FOR_M3C = "127.0.0.3/24"; - #MCE_PORT_FOR_M3C = 36444; # Spec 36444 MME_IPV4_ADDRESS_FOR_M3C = "127.0.0.18/24"; MME_PORT_FOR_M3C = 36444; # Spec 36444 diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index 06be260f1d..988d1e5be7 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -107,6 +107,8 @@ static int DEFENBS[] = {0}; #include "pdcp.h" +//#define MBMS_EXPERIMENTAL + extern volatile int oai_exit; extern int emulate_rf; extern int numerology; @@ -1801,6 +1803,7 @@ void *ru_thread( void *param ) { // wakeup all eNB processes waiting for this RU if (ru->num_eNB>0) wakeup_L1s(ru); +#ifdef MBMS_EXPERIMENTAL //Workaround ... this must be properly handled if(ru->if_south!=LOCAL_RF && RC.eNB[0][0]!=NULL){ if(ru->frame_parms.num_MBSFN_config!=RC.eNB[0][0]->frame_parms.num_MBSFN_config){ @@ -1808,6 +1811,7 @@ void *ru_thread( void *param ) { LOG_W(PHY,"RU MBSFN SF PARAMS Updated\n"); } } +#endif #ifndef PHY_TX_THREAD