SRSUE: Renamed PHY scell_state to cell_state

srsue/hdr/phy/phy_common.h

@@ -61,7 +61,7 @@ public:
   srslte::phy_cfg_mbsfn_t mbsfn_config = {};
 
   // Secondary serving cell states
-  scell::state scell_state;
+  scell::state cell_state;
 
   // Save last TBS for uplink (mcs >= 28)
   srslte_ra_tb_t last_ul_tb[SRSLTE_MAX_HARQ_PROC][SRSLTE_MAX_CARRIERS] = {};

srsue/src/phy/cc_worker.cc

@@ -847,7 +847,7 @@ void cc_worker::set_uci_ack(srslte_uci_data_t* uci_data,
 
   // Only PCell generates ACK for all SCell
   for (uint32_t i = 0; i < phy->args->nof_carriers; i++) {
-    if (phy->scell_state.is_configured(i)) {
+    if (phy->cell_state.is_configured(i)) {
       phy->get_dl_pending_ack(&sf_cfg_ul, i, &ack_info.cc[i]);
       nof_configured_carriers++;
     }

srsue/src/phy/phy.cc

@@ -246,8 +246,8 @@ void phy::get_metrics(phy_metrics_t* m)
   m->info[0].dl_earfcn = dl_earfcn;
 
   for (uint32_t i = 1; i < args.nof_carriers; i++) {
-    m->info[i].dl_earfcn = common.scell_state.get_earfcn(i);
+    m->info[i].dl_earfcn = common.cell_state.get_earfcn(i);
-    m->info[i].pci       = common.scell_state.get_pci(i);
+    m->info[i].pci       = common.cell_state.get_pci(i);
   }
 
   common.get_ch_metrics(m->ch);
@@ -269,12 +269,12 @@ void phy::set_timeadv(uint32_t ta_cmd)
 
 void phy::deactivate_scells()
 {
-  common.scell_state.deactivate_all();
+  common.cell_state.deactivate_all();
 }
 
 void phy::set_activation_deactivation_scell(uint32_t cmd, uint32_t tti)
 {
-  common.scell_state.set_activation_deactivation(cmd, tti);
+  common.cell_state.set_activation_deactivation(cmd, tti);
 }
 
 void phy::configure_prach_params()
@@ -519,13 +519,13 @@ bool phy::set_scell(srslte_cell_t cell_info, uint32_t cc_idx, uint32_t earfcn)
     return false;
   }
 
-  bool earfcn_is_different = common.scell_state.get_earfcn(cc_idx) != earfcn;
+  bool earfcn_is_different = common.cell_state.get_earfcn(cc_idx) != earfcn;
 
   // Set inter-frequency measurement
   sfsync.set_inter_frequency_measurement(cc_idx, earfcn, cell_info);
 
   // Store secondary serving cell EARFCN and PCI
-  common.scell_state.configure(cc_idx, earfcn, cell_info.id);
+  common.cell_state.configure(cc_idx, earfcn, cell_info.id);
 
   // Reset cell configuration
   for (uint32_t i = 0; i < nof_workers; i++) {

srsue/src/phy/phy_common.cc

@@ -742,7 +742,7 @@ void phy_common::update_measurements(uint32_t
     set_ch_metrics(cc_idx, ch);
 
     // Prepare measurements for serving cells
-    bool active = scell_state.is_configured(cc_idx);
+    bool active = cell_state.is_configured(cc_idx);
     if (active && ((sf_cfg_dl.tti % pcell_report_period) == pcell_report_period - 1)) {
       rrc_interface_phy_lte::phy_meas_t meas = {};
       meas.rsrp                              = avg_rsrp_dbm[cc_idx];
@@ -753,8 +753,8 @@ void phy_common::update_measurements(uint32_t
       if (cc_idx == 0) {
         meas.pci = cell.id;
       } else {
-        meas.earfcn = scell_state.get_earfcn(cc_idx);
+        meas.earfcn = cell_state.get_earfcn(cc_idx);
-        meas.pci    = scell_state.get_pci(cc_idx);
+        meas.pci    = cell_state.get_pci(cc_idx);
       }
       serving_cells.push_back(meas);
     }
@@ -903,7 +903,7 @@ void phy_common::reset()
   ZERO_OBJECT(avg_rsrp);
   ZERO_OBJECT(avg_rsrp_dbm);
   ZERO_OBJECT(avg_rsrq_db);
-  scell_state.reset();
+  cell_state.reset();
 
   reset_neighbour_cells();
 

srsue/src/phy/sf_worker.cc

@@ -205,7 +205,7 @@ void sf_worker::work_imp()
       if (carrier_idx == 0 && phy->is_mbsfn_sf(&mbsfn_cfg, tti)) {
         cc_workers[0]->work_dl_mbsfn(mbsfn_cfg); // Don't do chest_ok in mbsfn since it trigger measurements
       } else {
-        if (phy->scell_state.is_active(carrier_idx, tti)) {
+        if (phy->cell_state.is_active(carrier_idx, tti)) {
           rx_signal_ok = cc_workers[carrier_idx]->work_dl_regular();
         }
       }
@@ -230,14 +230,14 @@ void sf_worker::work_imp()
       for (uint32_t carrier_idx = 0;
            carrier_idx < phy->args->nof_carriers and not uci_data.cfg.cqi.data_enable and uci_data.cfg.cqi.ri_len == 0;
            carrier_idx++) {
-        if (phy->scell_state.is_active(carrier_idx, TTI_TX(tti))) {
+        if (phy->cell_state.is_active(carrier_idx, TTI_TX(tti))) {
           cc_workers[carrier_idx]->set_uci_periodic_cqi(&uci_data);
         }
       }
 
       // Loop through all carriers
       for (uint32_t carrier_idx = 0; carrier_idx < phy->args->nof_carriers; carrier_idx++) {
-        if (phy->scell_state.is_active(carrier_idx, tti)) {
+        if (phy->cell_state.is_active(carrier_idx, tti)) {
           tx_signal_ready |= cc_workers[carrier_idx]->work_ul(uci_cc_idx == carrier_idx ? &uci_data : nullptr);
 
           // Set signal pointer based on offset

srsue/src/phy/sync.cc

@@ -481,7 +481,7 @@ void sync::run_camping_in_sync_state(sf_worker* worker, srslte::rf_buffer_t& syn
   worker->set_prach(prach_ptr ? &prach_ptr[prach_sf_cnt * SRSLTE_SF_LEN_PRB(cell.nof_prb)] : nullptr, prach_power);
 
   // Execute Serving Cell state FSM
-  worker_com->scell_state.run_tti(tti);
+  worker_com->cell_state.run_tti(tti);
 
   // Set CFO for all Carriers
   for (uint32_t cc = 0; cc < worker_com->args->nof_carriers; cc++) {