creation of a separate .h file for L2_interface_ue

executables/nr-ue.c

@@ -27,6 +27,7 @@
 #include "PHY/INIT/nr_phy_init.h"
 #include "NR_MAC_UE/mac_proto.h"
 #include "RRC/NR_UE/rrc_proto.h"
+#include "RRC/NR_UE/L2_interface_ue.h"
 #include "SCHED_NR_UE/phy_frame_config_nr.h"
 #include "SCHED_NR_UE/defs.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"

openair1/SIMULATION/NR_PHY/nr_dummy_functions.c

@@ -36,6 +36,8 @@ void nr_mac_rrc_msg3_ind(const module_id_t mod_id, int rnti, int gnb_id) {}
 
 void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success) {}
 
+void nr_mac_rrc_inactivity_timer_ind(const module_id_t mod_id) {}
+
 void rrc_data_ind(const protocol_ctxt_t *const ctxt_pP,
                   const rb_id_t                Srb_id,
                   const sdu_size_t             sdu_sizeP,

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -248,8 +248,7 @@ void reset_mac_inst(NR_UE_MAC_INST_t *nr_mac)
   // TODO beam failure procedure not implemented
 }
 
-void release_mac_configuration(NR_UE_MAC_INST_t *mac,
-                               NR_UE_MAC_reset_cause_t cause)
+void release_mac_configuration(NR_UE_MAC_INST_t *mac, NR_UE_MAC_reset_cause_t cause)
 {
   NR_UE_ServingCell_Info_t *sc = &mac->sc_info;
   // if cause is Re-establishment, release spCellConfig only

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -31,7 +31,7 @@
  */
 
 /* RRC */
-#include "RRC/NR_UE/rrc_proto.h"
+#include "RRC/NR_UE/L2_interface_ue.h"
 
 /* MAC */
 #include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -38,7 +38,7 @@
 #include "executables/nr-softmodem.h"
 
 /* RRC*/
-#include "RRC/NR_UE/rrc_proto.h"
+#include "RRC/NR_UE/L2_interface_ue.h"
 
 /* MAC */
 #include "NR_MAC_COMMON/nr_mac.h"

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -54,7 +54,7 @@
 
 #include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
 #include "LAYER2/RLC/rlc.h"
-#include "RRC/NR_UE/rrc_proto.h"
+#include "RRC/NR_UE/L2_interface_ue.h"
 
 //#define SRS_DEBUG
 #define verifyMutex(a)                                                \

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -41,7 +41,7 @@
 #include "NR_MAC_UE/mac_extern.h"
 #include "SCHED_NR_UE/fapi_nr_ue_l1.h"
 #include "executables/softmodem-common.h"
-#include "openair2/RRC/NR_UE/rrc_proto.h"
+#include "openair2/RRC/NR_UE/L2_interface_ue.h"
 #include "openair2/GNB_APP/L1_nr_paramdef.h"
 #include "openair2/GNB_APP/gnb_paramdef.h"
 #include "radio/ETHERNET/if_defs.h"

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -51,6 +51,17 @@ typedef enum sl_sidelink_slot_type {
 
 } sl_sidelink_slot_type_t;
 
+extern queue_t nr_rach_ind_queue;
+extern queue_t nr_rx_ind_queue;
+extern queue_t nr_crc_ind_queue;
+extern queue_t nr_uci_ind_queue;
+extern queue_t nr_sfn_slot_queue;
+extern queue_t nr_chan_param_queue;
+extern queue_t nr_dl_tti_req_queue;
+extern queue_t nr_tx_req_queue;
+extern queue_t nr_ul_dci_req_queue;
+extern queue_t nr_ul_tti_req_queue;
+
 extern slot_rnti_mcs_s slot_rnti_mcs[NUM_NFAPI_SLOT];
 
 typedef struct NR_UL_TIME_ALIGNMENT NR_UL_TIME_ALIGNMENT_t;

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -31,16 +31,14 @@
  */
 
 #include "rrc_defs.h"
-#include "rrc_proto.h"
+#include "L2_interface_ue.h"
 #include "assertions.h"
 #include "LAYER2/NR_MAC_COMMON/nr_mac.h"
 #include "openair2/LAYER2/NR_MAC_UE/mac_proto.h"
 
 typedef uint32_t channel_t;
 
-void nr_mac_rrc_sync_ind(const module_id_t module_id,
-                         const frame_t frame,
-                         const bool in_sync)
+void nr_mac_rrc_sync_ind(const module_id_t module_id, const frame_t frame, const bool in_sync)
 {
   MessageDef *message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_SYNC_IND);
   NR_RRC_MAC_SYNC_IND (message_p).frame = frame;
@@ -48,7 +46,7 @@ void nr_mac_rrc_sync_ind(const module_id_t module_id,
   itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(module_id), message_p);
 }
 
-int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
+void nr_mac_rrc_data_ind_ue(const module_id_t module_id,
                             const int CC_id,
                             const uint8_t gNB_index,
                             const frame_t frame,
@@ -121,8 +119,6 @@ int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
     default:
       break;
   }
