Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split

Conflicts:
	openair2/ENB_APP/enb_config.c

openair1/PHY/INIT/lte_init.c

@@ -1648,9 +1648,17 @@ int phy_init_RU(RU_t *ru) {
     AssertFatal(ru->nb_rx <= sizeof(ru->prach_rxsigF) / sizeof(ru->prach_rxsigF[0]),
 		"nb_antennas_rx too large");
     ru->prach_rxsigF = (int16_t**)malloc(ru->nb_rx * sizeof(int16_t*));
+    for (j=0;j<4;j++) ru->prach_rxsigF_br[j] = (int16_t**)malloc(ru->nb_rx * sizeof(int16_t*));
+
     for (i=0; i<ru->nb_rx; i++) {
       ru->prach_rxsigF[i] = (int16_t*)malloc16_clear( fp->ofdm_symbol_size*12*2*sizeof(int16_t) );
       LOG_D(PHY,"[INIT] prach_vars->rxsigF[%d] = %p\n",i,ru->prach_rxsigF[i]);
+#ifdef Rel14
+      for (j=0;j<4;j++) {
+	ru->prach_rxsigF_br[j][i] = (int16_t*)malloc16_clear( fp->ofdm_symbol_size*12*2*sizeof(int16_t) );
+	LOG_D(PHY,"[INIT] prach_vars_br->rxsigF[%d] = %p\n",i,ru->prach_rxsigF_br[j][i]);
+      }
+#endif
     }
 
     for (i=0; i<RC.nb_inst; i++) {
@@ -1772,19 +1780,19 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
   prach_vars->prachF = (int16_t*)malloc16_clear( 1024*2*sizeof(int16_t) );
 
   // assume maximum of 64 RX antennas for PRACH receiver
-  prach_vars->prach_ifft       = (int16_t***)malloc16_clear(4*sizeof(int32_t**));
-  prach_vars->prach_ifft[0]    = (int16_t**)malloc16_clear(2*sizeof(int32_t*)); 
-  prach_vars->prach_ifft[0][0] = (int16_t*)malloc16_clear(1024*2*sizeof(int32_t));
-  
+  prach_vars->prach_ifft[0]    = (int32_t**)malloc16_clear(64*sizeof(int32_t*)); 
+  for (i=0;i<64;i++) prach_vars->prach_ifft[0][i]    = (int32_t*)malloc16_clear(1024*2*sizeof(int32_t)); 
+
+  prach_vars->rxsigF[0]        = (int16_t**)malloc16_clear(64*sizeof(int16_t*));
   // PRACH BR
 #ifdef Rel14
   prach_vars_br->prachF = (int16_t*)malloc16_clear( 1024*2*sizeof(int32_t) );
 
   // assume maximum of 64 RX antennas for PRACH receiver
-  prach_vars_br->prach_ifft    = (int32_t***)malloc16_clear(4*sizeof(int32_t**));
   for (int ce_level=0;ce_level<4;ce_level++) {
-    prach_vars_br->prach_ifft[ce_level] = (int32_t**)malloc16_clear(64*sizeof(int32_t*)); 
-    for (i=0; i<64; i++) prach_vars_br->prach_ifft[ce_level][i] = (int32_t*)malloc16_clear(1024*2*sizeof(int32_t));
+    prach_vars_br->prach_ifft[ce_level] = (int32_t**)malloc16_clear(64*sizeof(int32_t*));
+    for (i=0;i<64;i++) prach_vars_br->prach_ifft[ce_level][i] = (int32_t*)malloc16_clear(1024*2*sizeof(int32_t));
+    prach_vars->rxsigF[ce_level]        = (int16_t**)malloc16_clear(64*sizeof(int16_t*));
   }
 #endif
   

openair1/PHY/impl_defs_lte.h

@@ -1182,13 +1182,15 @@ typedef struct {
   /// first index: ? [0..1023] (hard coded)
   int16_t *prachF;
   /// \brief ?.
-  /// first index: rx antenna [0..63] (hard coded) \note Hard coded array size indexed by \c nb_antennas_rx.
-  /// second index: ? [0..ofdm_symbol_size*12[
-  int16_t **rxsigF;
+  /// first index: ce_level [0..3]
+  /// second index: rx antenna [0..63] (hard coded) \note Hard coded array size indexed by \c nb_antennas_rx.
+  /// third index: frequency-domain sample [0..ofdm_symbol_size*12[
+  int16_t **rxsigF[4];
   /// \brief local buffer to compute prach_ifft (necessary in case of multiple CCs)
-  /// first index: rx antenna [0..63] (hard coded) \note Hard coded array size indexed by \c nb_antennas_rx.
-  /// second index: ? [0..2047] (hard coded)
-  int32_t ***prach_ifft;
+  /// first index: ce_level [0..3] (hard coded) \note Hard coded array size indexed by \c nb_antennas_rx.
+  /// second index: ? [0..63] (hard coded)
+  /// third index: ? [0..63] (hard coded)
+  int32_t **prach_ifft[4];
 
   /// repetition number
 #ifdef Rel14

openair2/ENB_APP/enb_config.h

@@ -91,189 +91,10 @@ typedef struct ru_config_s {
   uint8_t   if_compress;
 } ru_config_t;
 
-typedef struct Enb_properties_s {
-  /* Unique eNB_id to identify the eNB within EPC.
-   * For macro eNB ids this field should be 20 bits long.
-   * For home eNB ids this field should be 28 bits long.
-   */
-  uint32_t            eNB_id;
 
-  /* The type of the cell */
-  enum cell_type_e    cell_type;
-
-  /* Optional name for the cell
-   * NOTE: the name can be NULL (i.e no name) and will be cropped to 150
-   * characters.
-   */
-  char               *eNB_name;
-
-
-  /* Tracking area code */
-  uint16_t            tac;
-
-  /* Mobile Country Code
-   * Mobile Network Code
-   */
-  uint16_t            mcc;
-  uint16_t            mnc;
-  uint8_t             mnc_digit_length;
-
-
-
-  /* Physical parameters */
-  int16_t                 nb_cc;
-#ifndef OCP_FRAMEWORK
-  node_function_t         cc_node_function[1+MAX_NUM_CCs];
-  node_timing_t           cc_node_timing[1+MAX_NUM_CCs];
-  int16_t                 cc_node_synch_ref[1+MAX_NUM_CCs];
-  lte_frame_type_t        frame_type[1+MAX_NUM_CCs];
-  uint8_t                 tdd_config[1+MAX_NUM_CCs];
-  uint8_t                 tdd_config_s[1+MAX_NUM_CCs];
-  lte_prefix_type_t       prefix_type[1+MAX_NUM_CCs];
-  int16_t                 eutra_band[1+MAX_NUM_CCs];
-  uint64_t                downlink_frequency[1+MAX_NUM_CCs];
-  int32_t                 uplink_frequency_offset[1+MAX_NUM_CCs];
-
-  int16_t                 Nid_cell[1+MAX_NUM_CCs];// for testing, change later
-  int16_t                 N_RB_DL[1+MAX_NUM_CCs];// for testing, change later
-  int                     nb_antenna_ports[1+MAX_NUM_CCs];
-  int                     nb_antennas_tx[1+MAX_NUM_CCs];
-  int                     nb_antennas_rx[1+MAX_NUM_CCs];
-  int                     tx_gain[1+MAX_NUM_CCs];
-  int                     rx_gain[1+MAX_NUM_CCs];
-  long                    prach_root[1+MAX_NUM_CCs];
-  long                    prach_config_index[1+MAX_NUM_CCs];
-  BOOLEAN_t               prach_high_speed[1+MAX_NUM_CCs];
-  long                    prach_zero_correlation[1+MAX_NUM_CCs];
-  long                    prach_freq_offset[1+MAX_NUM_CCs];
-  long                    pucch_delta_shift[1+MAX_NUM_CCs];
-  long                    pucch_nRB_CQI[1+MAX_NUM_CCs];
-  long                    pucch_nCS_AN[1+MAX_NUM_CCs];
-#if !defined(Rel10) && !defined(Rel14)
-  long                    pucch_n1_AN[1+MAX_NUM_CCs];
-#endif
-  long                    pdsch_referenceSignalPower[1+MAX_NUM_CCs];
-  long                    pdsch_p_b[1+MAX_NUM_CCs];
-  long                    pusch_n_SB[1+MAX_NUM_CCs];
-  long                    pusch_hoppingMode[1+MAX_NUM_CCs];
-  long                    pusch_hoppingOffset[1+MAX_NUM_CCs];
-  BOOLEAN_t               pusch_enable64QAM[1+MAX_NUM_CCs];
-  BOOLEAN_t               pusch_groupHoppingEnabled[1+MAX_NUM_CCs];
-  long                    pusch_groupAssignment[1+MAX_NUM_CCs];
-  BOOLEAN_t               pusch_sequenceHoppingEnabled[1+MAX_NUM_CCs];
-  long                    pusch_nDMRS1[1+MAX_NUM_CCs];
-  long                    phich_duration[1+MAX_NUM_CCs];
-  long                    phich_resource[1+MAX_NUM_CCs];
-  BOOLEAN_t               srs_enable[1+MAX_NUM_CCs];
-  long                    srs_BandwidthConfig[1+MAX_NUM_CCs];
-  long                    srs_SubframeConfig[1+MAX_NUM_CCs];
-  BOOLEAN_t               srs_ackNackST[1+MAX_NUM_CCs];
-  BOOLEAN_t               srs_MaxUpPts[1+MAX_NUM_CCs];
-  long                    pusch_p0_Nominal[1+MAX_NUM_CCs];
-  long                    pusch_alpha[1+MAX_NUM_CCs];
-  long                    pucch_p0_Nominal[1+MAX_NUM_CCs];
-  long                    msg3_delta_Preamble[1+MAX_NUM_CCs];
-  long                    ul_CyclicPrefixLength[1+MAX_NUM_CCs];
-  e_DeltaFList_PUCCH__deltaF_PUCCH_Format1                    pucch_deltaF_Format1[1+MAX_NUM_CCs];
-  e_DeltaFList_PUCCH__deltaF_PUCCH_Format1b                   pucch_deltaF_Format1b[1+MAX_NUM_CCs];
-  e_DeltaFList_PUCCH__deltaF_PUCCH_Format2                    pucch_deltaF_Format2[1+MAX_NUM_CCs];
-  e_DeltaFList_PUCCH__deltaF_PUCCH_Format2a                   pucch_deltaF_Format2a[1+MAX_NUM_CCs];
-  e_DeltaFList_PUCCH__deltaF_PUCCH_Format2b                   pucch_deltaF_Format2b[1+MAX_NUM_CCs];
-  long                    rach_numberOfRA_Preambles[1+MAX_NUM_CCs];
-  BOOLEAN_t               rach_preamblesGroupAConfig[1+MAX_NUM_CCs];
-  long                    rach_sizeOfRA_PreamblesGroupA[1+MAX_NUM_CCs];
-  long                    rach_messageSizeGroupA[1+MAX_NUM_CCs];
-  e_RACH_ConfigCommon__preambleInfo__preamblesGroupAConfig__messagePowerOffsetGroupB                    rach_messagePowerOffsetGroupB[1+MAX_NUM_CCs];
-  long                    rach_powerRampingStep[1+MAX_NUM_CCs];
-  long                    rach_preambleInitialReceivedTargetPower[1+MAX_NUM_CCs];
-  long                    rach_preambleTransMax[1+MAX_NUM_CCs];
-  long                    rach_raResponseWindowSize[1+MAX_NUM_CCs];
-  long                    rach_macContentionResolutionTimer[1+MAX_NUM_CCs];
-  long                    rach_maxHARQ_Msg3Tx[1+MAX_NUM_CCs];
-  long                    bcch_modificationPeriodCoeff[1+MAX_NUM_CCs];
-  long                    pcch_defaultPagingCycle[1+MAX_NUM_CCs];
-  long                    pcch_nB[1+MAX_NUM_CCs];
-  long                    ue_TimersAndConstants_t300[1+MAX_NUM_CCs];
-  long                    ue_TimersAndConstants_t301[1+MAX_NUM_CCs];
-  long                    ue_TimersAndConstants_t310[1+MAX_NUM_CCs];
-  long                    ue_TimersAndConstants_t311[1+MAX_NUM_CCs];
-  long                    ue_TimersAndConstants_n310[1+MAX_NUM_CCs];
-  long                    ue_TimersAndConstants_n311[1+MAX_NUM_CCs];
-#else
-   RrcConfigurationReq    RrcReq;
-#endif
-  long                    ue_TransmissionMode[1+MAX_NUM_CCs];
-  long                    srb1_timer_poll_retransmit;
-  long                    srb1_timer_reordering;
-  long                    srb1_timer_status_prohibit;
-  long                    srb1_poll_pdu;
-  long                    srb1_poll_byte;
-  long                    srb1_max_retx_threshold;
-  /* Nb of MME to connect to */
-  uint8_t             nb_mme;
-  /* List of MME to connect to */
-  mme_ip_address_t    mme_ip_address[S1AP_MAX_NB_MME_IP_ADDRESS];
-
-  int                 sctp_in_streams;
-  int                 sctp_out_streams;
-
-  char               *enb_interface_name_for_S1U;
-  in_addr_t           enb_ipv4_address_for_S1U;
-  tcp_udp_port_t      enb_port_for_S1U;
-
-  char               *enb_interface_name_for_S1_MME;
-  in_addr_t           enb_ipv4_address_for_S1_MME;
-
-  char               *flexran_agent_interface_name;
-  in_addr_t           flexran_agent_ipv4_address;
-  tcp_udp_port_t      flexran_agent_port;
-  char               *flexran_agent_cache;
-
-
-#ifndef OCP_FRAMEWORK
-  // otg config
-  /* Nb of OTG elements */
-  uint8_t            num_otg_elements;
-  /* element config*/
-  uint16_t          otg_ue_id[NB_MODULES_MAX+1];
-  uint8_t          otg_app_type[NB_MODULES_MAX+1];
-  uint8_t            otg_bg_traffic[NB_MODULES_MAX+1];
-  // log config
-  int16_t           glog_level;
-  int16_t           glog_verbosity;
-  int16_t           hw_log_level;
-  int16_t           hw_log_verbosity;
-  int16_t           phy_log_level;
-  int16_t           phy_log_verbosity;
-  int16_t           mac_log_level;
-  int16_t           mac_log_verbosity;
-  int16_t           rlc_log_level;
-  int16_t           rlc_log_verbosity;
-  int16_t           pdcp_log_level;
-  int16_t           pdcp_log_verbosity;
-  int16_t           rrc_log_level;
-  int16_t           rrc_log_verbosity;
-  int16_t           gtpu_log_level;
-  int16_t           gtpu_log_verbosity;
-  int16_t           udp_log_level;
-  int16_t           udp_log_verbosity;
-  int16_t           osa_log_level;
-  int16_t           osa_log_verbosity;
-#endif
-} Enb_properties_t;
-
-typedef struct Enb_properties_array_s {
-  int                  number;
-  Enb_properties_t    *properties[MAX_ENB];
-  int                  nb_ru;
-  ru_config_t         *ru_config[NUMBER_OF_RU_MAX];
-} Enb_properties_array_t;
 
 void                          enb_config_display(void);
 void                          ru_config_display(void);
-const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP);
-
-const Enb_properties_array_t *enb_config_get(void);
 
 #endif /* ENB_CONFIG_H_ */
 /** @} */

openair2/LAYER2/MAC/eNB_scheduler_RA.c

@@ -149,7 +149,7 @@ void check_and_add_msg3(module_id_t module_idP,frame_t frameP, sub_frame_t subfr
   }
 }
 
-void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,unsigned char Msg3_subframe)
+void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP)
 {
 
   int                             CC_id;
@@ -180,28 +180,38 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
   int reps            = 0;
   int num_nb          = 0;
   first_rb        = 0;
-
-  struct PRACH_ConfigSIB_v1310 *ext4_prach                 = cc[CC_id].radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
-  PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
+  struct PRACH_ConfigSIB_v1310 *ext4_prach;
+  PRACH_ParametersListCE_r13_t *prach_ParametersListCE_r13;
   PRACH_ParametersCE_r13_t *p[3];
 
-  switch (prach_ParametersListCE_r13->list.count) {
-  case 4:
-    p[3]=prach_ParametersListCE_r13->list.array[3];
-  case 3:
-    p[2]=prach_ParametersListCE_r13->list.array[2];
-  case 2:
-    p[1]=prach_ParametersListCE_r13->list.array[1];
-  case 1:
-    p[0]=prach_ParametersListCE_r13->list.array[0];
-  default:
-    AssertFatal(1==0,"Illegal count for prach_ParametersListCE_r13 %d\n",prach_ParametersListCE_r13->list.count);
+  if (cc[CC_id].radioResourceConfigCommon_BR) {
+
+    ext4_prach                 = cc[CC_id].radioResourceConfigCommon_BR->ext4->prach_ConfigCommon_v1310;
+    prach_ParametersListCE_r13 = &ext4_prach->prach_ParametersListCE_r13;
+        
+    switch (prach_ParametersListCE_r13->list.count) {
+    case 4:
+      p[3]=prach_ParametersListCE_r13->list.array[3];
+    case 3:
+      p[2]=prach_ParametersListCE_r13->list.array[2];
+    case 2:
+      p[1]=prach_ParametersListCE_r13->list.array[1];
+    case 1:
+      p[0]=prach_ParametersListCE_r13->list.array[0];
+    default:
+      AssertFatal(1==0,"Illegal count for prach_ParametersListCE_r13 %d\n",prach_ParametersListCE_r13->list.count);
+    }
   }
 #endif
 
+  
   start_meas(&eNB->schedule_ra);
 
+ 
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
+    // skip UL component carriers
+    if (is_UL_sf(&cc[CC_id],subframeP)==1) continue;
+
     vrb_map       = cc[CC_id].vrb_map;
 
     dl_req        = &eNB->DL_req[CC_id].dl_config_request_body;
@@ -224,7 +234,7 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
 
 	    // This uses an MPDCCH Type 2 allocation according to Section 9.1.5 36-213
 	    // Parameters:
-	    //    p=2+4 PRB set (number of PRB pairs 6)
+	    //    p=2+4 PRB set (number of PRB pairs 3)
 	    //    rmax = mpdcch-NumRepetition-RA-r13 => Table 9.1.5-3
 	    //    if CELevel = 0,1 => Table 9.1.5-1b for MPDCCH candidates
 	    //    if CELevel = 2,3 => Table 9.1.5-2b for MPDCCH candidates
@@ -568,9 +578,9 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
 		}
 	      } // mpdcch_repetition_count == reps
 	      if ((RA_template->Msg4_frame == frameP) && (RA_template->Msg4_subframe == subframeP)) {
+
 		// Program PDSCH
-		RA_template->generate_rar = 0;	 
-		
+
 		LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d, subframeP %d: Generating Msg4 BR with RRC Piggyback (RA proc %d, RNTI %x)\n",
 		      module_idP, CC_id, frameP, subframeP,i,RA_template->rnti);
 		

