renaming for gNB

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -49,7 +49,7 @@ void nr_pdcch_scrambling(uint32_t *in,
 void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
                            int frame,
                            int subframe,
-                           gNB_rxtx_proc_t *proc,
+                           gNB_L1_rxtx_proc_t *proc,
                            NR_gNB_DCI_ALLOC_t *dci_alloc,
                            nfapi_nr_dl_config_request_pdu_t *pdu);
 

openair1/PHY/NR_TRANSPORT/nr_dci_tools.c

@@ -108,7 +108,7 @@ void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m
 void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
                            int frame,
                            int subframe,
-                           gNB_rxtx_proc_t *proc,
+                           gNB_L1_rxtx_proc_t *proc,
                            NR_gNB_DCI_ALLOC_t *dci_alloc,
                            nfapi_nr_dl_config_request_pdu_t *pdu)
 {

openair1/PHY/defs_gNB.h

@@ -99,22 +99,29 @@ typedef struct {
   int frame_rx;
   /// \brief Instance count for RXn-TXnp4 processing thread.
   /// \internal This variable is protected by \ref mutex_rxtx.
-  int instance_cnt_rxtx;
+  int instance_cnt;
   /// pthread structure for RXn-TXnp4 processing thread
-  pthread_t pthread_rxtx;
+  pthread_t pthread;
   /// pthread attributes for RXn-TXnp4 processing thread
-  pthread_attr_t attr_rxtx;
+  pthread_attr_t attr;
   /// condition variable for tx processing thread
-  pthread_cond_t cond_rxtx;
+  pthread_cond_t cond;
   /// mutex for RXn-TXnp4 processing thread
-  pthread_mutex_t mutex_rxtx;
+  pthread_mutex_t mutex;
   /// scheduling parameters for RXn-TXnp4 thread
   struct sched_param sched_param_rxtx;
-} gNB_rxtx_proc_t;
+
+  /// \internal This variable is protected by \ref mutex_RUs.
+  int instance_cnt_RUs;
+  /// condition variable for tx processing thread
+  pthread_cond_t cond_RUs;
+  /// mutex for RXn-TXnp4 processing thread
+  pthread_mutex_t mutex_RUs;
+} gNB_L1_rxtx_proc_t;
 
 
 /// Context data structure for eNB subframe processing
-typedef struct gNB_proc_t_s {
+typedef struct gNB_L1_proc_t_s {
   /// Component Carrier index
   uint8_t              CC_id;
   /// thread index
@@ -181,17 +188,19 @@ typedef struct gNB_proc_t_s {
   pthread_mutex_t mutex_asynch_rxtx;
   /// mutex for RU access to eNB processing (PDSCH/PUSCH)
   pthread_mutex_t mutex_RU;
+  /// mutex for RU_tx access to eNB_tx processing (PDSCH/PUSCH)
+  pthread_mutex_t mutex_RU_tx;
   /// mutex for RU access to eNB processing (PRACH)
   pthread_mutex_t mutex_RU_PRACH;
   /// mutex for RU access to eNB processing (PRACH BR)
   pthread_mutex_t mutex_RU_PRACH_br;
   /// mask for RUs serving eNB (PDSCH/PUSCH)
-  int RU_mask;
+  int RU_mask, RU_mask_tx;
   /// mask for RUs serving eNB (PRACH)
   int RU_mask_prach;
   /// set of scheduling variables RXn-TXnp4 threads
-  gNB_rxtx_proc_t proc_rxtx[2];
-} gNB_proc_t;
+  gNB_L1_rxtx_proc_t L1_proc, L1_proc_tx;
+} gNB_L1_proc_t;
 
 
 
@@ -251,7 +260,7 @@ typedef struct PHY_VARS_gNB_s {
   module_id_t          Mod_id;
   uint8_t              CC_id;
   uint8_t              configured;
-  gNB_proc_t           proc;
+  gNB_L1_proc_t           proc;
   int                  single_thread_flag;
   int                  abstraction_flag;
   int                  num_RU;

openair1/SCHED_NR/fapi_nr_l1.c

@@ -37,7 +37,7 @@ int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req);
 extern uint8_t nfapi_mode;
 
 void handle_nr_nfapi_bch_pdu(PHY_VARS_gNB *gNB,
-                             gNB_rxtx_proc_t *proc,
+                             gNB_L1_rxtx_proc_t *proc,
                              nfapi_nr_dl_config_request_pdu_t *dl_config_pdu,
                              uint8_t *sdu)
 {
@@ -56,7 +56,7 @@ void handle_nr_nfapi_bch_pdu(PHY_VARS_gNB *gNB,
 
 void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
                                 int frame, int subframe,
-                                gNB_rxtx_proc_t *proc,
+                                gNB_L1_rxtx_proc_t *proc,
                                 nfapi_nr_dl_config_request_pdu_t *dl_config_pdu)
 {
   int idx                        = subframe&1;
@@ -73,7 +73,7 @@ void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
 
 void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
   PHY_VARS_gNB *gNB;
-  gNB_rxtx_proc_t *proc;
+  gNB_L1_rxtx_proc_t *proc;
   // copy data from L2 interface into L1 structures
   module_id_t                   Mod_id       = Sched_INFO->module_id;
   uint8_t                       CC_id        = Sched_INFO->CC_id;
@@ -87,7 +87,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
   AssertFatal(RC.gNB[Mod_id][CC_id]!=NULL,"RC.gNB[%d][%d] is null\n",Mod_id,CC_id);
 
   gNB         = RC.gNB[Mod_id][CC_id];
-  proc        = &gNB->proc.proc_rxtx[0];
+  proc        = &gNB->proc.L1_proc;
 
   uint8_t number_dl_pdu             = DL_req->dl_config_request_body.number_pdu;
 

openair1/SCHED_NR/fapi_nr_l1.h

@@ -41,5 +41,5 @@
 void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO);
 void handle_nfapi_nr_dci_dl_pdu(PHY_VARS_gNB *gNB,
                                 int frame, int subframe,
-                                gNB_rxtx_proc_t *proc,
+                                gNB_L1_rxtx_proc_t *proc,
                                 nfapi_nr_dl_config_request_pdu_t *dl_config_pdu);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -152,7 +152,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int subframe) {
 }
 
 void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
-						   gNB_rxtx_proc_t *proc,
+						   gNB_L1_rxtx_proc_t *proc,
 						   int do_meas)
 {
   int aa;

openair1/SCHED_NR/sched_nr.h

@@ -36,7 +36,7 @@
 
 lte_subframe_t nr_subframe_select (nfapi_nr_config_request_t *cfg, unsigned char subframe);
 void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp);
-void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, gNB_rxtx_proc_t *proc, int do_meas);
+void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, int do_meas);
 void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int subframe);
 void nr_init_feptx_thread(RU_t *ru,pthread_attr_t *attr_feptx);
 void nr_feptx_ofdm(RU_t *ru);

targets/RT/USER/nr-ru.c

@@ -874,7 +874,7 @@ void tx_rf(RU_t *ru) {
 /*!
  * \brief The Asynchronous RX/TX FH thread of RAU/RCC/gNB/RRU.
  * This handles the RX FH for an asynchronous RRU/UE
- * \param param is a \ref gNB_proc_t structure which contains the info what to process.
+ * \param param is a \ref gNB_L1_proc_t structure which contains the info what to process.
  * \returns a pointer to an int. The storage is not on the heap and must not be freed.
  */
 static void* ru_thread_asynch_rxtx( void* param ) {