merge SIM2 branch

openair2/COMMON/tasks_def.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-// This task is mandatory and must always be placed in first position
-TASK_DEF(TASK_TIMER,    TASK_PRIORITY_MAX,          10)
-
-// Other possible tasks in the process
-
-// Common tasks:
-/// Layer 2 and Layer 1 task supporting all the synchronous processing
-TASK_DEF(TASK_L2L1,     TASK_PRIORITY_MAX_LEAST,    200)
-
-///   Bearers Manager task
-TASK_DEF(TASK_BM,       TASK_PRIORITY_MED,          200)
-
-// eNodeB tasks and sub-tasks:
-//// Layer 2 and Layer 1 sub-tasks
-SUB_TASK_DEF(TASK_L2L1,     TASK_PHY_ENB,               200)
-SUB_TASK_DEF(TASK_L2L1,     TASK_MAC_ENB,               200)
-SUB_TASK_DEF(TASK_L2L1,     TASK_RLC_ENB,               200)
-SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_ENB,              200)
-
-///   Radio Resource Control task
-TASK_DEF(TASK_RRC_ENB,  TASK_PRIORITY_MED,          200)
-///   S1ap task
-/// RAL task for ENB
-TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)
-
-// UDP TASK
-TASK_DEF(TASK_UDP,      TASK_PRIORITY_MED,          1000)
-// GTP_V1U task
-TASK_DEF(TASK_GTPV1_U,  TASK_PRIORITY_MED,          1000)
-TASK_DEF(TASK_S1AP,     TASK_PRIORITY_MED,          200)
-///   X2ap task, acts as both source and target
-TASK_DEF(TASK_X2AP,     TASK_PRIORITY_MED,          200)
-///   Sctp task (Used by both S1AP and X2AP)
-TASK_DEF(TASK_SCTP,     TASK_PRIORITY_MED,          200)
-///   eNB APP task
-TASK_DEF(TASK_ENB_APP,  TASK_PRIORITY_MED,          200)
-///   eNB Agent task
-TASK_DEF(TASK_FLEXRAN_AGENT,  TASK_PRIORITY_MED,          200)
-
-// UE tasks and sub-tasks:
-//// Layer 2 and Layer 1 sub-tasks
-SUB_TASK_DEF(TASK_L2L1,     TASK_PHY_UE,                200)
-SUB_TASK_DEF(TASK_L2L1,     TASK_MAC_UE,                200)
-SUB_TASK_DEF(TASK_L2L1,     TASK_RLC_UE,                200)
-SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_UE,               200)
-
-///   Radio Resource Control task
-TASK_DEF(TASK_RRC_UE,   TASK_PRIORITY_MED,          200)
-///   Non Access Stratum task
-TASK_DEF(TASK_NAS_UE,   TASK_PRIORITY_MED,          200)
-TASK_DEF(TASK_RAL_UE,   TASK_PRIORITY_MED,          200)
-
-//MESSAGE GENERATOR TASK
-TASK_DEF(TASK_MSC,      TASK_PRIORITY_MED,          200)
-
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+// This task is mandatory and must always be placed in first position
+TASK_DEF(TASK_TIMER,    TASK_PRIORITY_MAX,          10)
+
+// Other possible tasks in the process
+
+// Common tasks:
+/// Layer 2 and Layer 1 task supporting all the synchronous processing
+TASK_DEF(TASK_L2L1,     TASK_PRIORITY_MAX_LEAST,    200)
+
+///   Bearers Manager task
+TASK_DEF(TASK_BM,       TASK_PRIORITY_MED,          200)
+
+// eNodeB tasks and sub-tasks:
+//// Layer 2 and Layer 1 sub-tasks
+SUB_TASK_DEF(TASK_L2L1,     TASK_PHY_ENB,               200)
+SUB_TASK_DEF(TASK_L2L1,     TASK_MAC_ENB,               200)
+SUB_TASK_DEF(TASK_L2L1,     TASK_RLC_ENB,               200)
+SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_ENB,              200)
+
+///   Radio Resource Control task
+TASK_DEF(TASK_RRC_ENB,  TASK_PRIORITY_MED,          200)
+///   S1ap task
+/// RAL task for ENB
+TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)
+
+// UDP TASK
+TASK_DEF(TASK_UDP,      TASK_PRIORITY_MED,          1000)
+// GTP_V1U task
+TASK_DEF(TASK_GTPV1_U,  TASK_PRIORITY_MED,          1000)
+TASK_DEF(TASK_S1AP,     TASK_PRIORITY_MED,          200)
+///   X2ap task, acts as both source and target
+TASK_DEF(TASK_X2AP,     TASK_PRIORITY_MED,          200)
+///   Sctp task (Used by both S1AP and X2AP)
+TASK_DEF(TASK_SCTP,     TASK_PRIORITY_MED,          200)
+///   eNB APP task
+TASK_DEF(TASK_ENB_APP,  TASK_PRIORITY_MED,          200)
+///   eNB Agent task
+TASK_DEF(TASK_FLEXRAN_AGENT,  TASK_PRIORITY_MED,          200)
+
+// UE tasks and sub-tasks:
+#ifndef UE_EXPANSION_SIM2
+//// Layer 2 and Layer 1 sub-tasks
+SUB_TASK_DEF(TASK_L2L1,     TASK_PHY_UE,                200)
+SUB_TASK_DEF(TASK_L2L1,     TASK_MAC_UE,                200)
+SUB_TASK_DEF(TASK_L2L1,     TASK_RLC_UE,                200)
+SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_UE,               200)
+
+///   Radio Resource Control task
+TASK_DEF(TASK_RRC_UE,   TASK_PRIORITY_MED,          200)
+///   Non Access Stratum task
+TASK_DEF(TASK_NAS_UE,   TASK_PRIORITY_MED,          200)
+TASK_DEF(TASK_RAL_UE,   TASK_PRIORITY_MED,          200)
+#else
+//// Layer 2 and Layer 1 sub-tasks
+SUB_TASK_DEF(TASK_L2L1,     TASK_PHY_UE,                300)
+SUB_TASK_DEF(TASK_L2L1,     TASK_MAC_UE,                300)
+SUB_TASK_DEF(TASK_L2L1,     TASK_RLC_UE,                300)
+SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_UE,               300)
+
+///   Radio Resource Control task
+TASK_DEF(TASK_RRC_UE,   TASK_PRIORITY_MED,          300)
+///   Non Access Stratum task
+TASK_DEF(TASK_NAS_UE,   TASK_PRIORITY_MED,          300)
+TASK_DEF(TASK_RAL_UE,   TASK_PRIORITY_MED,          300)
+#endif
+
+
+//MESSAGE GENERATOR TASK
+TASK_DEF(TASK_MSC,      TASK_PRIORITY_MED,          200)
+

openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue_remote.h

@@ -17,11 +17,7 @@
  *-------------------------------------------------------------------------------
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
-<<<<<<< HEAD
  */
-=======
- */ 
->>>>>>> issue271_sim
 
 /*! \file flexran_agent_scheduler_dlsch_ue_remote.h
  * \brief Local stub for remote scheduler used by the controller
@@ -50,13 +46,8 @@
 #define SCHED_AHEAD_SUBFRAMES 20
 
 typedef struct dl_mac_config_element_s {
-<<<<<<< HEAD
     Protocol__FlexranMessage *dl_info;
      TAILQ_ENTRY(dl_mac_config_element_s) configs;
-=======
-  Protocol__FlexranMessage *dl_info;
-  TAILQ_ENTRY(dl_mac_config_element_s) configs;
->>>>>>> issue271_sim
 } dl_mac_config_element_t;
 
 TAILQ_HEAD(DlMacConfigHead, dl_mac_config_element_s);
@@ -64,14 +55,9 @@ TAILQ_HEAD(DlMacConfigHead, dl_mac_config_element_s);
 /*
  * Default scheduler used by the eNB agent
  */
-<<<<<<< HEAD
 void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame,
 				     uint32_t subframe, int *mbsfn_flag,
 				     Protocol__FlexranMessage ** dl_info);
-=======
-void flexran_schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
-			     int *mbsfn_flag, Protocol__FlexranMessage **dl_info);
->>>>>>> issue271_sim
 
 
 // Find the difference in subframes from the given subframe

openair2/LAYER2/MAC/flexran_dci_conversions.h

@@ -17,11 +17,7 @@
  *-------------------------------------------------------------------------------
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
-<<<<<<< HEAD
  */
-=======
- */ 
->>>>>>> issue271_sim
 
 /*! \file flexran_dci_conversions.h
  * \brief Conversion helpers from flexran messages to OAI formats DCI  
@@ -51,9 +47,5 @@
   ((TYPE*)DCI)->mcs = FLEXRAN_DCI->mcs[0]; \
   ((TYPE*)DCI)->TPC = FLEXRAN_DCI->tpc; \
   ((TYPE*)DCI)->ndi = FLEXRAN_DCI->ndi[0];
-<<<<<<< HEAD
 
-=======
-  
->>>>>>> issue271_sim
 #endif

targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c

@@ -235,12 +235,8 @@ int trx_eth_write_udp_IF4p5(openair0_device *device, openair0_timestamp timestam
     packet_size = UDP_IF4p5_PULFFT_SIZE_BYTES(nblocks); 
   } else if (flags == IF4p5_PULTICK) {
     packet_size = UDP_IF4p5_PULTICK_SIZE_BYTES; 
-<<<<<<< HEAD
   } else if ((flags >= IF4p5_PRACH)&&
              (flags <= (IF4p5_PRACH+4))) {  
-=======
-  } else if (flags == IF4p5_PRACH) {  
->>>>>>> issue271_sim
     packet_size = UDP_IF4p5_PRACH_SIZE_BYTES;   
   } else {
     printf("trx_eth_write_udp_IF4p5: unknown flags %d\n",flags);

targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf

@@ -17,7 +17,6 @@ RUs = (
     }
 );  
 
-<<<<<<< HEAD
 log_config = { 
       global_log_level                      ="debug";
       global_log_verbosity                  ="medium";
@@ -35,5 +34,3 @@ log_config = {
       rrc_log_verbosity                     ="medium";
 };
 
-=======
->>>>>>> issue271_sim

targets/SIMU/USER/oaisim_functions.c

@@ -782,14 +782,10 @@ void get_simulation_options(int argc, char *argv[])
     }
   }
 
-<<<<<<< HEAD
   if ( load_configmodule(argc,argv) == NULL) {
     exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
   } 
  
-=======
-  
->>>>>>> issue271_sim
   if (RC.config_file_name != NULL) {
     /* Read eNB configuration file */
     RCConfig();