Merge remote-tracking branch 'origin/change-typedef-names-for-coding-style' into integration_2026_w10 (!3846)

rename with distinct names structs and related typedefs, remove spread struct keyword

openair1/PHY/defs_RU.h

@@ -45,7 +45,7 @@
 #define MAX_BANDS_PER_RRU 4
 #define MAX_RRU_CONFIG_SIZE 1024
 
-
+typedef struct NR_DL_FRAME_PARMS_s NR_DL_FRAME_PARMS;
 
 typedef enum {
   normal_txrx=0,
@@ -176,7 +176,7 @@ typedef struct {
  int slot;
  const c16_t *rxdata;
  c16_t *rxdataF;
- const struct NR_DL_FRAME_PARMS *fp;
+ const NR_DL_FRAME_PARMS *fp;
  int32_t sample_offet;
  task_ans_t *ans;
 } feprx_cmd_t;
@@ -491,8 +491,8 @@ typedef struct RU_t_s {
   /// FAPI confiuration
   nfapi_nr_config_request_scf_t  config;
   /// Frame parameters
-  struct LTE_DL_FRAME_PARMS *frame_parms;
-  struct NR_DL_FRAME_PARMS *nr_frame_parms;
+  struct LTE_DL_FRAME_PARMS_s *frame_parms;
+  struct NR_DL_FRAME_PARMS_s *nr_frame_parms;
   ///timing offset used in TDD
   int N_TA_offset;
   /// SF extension used in TDD (unit: number of samples at 30.72MHz) (this is an expert option)

openair1/PHY/defs_common.h

@@ -598,8 +598,7 @@ typedef struct {
   int non_mbsfn_SubframeConfig;
 } NonMBSFN_config_t;
 
-
-typedef struct LTE_DL_FRAME_PARMS {
+typedef struct LTE_DL_FRAME_PARMS_s {
   /// Number of resource blocks (RB) in DL
   uint8_t N_RB_DL;
   /// Number of resource blocks (RB) in UL

openair1/PHY/defs_nr_common.h

@@ -156,9 +156,7 @@ typedef struct {
 } prach_list_t;
 void init_prach_list(prach_list_t *);
 
-typedef struct NR_DL_FRAME_PARMS NR_DL_FRAME_PARMS;
-
-struct NR_DL_FRAME_PARMS {
+typedef struct NR_DL_FRAME_PARMS_s {
   /// frequency range
   frequency_range_t freq_range;
   //  /// Placeholder to replace overlapping fields below
@@ -269,7 +267,7 @@ struct NR_DL_FRAME_PARMS {
   uint16_t tdd_slot_config;
   uint8_t tdd_period;
   bool print_ue_help_cmdline_log;
-};
+} NR_DL_FRAME_PARMS;
 
 // PRS config structures
 typedef struct {

openair1/SCHED/nfapi_lte_dummy.c

@@ -4,11 +4,8 @@
 #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h"
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "openair1/PHY/LTE_TRANSPORT/transport_common.h"
-typedef struct pnf_t pnf_t;
-typedef struct pnf_p7_t pnf_p7_t;
-typedef struct vnf_t vnf_t;
-typedef struct vnf_p7_t vnf_p7_t;
-
+#include "nfapi/open-nFAPI/vnf/inc/vnf.h"
+#include "nfapi/open-nFAPI/pnf/inc/pnf.h"
 int l1_north_init_gNB(void){return 0;}
 
 int slot_ahead = 6;

openair1/SCHED_NR/nr_ru_procedures.c

@@ -35,7 +35,7 @@
 #include "sched_nr.h"
 #include "PHY/MODULATION/modulation_common.h"
 #include "PHY/MODULATION/nr_modulation.h"
-
+#include "openair1/PHY/defs_nr_common.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/system.h"