From fced989d6073d4100281a81d7cdb6e6df2af17ac Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 22 Mar 2024 13:49:43 +0100 Subject: [PATCH] Remove F1 config for LTE: does not exist --- openair2/ENB_APP/enb_paramdef.h | 58 ------------------- .../CONF/enb.band7.master.conf | 28 --------- .../CONF/enb.band7.tm1.50PRB.usrpb210.conf | 28 --------- 3 files changed, 114 deletions(-) diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index e2ceb61987..8e2ff45e21 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -1183,64 +1183,6 @@ typedef struct srb1_params_s { #define CONFIG_STRING_L1_LIST "L1s" #define CONFIG_STRING_L1_CONFIG "l1_config" -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/* CU/DU configuration section names*/ -#define CONFIG_STRING_DU_LIST "DU" -#define CONFIG_STRING_CU_LIST "CU" -#define DU_TYPE_LTE 0 -#define DU_TYPE_WIFI 1 -#define ENB_CONFIG_STRING_CU_INTERFACES_CONFIG "CU_INTERFACES" -#define ENB_CONFIG_STRING_CU_INTERFACE_NAME_FOR_F1U "CU_INTERFACE_NAME_FOR_F1U" -#define ENB_CONFIG_STRING_CU_IPV4_ADDRESS_FOR_F1U "CU_IPV4_ADDRESS_FOR_F1U" -#define ENB_CONFIG_STRING_CU_PORT_FOR_F1U "CU_PORT_FOR_F1U" -#define ENB_CONFIG_STRING_DU_TYPE "DU_TYPE" -#define ENB_CONFIG_STRING_F1_U_CU_TRANSPORT_TYPE "F1_U_CU_TRANSPORT_TYPE" -#define ENB_CONFIG_STRING_DU_INTERFACES_CONFIG "DU_INTERFACES" -#define ENB_CONFIG_STRING_DU_INTERFACE_NAME_FOR_F1U "DU_INTERFACE_NAME_FOR_F1U" -#define ENB_CONFIG_STRING_DU_IPV4_ADDRESS_FOR_F1U "DU_IPV4_ADDRESS_FOR_F1U" -#define ENB_CONFIG_STRING_DU_PORT_FOR_F1U "DU_PORT_FOR_F1U" -#define ENB_CONFIG_STRING_F1_U_DU_TRANSPORT_TYPE "F1_U_DU_TRANSPORT_TYPE" - -#define CONFIG_STRING_CU_BALANCING "CU_BALANCING" - -// clang-format off -#define CUPARAMS_DESC { \ - {ENB_CONFIG_STRING_CU_INTERFACE_NAME_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="eth0", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_CU_IPV4_ADDRESS_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_CU_PORT_FOR_F1U, NULL, 0, .uptr=NULL, .defintval=2210, TYPE_UINT, 0}, \ - {ENB_CONFIG_STRING_F1_U_CU_TRANSPORT_TYPE, NULL, 0, .strptr=NULL, .defstrval="TCP", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_DU_TYPE, NULL, 0, .strptr=NULL, .defstrval="LTE", TYPE_STRING, 0}, \ -} -// clang-format on - -// clang-format off -#define DUPARAMS_DESC { \ - {ENB_CONFIG_STRING_DU_INTERFACE_NAME_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="eth0", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_DU_IPV4_ADDRESS_FOR_F1U, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {ENB_CONFIG_STRING_DU_PORT_FOR_F1U, NULL, 0, .uptr=NULL, .defintval=2210, TYPE_UINT, 0}, \ - {ENB_CONFIG_STRING_F1_U_DU_TRANSPORT_TYPE, NULL, 0, .strptr=NULL, .defstrval="TCP", TYPE_STRING, 0}, \ -} -// clang-format on - -// clang-format off -#define CU_BAL_DESC { \ - {CONFIG_STRING_CU_BALANCING, NULL, 0, .strptr=NULL, .defstrval="ALL", TYPE_STRING, 0}, \ -} -// clang-format on - -#define CU_INTERFACE_F1U 0 -#define CU_ADDRESS_F1U 1 -#define CU_PORT_F1U 2 -#define CU_TYPE_F1U 3 - -#define DU_INTERFACE_F1U 0 -#define DU_ADDRESS_F1U 1 -#define DU_PORT_F1U 2 -#define DU_TYPE_F1U 3 -#define DU_TECH 4 - -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /* MACRLC configuration section names */ #define CONFIG_STRING_MACRLC_LIST "MACRLCs" diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf index 15a6d640c4..1d48bd6bc6 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.master.conf @@ -199,34 +199,6 @@ eNBs = } ); -DU = ( - { - DU_INTERFACE_NAME_FOR_F1U = "lo"; - DU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1/16"; - DU_PORT_FOR_F1U = 22100; - F1_U_DU_TRANSPORT_TYPE = "TCP"; - } - ); - -CU = ( - { - CU_INTERFACE_NAME_FOR_F1U = "lo"; - CU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1"; //Address to search the DU - CU_PORT_FOR_F1U = 22100; - F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP - DU_TYPE = "LTE"; - }//, -// { -// CU_INTERFACE_NAME_FOR_F1U = "eth0"; -// CU_IPV4_ADDRESS_FOR_F1U = "10.64.93.142"; //Address to search the DU -// CU_PORT_FOR_F1U = 2211; -// F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP -// DU_TYPE = "WiFi"; -// } - ); - - CU_BALANCING = "ALL"; - MACRLCs = ( { num_cc = 1; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf index 92c1db094a..c193cd70b3 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf @@ -201,34 +201,6 @@ eNBs = } ); -DU = ( - { - DU_INTERFACE_NAME_FOR_F1U = "lo"; - DU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1/16"; - DU_PORT_FOR_F1U = 22100; - F1_U_DU_TRANSPORT_TYPE = "TCP"; - } - ); - -CU = ( - { - CU_INTERFACE_NAME_FOR_F1U = "lo"; - CU_IPV4_ADDRESS_FOR_F1U = "127.0.0.1"; //Address to search the DU - CU_PORT_FOR_F1U = 22100; - F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP - DU_TYPE = "LTE"; - }//, -// { -// CU_INTERFACE_NAME_FOR_F1U = "eth0"; -// CU_IPV4_ADDRESS_FOR_F1U = "10.64.93.142"; //Address to search the DU -// CU_PORT_FOR_F1U = 2211; -// F1_U_CU_TRANSPORT_TYPE = "TCP"; // One of TCP/UDP/SCTP -// DU_TYPE = "WiFi"; -// } - ); - - CU_BALANCING = "ALL"; - MACRLCs = ( { num_cc = 1;