5G scope cleaning round 2

executables/nr-uesoftmodem.c

@@ -249,7 +249,7 @@ void exit_function(const char *file, const char *function, const int line, const
 }
 
 
-void reset_stats(FL_OBJECT *button, long arg) {
+void reset_stats(long arg) {
   //int i,j,k;
   /*PHY_VARS_eNB *phy_vars_eNB = PHY_vars_eNB_g[0][0];
 

openair1/PHY/TOOLS/nr_phy_scope.h

@@ -28,7 +28,6 @@
 #include <openairinterface5g_limits.h>
 #include "common/ran_context.h"
 #include <openair1/PHY/defs_gNB.h>
-#include <forms.h>
 #include "PHY/defs_gNB.h"
 //#include "PHY/defs_nrUE.h"
 //#include "PHY/impl_defs_top.h"

openair1/SCHED_NR/phy_frame_config_nr.h

@@ -32,6 +32,7 @@
 #ifndef PHY_FRAME_CONFIG_NR_H
 #define PHY_FRAME_CONFIG_NR_H
 
+#include <nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h>
 /************** DEFINE ********************************************/
 
 #define TDD_CONFIG_NB_FRAMES           (2)
@@ -79,6 +80,7 @@ int set_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms);
     @returns nr_slot_t : downlink or uplink */
 
 nr_slot_t nr_slot_select(nfapi_nr_config_request_scf_t *cfg, int nr_frame, int nr_tti);
+int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_frame, int nr_tti);
 
 /** \brief This function frees tdd configuration for nr
  *  @param frame_parms NR DL Frame parameters

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -263,5 +263,6 @@ void nr_Msg1_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, uint
 
 void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, uint8_t gNB_id);
 
+void nr_ue_msg2_scheduler(module_id_t mod_id, uint16_t rach_frame, uint16_t rach_slot, uint16_t *msg2_frame, uint16_t *msg2_slot);
 #endif
 /** @}*/

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -50,7 +50,7 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst)
     //LOG_I(MAC, "[MAIN] init UE MAC functions \n");
     
     //init mac here
-    nr_ue_mac_inst = (NR_UE_MAC_INST_t *)malloc(sizeof(NR_UE_MAC_INST_t)*NB_NR_UE_MAC_INST);
+    nr_ue_mac_inst = (NR_UE_MAC_INST_t *)calloc(sizeof(NR_UE_MAC_INST_t),NB_NR_UE_MAC_INST);
     if (rrc_inst) {
       nr_rrc_mac_config_req_ue(0,0,0,NULL,rrc_inst->cell_group_config->spCellConfig);
       

openair2/LAYER2/NR_MAC_UE/nr_l1_helpers.c

@@ -91,8 +91,8 @@ int8_t nr_get_DELTA_PREAMBLE(module_id_t mod_id, int CC_id, uint16_t prach_forma
   prachConfigIndex = nr_rach_ConfigCommon->rach_ConfigGeneric.prach_ConfigurationIndex;
 
   if (prach_sequence_length == 0) {
+    AssertFatal(prach_format < 4, "Illegal PRACH format %d for sequence length 839\n", prach_format);
     switch (prach_format) {
-      AssertFatal(prach_format < 4, "Illegal PRACH format %d for sequence length 839\n", prach_format);
 
       // long preamble formats
       case 0:

openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c

@@ -44,6 +44,7 @@
 #include "NR_MAC_UE/mac.h"
 #include "NR_MAC_UE/mac_proto.h"
 #include "NR_MAC_COMMON/nr_mac_extern.h"
+#include <common/utils/nr/nr_common.h>
 
 #define DEBUG_RAR
 

openair2/LAYER2/PDCP_v10.1.0/pdcp.h

@@ -34,10 +34,6 @@
 #ifndef __PDCP_H__
 #    define __PDCP_H__
 //-----------------------------------------------------------------------------
-#ifndef NON_ACCESS_STRATUM
-  #include "UTIL/MEM/mem_block.h"
-  #include "UTIL/LISTS/list.h"
-#endif //NON_ACCESS_STRATUM
 //-----------------------------------------------------------------------------
 #include "RRC/LTE/rrc_defs.h"
 #include "COMMON/platform_constants.h"

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -55,7 +55,6 @@ extern int otg_enabled;
 #include "common/utils/LOG/log.h"
 #include "UTIL/OTG/otg_tx.h"
 #include "nfapi/oai_integration/vendor_ext.h"
-#include "UTIL/FIFO/pad_list.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "platform_constants.h"
 #include "msc.h"
@@ -91,7 +90,6 @@ extern struct msghdr nas_msg_rx;
   extern uint16_t inst_pdcp_list[NUMBER_OF_UE_MAX];
 #endif
 
-extern Packet_OTG_List_t *otg_pdcp_buffer;
 
 
 #  include "gtpv1u_eNB_task.h"
@@ -122,7 +120,6 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const  ctxt_pP) {
     int sizeToWrite= sizeof (pdcp_data_ind_header_t) +
       pdcpHead->data_size;
     void * pdcpData=(void*)(pdcpHead+1);
-
     if (rb_id == 10) { //hardcoded for PC5-Signaling
       if( LOG_DEBUGFLAG(DEBUG_PDCP) ) {
         debug_pdcp_pc5s_sdu((sidelink_pc5s_element *)pdcpData,