Merge remote-tracking branch 'origin/cleanup_fapi_and_more' into integration_2024_w10

nfapi/oai_integration/nfapi_vnf.c

@@ -46,6 +46,7 @@
 #include "common/ran_context.h"
 #include "openair2/PHY_INTERFACE/queue_t.h"
 #include "gnb_ind_vars.h"
+#include "LAYER2/MAC/mac.h"
 
 #define TEST
 

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h

@@ -11,7 +11,6 @@
 
 #include "stddef.h"
 #include "nfapi_interface.h"
-#include "nfapi_nr_interface.h"
 
 #define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
 #define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
@@ -26,13 +25,6 @@
 
 // Extension to the generic structures for single tlv values
 
-
-typedef enum {
-  NFAPI_NR_DMRS_TYPE1=0,
-  NFAPI_NR_DMRS_TYPE2
-} nfapi_nr_dmrs_type_e;
-
-
 typedef struct {
   /// Value: 0 -> 1, 0: Payload is carried directly in the value field, 1: Pointer to payload is in the value field 
   uint16_t tag; 

openair1/PHY/INIT/nr_init.c

@@ -39,8 +39,6 @@
 #include "PHY/NR_TRANSPORT/nr_ulsch.h"
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "SCHED_NR/fapi_nr_l1.h"
-#include "nfapi_nr_interface.h"
-
 #include "PHY/NR_REFSIG/ul_ref_seq_nr.h"
 
 

openair1/PHY/NR_REFSIG/dmrs_nr.c

@@ -32,29 +32,29 @@
 
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 #include "PHY/NR_REFSIG/dmrs_nr.h"
-
-
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 uint8_t allowed_xlsch_re_in_dmrs_symbol(uint16_t k,
                                         uint16_t start_sc,
                                         uint16_t ofdm_symbol_size,
                                         uint8_t numDmrsCdmGrpsNoData,
-                                        uint8_t dmrs_type) {
+                                        uint8_t dmrs_type)
+{
   uint8_t delta;
   uint16_t diff;
-  if (k>start_sc)
+  if (k > start_sc)
     diff = k-start_sc;
   else
     diff = (ofdm_symbol_size-start_sc)+k;
   for (int i = 0; i<numDmrsCdmGrpsNoData; i++){
-    if  (dmrs_type==NFAPI_NR_DMRS_TYPE1) {
+    if  (dmrs_type == NFAPI_NR_DMRS_TYPE1) {
       delta = i;
       if (((diff)%2)  == delta)
         return (0);
     }
     else {
-      delta = i<<1;
-      if (((diff%6) == delta) || ((diff%6) == (delta+1)))
+      delta = i << 1;
+      if (((diff % 6) == delta) || ((diff % 6) == (delta + 1)))
         return (0);
     }
   }

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -38,6 +38,7 @@
 #include "PHY/defs_nr_UE.h"
 #include "nr_refsig.h"
 #include "PHY/defs_gNB.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 // Table 6.4.1.1.3-1/2 from TS 38.211
 static const int delta1[8] = {0, 0, 1, 1, 0, 0, 1, 1};

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -24,6 +24,7 @@
 
 #include "PHY/defs_gNB.h"
 #include "PHY/NR_REFSIG/nr_refsig.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 void nr_generate_dci_top(processingData_L1tx_t *msgTx,
                          int slot,

openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h

@@ -34,6 +34,7 @@
 #define NR_SCH_DMRS_H
 
 #include "PHY/defs_nr_common.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 #define NR_PDSCH_DMRS_ANTENNA_PORT0 1000
 #define NR_PDSCH_DMRS_NB_ANTENNA_PORTS 12

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -19,7 +19,6 @@
  *      contact@openairinterface.org
  */
 
-
 #include <string.h>
 #include "SCHED_NR_UE/defs.h"
 #include "nr_estimation.h"
@@ -34,6 +33,8 @@
 #include "filt16a_32.h"
 #include "T.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
+
 extern openair0_config_t openair0_cfg[];
 
 //#define DEBUG_PDSCH

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c

@@ -36,15 +36,14 @@
 #include "PHY/phy_extern_nr_ue.h"
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/coding_defs.h"
-#include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
-#include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "SCHED_NR_UE/defs.h"
 #include "SIMULATION/TOOLS/sim.h"
 #include "executables/nr-uesoftmodem.h"
 #include "PHY/CODING/nrLDPC_extern.h"
 #include "common/utils/nr/nr_common.h"
 #include "openair1/PHY/TOOLS/phy_scope_interface.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 //#define ENABLE_PHY_PAYLOAD_DEBUG 1
 

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -41,6 +41,7 @@
 #include "common/utils/nr/nr_common.h"
 #include <complex.h>
 #include "openair1/PHY/TOOLS/phy_scope_interface.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 /* dynamic shift for LLR computation for TM3/4
  * set as command line argument, see lte-softmodem.c

openair1/SCHED_NR/fapi_nr_l1.h

@@ -32,7 +32,6 @@
 
 #include "PHY/defs_gNB.h"
 #include "SCHED_NR/sched_nr.h"
-#include "nfapi_nr_interface.h"
 #include "nfapi_nr_interface_scf.h"
 
 // added

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -27,7 +27,6 @@
 #include "PHY/NR_TRANSPORT/nr_dci.h"
 #include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
 #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h"
-#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 #include "fapi_nr_l1.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
@@ -38,10 +37,7 @@
 #include "executables/nr-softmodem.h"
 #include "executables/softmodem-common.h"
 #include "nfapi/oai_integration/vendor_ext.h"
-#include "NR_SRS-ResourceSet.h"
-
 #include "assertions.h"
-
 #include <time.h>
 
 //#define DEBUG_RXDATA
@@ -1040,17 +1036,17 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
           case 0:
             LOG_W(NR_PHY, "SRS report was not requested by MAC\n");
             return 0;
-          case 1 << NR_SRS_ResourceSet__usage_beamManagement:
-            srs_indication->srs_usage = NR_SRS_ResourceSet__usage_beamManagement;
+          case 1 << NFAPI_NR_SRS_BEAMMANAGEMENT:
+            srs_indication->srs_usage = NFAPI_NR_SRS_BEAMMANAGEMENT;
             break;
-          case 1 << NR_SRS_ResourceSet__usage_codebook:
-            srs_indication->srs_usage = NR_SRS_ResourceSet__usage_codebook;
+          case 1 << NFAPI_NR_SRS_CODEBOOK:
+            srs_indication->srs_usage = NFAPI_NR_SRS_CODEBOOK;
             break;
-          case 1 << NR_SRS_ResourceSet__usage_nonCodebook:
-            srs_indication->srs_usage = NR_SRS_ResourceSet__usage_nonCodebook;
+          case 1 << NFAPI_NR_SRS_NONCODEBOOK:
+            srs_indication->srs_usage = NFAPI_NR_SRS_NONCODEBOOK;
             break;
-          case 1 << NR_SRS_ResourceSet__usage_antennaSwitching:
-            srs_indication->srs_usage = NR_SRS_ResourceSet__usage_antennaSwitching;
+          case 1 << NFAPI_NR_SRS_ANTENNASWITCH:
+            srs_indication->srs_usage = NFAPI_NR_SRS_ANTENNASWITCH;
             break;
           default:
             LOG_E(NR_PHY, "Invalid srs_pdu->srs_parameters_v4.usage %i\n", srs_pdu->srs_parameters_v4.usage);
@@ -1073,7 +1069,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
 
         start_meas(&gNB->srs_report_tlv_stats);
         switch (srs_indication->srs_usage) {
-          case NR_SRS_ResourceSet__usage_beamManagement: {
+          case NFAPI_NR_SRS_BEAMMANAGEMENT: {
             start_meas(&gNB->srs_beam_report_stats);
             nfapi_nr_srs_beamforming_report_t nr_srs_bf_report;
             nr_srs_bf_report.prg_size = srs_pdu->beamforming.prg_size;
@@ -1102,7 +1098,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
             break;
           }
 
-          case NR_SRS_ResourceSet__usage_codebook: {
+          case NFAPI_NR_SRS_CODEBOOK: {
             start_meas(&gNB->srs_iq_matrix_stats);
             nfapi_nr_srs_normalized_channel_iq_matrix_t nr_srs_channel_iq_matrix;
             nr_srs_channel_iq_matrix.normalized_iq_representation = srs_pdu->srs_parameters_v4.iq_representation;
@@ -1151,8 +1147,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
             break;
           }
 
-          case NR_SRS_ResourceSet__usage_nonCodebook:
-          case NR_SRS_ResourceSet__usage_antennaSwitching:
+          case NFAPI_NR_SRS_NONCODEBOOK:
+          case NFAPI_NR_SRS_ANTENNASWITCH:
             LOG_W(NR_PHY, "PHY procedures for this SRS usage are not implemented yet!\n");
             break;
 

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -53,6 +53,7 @@
 #include "executables/nr-uesoftmodem.h"
 #include "SCHED_NR_UE/pucch_uci_ue_nr.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 //#define DEBUG_PHY_PROC
 //#define NR_PDCCH_SCHED_DEBUG

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -59,7 +59,7 @@
 // Definitions for MAC control and data
 #define NR_BCCH_DL_SCH 3 // SI
 #define NR_BCCH_BCH 5    // MIB
-#define CCCH_PAYLOAD_SIZE_MAX 512 
+#define NR_CCCH_PAYLOAD_SIZE_MAX 512
 #define RAR_PAYLOAD_SIZE_MAX  128
 #define MAX_CSI_REPORTCONFIG  48
 

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -45,7 +45,6 @@
 /* MAC */
 #include "LAYER2/NR_MAC_COMMON/nr_mac.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
-#include "LAYER2/MAC/mac.h"
 #include "NR_MAC_COMMON/nr_mac_extern.h"
 #include "mac_defs_sl.h"
 
@@ -181,7 +180,7 @@ typedef struct {
   // after multiplexing buffer remain for each lcid
   int32_t LCID_buffer_remain;
   // buffer status for each lcid
-  uint8_t LCID_status;
+  bool LCID_buffer_with_data;
   // logical channel group id of this LCID
   long LCGID;
   // Bj bucket usage per lcid
@@ -445,6 +444,11 @@ typedef struct nr_lcordered_info_s {
   uint32_t bucket_size;
 } nr_lcordered_info_t;
 
+
+typedef struct {
+  uint8_t payload[NR_CCCH_PAYLOAD_SIZE_MAX];
+} __attribute__ ((__packed__)) NR_CCCH_PDU;
+
 typedef struct {
   NR_SearchSpace_t *otherSI_SS;
   NR_SearchSpace_t *ra_SS;

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -36,6 +36,7 @@
 #include "mac_defs.h"
 #include "oai_asn1.h"
 #include "RRC/NR_UE/rrc_defs.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 #define NR_DL_MAX_DAI                            (4)                      /* TS 38.213 table 9.1.3-1 Value of counter DAI for DCI format 1_0 and 1_1 */
 #define NR_DL_MAX_NB_CW                          (2)                      /* number of downlink code word */

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -95,13 +95,13 @@ void nr_ue_mac_default_configs(NR_UE_MAC_INST_t *mac)
 
   // set init value 0xFFFF, make sure periodic timer and retx time counters are NOT active, after bsr transmission set the value
   // configured by the NW.
-  mac->scheduling_info.periodicBSR_SF = MAC_UE_BSR_TIMER_NOT_RUNNING;
-  mac->scheduling_info.retxBSR_SF = MAC_UE_BSR_TIMER_NOT_RUNNING;
-  mac->BSR_reporting_active = BSR_TRIGGER_NONE;
+  mac->scheduling_info.periodicBSR_SF = NR_MAC_UE_BSR_TIMER_NOT_RUNNING;
+  mac->scheduling_info.retxBSR_SF = NR_MAC_UE_BSR_TIMER_NOT_RUNNING;
+  mac->BSR_reporting_active = NR_BSR_TRIGGER_NONE;
 
   for (int i = 0; i < NR_MAX_NUM_LCID; i++) {
     LOG_D(NR_MAC, "Applying default logical channel config for LCGID %d\n", i);
-    mac->scheduling_info.lc_sched_info[i].LCID_status = LCID_EMPTY;
+    mac->scheduling_info.lc_sched_info[i].LCID_buffer_with_data = false;
     mac->scheduling_info.lc_sched_info[i].LCID_buffer_remain = 0;
     mac->scheduling_info.lc_sched_info[i].Bj = 0;
   }

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -38,7 +38,6 @@
 #include "common/utils/nr/nr_common.h"
 #include "executables/softmodem-common.h"
 #include <stdio.h>
-#include "nfapi_nr_interface.h"
 
 void fill_dci_search_candidates(const NR_SearchSpace_t *ss,
                                 fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15,

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1147,12 +1147,12 @@ void nr_ue_ul_scheduler(NR_UE_MAC_INST_t *mac, nr_uplink_indication_t *ul_info)
 
   // First check ReTxBSR Timer because it is always configured
   // Decrement ReTxBSR Timer if it is running and not null
-  if ((mac->scheduling_info.retxBSR_SF != MAC_UE_BSR_TIMER_NOT_RUNNING) && (mac->scheduling_info.retxBSR_SF != 0)) {
+  if ((mac->scheduling_info.retxBSR_SF != NR_MAC_UE_BSR_TIMER_NOT_RUNNING) && (mac->scheduling_info.retxBSR_SF != 0)) {
     mac->scheduling_info.retxBSR_SF--;
   }
 
   // Decrement Periodic Timer if it is running and not null
-  if ((mac->scheduling_info.periodicBSR_SF != MAC_UE_BSR_TIMER_NOT_RUNNING) && (mac->scheduling_info.periodicBSR_SF != 0)) {
+  if ((mac->scheduling_info.periodicBSR_SF != NR_MAC_UE_BSR_TIMER_NOT_RUNNING) && (mac->scheduling_info.periodicBSR_SF != 0)) {
     mac->scheduling_info.periodicBSR_SF--;
   }
 
@@ -1194,7 +1194,7 @@ bool nr_update_bsr(NR_UE_MAC_INST_t *mac, frame_t frameP, slot_t slotP, uint8_t
   for (int lcid = 1; lcid <= NR_MAX_NUM_LCID; lcid++) {
     // Reset transmission status
     lcid_bytes_in_buffer[lcid - 1] = 0;
-    mac->scheduling_info.lc_sched_info[lcid - 1].LCID_status = LCID_EMPTY;
+    mac->scheduling_info.lc_sched_info[lcid - 1].LCID_buffer_with_data = false;
   }
 
   for (int lcgid = 0; lcgid < NR_MAX_NUM_LCGID; lcgid++) {
@@ -1235,7 +1235,7 @@ bool nr_update_bsr(NR_UE_MAC_INST_t *mac, frame_t frameP, slot_t slotP, uint8_t
             rlc_status.bytes_in_buffer,
             frameP,
             slotP);
-      mac->scheduling_info.lc_sched_info[lcid - 1].LCID_status = LCID_NOT_EMPTY;
+      mac->scheduling_info.lc_sched_info[lcid - 1].LCID_buffer_with_data = true;
 
       //Update BSR_bytes and position in lcid_reordered_array only if Group is defined
       if (lcgid < NR_MAX_NUM_LCGID) {
@@ -2693,7 +2693,7 @@ static int nr_ue_get_sdu_mac_ce_pre(NR_UE_MAC_INST_t *mac,
   }
 
   //Restart ReTxBSR Timer at new grant indication (38.321)
-  if (mac->scheduling_info.retxBSR_SF != MAC_UE_BSR_TIMER_NOT_RUNNING) {
+  if (mac->scheduling_info.retxBSR_SF != NR_MAC_UE_BSR_TIMER_NOT_RUNNING) {
     mac->scheduling_info.retxBSR_SF = nr_get_sf_retxBSRTimer(mac->scheduling_info.retxBSR_Timer);
   }
 
@@ -2918,7 +2918,7 @@ static void nr_ue_get_sdu_mac_ce_post(NR_UE_MAC_INST_t *mac,
     }
 
     // Reset BSR Trigger flags
-    mac->BSR_reporting_active = BSR_TRIGGER_NONE;
+    mac->BSR_reporting_active = NR_BSR_TRIGGER_NONE;
   }
 }
 
@@ -3242,7 +3242,7 @@ uint8_t nr_ue_get_sdu(NR_UE_MAC_INST_t *mac,
 
       // skip the logical channel if no data in the buffer initially or the data in the buffer was zero because it was written in to
       // MAC PDU
-      if (!sched_info->lc_sched_info[lcid - 1].LCID_status || !lcids_data_status[lcid - 1]) {
+      if (!sched_info->lc_sched_info[lcid - 1].LCID_buffer_with_data || !lcids_data_status[lcid - 1]) {
         lcids_data_status[lcid - 1] = false;
         continue;
       }

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -617,7 +617,6 @@ void nr_initiate_ra_proc(module_id_t module_idP,
       }
     }
     LOG_D(NR_MAC, "Frame %d, Slot %d: Activating RA process \n", frameP, slotP);
-    ra->state = Msg2;
     ra->timing_offset = timing_offset;
     ra->preamble_slot = slotP;
 
@@ -653,11 +652,12 @@ void nr_initiate_ra_proc(module_id_t module_idP,
                && !((find_nr_UE(&nr_mac->UE_info, ra->rnti) == NULL) && (find_nr_RA_id(module_idP, CC_id, ra->rnti) == -1)
                     && ra->rnti >= 0x1 && ra->rnti <= 0xffef));
       if (loop == 100) {
-        LOG_E(NR_MAC, "%s:%d:%s: [RAPROC] initialisation random access aborted\n", __FILE__, __LINE__, __FUNCTION__);
+        LOG_E(NR_MAC, "[RAPROC] initialisation random access aborted\n");
         abort();
       }
     }
 
+    ra->state = Msg2;
     ra->RA_rnti = ra_rnti;
     ra->preamble_index = preamble_index;
     ra->beam_id = cc->ssb_index[beam_index];

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -37,8 +37,6 @@
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "LAYER2/RLC/rlc.h"
 
-/*NFAPI*/
-#include "nfapi_nr_interface.h"
 /*TAG*/
 #include "NR_TAG-Id.h"
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1966,18 +1966,17 @@ NR_UE_info_t *find_nr_UE(NR_UEs_t *UEs, rnti_t rntiP)
   return NULL;
 }
 
-int find_nr_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP) {
-//------------------------------------------------------------------------------
-  int RA_id;
-  RA_t *ra = (RA_t *) &RC.nrmac[mod_idP]->common_channels[CC_idP].ra[0];
+int find_nr_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP)
+{
+  NR_RA_t *ra = &RC.nrmac[mod_idP]->common_channels[CC_idP].ra[0];
 
-  for (RA_id = 0; RA_id < NB_RA_PROC_MAX; RA_id++) {
+  for (int RA_id = 0; RA_id < NR_NB_RA_PROC_MAX; RA_id++) {
     LOG_D(NR_MAC, "Checking RA_id %d for %x : state %d\n",
           RA_id,
           rntiP,
           ra[RA_id].state);
 
-    if (ra[RA_id].state != IDLE && ra[RA_id].rnti == rntiP)
+    if (ra[RA_id].state != RA_IDLE && ra[RA_id].rnti == rntiP)
       return RA_id;
   }
 
@@ -3047,7 +3046,7 @@ void prepare_initial_ul_rrc_message(gNB_MAC_INST *mac, NR_UE_info_t *UE)
   DevAssert(cellGroupConfig->rlc_BearerToAddModList->list.count == 1);
   const NR_RLC_BearerConfig_t *bearer = cellGroupConfig->rlc_BearerToAddModList->list.array[0];
   DevAssert(bearer->servedRadioBearer->choice.srb_Identity == 1);
-  nr_rlc_add_srb(UE->rnti, DCCH, bearer);
+  nr_rlc_add_srb(UE->rnti, bearer->servedRadioBearer->choice.srb_Identity, bearer);
 }
 
 void nr_mac_trigger_release_timer(NR_UE_sched_ctrl_t *sched_ctrl, NR_SubcarrierSpacing_t subcarrier_spacing)

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -317,12 +317,6 @@ void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti);
 
 int nr_get_default_pucch_res(int pucch_ResourceCommon);
 
-int get_dlscs(nfapi_nr_config_request_t *cfg);
-
-int get_ulscs(nfapi_nr_config_request_t *cfg);
-
-int get_symbolsperslot(nfapi_nr_config_request_t *cfg);
-
 int nr_write_ce_dlsch_pdu(module_id_t module_idP,
                           const NR_UE_sched_ctrl_t *ue_sched_ctl,
                           unsigned char *mac_pdu,

openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c

@@ -332,8 +332,10 @@ void ue_context_setup_request(const f1ap_ue_context_setup_t *req)
                                                                 new_CellGroup);
   }
 
-  if (req->rrc_container != NULL)
-    nr_rlc_srb_recv_sdu(req->gNB_DU_ue_id, DCCH, req->rrc_container, req->rrc_container_length);
+  if (req->rrc_container != NULL) {
+    logical_chan_id_t id = 1;
+    nr_rlc_srb_recv_sdu(req->gNB_DU_ue_id, id, req->rrc_container, req->rrc_container_length);
+  }
 
   UE->capability = ue_cap;
   if (ue_cap != NULL) {
@@ -424,8 +426,10 @@ void ue_context_modification_request(const f1ap_ue_context_modif_req_t *req)
         handle_ue_context_drbs_release(req->gNB_DU_ue_id, req->drbs_to_be_released_length, req->drbs_to_be_released, new_CellGroup);
   }
 
-  if (req->rrc_container != NULL)
-    nr_rlc_srb_recv_sdu(req->gNB_DU_ue_id, DCCH, req->rrc_container, req->rrc_container_length);
+  if (req->rrc_container != NULL) {
+    logical_chan_id_t id = 1;
+    nr_rlc_srb_recv_sdu(req->gNB_DU_ue_id, id, req->rrc_container, req->rrc_container_length);
+  }
 
   if (req->ReconfigComplOutcome != RRCreconf_info_not_present && req->ReconfigComplOutcome != RRCreconf_success) {
     LOG_E(NR_MAC,
@@ -498,9 +502,10 @@ void ue_context_modification_confirm(const f1ap_ue_context_modif_confirm_t *conf
   }
   NR_SCHED_UNLOCK(&mac->sched_lock);
 
-  if (confirm->rrc_container_length > 0)
-    nr_rlc_srb_recv_sdu(confirm->gNB_DU_ue_id, DCCH, confirm->rrc_container, confirm->rrc_container_length);
-
+  if (confirm->rrc_container_length > 0) {
+    logical_chan_id_t id = 1;
+    nr_rlc_srb_recv_sdu(confirm->gNB_DU_ue_id, id, confirm->rrc_container, confirm->rrc_container_length);
+  }
   /* nothing else to be done? */
 }
 
@@ -589,7 +594,7 @@ void dl_rrc_message_transfer(const f1ap_dl_rrc_message_t *dl_rrc)
     du_add_f1_ue_data(dl_rrc->gNB_DU_ue_id, &new_ue_data);
   }
 
-  if (UE->expect_reconfiguration && dl_rrc->srb_id == DCCH) {
+  if (UE->expect_reconfiguration && dl_rrc->srb_id == 1) {
     /* we expected a reconfiguration, and this is on DCCH. We assume this is
      * the reconfiguration: nr_mac_prepare_cellgroup_update() already stored
      * the CellGroupConfig. Below, we trigger a timer, and the CellGroupConfig

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -78,14 +78,13 @@
 
 /* Interface */
 #include "nfapi_nr_interface_scf.h"
+#include "nfapi_nr_interface.h"
 #include "NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "mac_rrc_ul.h"
 
 /* MAC */
 #include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac_common.h"
-#include "LAYER2/MAC/mac.h"
-#include "NR_TAG.h"
 
 #include <openair3/UICC/usim_interface.h>
 
@@ -250,14 +249,6 @@ typedef struct {
   /// Outgoing BCCH pdu for PHY
   uint8_t sib1_bcch_pdu[NR_MAX_SIB_LENGTH / 8];
   int sib1_bcch_length;
-  /// Outgoing BCCH DCI allocation
-  uint32_t BCCH_alloc_pdu;
-  /// Outgoing CCCH pdu for PHY
-  CCCH_PDU CCCH_pdu;
-  /// Outgoing PCCH DCI allocation
-  uint32_t PCCH_alloc_pdu;
-  /// Outgoing PCCH pdu for PHY
-  PCCH_PDU PCCH_pdu;
   /// Template for RA computations
   NR_RA_t ra[NR_NB_RA_PROC_MAX];
   /// VRB map for common channels

openair2/NR_PHY_INTERFACE/NR_IF_Module.h

@@ -35,7 +35,6 @@
 
 #include <pthread.h>
 #include <stdint.h>
-#include "nfapi_nr_interface.h"
 #include "nfapi_nr_interface_scf.h"
 #include "common/platform_constants.h"
 #include "common/platform_types.h"

openair2/RRC/NR/nr_rrc_defs.h

@@ -40,7 +40,6 @@
 #include "nr_rrc_common.h"
 #include "ds/byte_array.h"
 
-#include "common/ngran_types.h"
 #include "common/platform_constants.h"
 #include "common/platform_types.h"
 #include "mac_rrc_dl.h"

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -33,7 +33,6 @@
 #include "rrc_defs.h"
 #include "rrc_proto.h"
 #include "assertions.h"
-#include "MAC/mac.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac.h"
 #include "openair2/LAYER2/NR_MAC_UE/mac_proto.h"
 
@@ -89,13 +88,9 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
         itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(module_id), message_p);
       }
       break;
-
-    case CCCH:
-      AssertFatal(false, "use RLC instead\n");
-      break;
-
+      
     case NR_SBCCH_SL_BCH:
-      if (pdu_len>0) {
+      if (pdu_len > 0) {
         LOG_T(NR_RRC, "[UE %d] Received SL-MIB for NR_SBCCH_SL_BCH.\n", module_id);
 
         MessageDef *message_p;