Merge remote-tracking branch 'origin/remove-exmimo' into integration_2022_wk42

openair2/LAYER2/MAC/ue_procedures.c

@@ -29,10 +29,6 @@
  * \email: raymond.knopp@eurecom.fr, navid.nikaein@eurecom.fr javier.morgade@ieee.org
  */
 
-#ifdef EXMIMO
-  #include <pthread.h>
-#endif
-
 #include "mac_extern.h"
 #include "mac.h"
 #include "mac_proto.h"
@@ -2974,11 +2970,6 @@ ue_scheduler(const module_id_t module_idP,
     } while (msg_p != NULL);
   }
 
-  //Mac_rlc_xface->frameP=frameP;
-  //Rrc_xface->Frame_index=Mac_rlc_xface->frameP;
-  //if (subframe%5 == 0)
-  //LG#ifdef EXMIMO
-
   // data to/from NETLINK is treated in pdcp_run.
   // one socket is used in multiple UE's L2 FAPI simulator and
   // only first UE need to do this.

openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_segment.c

@@ -364,9 +364,6 @@ rlc_um_segment_10 (const protocol_ctxt_t* const ctxt_pP, rlc_um_entity_t *rlc_pP
               sdu_mngt_p->sdu_remaining_size,
               pdu_remaining_size - sdu_mngt_p->sdu_remaining_size);
 #endif
-//#if !EXMIMO
-//        assert(1!=1);
-//#endif
         memcpy(data, data_sdu_p, sdu_mngt_p->sdu_remaining_size);
         // reduce the size of the PDU
         continue_fill_pdu_with_sdu = 0;

openair2/LAYER2/openair2_proc.c

@@ -85,11 +85,7 @@ int dump_eNB_l2_stats(char *buffer, int length) {
     unsigned int  stat_timer_reordering_timed_out;
     unsigned int  stat_timer_poll_retransmit_timed_out;
     unsigned int  stat_timer_status_prohibit_timed_out;
-#ifdef EXMIMO
-    number_of_cards=1;
-#else
     number_of_cards=NB_eNB_INST;
-#endif
     eNB_MAC_INST *eNB;
     UE_info_t *UE_info;