ue remove demo flag

openair1/PHY/INIT/lte_parms.c

@@ -111,11 +111,11 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf)
     else {
       frame_parms->ofdm_symbol_size = 2048;
       frame_parms->samples_per_tti = 30720;
-#ifdef UE_NR_PHY_DEMO
+//#ifdef UE_NR_PHY_DEMO
       frame_parms->samples_per_subframe = 30720 * frame_parms->ttis_per_subframe;
-#else
-      frame_parms->samples_per_subframe = 30720;
-#endif
+//#else
+//      frame_parms->samples_per_subframe = 30720;
+//#endif
       frame_parms->first_carrier_offset = 2048-600;
     }
     frame_parms->N_RBGS = 4;

openair1/PHY/defs.h

@@ -197,12 +197,12 @@ typedef struct {
   uint8_t              CC_id;
   /// timestamp transmitted to HW
   openair0_timestamp timestamp_tx;
-#ifdef UE_NR_PHY_DEMO
+//#ifdef UE_NR_PHY_DEMO
   /// NR TTI index within subframe_tx [0 .. ttis_per_subframe - 1] to act upon for transmission
   int nr_tti_tx;
   /// NR TTI index within subframe_rx [0 .. ttis_per_subframe - 1] to act upon for reception
   int nr_tti_rx;
-#endif
+//#endif
   /// subframe to act upon for transmission
   int subframe_tx;
   /// subframe to act upon for reception
@@ -381,12 +381,12 @@ typedef struct {
   uint8_t              CC_id;
   /// timestamp transmitted to HW
   openair0_timestamp timestamp_tx;
-#ifdef UE_NR_PHY_DEMO
+//#ifdef UE_NR_PHY_DEMO
   /// NR TTI index within subframe_tx [0 .. ttis_per_subframe - 1] to act upon for transmission
   int nr_tti_tx;
   /// NR TTI index within subframe_rx [0 .. ttis_per_subframe - 1] to act upon for reception
   int nr_tti_rx;
-#endif
+//#endif
   /// subframe to act upon for transmission
   int subframe_tx;
   /// subframe to act upon for reception

openair1/SCHED/phy_procedures_lte_ue.c

@@ -5654,7 +5654,7 @@ void phy_procedures_UE_lte(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,u
 
     if (ue->mac_enabled==1) {
       if (slot==0) {
-#ifdef UE_NR_PHY_DEMO
+//#ifdef UE_NR_PHY_DEMO
           ret = mac_xface->ue_scheduler(ue->Mod_id,
                frame_rx,
                nr_tti_rx,
@@ -5665,16 +5665,16 @@ void phy_procedures_UE_lte(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,u
                subframe_select(&ue->frame_parms,nr_tti_tx),
                eNB_id,
                0/*FIXME CC_id*/);
-#else
-        ret = mac_xface->ue_scheduler(ue->Mod_id,
+//#else
+/*        ret = mac_xface->ue_scheduler(ue->Mod_id,
             frame_rx,
             nr_tti_rx,
             frame_tx,
             nr_tti_tx,
             subframe_select(&ue->frame_parms,nr_tti_tx),
-            eNB_id,
-            0/*FIXME CC_id*/);
-#endif
+            eNB_id,*/
+//            0/*FIXME CC_id*/);
+//#endif
 
   if (ret == CONNECTION_LOST) {
     LOG_E(PHY,"[UE %d] Frame %d, nr_tti_rx %d RRC Connection lost, returning to PRACH\n",ue->Mod_id,