final round of warning fixes to compile nr softmodems

openair2/COMMON/as_message.h

@@ -469,7 +469,11 @@ typedef ul_info_transfer_ind_t dl_info_transfer_ind_t;
  */
 
 /* TODO: Quality of Service parameters */
-typedef struct {} as_qos_t;
+typedef struct {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} as_qos_t;
 
 /*
  * NAS->AS - Radio access bearer establishment request

openair2/COMMON/f1ap_messages_types.h

@@ -73,7 +73,9 @@ typedef struct f1ap_net_ip_address_s {
 } f1ap_net_ip_address_t;
 
 typedef struct f1ap_cu_setup_req_s {
-   //
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } f1ap_cu_setup_req_t;
 
 typedef struct cellIDs_s {

openair2/COMMON/m2ap_messages_types.h

@@ -90,7 +90,9 @@ typedef struct m2ap_net_ip_address_s {
 } m2ap_net_ip_address_t;
 
 typedef struct m2ap_enb_setup_req_s {
-   //
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_enb_setup_req_t;
 
 
@@ -449,6 +451,9 @@ typedef struct m2ap_register_enb_req_s {
 
 typedef struct m2ap_subframe_process_s {
   /* nothing, we simply use the module ID in the header */
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_subframe_process_t;
 
 //-------------------------------------------------------------------------------------------//