openair2/LAYER2/MAC/eNB_scheduler_bch.c

@@ -550,8 +550,12 @@ schedule_SI(
   nfapi_dl_config_request_pdu_t  *dl_config_pdu;
   nfapi_tx_request_pdu_t         *TX_req;
   nfapi_dl_config_request_body_t *dl_req;
+
   start_meas(&eNB->schedule_si);
 
+  // Only schedule System Information in subframe 5
+  if (subframeP != 5) return;
+
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
 
     cc              = &eNB->common_channels[CC_id];

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -456,6 +456,7 @@ schedule_ue_spec(
   nfapi_dl_config_request_body_t *dl_req;
   nfapi_dl_config_request_pdu_t  *dl_config_pdu;
   nfapi_tx_request_pdu_t         *TX_req;
+  int                            tdd_sfa;
 
 #if 0
   if (UE_list->head==-1) {
@@ -466,6 +467,41 @@ schedule_ue_spec(
   start_meas(&eNB->schedule_dlsch);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH,VCD_FUNCTION_IN);
 
+
+  // for TDD: check that we have to act here, otherwise return
+  if (cc[0].tdd_Config) {
+    tdd_sfa = cc[0].tdd_Config->subframeAssignment;
+    switch (subframeP) {
+    case 0:
+      // always continue
+       break;
+    case 1:
+      return;
+	break;
+    case 2:
+      return;
+      break;
+    case 3:
+      if ((tdd_sfa!=2) && (tdd_sfa!=5)) return;
+      break;
+    case 4:
+      if ((tdd_sfa!=1)&&(tdd_sfa!=2)&&(tdd_sfa!=4)&&(tdd_sfa!=5)) return;
+      break;
+    case 5:
+      break;
+    case 6:
+    case 7:
+      if ((tdd_sfa!=1)&&(tdd_sfa!=2)&&(tdd_sfa!=4)&&(tdd_sfa!=5)) return;
+      break;
+    case 8:
+      if ((tdd_sfa!=2)&&(tdd_sfa!=3)&&(tdd_sfa!=4)&&(tdd_sfa!=5)) return;
+      break;
+    case 9:
+      if ((tdd_sfa!=1)&&(tdd_sfa!=3)&&(tdd_sfa!=4)&&(tdd_sfa!=6)) return;
+      break;
+   
+    }
+  }
   //weight = get_ue_weight(module_idP,UE_id);
   aggregation = 2; 
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
@@ -1181,6 +1217,8 @@ schedule_ue_spec(
     } // UE_id loop
   }  // CC_id loop
 
+     
+  fill_DLSCH_dci(module_idP,frameP,subframeP,mbsfn_flag);
 
   stop_meas(&eNB->schedule_dlsch);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH,VCD_FUNCTION_OUT);

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -403,6 +403,69 @@ uint8_t get_Msg3harqpid(COMMON_channels_t *cc,
 
 }
 
+int is_UL_sf(COMMON_channels_t *ccP,uint8_t subframeP)
+{
+
+  // if FDD return dummy value
+  if (ccP->tdd_Config == NULL)
+    return(0);
+
+  switch (ccP->tdd_Config->subframeAssignment) {
+
+  case 1:
+    switch (subframeP) {
+    case 0:
+    case 4:
+    case 5:
+    case 9:
+      return(0);
+      break;
+
+    case 2:
+    case 3:
+    case 7:
+    case 8:
+      return(1);
+      break;
+
+    default:
+      return(0);
+      break;
+    }
+    break;
+
+  case 3:
+    if  ((subframeP<=1) || (subframeP>=5))
+      return(0);
+    else if ((subframeP>1) && (subframeP < 5))
+      return(1);
+    else AssertFatal(1==0,"Unknown subframe number\n");
+    break;
+
+  case 4:
+    if  ((subframeP<=1) || (subframeP>=4))
+      return(0);
+    else if ((subframeP>1) && (subframeP < 4))
+      return(1);
+    else AssertFatal(1==0,"Unknown subframe number\n");
+    break;
+    
+  case 5:
+    if  ((subframeP<=1) || (subframeP>=3))
+      return(0);
+    else if ((subframeP>1) && (subframeP < 3))
+      return(1);
+    else AssertFatal(1==0,"Unknown subframe number\n");
+    break;
+
+  default:
+    AssertFatal(1==0,"subframe %d Unsupported TDD configuration %d\n",
+		subframeP,ccP->tdd_Config->subframeAssignment);
+    break;
+
+  }
+}
+
 #ifdef Rel14
 
 int get_numnarrowbands(long dl_Bandwidth) {

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -126,7 +126,7 @@ void rx_sdu(const module_id_t enb_mod_idP,
       return;
     }
   }
-  else {
+  else { // Check if this is an RA process for the rnti
     AssertFatal((RA_id = find_RA_id(enb_mod_idP,CC_idP,rntiP))!=-1,
 		"Cannot find rnti %x in RA list\n",rntiP);
     AssertFatal(eNB->common_channels[CC_idP].radioResourceConfigCommon->rach_ConfigCommon.maxHARQ_Msg3Tx>1,
@@ -353,27 +353,29 @@ void rx_sdu(const module_id_t enb_mod_idP,
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TERMINATE_RA_PROC,1);
       VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_TERMINATE_RA_PROC,0);
       for (ii=0; ii<NB_RA_PROC_MAX; ii++) {
+	RA_TEMPLATE *RA_template = &eNB->common_channels[CC_idP].RA_template[ii];
+
         LOG_D(MAC,"[eNB %d][RAPROC] CC_id %d Checking proc %d : rnti (%x, %x), active %d\n",
               enb_mod_idP, CC_idP, ii,
-              eNB->common_channels[CC_idP].RA_template[ii].rnti, rntiP,
-              eNB->common_channels[CC_idP].RA_template[ii].RA_active);
+              RA_template->rnti, rntiP,
+              RA_template->RA_active);
 
-        if ((eNB->common_channels[CC_idP].RA_template[ii].rnti==rntiP) &&
-            (eNB->common_channels[CC_idP].RA_template[ii].RA_active==TRUE)) {
+        if ((RA_template->rnti==rntiP) &&
+            (RA_template->RA_active==TRUE)) {
 
           //payload_ptr = parse_ulsch_header(msg3,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,msg3_len);
 
           if (UE_id < 0) {
-            memcpy(&eNB->common_channels[CC_idP].RA_template[ii].cont_res_id[0],payload_ptr,6);
+            memcpy(&RA_template->cont_res_id[0],payload_ptr,6);
             LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3: length %d, offset %ld\n",
                   enb_mod_idP,CC_idP,frameP,rx_lengths[i],payload_ptr-sduP);
 
-            if ((UE_id=add_new_ue(enb_mod_idP,CC_idP,eNB->common_channels[CC_idP].RA_template[ii].rnti,harq_pid)) == -1 ) {
+            if ((UE_id=add_new_ue(enb_mod_idP,CC_idP,RA_template->rnti,harq_pid)) == -1 ) {
               AssertFatal(1==0,"[MAC][eNB] Max user count reached\n");
 	      // kill RA procedure
             } else
               LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d Added user with rnti %x => UE %d\n",
-                    enb_mod_idP,CC_idP,frameP,eNB->common_channels[CC_idP].RA_template[ii].rnti,UE_id);
+                    enb_mod_idP,CC_idP,frameP,RA_template->rnti,UE_id);
           } else {
             LOG_I(MAC,"[eNB %d][RAPROC] CC_id %d Frame %d CCCH: Received Msg3 from already registered UE %d: length %d, offset %ld\n",
                   enb_mod_idP,CC_idP,frameP,UE_id,rx_lengths[i],payload_ptr-sduP);
@@ -397,9 +399,14 @@ void rx_sdu(const module_id_t enb_mod_idP,
             //  process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
           }
 
-          eNB->common_channels[CC_idP].RA_template[ii].generate_Msg4 = 1;
-          eNB->common_channels[CC_idP].RA_template[ii].wait_ack_Msg4 = 0;
-
+	  // prepare transmission of Msg4
+          RA_template->generate_Msg4 = 1;
+          RA_template->wait_ack_Msg4 = 0;
+	  
+	  // Program Msg4 PDCCH+DLSCH/MPDCCH transmission 4 subframes from now
+	  RA_template->Msg4_frame    = frameP + ((subframeP>5) ? 1 : 0);
+	  RA_template->Msg4_subframe = (subframeP+4)%10;
+	  
         } // if process is active
       } // loop on RA processes
       
@@ -656,23 +663,82 @@ void set_msg3_subframe(module_id_t Mod_id,
   }
 }
 
+
 void schedule_ulsch(module_id_t module_idP, 
 		    frame_t frameP,
-		    unsigned char cooperation_flag,
-		    sub_frame_t subframeP, 
-		    unsigned char sched_subframe) {
+		    sub_frame_t subframeP) { 
+
+
 
 
 
   uint16_t first_rb[MAX_NUM_CCs],i;
   int CC_id;
   eNB_MAC_INST *eNB=RC.mac[module_idP];
+  COMMON_channels_t *cc;
 
   start_meas(&eNB->schedule_ulsch);
 
 
+  int sched_subframe = (subframeP+4)%10;
+
+  cc = &eNB->common_channels[0];
+  int tdd_sfa;
+  // for TDD: check subframes where we have to act and return if nothing should be done now
+  if (cc->tdd_Config) {
+    tdd_sfa = cc->tdd_Config->subframeAssignment;
+    switch (subframeP) {
+    case 0:
+      if ((tdd_sfa == 0)||
+	  (tdd_sfa == 3)||
+	  (tdd_sfa == 6)) sched_subframe = 4;
+      else return;
+      break;
+    case 1:
+      if ((tdd_sfa==0)||
+	  (tdd_sfa==1)) sched_subframe = 7;
+      else if (tdd_sfa==6) sched_subframe = 8;
+      break;
+    default:
+      return;
+
+    case 2: // Don't schedule UL in subframe 2 for TDD
+      return;
+    case 3:
+      if (tdd_sfa==2) sched_subframe = 7;
+      else return;
+      break;
+    case 4:
+      if (tdd_sfa==1) sched_subframe = 8;
+      else return;
+      break;
+    case 5:
+      if (tdd_sfa==0)      sched_subframe = 9;
+      else if (tdd_sfa==6) sched_subframe = 3;
+      else return;
+      break;
+    case 6:
+      if (tdd_sfa==1)      sched_subframe = 2;
+      else if (tdd_sfa==6) sched_subframe = 3;
+      else return;
+      break;
+    case 7:
+      return;
+    case 8:
+      if ((tdd_sfa>=2) || (tdd_sfa<=5)) sched_subframe=2;
+      else return;
+      break;
+    case 9:
+      if ((tdd_sfa==1) || (tdd_sfa==3) || (tdd_sfa==4)) sched_subframe=3;
+      else if (tdd_sfa==6) sched_subframe=4;
+      else return;
+      break;
+    }
+  }
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
 
+
+
     //leave out first RB for PUCCH
     first_rb[CC_id] = 1;
 
@@ -691,19 +757,19 @@ void schedule_ulsch(module_id_t module_idP,
 
     
     for (i=0; i<NB_RA_PROC_MAX; i++) {
-      if ((eNB->common_channels[CC_id].RA_template[i].RA_active == TRUE) &&
-          (eNB->common_channels[CC_id].RA_template[i].generate_rar == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].generate_Msg4 == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].wait_ack_Msg4 == 0) &&
-          (eNB->common_channels[CC_id].RA_template[i].Msg3_subframe == sched_subframe)) {
+      if ((cc->RA_template[i].RA_active == TRUE) &&
+          (cc->RA_template[i].generate_rar == 0) &&
+          (cc->RA_template[i].generate_Msg4 == 0) &&
+          (cc->RA_template[i].wait_ack_Msg4 == 0) &&
+          (cc->RA_template[i].Msg3_subframe == sched_subframe)) {
         first_rb[CC_id]++;
-	//    eNB->common_channels[CC_id].RA_template[i].Msg3_subframe = -1;
+	//    cc->RA_template[i].Msg3_subframe = -1;
         break;
       }
     }
   }
 
-  schedule_ulsch_rnti(module_idP, cooperation_flag, frameP, subframeP, sched_subframe,first_rb);
+  schedule_ulsch_rnti(module_idP, frameP, subframeP, sched_subframe,first_rb);
 
 
   stop_meas(&eNB->schedule_ulsch);
@@ -713,7 +779,6 @@ void schedule_ulsch(module_id_t module_idP,
 
 
 void schedule_ulsch_rnti(module_id_t   module_idP,
-                         unsigned char cooperation_flag,
                          frame_t       frameP,
                          sub_frame_t   subframeP,
                          unsigned char sched_subframe,

openair2/LAYER2/MAC/proto.h

@@ -33,22 +33,33 @@
  *  @{
  */
 
+/** \fn void schedule_mib(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
+\brief MIB scheduling for PBCH. This function requests the MIB from RRC and provides it to L1.
+@param Mod_id Instance ID of eNB
+@param frame Frame index
+@param subframe Subframe number on which to act
+
+*/
+
+void schedule_mib(module_id_t   module_idP,
+		  frame_t       frameP,
+		  sub_frame_t   subframeP);
 
-/** \fn void schedule_RA(module_id_t module_idP,frame_t frameP,sub_frame_t subframe,uint8_t Msg3_subframe,unsigned int *nprb);
+/** \fn void schedule_RA(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 \brief First stage of Random-Access Scheduling. Loops over the RA_templates and checks if RAR, Msg3 or its retransmission are to be scheduled in the subframe.  It returns the total number of PRB used for RA SDUs.  For Msg3 it retrieves the L3msg from RRC and fills the appropriate buffers.  For the others it just computes the number of PRBs. Each DCI uses 3 PRBs (format 1A)
 for the message.
 @param Mod_id Instance ID of eNB
 @param frame Frame index
 @param subframe Subframe number on which to act
-
 */
-void schedule_RA(module_id_t module_idP,frame_t frameP,sub_frame_t subframe,uint8_t Msg3_subframe);
+
+
+void schedule_RA(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 
 /** \brief First stage of SI Scheduling. Gets a SI SDU from RRC if available and computes the MCS required to transport it as a function of the SDU length.  It assumes a length less than or equal to 64 bytes (MCS 6, 3 PRBs).
 @param Mod_id Instance ID of eNB
 @param frame Frame index
 @param subframe Subframe number on which to act
-@param Msg3_subframe Subframe where Msg3 will be transmitted
 */
 void schedule_SI(module_id_t module_idP,frame_t frameP,sub_frame_t subframeP);
 
@@ -78,9 +89,8 @@ int8_t ue_get_mbsfn_sf_alloction (module_id_t module_idP, uint8_t mbsfn_sync_are
 @param Mod_id Instance ID of eNB
 @param frame Frame index
 @param subframe Subframe number on which to act
-@param sched_subframe Subframe number where PUSCH is transmitted (for DAI lookup)
 */
-void schedule_ulsch(module_id_t module_idP,frame_t frameP,unsigned char cooperation_flag,sub_frame_t subframe,unsigned char sched_subframe);
+void schedule_ulsch(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 
 /** \brief ULSCH Scheduling per RNTI
 @param Mod_id Instance ID of eNB
@@ -88,15 +98,7 @@ void schedule_ulsch(module_id_t module_idP,frame_t frameP,unsigned char cooperat
 @param subframe Subframe number on which to act
 @param sched_subframe Subframe number where PUSCH is transmitted (for DAI lookup)
 */
-void schedule_ulsch_rnti(module_id_t module_idP, unsigned char cooperation_flag, frame_t frameP, sub_frame_t subframe, unsigned char sched_subframe, uint16_t *first_rb);
-
-/** \brief ULSCH Scheduling for CBA  RNTI
-@param Mod_id Instance ID of eNB
-@param frame Frame index
-@param subframe Subframe number on which to act
-@param sched_subframe Subframe number where PUSCH is transmitted (for DAI lookup)
-*/
-void schedule_ulsch_cba_rnti(module_id_t module_idP, unsigned char cooperation_flag, frame_t frameP, sub_frame_t subframe, unsigned char sched_subframe, uint16_t *first_rb);
+void schedule_ulsch_rnti(module_id_t module_idP, frame_t frameP, sub_frame_t subframe, unsigned char sched_subframe, uint16_t *first_rb);
 
 /** \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
@@ -194,12 +196,10 @@ void dlsch_scheduler_pre_processor_allocate (module_id_t   Mod_id,
 /* \brief Function to trigger the eNB scheduling procedure.  It is called by PHY at the beginning of each subframe, \f$n$\f
    and generates all DLSCH allocations for subframe \f$n\f$ and ULSCH allocations for subframe \f$n+k$\f. 
 @param Mod_id Instance ID of eNB
-@param cooperation_flag Flag to indicated that this cell has cooperating nodes (i.e. that there are collaborative transport channels that
-can be scheduled.
 @param subframe Index of current subframe
 @param calibration_flag Flag to indicate that eNB scheduler should schedule TDD auto-calibration PUSCH.
 */
-void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, uint8_t cooperation_flag, frame_t frameP, sub_frame_t subframeP);//, int calibration_flag);
+void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP);//, int calibration_flag);
 
 /* \brief Function to indicate a received preamble on PRACH.  It initiates the RA procedure.
 @param Mod_id Instance ID of eNB

openair2/PHY_INTERFACE/IF_Module.c

@@ -132,7 +132,6 @@ void UL_indication(UL_IND_t *UL_info)
   if (ifi->CC_mask == ((1<<MAX_NUM_CCs)-1)) {
 
     eNB_dlsch_ulsch_scheduler(module_id,
-			      0,
 			      UL_info->frame+((UL_info->subframe>5)?1:0),
 			      (UL_info->subframe+4)%10);
 

openair3/GTPV1-U/gtpv1u_eNB.c

@@ -906,7 +906,7 @@ static int gtpv1u_eNB_init(void)
   NwGtpv1uUdpEntityT      udp;
   NwGtpv1uLogMgrEntityT   log;
   NwGtpv1uTimerMgrEntityT tmr;
-  Enb_properties_t       *enb_properties_p  = NULL;
+
 
   //  enb_properties_p = enb_config_get()->properties[0];
   RC.gtpv1u_data_g = (gtpv1u_data_t*)malloc(sizeof(gtpv1u_data_t));

openair3/UDP/udp_eNB_task.c

@@ -99,7 +99,7 @@ void udp_eNB_receiver(struct udp_socket_desc_s *udp_sock_pP);
 
 void *udp_eNB_task(void *args_p);
 
-int udp_enb_init(const Enb_properties_t *enb_config_p);
+int udp_enb_init();
 /* @brief Retrieve the descriptor associated with the task_id
  */
 static
@@ -295,7 +295,7 @@ void *udp_eNB_task(void *args_p)
   MessageDef         *received_message_p    = NULL;
   //const char         *msg_name = NULL;
   //instance_t          instance  = 0;
-  udp_enb_init(NULL);
+  udp_enb_init();
 
   itti_mark_task_ready(TASK_UDP);
   MSC_START_USE();
@@ -427,7 +427,7 @@ on_error:
   return NULL;
 }
 
-int udp_enb_init(const Enb_properties_t *enb_config_p)
+int udp_enb_init()
 {
   LOG_I(UDP_, "Initializing UDP task interface\n");
   STAILQ_INIT(&udp_socket_list);

openair3/UDP/udp_eNB_task.h

@@ -93,6 +93,6 @@ void *udp_eNB_task(void *args_p);
  *  \param enb_config_p configuration of eNB
  *  @returns always 0
  */
-int udp_enb_init(const Enb_properties_t *enb_config_p);
+int udp_enb_init();
 
 #endif /* UDP_ENB_TASK_H_ */

targets/RT/USER/lte-enb.c

@@ -721,31 +721,40 @@ void kill_eNB_proc(int inst) {
     
 
     LOG_I(PHY, "Killing TX CC_id %d inst %d\n", CC_id, inst );
-    
-    proc_rxtx[0].instance_cnt_rxtx = 0; // FIXME data race!
-    proc_rxtx[1].instance_cnt_rxtx = 0; // FIXME data race!
+
+    if (eNB->single_thread_flag==0) {
+      proc_rxtx[0].instance_cnt_rxtx = 0; // FIXME data race!
+      proc_rxtx[1].instance_cnt_rxtx = 0; // FIXME data race!
+      pthread_cond_signal( &proc_rxtx[0].cond_rxtx );    
+      pthread_cond_signal( &proc_rxtx[1].cond_rxtx );
+    }
     proc->instance_cnt_prach = 0;
-    pthread_cond_signal( &proc_rxtx[0].cond_rxtx );    
-    pthread_cond_signal( &proc_rxtx[1].cond_rxtx );
     pthread_cond_signal( &proc->cond_prach );
 
     pthread_cond_broadcast(&sync_phy_proc.cond_phy_proc_tx);
     pthread_join( proc->pthread_prach, (void**)&status );    
 
+    LOG_I(PHY, "Destroying prach mutex/cond\n");
     pthread_mutex_destroy( &proc->mutex_prach );
     pthread_cond_destroy( &proc->cond_prach );
 #ifdef Rel14
+    proc->instance_cnt_prach_br = 0;
     pthread_cond_signal( &proc->cond_prach_br );
     pthread_join( proc->pthread_prach_br, (void**)&status );    
     pthread_mutex_destroy( &proc->mutex_prach_br );
     pthread_cond_destroy( &proc->cond_prach_br );
 #endif         
+    LOG_I(PHY, "Destroying UL_INFO mutex\n");
     pthread_mutex_destroy(&eNB->UL_INFO_mutex);
     int i;
-    for (i=0;i<2;i++) {
-      pthread_join( proc_rxtx[i].pthread_rxtx, (void**)&status );
-      pthread_mutex_destroy( &proc_rxtx[i].mutex_rxtx );
-      pthread_cond_destroy( &proc_rxtx[i].cond_rxtx );
+    if (eNB->single_thread_flag==0) {
+      for (i=0;i<2;i++) {
+	LOG_I(PHY, "Joining rxtx[%d] mutex/cond\n");
+	pthread_join( proc_rxtx[i].pthread_rxtx, (void**)&status );
+	LOG_I(PHY, "Destroying rxtx[%d] mutex/cond\n");
+	pthread_mutex_destroy( &proc_rxtx[i].mutex_rxtx );
+	pthread_cond_destroy( &proc_rxtx[i].cond_rxtx );
+      }
     }
   }
 }
@@ -854,6 +863,11 @@ void init_eNB_afterRU() {
       AssertFatal(eNB->num_RU>0,"Number of RU attached to eNB %d is zero\n",eNB->Mod_id);
       LOG_I(PHY,"Mapping RX ports from %d RUs to eNB %d\n",eNB->num_RU,eNB->Mod_id);
       eNB->frame_parms.nb_antennas_rx       = 0;
+      eNB->prach_vars.rxsigF[0] = (int16_t*)malloc16(64*sizeof(int16_t*));
+#ifdef Rel14
+      for (int ce_level=0;ce_level<4;ce_level++)
+	eNB->prach_vars_br.rxsigF[ce_level] = (int16_t*)malloc16(64*sizeof(int16_t*));
+#endif
       for (ru_id=0,aa=0;ru_id<eNB->num_RU;ru_id++) {
 	eNB->frame_parms.nb_antennas_rx    += eNB->RU_list[ru_id]->nb_rx;
 
@@ -875,12 +889,6 @@ void init_eNB_afterRU() {
 		  "inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,eNB->frame_parms.nb_antennas_rx);
       LOG_I(PHY,"inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,eNB->frame_parms.nb_antennas_rx);
 
-      AssertFatal(eNB->frame_parms.nb_antennas_rx <= sizeof(eNB->prach_vars.prach_ifft) / sizeof(eNB->prach_vars.prach_ifft[0]),
-		  "nb_antennas_rx too large");
-      for (i=0; i<eNB->frame_parms.nb_antennas_rx; i++) {
-	eNB->prach_vars.prach_ifft[i] = (int16_t*)malloc16_clear(1024*2*sizeof(int16_t));
-	LOG_D(PHY,"[INIT] prach_vars->prach_ifft[%d] = %p\n",i,eNB->prach_vars.prach_ifft[i]);
-      }
       init_transport(eNB);
       init_precoding_weights(RC.eNB[inst][CC_id]);
     }

targets/RT/USER/lte-ru.c

@@ -133,6 +133,8 @@ int connect_rau(RU_t *ru);
 /*************************************************************/
 /* Functions to attach and configure RRU                     */
 
+extern void wait_eNBs();
+
 int attach_rru(RU_t *ru) {
   
   ssize_t      msg_len,len;
@@ -626,7 +628,7 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
   if ((frame_tx == 0)&&(subframe_tx == 0)) proc->frame_tx_unwrap += 1024;
 
   proc->timestamp_tx = (((frame_tx + proc->frame_tx_unwrap) * 10) + subframe_tx) * fp->samples_per_tti;
-  LOG_D(PHY,"RU %d/%d TST %llu, frame %d, subframe %d\n",ru->idx,0,proc->timestamp_tx,frame_tx,subframe_tx);
+  LOG_D(PHY,"RU %d/%d TST %llu, frame %d, subframe %d\n",ru->idx,0,(long long unsigned int)proc->timestamp_tx,frame_tx,subframe_tx);
     // dump VCD output for first RU in list
   if (ru == RC.ru[0]) {
     VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_RU, frame_tx );
@@ -680,33 +682,53 @@ void rx_rf(RU_t *ru,int *frame,int *subframe) {
   void *rxp[ru->nb_rx];
   unsigned int rxs;
   int i;
-
+  openair0_timestamp ts,old_ts;
     
   for (i=0; i<ru->nb_rx; i++)
     rxp[i] = (void*)&ru->common.rxdata[i][*subframe*fp->samples_per_tti];
   
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
 
+  old_ts = proc->timestamp_rx;
+
   rxs = ru->rfdevice.trx_read_func(&ru->rfdevice,
-				   &(proc->timestamp_rx),
+				   &ts,
 				   rxp,
 				   fp->samples_per_tti,
 				   ru->nb_rx);
   
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
  
-  if (proc->first_rx == 1)
+  proc->timestamp_rx = ts-ru->ts_offset;
+
+  if (rxs != fp->samples_per_tti)
+    LOG_E(PHY,"rx_rf: Asked for %d samples, got %d from USRP\n",fp->samples_per_tti,rxs);
+
+  if (proc->first_rx == 1) {
     ru->ts_offset = proc->timestamp_rx;
- 
-  proc->frame_rx     = ((proc->timestamp_rx-ru->ts_offset) / (fp->samples_per_tti*10))&1023;
-  proc->subframe_rx  = ((proc->timestamp_rx-ru->ts_offset) / fp->samples_per_tti)%10;
+    proc->timestamp_rx = 0;
+  }
+  else {
+    if (proc->timestamp_rx - old_ts != fp->samples_per_tti) {
+      LOG_I(PHY,"rx_rf: rfdevice timing drift of %"PRId64" samples (ts_off %"PRId64")\n",proc->timestamp_rx - old_ts - fp->samples_per_tti,ru->ts_offset);
+      ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
+      proc->timestamp_rx = ts-ru->ts_offset;
+    }
+
+  }
+  proc->frame_rx     = (proc->timestamp_rx / (fp->samples_per_tti*10))&1023;
+  proc->subframe_rx  = (proc->timestamp_rx / fp->samples_per_tti)%10;
   // synchronize first reception to frame 0 subframe 0
 
   proc->timestamp_tx = proc->timestamp_rx+(4*fp->samples_per_tti);
   proc->subframe_tx  = (proc->subframe_rx+4)%10;
   proc->frame_tx     = (proc->subframe_rx>5) ? (proc->frame_rx+1)&1023 : proc->frame_rx;
-
-  LOG_D(PHY,"RU %d/%d TS %llu (off %d), frame %d, subframe %d\n",ru->idx, 0, proc->timestamp_rx,ru->ts_offset,proc->frame_rx,proc->subframe_rx);
+  
+  LOG_D(PHY,"RU %d/%d TS %llu (off %d), frame %d, subframe %d\n",
+	ru->idx, 
+	0, 
+	(unsigned long long int)proc->timestamp_rx,
+	(int)ru->ts_offset,proc->frame_rx,proc->subframe_rx);
 
     // dump VCD output for first RU in list
   if (ru == RC.ru[0]) {
@@ -752,30 +774,56 @@ void tx_rf(RU_t *ru) {
   unsigned int txs;
   int i;
 
-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, (proc->timestamp_tx-ru->openair0_cfg.tx_sample_advance)&0xffffffff );
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
-  // prepare tx buffer pointers
-  
-  for (i=0; i<ru->nb_tx; i++)
-    txp[i] = (void*)&ru->common.txdata[i][proc->subframe_tx*fp->samples_per_tti];
-  
-  txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
-				    proc->timestamp_tx-ru->openair0_cfg.tx_sample_advance,
-				    txp,
-				    fp->samples_per_tti,
-				    ru->nb_tx,
-				    1);
-  
-  LOG_D(PHY,"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, unwrapped_frame %d, subframe %d\n",ru->idx,
-	proc->timestamp_tx,proc->frame_tx,proc->frame_tx_unwrap,proc->subframe_tx,proc);
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
+  lte_subframe_t SF_type     = subframe_select(fp,proc->subframe_tx%10);
+  lte_subframe_t prevSF_type = subframe_select(fp,(proc->subframe_tx+9)%10);
+  lte_subframe_t nextSF_type = subframe_select(fp,(proc->subframe_tx+1)%10);
+  if ((SF_type == SF_DL) ||
+      (SF_type == SF_S)) {
+    
+    for (i=0; i<ru->nb_tx; i++)
+      txp[i] = (void*)&ru->common.txdata[i][proc->subframe_tx*fp->samples_per_tti]; 
+    
+    int siglen=fp->samples_per_tti,flags=1;
+    
+    if (SF_type == SF_S) {
+      siglen = fp->dl_symbols_in_S_subframe*(fp->ofdm_symbol_size+fp->nb_prefix_samples0);
+      flags=3; // end of burst
+    }
+    if ((fp->frame_type == TDD) &&
+	(SF_type == SF_DL)&&
+	(prevSF_type == SF_UL) &&
+	(nextSF_type == SF_DL))
+      flags = 2; // start of burst
+    
+    if ((fp->frame_type == TDD) &&
+	(SF_type == SF_DL)&&
+	(prevSF_type == SF_UL) &&
+	(nextSF_type == SF_UL))
+      flags = 4; // start of burst and end of burst (only one DL SF between two UL)
   
     
+    VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST, (proc->timestamp_tx-ru->openair0_cfg.tx_sample_advance)&0xffffffff );
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
+    // prepare tx buffer pointers
+    
+    txs = ru->rfdevice.trx_write_func(&ru->rfdevice,
+				      proc->timestamp_tx+ru->ts_offset-ru->openair0_cfg.tx_sample_advance,
+				      txp,
+				      siglen,
+				      ru->nb_tx,
+				      flags);
     
-  if (txs !=  fp->samples_per_tti) {
-    LOG_E(PHY,"TX : Timeout (sent %d/%d)\n",txs, fp->samples_per_tti);
-    exit_fun( "problem transmitting samples" );
-  }	
+    LOG_D(PHY,"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, unwrapped_frame %d, subframe %d\n",ru->idx,
+	  proc->timestamp_tx,proc->frame_tx,proc->frame_tx_unwrap,proc->subframe_tx,proc);
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
+    
+    
+    
+    if (txs !=  fp->samples_per_tti) {
+      LOG_E(PHY,"TX : Timeout (sent %d/%d)\n",txs, fp->samples_per_tti);
+      exit_fun( "problem transmitting samples" );
+    }	
+  }
 }
 
 
@@ -1788,17 +1836,18 @@ void init_RU(const char *rf_config_file) {
 
     
     eNB0             = ru->eNB_list[0];
-    if ((ru->function != NGFI_RRU_IF5) || (ru->function != NGFI_RRU_IF4p5))
+    if ((ru->function != NGFI_RRU_IF5) && (ru->function != NGFI_RRU_IF4p5))
       AssertFatal(eNB0!=NULL,"eNB0 is null!\n");
 
     if (eNB0) {
       LOG_I(PHY,"Copying frame parms from eNB %d to ru %d\n",eNB0->Mod_id,ru->idx);
       memcpy((void*)&ru->frame_parms,(void*)&eNB0->frame_parms,sizeof(LTE_DL_FRAME_PARMS));
-    }
-    // attach all RU to all eNBs in its list/
-    for (i=0;i<ru->num_eNB;i++) {
-      eNB0 = ru->eNB_list[i];
-      eNB0->RU_list[eNB0->num_RU++] = ru;
+
+      // attach all RU to all eNBs in its list/
+      for (i=0;i<ru->num_eNB;i++) {
+	eNB0 = ru->eNB_list[i];
+	eNB0->RU_list[eNB0->num_RU++] = ru;
+      }
     }
     //    LOG_I(PHY,"Initializing RRU descriptor %d : (%s,%s,%d)\n",ru_id,ru_if_types[ru->if_south],eNB_timing[ru->if_timing],ru->function);
 
@@ -1863,9 +1912,11 @@ void init_RU(const char *rf_config_file) {
       ru->start_rf               = start_rf;                            // need to start the local RF interface
       printf("configuring ru_id %d (start_rf %p)\n",ru_id,start_rf);
 
-      fill_rf_config(ru,rf_config_file);      
-      init_frame_parms(&ru->frame_parms,1);
-      phy_init_RU(ru);
+      if (ru->function == eNodeB_3GPP) { // configure RF parameters only for 3GPP eNodeB, we need to get them from RAU otherwise
+	fill_rf_config(ru,rf_config_file);      
+	init_frame_parms(&ru->frame_parms,1);
+	phy_init_RU(ru);
+      }
 
       ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);
       if (setup_RU_buffers(ru)!=0) {

targets/RT/USER/lte-softmodem.c

@@ -1361,7 +1361,7 @@ int main( int argc, char **argv )
 #endif
 
   } else {
-    printf("configuring for RAU\n");
+    printf("configuring for RAU/RRU\n");
 
     set_comp_log(HW,      hw_log_level, hw_log_verbosity, 1);
     set_comp_log(PHY,     phy_log_level,   phy_log_verbosity, 1);
@@ -1691,8 +1691,8 @@ int main( int argc, char **argv )
     if (RC.nb_L1_inst > 0) {
       printf("Initializing eNB threads\n");
       init_eNB(single_thread_flag,wait_for_sync);
-      for (inst=0;inst<RC.nb_L1_inst;inst++)
-	for (CC_id=0;CC_id<RC.nb_L1_CC[inst];CC_id++) phy_init_lte_eNB(RC.eNB[inst][CC_id],0,0);
+      //      for (inst=0;inst<RC.nb_L1_inst;inst++)
+      //	for (CC_id=0;CC_id<RC.nb_L1_CC[inst];CC_id++) phy_init_lte_eNB(RC.eNB[inst][CC_id],0,0);
     }
 
     wait_eNBs();
@@ -1706,21 +1706,9 @@ int main( int argc, char **argv )
       }
     }
 
-    AssertFatal(RC.eNB[0][0]->UL_INFO.crc_ind.crc_pdu_list!=NULL,
-		"RC.eNB[0][0]->UL_INFO.crc_ind.crc_pdu_list is null\n");
-    AssertFatal(RC.eNB[0][0]->UL_INFO.rx_ind.rx_pdu_list!=NULL,
-		"RC.eNB[0][0]->UL_INFO.rx_ind.rx_pdu_list is null\n");
     wait_RUs();
-    AssertFatal(RC.eNB[0][0]->UL_INFO.crc_ind.crc_pdu_list!=NULL,
-		"RC.eNB[0][0]->UL_INFO.crc_ind.crc_pdu_list is null\n");
-    AssertFatal(RC.eNB[0][0]->UL_INFO.rx_ind.rx_pdu_list!=NULL,
-		"RC.eNB[0][0]->UL_INFO.rx_ind.rx_pdu_list is null\n");
     // once all RUs are ready intiailize the rest of the eNBs ((dependence on final RU parameters after configuration)
     init_eNB_afterRU();
-    AssertFatal(RC.eNB[0][0]->UL_INFO.crc_ind.crc_pdu_list!=NULL,
-		"RC.eNB[0][0]->UL_INFO.crc_ind.crc_pdu_list is null\n");
-    AssertFatal(RC.eNB[0][0]->UL_INFO.rx_ind.rx_pdu_list!=NULL,
-		"RC.eNB[0][0]->UL_INFO.rx_ind.rx_pdu_list is null\n");
     
   }