rework of configuration for eMTC/Sidelink. Removal of warnings introduced by...

rework of configuration for eMTC/Sidelink. Removal of warnings introduced by eMTC code. Validation of configuration component for eMTC and regular LTE. Sidelink is still not configured.

cmake_targets/CMakeLists.txt

@@ -231,8 +231,8 @@ add_definitions("-DPACKAGE_BUGREPORT=\"openair4g-devel@lists.eurecom.fr\"")
 
 # Debug related options
 #########################################
-add_boolean_option(ASN_DEBUG           False "ASN1 coder/decoder Debug")
-add_boolean_option(EMIT_ASN_DEBUG      False  "ASN1 coder/decoder Debug")
+add_boolean_option(ASN_DEBUG           False  "ASN1 coder/decoder Debug")
+add_boolean_option(ASN_EMIT_DEBUG      False  "ASN1 coder/decoder Debug")
 add_boolean_option(MSG_PRINT           False "print debug messages")
 add_boolean_option(DISABLE_XER_PRINT   False "print XER Format")
 add_boolean_option(XER_PRINT           False "print XER Format")
@@ -1369,6 +1369,8 @@ set (MAC_SRC_UE
 set (ENB_APP_SRC
   ${OPENAIR2_DIR}/ENB_APP/enb_app.c
   ${OPENAIR2_DIR}/ENB_APP/enb_config.c
+  ${OPENAIR2_DIR}/ENB_APP/enb_config_SL.c
+  ${OPENAIR2_DIR}/ENB_APP/enb_config_eMTC.c
   ${OPENAIR2_DIR}/ENB_APP/RRC_config_tools.c
   )
 

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -2145,7 +2145,6 @@ fill_mpdcch_dci0 (PHY_VARS_eNB * eNB, eNB_rxtx_proc_t * proc, mDCI_ALLOC_t * dci
   nfapi_hi_dci0_mpdcch_dci_pdu_rel13_t *rel13 = &pdu->mpdcch_dci_pdu_rel13;
 
   uint32_t        cqi_req = rel13->csi_request;
-  uint32_t        dai = rel13->dl_assignment_index;
   uint32_t        TPC = rel13->tpc;
   uint32_t        mcs = rel13->mcs;
   uint32_t        hopping = rel13->frequency_hopping_flag;

openair1/PHY/LTE_TRANSPORT/dci_tools_common.c

@@ -296,7 +296,7 @@ void conv_eMTC_rballoc (uint16_t resource_block_coding, uint32_t N_RB_DL, uint32
   int             ind = first_rb >> 5;
   int             ind_mod = first_rb & 31;
 
-  AssertFatal(RIV<32,"RIV is %d > 31\n");
+  AssertFatal(RIV<32,"RIV is %d > 31\n",RIV);
 
   if (((N_RB_DL & 1) > 0) && (narrowband >= (N_NB_DL >> 1)))
     first_rb++;

openair1/PHY/LTE_TRANSPORT/edci.c

@@ -39,6 +39,7 @@
 #include "SCHED/sched_eNB.h"
 #include "SIMULATION/TOOLS/sim.h"      // for taus
 #include "PHY/sse_intrin.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 #include "assertions.h"
 #include "T.h"
@@ -270,7 +271,6 @@ void generate_mdci_top(PHY_VARS_eNB * eNB, int frame, int subframe, int16_t amp,
   LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
   int             i;
   int             gain_lin_QPSK;
-  uint8_t         bitsperCCE;
   uint16_t       *mpdcchtab;
 
   uint32_t        x1, x2, s = 0;
@@ -278,7 +278,7 @@ void generate_mdci_top(PHY_VARS_eNB * eNB, int frame, int subframe, int16_t amp,
   uint16_t        j0, j, idelta;
   uint16_t        i0;
 
-  int             off;
+  int             off=0;
 
   // Assumption: only handle a single MPDCCH per narrowband
 
@@ -453,11 +453,13 @@ void generate_mdci_top(PHY_VARS_eNB * eNB, int frame, int subframe, int16_t amp,
 	      (nprb<= last_prb)) {
 	    ((int16_t *) & yIQ)[0] = (((s >> (i & 0x1f)) & 1) == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
 	    ((int16_t *) & yIQ)[1] = (((s >> ((i + 1) & 0x1f)) & 1) == 1) ? -gain_lin_QPSK : gain_lin_QPSK;
+	    AssertFatal(mdci->transmission_type==1,"transmission_type %d!=1, handle this ...\n",mdci->transmission_type);
 	    if (mdci->transmission_type==1) { // same thing on both 107 and 109
 	      txF[(5*mprime)] = yIQ;
 	      txF[1+(5*mprime)] = yIQ;
 	    }
 	    else { // put on selected antenna port with w sequence
+
 	      if (((mprime+nprb)&1) == 0) 
 		txF[off+(5*mprime)] = yIQ*w[lprime];
 	      else

openair1/PHY/LTE_TRANSPORT/transport_proto.h

@@ -385,6 +385,8 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
                          uint32_t sub_frame_offset);
 
 
+void generate_mdci_top(PHY_VARS_eNB * eNB, int frame, int subframe, int16_t amp, int32_t ** txdataF);
+
 void generate_64qam_table(void);
 void generate_16qam_table(void);
 
@@ -421,6 +423,8 @@ void fill_dci0(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,DC
 
 void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu,int frame,int subframe);
 
+void fill_mpdcch_dci0 (PHY_VARS_eNB * eNB, eNB_rxtx_proc_t * proc, mDCI_ALLOC_t * dci_alloc, nfapi_hi_dci0_mpdcch_dci_pdu * pdu);
+
 int generate_eNB_ulsch_params_from_rar(PHY_VARS_eNB *eNB,
 				       unsigned char *rar_pdu,
                                        uint32_t frame,

openair2/COMMON/rrc_messages_types.h

@@ -186,7 +186,7 @@ typedef struct RrcConfigurationReq_s {
   int16_t                 Nid_cell[MAX_NUM_CCs];// for testing, change later
   int16_t                 N_RB_DL[MAX_NUM_CCs];// for testing, change later
   int                     nb_antenna_ports[MAX_NUM_CCs];
-
+  int                     eMBMS_configured;
   int                     eMTC_configured;
   int                     SL_configured;
 

openair2/ENB_APP/enb_config.h

@@ -48,6 +48,7 @@
 #endif
 #include "RRC/LTE/rrc_defs.h"
 #include <intertask_interface.h>
+#include "enb_paramdef.h"
 
 #define IPV4_STR_ADDR_TO_INT_NWBO(AdDr_StR,NwBo,MeSsAgE ) do {\
             struct in_addr inp;\
@@ -108,5 +109,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc);
 int RCconfig_S1(MessageDef *msg_p, uint32_t i);
 int RCconfig_X2(MessageDef *msg_p, uint32_t i);
 
+void fill_SL_configuration(MessageDef *msg_p,  ccparams_sidelink_t *SLconfig,int cell_idx,int cc_idx,char *config_fname);
+void fill_eMTC_configuration(MessageDef *msg_p,  ccparams_eMTC_t *eMTCconfig, int cell_idx,int cc_idx,char *config_fname,char *brparamspath);
+
 #endif /* ENB_CONFIG_H_ */
 /** @} */

openair2/ENB_APP/enb_paramdef.h

@@ -30,6 +30,8 @@
  * \warning
  */
 
+#ifndef ENB_PARAMDEF_H_
+#define ENB_PARAMDEF_H_
 #include "common/config/config_paramdesc.h"
 #include "RRC_paramsvalues.h"
 
@@ -1031,3 +1033,4 @@ typedef struct srb1_params_s {
 
 #include "enb_paramdef_emtc.h"
 #include "enb_paramdef_sidelink.h"
+#endif

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -1619,7 +1619,7 @@ void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
 			     frame_t       frameP,
 			     sub_frame_t   subframeP,
 			     unsigned char sched_subframeP,
-			     uint16_t     *emtc_active)
+			     int          *emtc_active)
 {
   int               UE_id;
   rnti_t            rnti           = -1;

openair2/LAYER2/MAC/mac_proto.h

@@ -113,6 +113,12 @@ void schedule_ulsch_rnti(module_id_t module_idP, int slice_idx, frame_t frameP,
 			 unsigned char sched_subframe,
 			 uint16_t * first_rb);
 
+void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
+			      frame_t       frameP,
+			      sub_frame_t   subframeP,
+			      unsigned char sched_subframeP,
+			      int          *emtc_active);
+
 /** \brief Second stage of DLSCH scheduling, after schedule_SI, schedule_RA and schedule_dlsch have been called.  This routine first allocates random frequency assignments for SI and RA SDUs using distributed VRB allocations and adds the corresponding DCI SDU to the DCI buffer for PHY.  It then loops over the UE specific DCIs previously allocated and fills in the remaining DCI fields related to frequency allocation.  It assumes localized allocation of type 0 (DCI.rah=0).  The allocation is done for tranmission modes 1,2,4.
 @param Mod_id Instance of eNB
 @param frame Frame index
@@ -133,7 +139,9 @@ void schedule_dlsch(module_id_t module_idP, frame_t frameP,
 
 void schedule_ue_spec(module_id_t module_idP, int slice_idxP,
 		      frame_t frameP,sub_frame_t subframe, int *mbsfn_flag);
-
+void schedule_ue_spec_br(module_id_t   module_idP,
+			 frame_t       frameP,
+			 sub_frame_t   subframeP);
 void schedule_ue_spec_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t subframe,int *mbsfn_flag);
 void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP);
 

openair2/LAYER2/MAC/rar_tools.c

@@ -126,9 +126,8 @@ unsigned short fill_rar_br(eNB_MAC_INST *eNB,
   COMMON_channels_t *cc = &eNB->common_channels[CC_id];
   uint8_t *rar = (uint8_t *)(dlsch_buffer+1);
 
-  int i;
   uint32_t rballoc,reps;
-  uint32_t mcs,TPC,ULdelay,cqireq,mpdcch_nb_index;
+  uint32_t TPC,ULdelay,cqireq,mpdcch_nb_index;
   int input_buffer_length;
 
 

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf

@@ -15,9 +15,7 @@ eNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  "1";
 
-    mobile_country_code =  "208";
-
-    mobile_network_code =  "92";
+    plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2;} );
 
     tr_s_preference     = "local_mac"
 
@@ -106,10 +104,10 @@ eNBs =
       ue_TimersAndConstants_n311                = "n1";
       ue_TransmissionMode                       = "tm1";
 
-      # BR Parameters
-      br_parameters : 
+      # eMTC Parameters
+      emtc_parameters : 
       {
-
+          eMTC_configured                       = 1;
           #hyperSFN_r13                               = 0;
           #eDRX_Allowed_r13                           = 0;
           #q_QualMinRSRQ_CE_r13                       = ;
@@ -155,9 +153,9 @@ eNBs =
 
           # SIB23
           frame_type                                = "FDD";
-          preambleTransMax_CE_r13                   = "n10"; #6
+          preambleTransMax_CE_r13                   = 10; #6
 
-          rach_numberOfRA_Preambles                 = "n60"; #14
+          rach_numberOfRA_Preambles                 = 60; #14
           rach_powerRampingStep                     = 4;
           rach_preambleInitialReceivedTargetPower   = -110;           
           rach_preambleTransMax                     = 10;
@@ -171,8 +169,8 @@ eNBs =
               {
                   firstPreamble_r13                 = 60;
                   lastPreamble_r13                  = 63;
-                  ra_ResponseWindowSize_r13         = "sf20"; #0
-                  mac_ContentionResolutionTimer_r13 = "sf80"; #0
+                  ra_ResponseWindowSize_r13         = 20; #0
+                  mac_ContentionResolutionTimer_r13 = 80; #0
                   rar_HoppingConfig_r13             = "off";  #1;
               }
           );
@@ -252,11 +250,11 @@ eNBs =
               {
                   prach_config_index_br                     = 3;
                   prach_freq_offset_br                      = 2;
-                  prach_StartingSubframe_r13                = 0;
-                  maxNumPreambleAttemptCE_r13               = "n10"; #6
-                  numRepetitionPerPreambleAttempt_r13       = "n1";  #0
-                  mpdcch_NumRepetition_RA_r13               = "r1";  #0
-                  prach_HoppingConfig_r13                   = "off"; #1
+                  prach_StartingSubframe_r13                = 2;
+                  maxNumPreambleAttemptCE_r13               = 10; #6
+                  numRepetitionPerPreambleAttempt_r13       = 1;  #0
+                  mpdcch_NumRepetition_RA_r13               = 1;  #0
+                  prach_HoppingConfig_r13                   = 0;  #1
                   max_available_narrow_band                 = [3]; 
              }
           );
@@ -370,6 +368,9 @@ eNBs =
         ENB_INTERFACE_NAME_FOR_S1U               = "lo";
         ENB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.4/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
     };
 
     log_config :
@@ -393,31 +394,34 @@ eNBs =
 );
 
 MACRLCs = (
-  {
-  num_cc = 1;
-  tr_s_preference = "local_L1";
-  tr_n_preference = "local_RRC";
+        {	
+        num_cc	 = 1;
+        tr_s_preference = "local_L1";
+        tr_n_preference = "local_RRC";
+	phy_test_mode = 0;
+        puSch10xSnr     =  200;
+        puCch10xSnr     =  200;
         }  
 );
 
 L1s = (
       {
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-        }  
+      num_cc = 1;
+      tr_n_preference = "local_mac";
+      }  
 );
 
 RUs = (
     {     
-  local_rf       = "yes"
-  nb_tx          = 1
-  nb_rx          = 1
-  att_tx         = 0
-  att_rx         = 0;
-  bands          = [13];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain                    = 125;
-  eNB_instances  = [0];
+        local_rf       = "yes"
+        nb_tx          = 1
+        nb_rx          = 1
+        att_tx         = 0
+        att_rx         = 0;
+        bands          = [13];
+        max_pdschReferenceSignalPower = -27;
+        max_rxgain                    = 125;
+        eNB_instances  = [0];
     }
 );