@@ -533,48 +538,114 @@ typedef struct m2ap_enb_sctp_req_s {
 
 
 typedef struct m2ap_mbms_scheduling_information_resp_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_scheduling_information_resp_t;
 typedef struct m2ap_session_start_req_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_session_start_req_t;
 typedef struct m2ap_session_start_resp_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_session_start_resp_t;
 typedef struct m2ap_session_start_failure_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_session_start_failure_t;
 typedef struct m2ap_session_stop_req_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_session_stop_req_t;
 typedef struct m2ap_session_stop_resp_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_session_stop_resp_t;
 typedef struct m2ap_reset_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_reset_t;
 typedef struct m2ap_enb_configuration_update_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_enb_configuration_update_t;
 typedef struct m2ap_enb_configuration_update_ack_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_enb_configuration_update_ack_t;
 typedef struct m2ap_enb_configuration_update_failure_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_enb_configuration_update_failure_t;
 typedef struct m2ap_mce_configuration_update_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mce_configuration_update_t;
 typedef struct m2ap_mce_configuration_update_ack_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mce_configuration_update_ack_t;
 typedef struct m2ap_mce_configuration_update_failure_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mce_configuration_update_failure_t;
 typedef struct m2ap_error_indication_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m2ap_error_indication_t;
 typedef struct m2ap_mbms_session_update_req_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_session_update_req_t;
 typedef struct m2ap_mbms_session_update_resp_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_session_update_resp_t;
 typedef struct m2ap_mbms_session_update_failure_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_session_update_failure_t;
 typedef struct m2ap_mbms_service_counting_report_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_service_counting_report_t;
 typedef struct m2ap_mbms_overload_notification_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_overload_notification_t;
 typedef struct m2ap_mbms_service_counting_req_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_service_counting_req_t;
 typedef struct m2ap_mbms_service_counting_resp_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_service_counting_resp_t;
 typedef struct m2ap_mbms_service_counting_failure_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m2ap_mbms_service_counting_failure_t;
 
 

openair2/COMMON/m3ap_messages_types.h

@@ -160,6 +160,9 @@ typedef struct m3ap_register_mce_req_s {
 
 typedef struct m3ap_subframe_process_s {
   /* nothing, we simply use the module ID in the header */
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } m3ap_subframe_process_t;
 
 //-------------------------------------------------------------------------------------------//
@@ -270,28 +273,64 @@ typedef struct m3ap_mme_sctp_req_s {
 
 
 typedef struct m3ap_session_start_req_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_session_start_req_t;
 typedef struct m3ap_session_start_resp_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_session_start_resp_t;
 typedef struct m3ap_session_start_failure_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_session_start_failure_t;
 typedef struct m3ap_session_stop_req_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_session_stop_req_t;
 typedef struct m3ap_session_stop_resp_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_session_stop_resp_t;
 typedef struct m3ap_session_stop_failure_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_session_stop_failure_t;
 typedef struct m3ap_error_indication_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_error_indication_t;
 typedef struct m3ap_reset_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_reset_t;
 typedef struct m3ap_reset_ack_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_reset_ack_t;
 typedef struct m3ap_mbms_session_update_req_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_mbms_session_update_req_t;
 typedef struct m3ap_mbms_session_update_resp_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_mbms_session_update_resp_t;
 typedef struct m3ap_mbms_session_update_failure_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_mbms_session_update_failure_t;
 typedef struct m3ap_setup_req_s{
   /* Connexion id used between SCTP/M3AP */
@@ -306,14 +345,29 @@ typedef struct m3ap_setup_req_s{
   uint16_t default_sctp_stream_id;
 }m3ap_setup_req_t;
 typedef struct m3ap_setup_resp_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_setup_resp_t;
 typedef struct m3ap_setup_failure_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_setup_failure_t;
 typedef struct m3ap_mce_configuration_update_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_mce_configuration_update_t;
 typedef struct m3ap_mce_configuration_update_ack_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_mce_configuration_update_ack_t;
 typedef struct m3ap_mce_configuration_update_failure_s{
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 }m3ap_mce_configuration_update_failure_t;
 
 

openair2/COMMON/phy_messages_types.h

@@ -82,6 +82,9 @@ typedef struct PhyConfigurationReq_s {
 
 // UE: RRC -> PHY messages
 typedef struct PhyDeactivateReq_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } PhyDeactivateReq;
 
 typedef struct PhyFindCellReq_s {
@@ -93,9 +96,15 @@ typedef struct PhyFindCellReq_s {
 } PhyFindCellReq;
 
 typedef struct PhyFindNextCellReq_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } PhyFindNextCellReq;
 
 typedef struct PhyMeasThresholdReq_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 #   if ENABLE_RAL
   ral_transaction_id_t    transaction_id;
   ral_link_cfg_param_t    cfg_param;
@@ -103,6 +112,9 @@ typedef struct PhyMeasThresholdReq_s {
 } PhyMeasThresholdReq;
 
 typedef struct PhyMeasReportInd_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 #   if ENABLE_RAL
   ral_threshold_t         threshold;
   ral_link_param_t        link_param;
@@ -119,6 +131,9 @@ typedef struct PhyFindCellInd_s {
 } PhyFindCellInd;
 
 typedef struct PhyMeasThresholdConf_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 #   if ENABLE_RAL
   ral_transaction_id_t    transaction_id;
   ral_status_t            status;

openair2/COMMON/x2ap_messages_types.h

@@ -174,6 +174,9 @@ typedef struct x2ap_register_enb_req_s {
 
 typedef struct x2ap_subframe_process_s {
   /* nothing, we simply use the module ID in the header */
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } x2ap_subframe_process_t;
 
 //-------------------------------------------------------------------------------------------//

openair2/ENB_APP/enb_paramdef_mme.h

@@ -45,9 +45,9 @@
 #define MME_CONFIG_STRING_MME_M3                        "enable_mme_m3"
 
 #define MMEPARAMS_DESC {\
-{MME_CONFIG_STRING_MME_ID,                       NULL,   0,            uptr:NULL,   defintval:0,                 TYPE_UINT,      0},  \
-{MME_CONFIG_STRING_MME_NAME,                     NULL,   0,            strptr:NULL, defstrval:"OAIMME",       TYPE_STRING,    0},  \
-{MME_CONFIG_STRING_MME_M3,                       NULL,   0,            strptr:NULL, defstrval:"no",              TYPE_STRING,    0},  \
+{MME_CONFIG_STRING_MME_ID,                       NULL,   0,           .uptr=NULL,   .defintval=0,                 TYPE_UINT,      0},  \
+{MME_CONFIG_STRING_MME_NAME,                     NULL,   0,           .strptr=NULL, .defstrval="OAIMME",       TYPE_STRING,    0},  \
+{MME_CONFIG_STRING_MME_M3,                       NULL,   0,           .strptr=NULL, .defstrval="no",              TYPE_STRING,    0},  \
 }  
 
 #define MME_MME_ID_IDX                  0
@@ -75,9 +75,9 @@
 
 
 #define MME_NETPARAMS_DESC {  \
-{MME_CONFIG_STRING_MME_INTERFACE_NAME_FOR_M3_MCE,        NULL,      0,         strptr:&mme_interface_name_for_m3_mce,    defstrval:"lo",      TYPE_STRING,      0},      \
-{MME_CONFIG_STRING_MME_IPV4_ADDRESS_FOR_M3C,             NULL,      0,         strptr:&mme_ipv4_address_for_m3c,         defstrval:"127.0.0.18/24",      TYPE_STRING,      0},      \
-{MME_CONFIG_STRING_MME_PORT_FOR_M3C,                     NULL,      0,         uptr:&mme_port_for_m3c,           	 defintval:36444L,    TYPE_UINT,        0},      \
+{MME_CONFIG_STRING_MME_INTERFACE_NAME_FOR_M3_MCE,        NULL,      0,        .strptr=&mme_interface_name_for_m3_mce,   .defstrval="lo",      TYPE_STRING,      0},      \
+{MME_CONFIG_STRING_MME_IPV4_ADDRESS_FOR_M3C,             NULL,      0,        .strptr=&mme_ipv4_address_for_m3c,        .defstrval="127.0.0.18/24",      TYPE_STRING,      0},      \
+{MME_CONFIG_STRING_MME_PORT_FOR_M3C,                     NULL,      0,        .uptr=&mme_port_for_m3c,           	.defintval=36444L,    TYPE_UINT,        0},      \
 } 
 
 #endif

openair2/RRC/NR/nr_rrc_config.c

@@ -946,7 +946,7 @@ static void set_SR_periodandoffset(NR_SchedulingRequestResourceConfig_t *schedul
     schedulingRequestResourceConfig->periodicityAndOffset->choice.sl160 = sr_slot;
     return;
   }
-  else if(sr_slot < 320 || NR_SubcarrierSpacing_kHz60){
+  else if(sr_slot < 320 || scs == NR_SubcarrierSpacing_kHz60){
     schedulingRequestResourceConfig->periodicityAndOffset->present = NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl320;
     schedulingRequestResourceConfig->periodicityAndOffset->choice.sl320 = sr_slot;
     return;