maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove L1s.local_n_portc: not used

Browse Source 
Also remove intermediate variable eth_params_n that is not used
anywhere.
This commit is contained in:
Robert Schmidt
2026-04-02 11:58:59 +02:00
parent 16b1a031a9
commit e1a7a2e8af
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/defs_gNB.h
-2
View File
@@ -329,8 +329,6 @@ typedef struct PHY_VARS_gNB_s {
gNB_L1_proc_t proc; gNB_L1_proc_t proc;
int num_RU; int num_RU;
RU_t *RU_list[MAX_NUM_RU_PER_gNB]; RU_t *RU_list[MAX_NUM_RU_PER_gNB];
/// Ethernet parameters for northbound midhaul interface
eth_params_t eth_params_n;
/// Ethernet parameters for fronthaul interface /// Ethernet parameters for fronthaul interface
eth_params_t eth_params; eth_params_t eth_params;
int rx_total_gain_dB; int rx_total_gain_dB;
openair2/GNB_APP/L1_nr_paramdef.h
-2
View File
@@ -15,7 +15,6 @@
/* L1 configuration parameters names */ /* L1 configuration parameters names */
#define L1_LOCAL_N_ADDRESS "local_n_address" #define L1_LOCAL_N_ADDRESS "local_n_address"
#define L1_REMOTE_N_ADDRESS "remote_n_address" #define L1_REMOTE_N_ADDRESS "remote_n_address"
#define L1_LOCAL_N_PORTC "local_n_portc"
#define L1_REMOTE_N_PORTC "remote_n_portc" #define L1_REMOTE_N_PORTC "remote_n_portc"
#define L1_LOCAL_N_PORTD "local_n_portd" #define L1_LOCAL_N_PORTD "local_n_portd"
#define L1_REMOTE_N_PORTD "remote_n_portd" #define L1_REMOTE_N_PORTD "remote_n_portd"
@@ -47,7 +46,6 @@
{L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \ {L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \
{L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ {L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \
{L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ {L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
{L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \
{L1_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \ {L1_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \
{L1_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ {L1_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \
{L1_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ {L1_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \
openair2/GNB_APP/gnb_config.c
+6 -12
View File
@@ -851,19 +851,13 @@ void RCconfig_NR_L1(void)
if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "local_mac") == 0) { if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "local_mac") == 0) {
// do nothing // do nothing
} else if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "nfapi") == 0) { } else if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "nfapi") == 0) {
gNB->eth_params_n.my_addr = strdup(*gpd(params, np, L1_LOCAL_N_ADDRESS)->strptr); char *my_addr = strdup(*gpd(params, np, L1_LOCAL_N_ADDRESS)->strptr);
gNB->eth_params_n.remote_addr = strdup(*gpd(params, np, L1_REMOTE_N_ADDRESS)->strptr); char *remote_addr = strdup(*gpd(params, np, L1_REMOTE_N_ADDRESS)->strptr);
gNB->eth_params_n.my_portc = *gpd(params, np, L1_LOCAL_N_PORTC)->iptr; int remote_portc = *gpd(params, np, L1_REMOTE_N_PORTC)->iptr;
gNB->eth_params_n.remote_portc = *gpd(params, np, L1_REMOTE_N_PORTC)->iptr; int my_portd = *gpd(params, np, L1_LOCAL_N_PORTD)->iptr;
gNB->eth_params_n.my_portd = *gpd(params, np, L1_LOCAL_N_PORTD)->iptr; int remote_portd = *gpd(params, np, L1_REMOTE_N_PORTD)->iptr;
gNB->eth_params_n.remote_portd = *gpd(params, np, L1_REMOTE_N_PORTD)->iptr;
gNB->eth_params_n.transp_preference = ETH_UDP_MODE;
configure_nr_nfapi_pnf(gNB->eth_params_n.remote_addr, configure_nr_nfapi_pnf(remote_addr, remote_portc, my_addr, my_portd, remote_portd);
gNB->eth_params_n.remote_portc,
gNB->eth_params_n.my_addr,
gNB->eth_params_n.my_portd,
gNB->eth_params_n.remote_portd);
} else { } else {
// other midhaul, do nothing // other midhaul, do nothing
} }