-
-  return(0);
 }
 
 void nr_mac_rrc_inactivity_timer_ind(const module_id_t mod_id)

openair2/RRC/NR_UE/L2_interface_ue.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "rrc_defs.h"
+#include "common/utils/ocp_itti/intertask_interface.h"
+
+#ifndef _L2_INTERFACE_UE_H_
+#define _L2_INTERFACE_UE_H_
+void nr_mac_rrc_sync_ind(const module_id_t module_id, const frame_t frame, const bool in_sync);
+void nr_mac_rrc_data_ind_ue(const module_id_t module_id,
+                            const int CC_id,
+                            const uint8_t gNB_index,
+                            const frame_t frame,
+                            const int slot,
+                            const rnti_t rnti,
+                            const uint32_t cellid,
+                            const long arfcn,
+                            const channel_t channel,
+                            const uint8_t* pduP,
+                            const sdu_size_t pdu_len);
+void nr_mac_rrc_inactivity_timer_ind(const module_id_t mod_id);
+void nr_mac_rrc_msg3_ind(const module_id_t mod_id, const int rnti, int gnb_id);
+void nr_ue_rrc_timer_trigger(int instance, int frame, int gnb_id);
+void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success);
+void nsa_sendmsg_to_lte_ue(const void *message, size_t msg_len, Rrc_Msg_Type_t msg_type);
+#endif
+

openair2/RRC/NR_UE/rrc_UE.c

@@ -47,6 +47,7 @@
 
 #include "rrc_defs.h"
 #include "rrc_proto.h"
+#include "L2_interface_ue.h"
 #include "LAYER2/NR_MAC_UE/mac_proto.h"
 
 #include "intertask_interface.h"

openair2/RRC/NR_UE/rrc_proto.h

@@ -39,57 +39,22 @@
 #include "NR_MeasConfig.h"
 #include "NR_CellGroupConfig.h"
 #include "NR_RadioBearerConfig.h"
-#include "openair2/PHY_INTERFACE/queue_t.h"
 #include "common/utils/ocp_itti/intertask_interface.h"
 
-extern queue_t nr_rach_ind_queue;
-extern queue_t nr_rx_ind_queue;
-extern queue_t nr_crc_ind_queue;
-extern queue_t nr_uci_ind_queue;
-extern queue_t nr_sfn_slot_queue;
-extern queue_t nr_chan_param_queue;
-extern queue_t nr_dl_tti_req_queue;
-extern queue_t nr_tx_req_queue;
-extern queue_t nr_ul_dci_req_queue;
-extern queue_t nr_ul_tti_req_queue;
-
 NR_UE_RRC_INST_t *nr_rrc_init_ue(char* uecap_file, int nb_inst, int num_ant_tx);
+
 void init_nsa_message (NR_UE_RRC_INST_t *rrc, char* reconfig_file, char* rbconfig_file);
 
 void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type, void *message, int msg_len);
 
 void nr_rrc_cellgroup_configuration(NR_UE_RRC_INST_t *rrc, NR_CellGroupConfig_t *cellGroupConfig);
 
-/**\brief interface between MAC and RRC thru SRB0 (RLC TM/no PDCP)
-   \param module_id  module id
-   \param CC_id      component carrier id
-   \param gNB_index  gNB index
-   \param channel    indicator for channel of the pdu
-   \param pduP       pointer to pdu
-   \param pdu_len    data length of pdu*/
-int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id,
-                              const int CC_id,
-                              const uint8_t gNB_index,
-                              const frame_t frame,
-                              const int slot,
-                              const rnti_t rnti,
-                              const uint32_t cellid,
-                              const long arfcn,
-                              const channel_t channel,
-                              const uint8_t* pduP,
-                              const sdu_size_t pdu_len);
-
-void nr_mac_rrc_sync_ind(const module_id_t module_id,
-                         const frame_t frame,
-                         const bool in_sync);
-
 void nr_rrc_going_to_IDLE(NR_UE_RRC_INST_t *rrc,
                           NR_Release_Cause_t release_cause,
                           NR_RRCRelease_t *RRCRelease);
+
 void handle_RRCRelease(NR_UE_RRC_INST_t *rrc);
-void nr_mac_rrc_ra_ind(const module_id_t mod_id, int frame, bool success);
-void nr_mac_rrc_msg3_ind(const module_id_t mod_id, const int rnti, int gnb_id);
-void nr_mac_rrc_inactivity_timer_ind(const module_id_t mod_id);
+
 void set_rlf_sib1_timers_and_constants(NR_UE_Timers_Constants_t *tac, NR_SIB1_t *sib1);
 
 /**\brief RRC UE task.
@@ -105,8 +70,6 @@ void *recv_msgs_from_lte_ue(void *args_p);
 
 void init_connections_with_lte_ue(void);
 
-void nsa_sendmsg_to_lte_ue(const void *message, size_t msg_len, Rrc_Msg_Type_t msg_type);
-
 extern void start_oai_nrue_threads(void);
 
 int get_from_lte_ue_fd();