From 5b0d34c3ad272978cb37f0a2c6784b1b3472daf2 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Mon, 22 Dec 2025 15:43:54 +0100 Subject: [PATCH] semi-manual remove of not used #define commands. I let the unused defintions that come from standard bodies --- common/config/config_load_configmodule.c | 1 - common/openairinterface5g_limits.h | 2 - common/platform_constants.h | 11 -- common/utils/LOG/log.c | 2 - common/utils/LOG/log.h | 17 -- common/utils/T/T.h | 1 - common/utils/T/tracer/macpdu2wireshark.c | 1 - common/utils/load_module_shlib.c | 1 - common/utils/telnetsrv/telnetsrv.h | 2 - .../utils/telnetsrv/telnetsrv_measurements.h | 3 - common/utils/telnetsrv/telnetsrv_phycmd.h | 2 - common/utils/telnetsrv/telnetsrv_proccmd.c | 1 - common/utils/utils.h | 5 - common/utils/websrv/websrv.h | 2 - common/utils/websrv/websrv_noforms.h | 98 ---------- doc/Doxyfile | 1 - executables/lte-ue.c | 1 - nfapi/oai_integration/nfapi_pnf.c | 1 - .../nfapi/public_inc/nfapi_interface.h | 3 - openair1/PHY/CODING/TESTBENCH/ldpctest.c | 1 - openair1/PHY/CODING/coding_defs.h | 1 - openair1/PHY/CODING/defs_NB_IoT.h | 6 - .../nrLDPC_decoder/nrLDPCdecoder_defs.h | 3 - .../nrPolar_tools/nr_polar_pucch_defs.h | 2 - .../CODING/nrPolar_tools/nr_polar_uci_defs.h | 10 - .../CODING/nrSmallBlock/nr_small_block_defs.h | 1 - openair1/PHY/LTE_REFSIG/mod_table.h | 3 - openair1/PHY/LTE_TRANSPORT/dci.h | 42 ----- openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h | 6 - openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h | 4 - openair1/PHY/LTE_TRANSPORT/mdci.h | 3 - openair1/PHY/LTE_TRANSPORT/pucch_extern.h | 2 - openair1/PHY/LTE_TRANSPORT/transport_common.h | 4 - openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h | 28 --- openair1/PHY/LTE_TRANSPORT/uci_common.h | 12 -- openair1/PHY/NR_REFSIG/dmrs_nr.c | 1 - openair1/PHY/NR_REFSIG/nr_mod_table.h | 4 - openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h | 2 - .../PHY/NR_TRANSPORT/nr_ulsch_demodulation.c | 1 - openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h | 2 +- openair1/PHY/NR_UE_TRANSPORT/dci_nr.c | 2 - openair1/PHY/TOOLS/dfts_load.c | 1 - openair1/PHY/defs_L1_NB_IoT.h | 3 - openair1/PHY/defs_common.h | 4 - openair1/PHY/defs_nr_UE.h | 6 - openair1/PHY/defs_nr_common.h | 9 - openair1/PHY/defs_nr_sl_UE.h | 3 - openair1/PHY/impl_defs_lte_NB_IoT.h | 4 - openair1/PHY/impl_defs_nr.h | 3 - openair1/PHY/impl_defs_top.h | 39 ---- openair1/PHY/impl_defs_top_NB_IoT.h | 1 - openair1/SCHED/sched_eNB.h | 8 - openair1/SCHED_NR_UE/defs.h | 7 - openair2/COMMON/e1ap_messages_types.h | 1 - openair2/COMMON/f1ap_messages_types.h | 2 - openair2/COMMON/mac_rrc_primitives.h | 14 -- openair2/COMMON/networkDef.h | 3 - openair2/COMMON/ngap_messages_types.h | 1 - openair2/COMMON/ral_messages_types.h | 57 ------ openair2/COMMON/rtos_header.h | 32 ---- .../RAN_FUNCTION/O-RAN/ran_func_rc_subs.c | 1 - openair2/ENB_APP/RRC_paramsvalues.h | 14 -- openair2/ENB_APP/enb_config.h | 4 - openair2/ENB_APP/enb_paramdef.h | 125 ------------ openair2/ENB_APP/enb_paramdef_emtc.h | 5 - openair2/ENB_APP/enb_paramdef_mce.h | 10 - openair2/ENB_APP/enb_paramdef_mme.h | 29 --- openair2/F1AP/f1ap_common.h | 2 - openair2/GNB_APP/RRC_nr_paramsvalues.h | 8 - openair2/GNB_APP/gnb_app.c | 3 - openair2/GNB_APP/gnb_config.h | 20 +- openair2/GNB_APP/gnb_paramdef.h | 20 -- openair2/LAYER2/MAC/defs_NB_IoT.h | 6 - openair2/LAYER2/MAC/mac.h | 8 - openair2/LAYER2/NR_MAC_COMMON/nr_mac.h | 13 -- openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h | 1 - .../LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c | 1 - .../NR_MAC_gNB/gNB_scheduler_primitives.c | 2 - openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h | 11 -- openair2/LAYER2/PDCP_v10.1.0/pdcp.h | 3 - openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c | 3 - .../LAYER2/PDCP_v10.1.0/pdcp_primitives.h | 12 -- openair2/NR_PHY_INTERFACE/NR_IF_Module.h | 7 - openair2/PHY_INTERFACE/IF_Module.h | 7 - openair2/PHY_INTERFACE/IF_Module_NB_IoT.h | 8 - openair2/PHY_INTERFACE/phy_interface.h | 4 - openair2/RRC/LTE/defs_NB_IoT.h | 5 - openair2/RRC/LTE/rrc_defs.h | 12 -- openair2/RRC/LTE/rrc_eNB.c | 2 - openair2/RRC/LTE/rrc_rrm_interface.h | 131 ------------- openair2/RRC/NR/rrc_gNB.c | 2 - openair2/RRC/NR_UE/rrc_sl_preconfig.c | 2 - openair2/RRC/NR_UE/sl_preconfig_paramvalues.h | 6 - openair2/UTIL/CLI/cli_server.c | 1 - openair2/UTIL/OMG/omg_constants.h | 3 - openair2/UTIL/OTG/otg_config.h | 13 -- openair2/UTIL/OTG/traffic_config.h | 1 - openair3/COMMON/common_types.h | 1 - openair3/COMMON/security_types.h | 3 - openair3/MME_APP/enb_paramdef_mme.h | 178 ------------------ openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h | 1 - openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h | 2 - .../NAS/COMMON/IES/AdditionalUpdateType.h | 2 - openair3/NAS/COMMON/IES/EpsMobileIdentity.h | 1 - openair3/NAS/COMMON/IES/MessageType.h | 3 - .../NAS/COMMON/IES/MobileStationClassmark3.h | 1 - openair3/NAS/COMMON/IES/NasRequestType.h | 1 - .../COMMON/IES/ProcedureTransactionIdentity.h | 3 - .../NAS/COMMON/IES/ProtocolDiscriminator.h | 3 - openair3/NAS/COMMON/IES/SecurityHeaderType.h | 3 - .../NAS/COMMON/IES/TransactionIdentifier.h | 1 - openair3/NAS/COMMON/IES/UeNetworkCapability.h | 5 - .../NAS/COMMON/IES/UeSecurityCapability.h | 38 ---- .../VoiceDomainPreferenceAndUeUsageSetting.h | 1 - openair3/NAS/COMMON/UTIL/nas_log.h | 23 --- openair3/NAS/COMMON/securityDef.h | 3 - .../5GS/5GMM/IES/FGCNasMessageContainer.h | 1 - .../5GS/5GMM/IES/FGSDeregistrationType.h | 2 - .../NR_UE/5GS/5GMM/IES/FGSRegistrationType.h | 2 - .../5GSM/MSG/PduSessionEstablishmentAccept.h | 1 - openair3/NAS/NR_UE/nr_nas_msg.h | 3 - openair3/NAS/TOOLS/conf_network.h | 3 - openair3/NAS/UE/API/USER/at_command.h | 23 --- openair3/NAS/UE/API/USIM/usim_api.h | 2 - openair3/NAS/UE/EMM/SAP/emm_fsm.c | 13 -- openair3/NAS/UE/EMM/SAP/emm_sap.h | 2 - openair3/NGAP/ngap_common.h | 2 - openair3/S1AP/s1ap_common.h | 2 - openair3/SECU/nas_stream_eia2.c | 2 - openair3/UICC/usim_interface.c | 1 - openair3/UTILS/conversions.h | 1 - radio/ETHERNET/ethernet_lib.h | 1 - radio/ETHERNET/if_defs.h | 1 - radio/iqplayer/iqplayer_lib.c | 2 - radio/rfsimulator/simulator.cpp | 1 - 135 files changed, 5 insertions(+), 1331 deletions(-) delete mode 100644 openair2/COMMON/rtos_header.h delete mode 100644 openair2/RRC/LTE/rrc_rrm_interface.h delete mode 100644 openair3/MME_APP/enb_paramdef_mme.h diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c index 5d8bb2cfcc..3af8a9b03e 100644 --- a/common/config/config_load_configmodule.c +++ b/common/config/config_load_configmodule.c @@ -38,7 +38,6 @@ #include #include "common/platform_types.h" -#define CONFIG_LOADCONFIG_MAIN #include "config_load_configmodule.h" #include "config_userapi.h" #include "../utils/LOG/log.h" diff --git a/common/openairinterface5g_limits.h b/common/openairinterface5g_limits.h index d2f44a6195..1470270db4 100644 --- a/common/openairinterface5g_limits.h +++ b/common/openairinterface5g_limits.h @@ -12,8 +12,6 @@ # define NUMBER_OF_SRS_MAX 16 # define NUMBER_OF_SCH_STATS_MAX 16 -#define MAX_MANAGED_ENB_PER_MOBILE 2 -#define MAX_MANAGED_GNB_PER_MOBILE 2 # ifndef PHYSIM # ifndef UE_EXPANSION diff --git a/common/platform_constants.h b/common/platform_constants.h index 2faadc3dcd..7415fbc545 100644 --- a/common/platform_constants.h +++ b/common/platform_constants.h @@ -27,39 +27,30 @@ #ifdef LARGE_SCALE #define NB_MODULES_MAX 128 -#define NB_NODE_MAX 128 #else #define NB_MODULES_MAX 32 -#define NB_NODE_MAX 32 #endif #define MAX_IP_PACKET_SIZE 10000 // 9000 #define MAX_MODULES NB_MODULES_MAX -#define MAX_NR_RRC_UE_CONTEXTS 64 #ifndef UE_EXPANSION #ifdef LARGE_SCALE #define MAX_MOBILES_PER_ENB 128 #define MAX_MOBILES_PER_ENB_NB_IoT 128 #define MAX_eNB 2 -#define MAX_gNB 2 #else #define MAX_MOBILES_PER_ENB 40 #define MAX_MOBILES_PER_ENB_NB_IoT 40 #define MAX_eNB 2 -#define MAX_gNB 2 #endif #else #define MAX_MOBILES_PER_ENB 256 #define MAX_MOBILES_PER_ENB_NB_IoT 256 #define MAX_eNB 2 -#define MAX_gNB 2 #endif -#define NUMBER_OF_NR_UCI_STATS_MAX 16 -#define MAX_MANAGED_ENB_PER_MOBILE 2 -#define MAX_MANAGED_GNB_PER_MOBILE 2 /// NB-IOT #define NB_RB_MAX_NB_IOT (2 + 3) /* 2 from LTE_maxDRB_NB_r13 in LTE_asn_constant.h + 3 SRBs */ @@ -85,12 +76,10 @@ // RLC Entity #define RLC_TX_MAXSIZE 10000000 #define RLC_RX_MAXSIZE 10000000 -#define SEND_MRW_ON 240 #define MAX_ANT 8 // CBA constant #define NUM_MAX_CBA_GROUP 4 -#define printk printf #define RETURNok (0) #define RETURNerror (-1) #define DEFAULT_NAS_PATH "PWD" diff --git a/common/utils/LOG/log.c b/common/utils/LOG/log.c index 23aa075ca1..99b1f140bc 100644 --- a/common/utils/LOG/log.c +++ b/common/utils/LOG/log.c @@ -31,8 +31,6 @@ #define _GNU_SOURCE /* required for pthread_getname_np */ //#define LOG_TEST 1 -#define COMPONENT_LOG -#define COMPONENT_LOG_IF #include #define LOG_MAIN #include "log.h" diff --git a/common/utils/LOG/log.h b/common/utils/LOG/log.h index 312f2c9510..a9db2e9c5c 100644 --- a/common/utils/LOG/log.h +++ b/common/utils/LOG/log.h @@ -302,22 +302,6 @@ void close_log_mem(void); @param multiVec create new file or append to existing (useful for writing multiple vectors to same file. Just call the function multiple times with same file name and with this parameter set to 1) */ #define MATLAB_RAW (1U<<31) -#define MATLAB_SHORT 0 -#define MATLAB_CSHORT 1 -#define MATLAB_INT 2 -#define MATLAB_CINT 3 -#define MATLAB_INT8 4 -#define MATLAB_CINT8 5 -#define MATLAB_LLONG 6 -#define MATLAB_DOUBLE 7 -#define MATLAB_CDOUBLE 8 -#define MATLAB_UINT8 9 -#define MATLEB_EREN1 10 -#define MATLEB_EREN2 11 -#define MATLEB_EREN3 12 -#define MATLAB_CSHORT_BRACKET1 13 -#define MATLAB_CSHORT_BRACKET2 14 -#define MATLAB_CSHORT_BRACKET3 15 int32_t write_file_matlab(const char *fname, const char *vname, @@ -333,7 +317,6 @@ int32_t write_file_matlab(const char *fname, #define LOG_CONFIG_STRING_GLOBAL_LOG_LEVEL "global_log_level" #define LOG_CONFIG_STRING_GLOBAL_LOG_ONLINE "global_log_online" -#define LOG_CONFIG_STRING_GLOBAL_LOG_INFILE "global_log_infile" #define LOG_CONFIG_STRING_GLOBAL_LOG_OPTIONS "global_log_options" #define LOG_CONFIG_LEVEL_FORMAT "%s_log_level" diff --git a/common/utils/T/T.h b/common/utils/T/T.h index c78b99632a..ab90dd5907 100644 --- a/common/utils/T/T.h +++ b/common/utils/T/T.h @@ -14,7 +14,6 @@ /* T message IDs */ #include "T_IDs.h" -#define T_ACTIVE_STDOUT 2 /* known type - this is where you add new types */ #define T_INT(x) int, (x) diff --git a/common/utils/T/tracer/macpdu2wireshark.c b/common/utils/T/tracer/macpdu2wireshark.c index 6d0a564ab8..831488d485 100644 --- a/common/utils/T/tracer/macpdu2wireshark.c +++ b/common/utils/T/tracer/macpdu2wireshark.c @@ -387,7 +387,6 @@ void sr(void *_d, event e) #define MAC_NR_HARQID 0x06 #define MAC_NR_FRAME_SLOT_TAG 0x07 -#define NR_FDD_RADIO 1 #define NR_TDD_RADIO 2 #define NR_DIRECTION_UPLINK 0 diff --git a/common/utils/load_module_shlib.c b/common/utils/load_module_shlib.c index 13eec39776..2f97879c1e 100644 --- a/common/utils/load_module_shlib.c +++ b/common/utils/load_module_shlib.c @@ -39,7 +39,6 @@ #include #include "openair1/PHY/defs_common.h" #include "common/oai_version.h" -#define LOAD_MODULE_SHLIB_MAIN #include "common/config/config_userapi.h" #include "load_module_shlib.h" diff --git a/common/utils/telnetsrv/telnetsrv.h b/common/utils/telnetsrv/telnetsrv.h index 82f2eba3ec..ab866c88fb 100644 --- a/common/utils/telnetsrv/telnetsrv.h +++ b/common/utils/telnetsrv/telnetsrv.h @@ -32,9 +32,7 @@ #define TELNETSRV_H #include -#define TELNETSRV_MODNAME "telnetsrv" -#define TELNET_PORT 9090 #define TELNET_MAX_MSGLENGTH 2048 #define TELNET_PROMPT_PREFIX "softmodem" #define TELNET_MAXCMD 20 diff --git a/common/utils/telnetsrv/telnetsrv_measurements.h b/common/utils/telnetsrv/telnetsrv_measurements.h index 351b27c1f1..4c9d36b9b2 100644 --- a/common/utils/telnetsrv/telnetsrv_measurements.h +++ b/common/utils/telnetsrv/telnetsrv_measurements.h @@ -42,7 +42,6 @@ #define TELNET_MAXMEASURNAME_LEN 30 -#define TELNET_MAXMEASURGROUPS 10 #define PRINT_CPUMEAS_STATE ((cpumeas(CPUMEAS_GETSTATE))?"enabled":"disabled") typedef struct cpumeasurdef { @@ -77,8 +76,6 @@ typedef struct mesurgroupdef { } telnet_measurgroupdef_t; #define MACSTATS_NAME(valptr) #valptr -#define LTEMAC_MEASURGROUP_NAME "ltemac" -#define PHYCPU_MEASURGROUP_NAME "phycpu" #ifdef TELNETSRV_MEASURMENTS_MAIN int measurcmd_show(char *buf, int debug, telnet_printfunc_t prnt); diff --git a/common/utils/telnetsrv/telnetsrv_phycmd.h b/common/utils/telnetsrv/telnetsrv_phycmd.h index b999436395..cdceedb1df 100644 --- a/common/utils/telnetsrv/telnetsrv_phycmd.h +++ b/common/utils/telnetsrv/telnetsrv_phycmd.h @@ -41,8 +41,6 @@ #include "openair1/PHY/phy_extern.h" -#define TELNETVAR_PHYCC0 0 -#define TELNETVAR_PHYCC1 1 telnetshell_vardef_t phy_vardef[] = {{"", 0, 0, NULL}}; diff --git a/common/utils/telnetsrv/telnetsrv_proccmd.c b/common/utils/telnetsrv/telnetsrv_proccmd.c index f79e9f5287..bdaaa37a05 100644 --- a/common/utils/telnetsrv/telnetsrv_proccmd.c +++ b/common/utils/telnetsrv/telnetsrv_proccmd.c @@ -48,7 +48,6 @@ #include #include -#define READCFG_DYNLOAD #define TELNETSERVERCODE #include "telnetsrv.h" diff --git a/common/utils/utils.h b/common/utils/utils.h index ede5cf7a84..fecf0eb3ad 100644 --- a/common/utils/utils.h +++ b/common/utils/utils.h @@ -50,8 +50,6 @@ extern "C" { # define malloc16(x) memalign(32,x+32) #endif #define free16(y,x) free(y) -#define bigmalloc malloc -#define bigmalloc16 malloc16 #define openair_free(y,x) free((y)) #define PAGE_SIZE 4096 @@ -101,12 +99,9 @@ static inline void *malloc_or_fail(size_t size) #endif #define free16(y,x) free(y) -#define bigmalloc malloc -#define bigmalloc16 malloc16 #define openair_free(y,x) free((y)) #define PAGE_SIZE 4096 -#define PAGE_MASK 0xfffff000 #define virt_to_phys(x) (x) // Converts an hexadecimal ASCII coded digit into its value. ** diff --git a/common/utils/websrv/websrv.h b/common/utils/websrv/websrv.h index 610eff917e..944b6761e7 100644 --- a/common/utils/websrv/websrv.h +++ b/common/utils/websrv/websrv.h @@ -33,9 +33,7 @@ #ifndef WEBSRV_H #define WEBSRV_H -#define WEBSRV_MODNAME "websrv" -#define WEBSRV_PORT 8090 /* websrv_params_t is an internal structure storing all the current parameters and */ /* global variables used by the web server */ diff --git a/common/utils/websrv/websrv_noforms.h b/common/utils/websrv/websrv_noforms.h index c3d3af78d6..05c43f57c1 100644 --- a/common/utils/websrv/websrv_noforms.h +++ b/common/utils/websrv/websrv_noforms.h @@ -35,7 +35,6 @@ #define FL_VERSION 1 #define FL_REVISION 2 -#define FL_FIXLEVEL "3" #define FL_INCLUDE_VERSION (FL_VERSION * 1000 + FL_REVISION) #include @@ -194,15 +193,10 @@ typedef enum { FL_CLASS_END /* sentinel */ } FL_CLASS; -#define FL_BEGIN_GROUP 10000 -#define FL_END_GROUP 20000 -#define FL_USER_CLASS_START 1001 /* min. user class value */ -#define FL_USER_CLASS_END 9999 /* max. user class value */ /* Maximum border width (in pixel) */ -#define FL_MAX_BW 10 /* How to display a form onto screen */ @@ -332,21 +326,11 @@ enum { FL_MBUTTON1 = 1, FL_MBUTTON2, FL_MBUTTON3, FL_MBUTTON4, FL_MBUTTON5 }; #define FL_SCROLLUP_MOUSE FL_MBUTTON4 #define FL_SCROLLDOWN_MOUSE FL_MBUTTON5 -#define FL_LEFTMOUSE FL_LEFT_MOUSE -#define FL_MIDDLEMOUSE FL_MIDDLE_MOUSE -#define FL_RIGHTMOUSE FL_RIGHT_MOUSE -#define FL_SCROLLUPMOUSE FL_SCROLLUP_MOUSE -#define FL_SCROLLDOWNMOUSE FL_SCROLLDOWN_MOUSE /* control when to return input, slider and dial etc. object. */ -#define FL_RETURN_NONE 0U -#define FL_RETURN_CHANGED 1U #define FL_RETURN_END 2U #define FL_RETURN_END_CHANGED 4U -#define FL_RETURN_SELECTION 8U -#define FL_RETURN_DESELECTION 16U -#define FL_RETURN_TRIGGERED 1024U #define FL_RETURN_ALWAYS (~FL_RETURN_END_CHANGED) /* Some special color indices for FL private colormap. It does not matter @@ -532,22 +516,13 @@ typedef enum { } FL_PD_COL; #define FL_BUILT_IN_COLS (FL_YELLOWGREEN + 1) -#define FL_INACTIVE_COL FL_INACTIVE /* Some aliases for a number of colors */ -#define FL_GRAY16 FL_RIGHT_BCOL -#define FL_GRAY35 FL_BOTTOM_BCOL -#define FL_GRAY80 FL_TOP_BCOL -#define FL_GRAY90 FL_LEFT_BCOL -#define FL_GRAY63 FL_COL1 -#define FL_GRAY75 FL_MCOL #define FL_LCOL FL_BLACK -#define FL_NoColor FL_NOCOLOR /* An alias probably for an earlier typo */ -#define FL_DOGERBLUE FL_DODGERBLUE /* Events that a form reacts to */ @@ -609,9 +584,7 @@ typedef enum { #define FL_ALT_MASK (1L << 25) /* alt + Key --> FL_ALT_MASK + key */ #define FL_CONTROL_MASK (1L << 26) #define FL_SHIFT_MASK (1L << 27) -#define FL_ALT_VAL FL_ALT_MASK /* Don' use! */ -#define MAX_SHORTCUTS 8 /* Pop-up menu item attributes. NOTE if more than 8, need to change * choice and menu class where mode is kept by a single byte */ @@ -619,8 +592,6 @@ typedef enum { enum { FL_PUP_NONE, FL_PUP_GREY = 1, FL_PUP_BOX = 2, FL_PUP_CHECK = 4, FL_PUP_RADIO = 8 }; #define FL_PUP_GRAY FL_PUP_GREY -#define FL_PUP_TOGGLE FL_PUP_BOX /* not used anymore */ -#define FL_PUP_INACTIVE FL_PUP_GREY /* Popup and menu entries */ @@ -633,7 +604,6 @@ typedef struct { int mode; /* FL_PUP_GRAY, FL_PUP_CHECK etc */ } FL_PUP_ENTRY; -#define FL_MENU_ENTRY FL_PUP_ENTRY /******************************************************************* * FONTS @@ -670,7 +640,6 @@ typedef enum { FL_EMBOSSED_STYLE = (1 << 11) } FL_TEXT_STYLE; -#define FL_FONT_STYLE FL_TEXT_STYLE #define special_style(a) ((a) >= FL_SHADOW_STYLE && (a) <= (FL_EMBOSSED_STYLE + FL_MAXFONTS)) @@ -683,26 +652,16 @@ typedef enum { #define FL_LARGE_SIZE 18 #define FL_HUGE_SIZE 24 -#define FL_DEFAULT_SIZE FL_SMALL_SIZE /* Defines for compatibility */ -#define FL_TINY_FONT FL_TINY_SIZE #define FL_SMALL_FONT FL_SMALL_SIZE -#define FL_NORMAL_FONT FL_NORMAL_SIZE -#define FL_MEDIUM_FONT FL_MEDIUM_SIZE -#define FL_LARGE_FONT FL_LARGE_SIZE -#define FL_HUGE_FONT FL_HUGE_SIZE -#define FL_NORMAL_FONT1 FL_SMALL_FONT -#define FL_NORMAL_FONT2 FL_NORMAL_FONT -#define FL_DEFAULT_FONT FL_SMALL_FONT #define FL_BOUND_WIDTH (FL_Coord)1 /* Border width of boxes */ /* Definition of basic struct that holds an object */ -#define FL_CLICK_TIMEOUT 400 /* double click interval */ typedef struct FL_FORM_ FL_FORM; typedef struct FL_OBJECT_ FL_OBJECT; @@ -969,7 +928,6 @@ FL_EXPORT FL_OBJECT *fl_get_focus_object(FL_FORM *form) FL_EXPORT void fl_reset_focus_object(FL_OBJECT *ob){}; -#define fl_set_object_focus fl_set_focus_object FL_EXPORT FL_FORM_ATCLOSE fl_set_form_atclose(FL_FORM *form, FL_FORM_ATCLOSE fmclose, void *data){}; @@ -1014,7 +972,6 @@ FL_EXPORT void fl_set_app_nomainform(int flag){}; FL_EXPORT void fl_set_form_callback(FL_FORM *form, FL_FORMCALLBACKPTR callback, void *d){}; -#define fl_set_form_call_back fl_set_form_callback FL_EXPORT void fl_set_form_size(FL_FORM *form, FL_Coord w, FL_Coord h){}; @@ -1036,7 +993,6 @@ FL_EXPORT unsigned long fl_get_form_event_cmask(FL_FORM *form){}; FL_EXPORT void fl_set_form_geometry(FL_FORM *form, FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h){}; -#define fl_set_initial_placement fl_set_form_geometry FL_EXPORT Window fl_show_form(FL_FORM *form, int place, int border, const char *name) { @@ -1088,7 +1044,6 @@ FL_EXPORT int fl_form_is_iconified(FL_FORM *form) FL_EXPORT FL_RAW_CALLBACK fl_register_raw_callback(FL_FORM *form, unsigned long mask, FL_RAW_CALLBACK rcb){}; -#define fl_register_call_back fl_register_raw_callback FL_EXPORT FL_OBJECT *fl_bgn_group(void) { @@ -1204,7 +1159,6 @@ FL_EXPORT FL_OBJECT *fl_get_object_component(FL_OBJECT *composite, int objclass, FL_EXPORT void fl_for_all_objects(FL_FORM *form, int (*cb)(FL_OBJECT *, void *), void *v){}; -#define fl_draw_object_outside_label fl_draw_object_label_outside FL_EXPORT void fl_set_object_dblclick(FL_OBJECT *obj, unsigned long timeout){}; @@ -1218,7 +1172,6 @@ FL_EXPORT void fl_set_object_geometry(FL_OBJECT *obj, FL_Coord x, FL_Coord y, FL FL_EXPORT void fl_move_object(FL_OBJECT *obj, FL_Coord dx, FL_Coord dy){}; #define fl_set_object_lcolor fl_set_object_lcol -#define fl_get_object_lcolor fl_get_object_lcol FL_EXPORT void fl_fit_object_label(FL_OBJECT *obj, FL_Coord xmargin, FL_Coord ymargin){}; @@ -1233,7 +1186,6 @@ FL_EXPORT void fl_get_object_bbox(FL_OBJECT *obj, FL_Coord *x, FL_Coord *y, FL_C *x = *y = *w = *h = 0; }; -#define fl_compute_object_geometry fl_get_object_bbox FL_EXPORT void fl_call_object_callback(FL_OBJECT *ob){}; @@ -1243,8 +1195,6 @@ FL_EXPORT FL_HANDLEPTR fl_set_object_posthandler(FL_OBJECT *ob, FL_HANDLEPTR pos FL_EXPORT FL_CALLBACKPTR fl_set_object_callback(FL_OBJECT *obj, FL_CALLBACKPTR callback, long argument){}; -#define fl_set_object_align fl_set_object_lalign -#define fl_set_call_back fl_set_object_callback FL_EXPORT void fl_redraw_object(FL_OBJECT *obj){}; @@ -1320,7 +1270,6 @@ FL_EXPORT int fl_get_string_widthTAB(int style, int size, const char *s, int len FL_EXPORT void fl_get_string_dimension(int fntstyle, int fntsize, const char *s, int len, int *width, int *height){}; -#define fl_get_string_size fl_get_string_dimension FL_EXPORT void fl_get_align_xy(int align, int x, int y, int w, int h, int xsize, int ysize, int xoff, int yoff, int *xx, int *yy){}; @@ -1364,7 +1313,6 @@ FL_EXPORT long fl_mapcolorname(FL_COLOR col, const char *name) return 0; }; -#define fl_mapcolor_name fl_mapcolorname FL_EXPORT void fl_free_colors(FL_COLOR *c, int n){}; @@ -1382,7 +1330,6 @@ FL_EXPORT unsigned long fl_get_pixel(FL_COLOR col) return 0; }; -#define fl_get_flcolor fl_get_pixel FL_EXPORT void fl_get_icm_color(FL_COLOR col, int *r, int *g, int *b){}; @@ -1489,7 +1436,6 @@ FL_EXPORT char **fl_get_cmdline_args(int *ia) #define fl_set_error_logfp fl_set_err_logfp -#define fl_mousebutton fl_mouse_button /* These give more flexibility for future changes. Also application * can re-assign these pointers to whatever function it wants, e.g., @@ -1510,7 +1456,6 @@ FL_EXPORT int fl_msleep(unsigned long msec) return 0; }; -#define FL_MAX_MENU_CHOICE_ITEMS 128 typedef const char *(*FL_VAL_FILTER)(FL_OBJECT *, double, int); @@ -1535,7 +1480,6 @@ FL_EXPORT int fl_is_same_object(FL_OBJECT *obj1, FL_OBJECT *obj2) enum { FL_XOR = 0, FL_COPY = 1, FL_AND = 2 }; -#define FL_MINDEPTH 1 /* FL_xxx does not do anything anymore, but kept for compatibility */ @@ -1554,7 +1498,6 @@ enum { FL_North = 0, FL_NorthEast, FL_NorthWest, FL_South, FL_SouthEast, FL_Sout #ifndef GreyScale #define GreyScale GrayScale -#define StaticGrey StaticGray #endif #define FL_is_gray(v) ((v) == GrayScale || (v) == StaticGray) @@ -1589,7 +1532,6 @@ typedef struct { unsigned int bshift, bmask, bbits; } FL_State; -#define FL_STATE FL_State /* for compatibility */ /***** Global variables ******/ @@ -1689,7 +1631,6 @@ FL_EXPORT void fl_point(FL_Coord x, FL_Coord y, FL_COLOR c){}; FL_EXPORT void fl_points(FL_POINT *p, int np, FL_COLOR c){}; -#define fl_simple_line fl_line FL_EXPORT void fl_dashedlinestyle(const char *dash, int ndash){}; @@ -1722,9 +1663,6 @@ FL_EXPORT int fl_get_drawmode(void) return 0; }; -#define fl_set_linewidth fl_linewidth -#define fl_set_linestyle fl_linestyle -#define fl_set_drawmode fl_drawmode /* * Interfaces @@ -1733,7 +1671,6 @@ FL_EXPORT int fl_get_drawmode(void) FL_EXPORT XFontStruct *fl_get_fontstruct(int style, int size){}; #define fl_get_font_struct fl_get_fontstruct -#define fl_get_fntstruct fl_get_font_struct FL_EXPORT Window fl_get_mouse(FL_Coord *x, FL_Coord *y, unsigned int *keymask) { @@ -1839,9 +1776,6 @@ FL_EXPORT void fl_winicontitle_f(Window win, const char *fmt, ...){}; FL_EXPORT void fl_winposition(FL_Coord x, FL_Coord y){}; #define fl_pref_winposition fl_winposition -#define fl_win_background fl_winbackground -#define fl_winstepunit fl_winstepsize -#define fl_set_winstepunit fl_winstepsize FL_EXPORT void fl_winminsize(Window win, FL_Coord w, FL_Coord h){}; @@ -1855,7 +1789,6 @@ FL_EXPORT void fl_winsize(FL_Coord w, FL_Coord h){}; FL_EXPORT void fl_initial_winsize(FL_Coord w, FL_Coord h){}; -#define fl_pref_winsize fl_winsize FL_EXPORT void fl_initial_winstate(int state){}; @@ -1863,7 +1796,6 @@ FL_EXPORT Colormap fl_create_colormap(XVisualInfo *xv, int nfill){}; FL_EXPORT void fl_wingeometry(FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h){}; -#define fl_pref_wingeometry fl_wingeometry FL_EXPORT void fl_initial_wingeometry(FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h){}; @@ -1879,10 +1811,6 @@ FL_EXPORT void fl_get_wingeometry(Window win, FL_Coord *x, FL_Coord *y, FL_Coord /* For compatibility */ -#define fl_get_win_size fl_get_winsize -#define fl_get_win_origin fl_get_winorigin -#define fl_get_win_geometry fl_get_wingeometry -#define fl_initial_winposition fl_pref_winposition #define fl_get_display() fl_display #define FL_FormDisplay(form) fl_display @@ -1895,7 +1823,6 @@ FL_EXPORT void fl_get_wingeometry(Window win, FL_Coord *x, FL_Coord *y, FL_Coord FL_EXPORT Window fl_get_real_object_window(FL_OBJECT *ob){}; -#define FL_OBJECT_WID FL_ObjWin /* All registerable events, including Client Message */ @@ -1941,7 +1868,6 @@ FL_EXPORT long fl_remove_selected_xevent(Window win, long mask) return 0; }; -#define fl_add_selected_xevent fl_addto_selected_xevent FL_EXPORT void fl_set_idle_delta(long delta){}; @@ -1960,7 +1886,6 @@ FL_EXPORT void fl_XFlush(void){}; #define controlkey_down(mask) ((mask)&ControlMask) #define button_down(mask) (((mask)&Button1Mask) || ((mask)&Button2Mask) || ((mask)&Button3Mask) || ((mask)&Button4Mask) || ((mask)&Button5Mask)) -#define fl_keypressed fl_keysym_pressed /****************** Resources ***************/ @@ -1975,7 +1900,6 @@ typedef struct { int nbytes; /* used only for strings */ } FL_RESOURCE; -#define FL_resource FL_RESOURCE #define FL_CMD_OPT XrmOptionDescRec @@ -2002,9 +1926,6 @@ FL_EXPORT int fl_keysym_pressed(KeySym k) return 0; }; -#define buttonLabelSize buttonFontSize -#define sliderLabelSize sliderFontSize -#define inputLabelSize inputFontSize /* All Form control variables. Named closely as its resource name */ @@ -2035,9 +1956,6 @@ typedef struct { char vname[24]; } FL_IOPT; -#define FL_PDButtonLabelSize FL_PDButtonFontSize -#define FL_PDSliderLabelSize FL_PDSliderFontSize -#define FL_PDInputLabelSize FL_PDInputFontSize /* Program default masks */ @@ -2068,7 +1986,6 @@ enum { FL_PDLabelFontSize = (1 << 24) }; -#define FL_PDButtonLabel FL_PDButtonLabelSize FL_EXPORT void fl_set_defaults(unsigned long mask, FL_IOPT *cntl){}; @@ -2133,11 +2050,8 @@ typedef unsigned int FL_PACKED4; #define FL_RMASK 0x000000ff #define FL_RSHIFT 0 -#define FL_GMASK 0x0000ff00 #define FL_GSHIFT 8 -#define FL_BMASK 0x00ff0000 #define FL_BSHIFT 16 -#define FL_AMASK 0xff000000 #define FL_ASHIFT 24 /* If PCBITS is not 8, we need to apply the RGBmask */ @@ -2225,8 +2139,6 @@ typedef int (*FL_MODIFY_CANVAS_PROP)(FL_OBJECT *); /******************** Default *********************/ -#define FL_CANVAS_BOXTYPE FL_DOWN_BOX /* really the decoration frame */ -#define FL_CANVAS_ALIGN FL_ALIGN_TOP /************ Interfaces ************************/ @@ -2244,7 +2156,6 @@ FL_EXPORT FL_OBJECT *fl_create_canvas(int type, FL_Coord x, FL_Coord y, FL_Coord /* backward compatibility */ -#define fl_set_canvas_decoration fl_set_object_boxtype FL_EXPORT void fl_set_canvas_colormap(FL_OBJECT *ob, Colormap colormap){}; @@ -2306,10 +2217,6 @@ FL_EXPORT void fl_canvas_yield_to_shortcut(FL_OBJECT *ob, int yes){}; enum { FL_NORMAL_TEXT }; -#define FL_TEXT_BOXTYPE FL_FLAT_BOX -#define FL_TEXT_COL1 FL_COL1 -#define FL_TEXT_COL2 FL_MCOL -#define FL_TEXT_LCOL FL_LCOL #define FL_TEXT_ALIGN (FL_ALIGN_LEFT | FL_ALIGN_INSIDE) FL_EXPORT FL_OBJECT *fl_create_text(int type, FL_Coord x, FL_Coord y, FL_Coord w, FL_Coord h, const char *label) @@ -2356,10 +2263,6 @@ enum { FL_GRID_NONE = 0, FL_GRID_MAJOR = 1, FL_GRID_MINOR = 2 }; /***** Defaults *****/ -#define FL_XYPLOT_BOXTYPE FL_FLAT_BOX -#define FL_XYPLOT_COL1 FL_COL1 -#define FL_XYPLOT_LCOL FL_LCOL -#define FL_XYPLOT_ALIGN FL_ALIGN_BOTTOM #define FL_MAX_XYPLOTOVERLAY 32 /***** Others *****/ @@ -2382,7 +2285,6 @@ FL_EXPORT int fl_set_xyplot_file(FL_OBJECT *ob, const char *f, const char *title FL_EXPORT void fl_insert_xyplot_data(FL_OBJECT *ob, int id, int n, double x, double y){}; -#define fl_set_xyplot_datafile fl_set_xyplot_file FL_EXPORT void fl_add_xyplot_text(FL_OBJECT *ob, double x, double y, const char *text, int al, FL_COLOR col){}; diff --git a/doc/Doxyfile b/doc/Doxyfile index 39c7983e72..fbf6889660 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1892,7 +1892,6 @@ INPUT = \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/RRC/LTE/rrc_eNB_S1AP.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_emtc.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_config.c \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_mme.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_paramdef_mce.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/L1_paramdef.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/ENB_APP/enb_app.h \ diff --git a/executables/lte-ue.c b/executables/lte-ue.c index 834df4a8a2..970fdc537f 100644 --- a/executables/lte-ue.c +++ b/executables/lte-ue.c @@ -60,7 +60,6 @@ #include "T.h" #define FRAME_PERIOD 100000000ULL -#define DAQ_PERIOD 66667ULL #define FIFO_PRIORITY 40 #define NB_THREAD_INST 1 typedef enum { diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c index 8b07bea297..5dd2a352de 100644 --- a/nfapi/oai_integration/nfapi_pnf.c +++ b/nfapi/oai_integration/nfapi_pnf.c @@ -72,7 +72,6 @@ #include #endif -#define NUM_P5_PHY 2 #define _GNU_SOURCE diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h index d146408abf..722ec5f807 100644 --- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h +++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h @@ -121,7 +121,6 @@ typedef struct { #define NFAPI_NR_P7_SET_MSS(_more, _segm, _sequ) ( (((_more) & 0x1) << 15) | (((_segm) & 0x7F) << 8) | ((_sequ) & 0xFF) ) #define NFAPI_P7_SET_MSS(_more, _segm, _sequ) ( (((_more) & 0x1) << 7) | (((_segm) & 0x7F) << 4) | ((_sequ) & 0xF) ) -#define NFAPI_TAG_LENGTH_PACKED_LEN 4 // Convenience methods to convert between SFN/SLOT formats #define NFAPI_SLOTNUM(_mu) (10 << (_mu)) @@ -563,7 +562,6 @@ typedef struct { uint16_t number_of_phys; nfapi_pnf_phy_rel15_info_t phy[NFAPI_MAX_PNF_PHY]; } nfapi_pnf_phy_rel15_t; -#define NFAPI_PNF_PHY_REL15_TAG 0x100H typedef struct { @@ -3053,7 +3051,6 @@ typedef struct { #define NFAPI_LTE_RSSI_REQUEST_TAG 0x3000 -#define NFAPI_P4_START_TAG NFAPI_LTE_RSSI_REQUEST_TAG typedef struct { nfapi_tl_t tl; diff --git a/openair1/PHY/CODING/TESTBENCH/ldpctest.c b/openair1/PHY/CODING/TESTBENCH/ldpctest.c index 4dddaf7e7e..b9ee66389f 100644 --- a/openair1/PHY/CODING/TESTBENCH/ldpctest.c +++ b/openair1/PHY/CODING/TESTBENCH/ldpctest.c @@ -42,7 +42,6 @@ #endif #define NR_LDPC_PROFILER_DETAIL -#define NR_LDPC_ENABLE_PARITY_CHECK ldpc_interface_t ldpc_orig, ldpc_toCompare; // 4-bit quantizer diff --git a/openair1/PHY/CODING/coding_defs.h b/openair1/PHY/CODING/coding_defs.h index d6e1b780f7..e5eb61e0bd 100644 --- a/openair1/PHY/CODING/coding_defs.h +++ b/openair1/PHY/CODING/coding_defs.h @@ -38,7 +38,6 @@ #define MAX_TURBO_ITERATIONS_MBSFN 8 #define MAX_TURBO_ITERATIONS max_turbo_iterations -#define MAX_LDPC_ITERATIONS_MBSFN 4 #define LTE_NULL 2 typedef struct { diff --git a/openair1/PHY/CODING/defs_NB_IoT.h b/openair1/PHY/CODING/defs_NB_IoT.h index d33ae1c440..2a8bbccd7d 100644 --- a/openair1/PHY/CODING/defs_NB_IoT.h +++ b/openair1/PHY/CODING/defs_NB_IoT.h @@ -30,15 +30,9 @@ #include // for uint8/16/32_t -#define CRC24_A_NB_IoT 0 -#define CRC24_B_NB_IoT 1 -#define CRC16_NB_IoT 2 -#define CRC8_NB_IoT 3 //#define MAX_TURBO_ITERATIONS_MBSFN 8 // no MBSFN -#define MAX_TURBO_ITERATIONS_NB_IoT 4 -#define LTE_NULL_NB_IoT 2 // defined also in PHY/LTE_TRANSPORT/defs_NB_IoT.h /** \fn uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w) \brief This is the subblock interleaving algorithm for convolutionally coded blocks from 36-212 (Release 13.4, 2017). diff --git a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h index 43bf68f48d..b04b991249 100644 --- a/openair1/PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h +++ b/openair1/PHY/CODING/nrLDPC_decoder/nrLDPCdecoder_defs.h @@ -40,7 +40,6 @@ /** Number of columns in BG1 */ #define NR_LDPC_NCOL_BG1 68 /** Number of rows in BG1 */ -#define NR_LDPC_NROW_BG1 46 /** Number of edges/entries in BG1 */ #define NR_LDPC_NUM_EDGE_BG1 316 /** Number of check node (CN) groups in BG1 @@ -67,9 +66,7 @@ /** Number of columns in BG2 */ #define NR_LDPC_NCOL_BG2 52 /** Number of rows in BG2 */ -#define NR_LDPC_NROW_BG2 42 /** Number of edges/entries in BG2 */ -#define NR_LDPC_NUM_EDGE_BG2 197 /** Number of check node (CN) groups in BG2 A CN group is defined by its number of connected bit nodes. */ #define NR_LDPC_NUM_CN_GROUPS_BG2 6 diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_pucch_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_pucch_defs.h index 2b1fa8c6a7..6f5ae86752 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_pucch_defs.h +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_pucch_defs.h @@ -5,7 +5,6 @@ #ifndef __NR_POLAR_PUCCH_DEFS__H__ #define __NR_POLAR_PUCCH_DEFS__H__ -#define NR_POLAR_PUCCH_PAYLOAD_BITS 16 // Ref. 38-212 v15.0.1 #define NR_POLAR_PUCCH_N_MAX 10 // uint8_t <------ @@ -16,7 +15,6 @@ // Ref. 38-212 v15.0.1, Section 7.1.5: Rate Matching #define NR_POLAR_PUCCH_I_BIL 0 // uint8_t -#define NR_POLAR_PUCCH_E 864 // uint16_t /* * TEST CODE diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h b/openair1/PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h index d08862bb13..5a9def2d04 100644 --- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h +++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_uci_defs.h @@ -35,23 +35,13 @@ #define NR_POLAR_UCI_PUCCH_MESSAGE_TYPE 2 // int8_t #define NR_POLAR_PUCCH_CRC_ERROR_CORRECTION_BITS 3 -#define NR_POLAR_PUCCH_PAYLOAD_BITS 32 -#define NR_POLAR_PUCCH_E 32 // Ref. 38-212, Section 6.3.1.2.1 -#define NR_POLAR_PUCCH_CRC_PARITY_BITS_SHORT 6 -#define NR_POLAR_PUCCH_CRC_PARITY_BITS_LONG 11 -#define NR_POLAR_PUCCH_I_SEG_LONG 1 -#define NR_POLAR_PUCCH_I_SEG_SHORT 0 // Ref. 38-212, Section 6.3.1.3.1 #define NR_POLAR_PUCCH_N_MAX 10 #define NR_POLAR_PUCCH_I_IL 0 -#define NR_POLAR_PUCCH_N_PC_SHORT 3 -#define NR_POLAR_PUCCH_N_PC_LONG 0 -#define NR_POLAR_PUCCH_N_PC_WM_LONG 0 -#define NR_POLAR_PUCCH_N_PC_WM_SHORT 1 // Ref. 38-212, Section 6.3.1.4.1 #define NR_POLAR_PUCCH_I_BIL 1 diff --git a/openair1/PHY/CODING/nrSmallBlock/nr_small_block_defs.h b/openair1/PHY/CODING/nrSmallBlock/nr_small_block_defs.h index 7c8554f807..02df3f8dc9 100644 --- a/openair1/PHY/CODING/nrSmallBlock/nr_small_block_defs.h +++ b/openair1/PHY/CODING/nrSmallBlock/nr_small_block_defs.h @@ -41,7 +41,6 @@ #define NR_SMALL_BLOCK_CODED_BITS 32 -#define L1d_CLS 64 uint32_t encodeSmallBlock(int in, int len); diff --git a/openair1/PHY/LTE_REFSIG/mod_table.h b/openair1/PHY/LTE_REFSIG/mod_table.h index 29ae9f4495..755bb06006 100644 --- a/openair1/PHY/LTE_REFSIG/mod_table.h +++ b/openair1/PHY/LTE_REFSIG/mod_table.h @@ -24,9 +24,6 @@ #define MOD_TABLE_SIZE_SHORT 304 #define MOD_TABLE_QPSK_OFFSET 1 -#define MOD_TABLE_16QAM_OFFSET 5 -#define MOD_TABLE_64QAM_OFFSET 21 -#define MOD_TABLE_PSS_OFFSET 85 short mod_table[MOD_TABLE_SIZE_SHORT] = {0,0,768,768,768,-768,-768,768,-768,-768,343,343,343,1030,1030,343,1030,1030,343,-343,343,-1030,1030,-343,1030,-1030,-343,343,-343,1030,-1030,343,-1030,1030,-343,-343,-343,-1030,-1030,-343,-1030,-1030,503,503,503,168,168,503,168,168,503,838,503,1173,168,838,168,1173,838,503,838,168,1173,503,1173,168,838,838,838,1173,1173,838,1173,1173,503,-503,503,-168,168,-503,168,-168,503,-838,503,-1173,168,-838,168,-1173,838,-503,838,-168,1173,-503,1173,-168,838,-838,838,-1173,1173,-838,1173,-1173,-503,503,-503,168,-168,503,-168,168,-503,838,-503,1173,-168,838,-168,1173,-838,503,-838,168,-1173,503,-1173,168,-838,838,-838,1173,-1173,838,-1173,1173,-503,-503,-503,-168,-168,-503,-168,-168,-503,-838,-503,-1173,-168,-838,-168,-1173,-838,-503,-838,-168,-1173,-503,-1173,-168,-838,-838,-838,-1173,-1173,-838,-1173,-1173,1086,0,1081,-108,1065,-215,1038,-320,1001,-422,954,-519,897,-612,832,-698,758,-777,677,-849,589,-912,495,-966,397,-1011,294,-1046,189,-1070,81,-1083,-27,-1086,-135,-1078,-242,-1059,-346,-1030,-447,-990,-543,-941,-634,-882,-719,-814,-796,-739,-866,-656,-927,-566,-979,-471,-1021,-371,-1053,-268,-1074,-162,-1085,-54,-1085,54,-1074,162,-1053,268,-1021,371,-979,471,-927,566,-866,656,-796,739,-719,814,-634,882,-543,941,-447,990,-346,1030,-242,1059,-135,1078,-27,1086,81,1083,189,1070,294,1045,397,1011,495,966,589,912,677,849,758,777,832,698,897,612,954,519,1001,422,1038,320,1065,215,1081,108,16384,0,8192,0,4096,0,2048,0}; #endif diff --git a/openair1/PHY/LTE_TRANSPORT/dci.h b/openair1/PHY/LTE_TRANSPORT/dci.h index cd76f20919..e15eaa4a96 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci.h +++ b/openair1/PHY/LTE_TRANSPORT/dci.h @@ -699,7 +699,6 @@ struct DCI1A_RA_5MHz_TDD_1_6 { } __attribute__ ((__packed__)); typedef struct DCI1A_RA_5MHz_TDD_1_6 DCI1A_RA_5MHz_TDD_1_6_t; -#define sizeof_DCI1A_RA_5MHz_TDD_1_6_t 27 /// DCI Format Type 1A (5 MHz, TDD, frame 0, 27 bits) /* @@ -717,7 +716,6 @@ struct DCI1A_5MHz_TDD_0 { } __attribute__ ((__packed__)); typedef struct DCI1A_5MHz_TDD_0 DCI1A_5MHz_TDD_0_t; -#define sizeof_DCI1A_5MHz_TDD_0_t 27 */ /// DCI Format Type 1B (5 MHz, FDD, 2 Antenna Ports, 27 bits) @@ -745,7 +743,6 @@ struct DCI1B_5MHz_2A_FDD { } __attribute__ ((__packed__)); typedef struct DCI1B_5MHz_2A_FDD DCI1B_5MHz_2A_FDD_t; -#define sizeof_DCI1B_5MHz_FDD_t 27 /// DCI Format Type 1B (5 MHz, TDD, 2 Antenna Ports, 29 bits) struct DCI1B_5MHz_2A_TDD { @@ -772,7 +769,6 @@ struct DCI1B_5MHz_2A_TDD { } __attribute__ ((__packed__)); typedef struct DCI1B_5MHz_2A_TDD DCI1B_5MHz_2A_TDD_t; -#define sizeof_DCI1B_5MHz_2A_TDD_t 29 /// DCI Format Type 1B (5 MHz, FDD, 4 Antenna Ports, 28 bits) struct DCI1B_5MHz_4A_FDD { @@ -797,7 +793,6 @@ struct DCI1B_5MHz_4A_FDD { } __attribute__ ((__packed__)); typedef struct DCI1B_5MHz_4A_FDD DCI1B_5MHz_4A_FDD_t; -#define sizeof_DCI1B_5MHz_4A_FDD_t 28 /// DCI Format Type 1B (5 MHz, TDD, 4 Antenna Ports, 31 bits) struct DCI1B_5MHz_4A_TDD { @@ -824,7 +819,6 @@ struct DCI1B_5MHz_4A_TDD { } __attribute__ ((__packed__)); typedef struct DCI1B_5MHz_4A_TDD DCI1B_5MHz_4A_TDD_t; -#define sizeof_DCI1B_5MHz_4A_TDD_t 31 /// DCI Format Type 1C (1.4 MHz, 8 bits) struct DCI1C_1_5MHz @@ -876,7 +870,6 @@ struct DCI1C_15MHz } __attribute__ ((__packed__)); typedef struct DCI1C_15MHz DCI1C_15MHz_t; -#define sizeof_DCI1C_15MHz_t X /// DCI Format Type 1C (20 MHz, 15 bits) struct DCI1C_20MHz @@ -919,7 +912,6 @@ struct DCI1D_5MHz_2A_FDD { } __attribute__ ((__packed__)); typedef struct DCI1D_5MHz_2A_FDD DCI1D_5MHz_2A_FDD_t; -#define sizeof_DCI1D_5MHz_2A_FDD_t 27 /// DCI Format Type 1D (5 MHz, TDD, 2 Antenna Ports, 30 bits) struct DCI1D_5MHz_2A_TDD { @@ -948,7 +940,6 @@ struct DCI1D_5MHz_2A_TDD { } __attribute__ ((__packed__)); typedef struct DCI1D_5MHz_2A_TDD DCI1D_5MHz_2A_TDD_t; -#define sizeof_DCI1D_5MHz_2A_TDD_t 30 /// DCI Format Type 1D (5 MHz, FDD, 4 Antenna Ports, 29 bits) struct DCI1D_5MHz_4A_FDD { @@ -975,7 +966,6 @@ struct DCI1D_5MHz_4A_FDD { } __attribute__ ((__packed__)); typedef struct DCI1D_5MHz_4A_FDD DCI1D_5MHz_4A_FDD_t; -#define sizeof_DCI1D_5MHz_4A_FDD_t 29 /// DCI Format Type 1D (5 MHz, TDD, 4 Antenna Ports, 33 bits) struct DCI1D_5MHz_4A_TDD { @@ -1006,7 +996,6 @@ struct DCI1D_5MHz_4A_TDD { } __attribute__ ((__packed__)); typedef struct DCI1D_5MHz_4A_TDD DCI1D_5MHz_4A_TDD_t; -#define sizeof_DCI1D_5MHz_4A_TDD_t 33 ///******************NEW DCI Format for MU-MIMO****************/////////// @@ -2121,7 +2110,6 @@ struct DCI2B_1_5MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2B_1_5MHz_TDD DCI2B_1_5MHz_TDD_t; -#define sizeof_DCI2B_1_5MHz_TDD_t 33 /// DCI Format Type 2B (5 MHz, TDD, 39 bits) struct DCI2B_5MHz_TDD { @@ -2156,7 +2144,6 @@ struct DCI2B_5MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2B_5MHz_TDD DCI2B_5MHz_TDD_t; -#define sizeof_DCI2B_5MHz_TDD_t 39 /// DCI Format Type 2B (10 MHz, TDD, 43 bits) struct DCI2B_10MHz_TDD { @@ -2191,7 +2178,6 @@ struct DCI2B_10MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2B_10MHz_TDD DCI2B_10MHz_TDD_t; -#define sizeof_DCI2B_10MHz_TDD_t 43 /// DCI Format Type 2B (20 MHz, TDD, 51 bits) struct DCI2B_20MHz_TDD { @@ -2226,7 +2212,6 @@ struct DCI2B_20MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2B_20MHz_TDD DCI2B_20MHz_TDD_t; -#define sizeof_DCI2B_20MHz_TDD_t 51 /// DCI Format Type 2B (1.5 MHz, FDD, 28 bits) struct DCI2B_1_5MHz_FDD { @@ -2255,7 +2240,6 @@ struct DCI2B_1_5MHz_FDD { } __attribute__ ((__packed__)); typedef struct DCI2B_1_5MHz_FDD DCI2B_1_5MHz_FDD_t; -#define sizeof_DCI2B_1_5MHz_FDD_t 28 /// DCI Format Type 2B (5 MHz, FDD, 36 bits) struct DCI2B_5MHz_FDD { @@ -2285,7 +2269,6 @@ struct DCI2B_5MHz_FDD { uint64_t rah:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2B_5MHz_FDD_t 36 typedef struct DCI2B_5MHz_FDD DCI2B_5MHz_FDD_t; /// DCI Format Type 2B (10 MHz, FDD, 41 bits) @@ -2318,7 +2301,6 @@ struct DCI2B_10MHz_FDD { uint64_t padding0:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2B_10MHz_FDD_t 41 typedef struct DCI2B_10MHz_FDD DCI2B_10MHz_FDD_t; /// DCI Format Type 2B (20 MHz, FDD, 48 bits) @@ -2349,7 +2331,6 @@ struct DCI2B_20MHz_FDD { uint64_t rah:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2B_20MHz_FDD_t 48 typedef struct DCI2B_20MHz_FDD DCI2B_20MHz_FDD_t; // ******************************************************************* @@ -2386,7 +2367,6 @@ struct DCI2C_1_5MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2C_1_5MHz_TDD DCI2C_1_5MHz_TDD_t; -#define sizeof_DCI2C_1_5MHz_TDD_t 34 /// DCI Format Type 2C (5 MHz, TDD, 41 bits) struct DCI2C_5MHz_TDD { @@ -2421,7 +2401,6 @@ struct DCI2C_5MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2C_5MHz_TDD DCI2C_5MHz_TDD_t; -#define sizeof_DCI2C_5MHz_TDD_t 41 /// DCI Format Type 2C (10 MHz, TDD, 45 bits) struct DCI2C_10MHz_TDD { @@ -2456,7 +2435,6 @@ struct DCI2C_10MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2C_10MHz_TDD DCI2C_10MHz_TDD_t; -#define sizeof_DCI2C_10MHz_TDD_t 45 /// DCI Format Type 2C (20 MHz, TDD, 53 bits) struct DCI2C_20MHz_TDD { @@ -2491,7 +2469,6 @@ struct DCI2C_20MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2C_20MHz_TDD DCI2C_20MHz_TDD_t; -#define sizeof_DCI2C_20MHz_TDD_t 53 /// DCI Format Type 2C (1.5 MHz, FDD, 30 bits) struct DCI2C_1_5MHz_FDD { @@ -2520,7 +2497,6 @@ struct DCI2C_1_5MHz_FDD { } __attribute__ ((__packed__)); typedef struct DCI2C_1_5MHz_FDD DCI2C_1_5MHz_FDD_t; -#define sizeof_DCI2C_1_5MHz_FDD_t 30 /// DCI Format Type 2C (5 MHz, FDD, 38 bits) struct DCI2C_5MHz_FDD { @@ -2550,7 +2526,6 @@ struct DCI2C_5MHz_FDD { uint64_t rah:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2C_5MHz_FDD_t 38 typedef struct DCI2C_5MHz_FDD DCI2C_5MHz_FDD_t; /// DCI Format Type 2C (10 MHz, FDD, 42 bits) @@ -2581,7 +2556,6 @@ struct DCI2C_10MHz_FDD { uint64_t rah:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2C_10MHz_FDD_t 43 typedef struct DCI2C_10MHz_FDD DCI2C_10MHz_FDD_t; /// DCI Format Type 2C (20 MHz, FDD, 50 bits) @@ -2612,7 +2586,6 @@ struct DCI2C_20MHz_FDD { uint64_t rah:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2C_20MHz_FDD_t 50 typedef struct DCI2C_20MHz_FDD DCI2C_20MHz_FDD_t; // ******************************************************************* @@ -2651,7 +2624,6 @@ struct DCI2D_1_5MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2D_1_5MHz_TDD DCI2D_1_5MHz_TDD_t; -#define sizeof_DCI2D_1_5MHz_TDD_t 36 /// DCI Format Type 2D (5 MHz, TDD, 43 bits) struct DCI2D_5MHz_TDD { @@ -2688,7 +2660,6 @@ struct DCI2D_5MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2D_5MHz_TDD DCI2D_5MHz_TDD_t; -#define sizeof_DCI2D_5MHz_TDD_t 43 /// DCI Format Type 2D (10 MHz, TDD, 47 bits) struct DCI2D_10MHz_TDD { @@ -2725,7 +2696,6 @@ struct DCI2D_10MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2D_10MHz_TDD DCI2D_10MHz_TDD_t; -#define sizeof_DCI2D_10MHz_TDD_t 47 /// DCI Format Type 2D (20 MHz, TDD, 55 bits) struct DCI2D_20MHz_TDD { @@ -2762,7 +2732,6 @@ struct DCI2D_20MHz_TDD { } __attribute__ ((__packed__)); typedef struct DCI2D_20MHz_TDD DCI2D_20MHz_TDD_t; -#define sizeof_DCI2D_20MHz_TDD_t 55 /// DCI Format Type 2D (1.5 MHz, FDD, 33 bits) struct DCI2D_1_5MHz_FDD { @@ -2795,7 +2764,6 @@ struct DCI2D_1_5MHz_FDD { } __attribute__ ((__packed__)); typedef struct DCI2D_1_5MHz_FDD DCI2D_1_5MHz_FDD_t; -#define sizeof_DCI2D_1_5MHz_FDD_t 33 /// DCI Format Type 2D (5 MHz, FDD, 41 bits) struct DCI2D_5MHz_FDD { @@ -2829,7 +2797,6 @@ struct DCI2D_5MHz_FDD { uint64_t padding0:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2D_5MHz_FDD_t 41 typedef struct DCI2D_5MHz_FDD DCI2D_5MHz_FDD_t; /// DCI Format Type 2D (10 MHz, FDD, 45 bits) @@ -2864,7 +2831,6 @@ struct DCI2D_10MHz_FDD { uint64_t padding0:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2D_10MHz_FDD_t 45 typedef struct DCI2D_10MHz_FDD DCI2D_10MHz_FDD_t; /// DCI Format Type 2D (20 MHz, FDD, 52 bits) @@ -2895,7 +2861,6 @@ struct DCI2D_20MHz_FDD { uint64_t rah:1; } __attribute__ ((__packed__)); -#define sizeof_DCI2D_20MHz_FDD_t 52 typedef struct DCI2D_20MHz_FDD DCI2D_20MHz_FDD_t; @@ -2904,14 +2869,12 @@ typedef struct __attribute__ ((__packed__)) uint32_t TPC:28; } DCI3_5MHz_TDD_0_t; -#define sizeof_DCI3_5MHz_TDD_0_t 27 typedef struct __attribute__ ((__packed__)) { uint32_t TPC:28; } DCI3_5MHz_TDD_1_6_t; -#define sizeof_DCI3_5MHz_TDD_1_6_t 27 typedef struct __attribute__ ((__packed__)) @@ -2919,7 +2882,6 @@ typedef struct __attribute__ ((__packed__)) uint32_t TPC:26; } DCI3_5MHz_FDD_t; -#define sizeof_DCI3_5MHz_FDD_t 25 /// DCI Format Type 0 (1.5 MHz,9 bits) struct DCI0A_1_5MHz { @@ -2932,7 +2894,6 @@ struct DCI0A_1_5MHz { /// Hopping flag uint32_t hopping:1; } __attribute__ ((__packed__)); -#define sizeof_DCI0A_1_5MHz 9 /// DCI Format Type 0 (5 MHz,13 bits) struct DCI0A_5MHz { @@ -2945,7 +2906,6 @@ struct DCI0A_5MHz { /// Hopping flag uint32_t hopping:1; } __attribute__ ((__packed__)); -#define sizeof_DCI0A_5MHz 13 /// DCI Format Type 0 (10 MHz,15 bits) struct DCI0A_10_MHz { @@ -2958,7 +2918,6 @@ struct DCI0A_10_MHz { /// Hopping flag uint32_t hopping:1; } __attribute__ ((__packed__)); -#define sizeof_DCI0A_10MHz 15 /// DCI Format Type 0 (20 MHz,17 bits) struct DCI0A_20_MHz { @@ -2971,7 +2930,6 @@ struct DCI0A_20_MHz { /// Hopping flag uint32_t hopping:1; } __attribute__ ((__packed__)); -#define sizeof_DCI0A_20MHz 17 #define MAX_DCI_SIZE_BITS 45 diff --git a/openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h b/openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h index 512316f565..d21af4d850 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h +++ b/openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h @@ -203,7 +203,6 @@ typedef union DCI_CONTENT { } __attribute__ ((__packed__)); typedef struct DCIN0 DCIN0_t; -#define sizeof_DCIN0_t 23 struct DCIN1_RAR{ // DCI subframe repetition Number, 2 bits @@ -227,7 +226,6 @@ struct DCIN1_RAR{ } __attribute__ ((__packed__)); typedef struct DCIN1_RAR DCIN1_RAR_t; -#define sizeof_DCIN1_RAR_t 23 struct DCIN1{ // DCI subframe repetition Number, 2 bits @@ -251,7 +249,6 @@ struct DCIN1{ } __attribute__ ((__packed__)); typedef struct DCIN1 DCIN1_t; -#define sizeof_DCIN1_t 23 // DCI Format Type N2 for direct indication, 15 bits struct DCIN2_Ind{ @@ -264,7 +261,6 @@ struct DCIN2_Ind{ } __attribute__ ((__packed__));; typedef struct DCIN2_Ind DCIN2_Ind_t; -#define sizeof_DCIN2_Ind_t 15 // DCI Format Type N2 for Paging, 15 bits struct DCIN2_Pag{ @@ -282,8 +278,6 @@ struct DCIN2_Pag{ typedef struct DCIN2_Pag DCIN2_Pag_t; -#define sizeof_DCIN2_Pag_t 15 -#define MAX_DCI_SIZE_BITS_NB_IoT 23 #endif diff --git a/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h b/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h index 44eac0ff0c..9b8624498e 100644 --- a/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h +++ b/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h @@ -29,14 +29,10 @@ //#include "dci_nb_iot.h" //#define MOD_TABLE_QPSK_OFFSET 1 -//#define MOD_TABLE_16QAM_OFFSET 5 -//#define MOD_TABLE_64QAM_OFFSET 21 -//#define MOD_TABLE_PSS_OFFSET 85 // //// structures below implement 36-211 and 36-212 // //#define NSOFT 1827072 -#define LTE_NULL_NB_IoT 2 // //// maximum of 3 segments before each coding block if data length exceeds 6144 bits. // diff --git a/openair1/PHY/LTE_TRANSPORT/mdci.h b/openair1/PHY/LTE_TRANSPORT/mdci.h index 3cb6380625..81bb73a024 100644 --- a/openair1/PHY/LTE_TRANSPORT/mdci.h +++ b/openair1/PHY/LTE_TRANSPORT/mdci.h @@ -267,7 +267,6 @@ struct DCI6_0B_5MHz { } __attribute__ ((__packed__)); typedef struct DCI6_0B_5MHz DCI6_0B_5MHz_t; -#define sizeof_DCI6_0B_5MHz_t 17 /// basic DCI Format Type 6-1B (5 MHz) struct DCI6_1B_5MHz { @@ -315,7 +314,6 @@ struct DCI6_0B_10MHz { } __attribute__ ((__packed__)); typedef struct DCI6_0B_10MHz DCI6_0B_10MHz_t; -#define sizeof_DCI6_0B_10MHz_t 18 /// basic DCI Format Type 6-1B (10 MHz) struct DCI6_1B_10MHz { @@ -363,7 +361,6 @@ struct DCI6_0B_20MHz { } __attribute__ ((__packed__)); typedef struct DCI6_0B_20MHz DCI6_0B_20MHz_t; -#define sizeof_DCI6_0B_20MHz_t 18 /// basic DCI Format Type 6-1B (10 MHz) struct DCI6_1B_20MHz { diff --git a/openair1/PHY/LTE_TRANSPORT/pucch_extern.h b/openair1/PHY/LTE_TRANSPORT/pucch_extern.h index 048c608627..15a726d84e 100644 --- a/openair1/PHY/LTE_TRANSPORT/pucch_extern.h +++ b/openair1/PHY/LTE_TRANSPORT/pucch_extern.h @@ -36,12 +36,10 @@ #include /* PUCCH format3 >> */ -#define D_IQDATA 2 #define D_NSLT1SF 2 #define D_NSYM1SLT 7 #define D_NSYM1SF 2*7 #define D_NSC1RB 12 -#define D_NRB1PUCCH 2 #define D_NPUCCH_SF5 5 #define D_NPUCCH_SF4 4 diff --git a/openair1/PHY/LTE_TRANSPORT/transport_common.h b/openair1/PHY/LTE_TRANSPORT/transport_common.h index bc90d44e1e..108ab7db06 100644 --- a/openair1/PHY/LTE_TRANSPORT/transport_common.h +++ b/openair1/PHY/LTE_TRANSPORT/transport_common.h @@ -40,9 +40,6 @@ //#endif #define MOD_TABLE_QPSK_OFFSET 1 -#define MOD_TABLE_16QAM_OFFSET 5 -#define MOD_TABLE_64QAM_OFFSET 21 -#define MOD_TABLE_PSS_OFFSET 85 // structures below implement 36-211 and 36-212 @@ -72,7 +69,6 @@ #define PMI_2A_1j 2 #define PMI_2A_1mj 3 //2 layers -#define PMI_2A_R1_10 0 #define PMI_2A_R1_11 1 #define PMI_2A_R1_1j 2 diff --git a/openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h b/openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h index c16be6a308..6f508e09ac 100644 --- a/openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h +++ b/openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h @@ -45,7 +45,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } wideband_cqi_rank1_2A_1_5MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank1_2A_1_5MHz_NB_IoT 16 typedef struct __attribute__((packed)) { @@ -55,7 +54,6 @@ typedef struct __attribute__((packed)) uint16_t cqi1:4; } wideband_cqi_rank2_2A_1_5MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank2_2A_1_5MHz_NB_IoT 14 typedef struct __attribute__((packed)) { @@ -64,7 +62,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_nopmi_1_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_nopmi_1_5MHz_NB_IoT 16 typedef struct __attribute__((packed)) { @@ -74,7 +71,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_1_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank1_2A_1_5MHz_NB_IoT 18 typedef struct __attribute__((packed)) { @@ -86,7 +82,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_1_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank2_2A_1_5MHz_NB_IoT 33 typedef struct __attribute__((packed)) { @@ -95,7 +90,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_1_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_modes123_1_5MHz_NB_IoT 16 typedef struct __attribute__((packed)) { @@ -104,7 +98,6 @@ typedef struct __attribute__((packed)) uint32_t mcs:5; } HLC_subband_cqi_mcs_CBA_1_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_mcs_CBA_1_5MHz_NB_IoT 21 // **********************************************5 MHz*************************************************************************** @@ -115,7 +108,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } wideband_cqi_rank1_2A_5MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank1_2A_5MHz_NB_IoT 18 typedef struct __attribute__((packed)) { @@ -125,7 +117,6 @@ typedef struct __attribute__((packed)) uint16_t cqi1:4; } wideband_cqi_rank2_2A_5MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank2_2A_5MHz_NB_IoT 15 typedef struct __attribute__((packed)) { @@ -134,7 +125,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_nopmi_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_nopmi_5MHz_NB_IoT 18 typedef struct __attribute__((packed)) { @@ -144,7 +134,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank1_2A_5MHz_NB_IoT 20 typedef struct __attribute__((packed)) { @@ -156,7 +145,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank2_2A_5MHz_NB_IoT 37 typedef struct __attribute__((packed)) { @@ -165,7 +153,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_modes123_5MHz_NB_IoT 18 typedef struct __attribute__((packed)) { @@ -174,7 +161,6 @@ typedef struct __attribute__((packed)) uint32_t mcs:5; } HLC_subband_cqi_mcs_CBA_5MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_mcs_CBA_5MHz_NB_IoT 21 // **********************************************10 MHz*************************************************************************** typedef struct __attribute__((packed)) @@ -184,7 +170,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } wideband_cqi_rank1_2A_10MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank1_2A_10MHz_NB_IoT 22 typedef struct __attribute__((packed)) { @@ -194,7 +179,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } wideband_cqi_rank2_2A_10MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank2_2A_10MHz_NB_IoT 17 typedef struct __attribute__((packed)) { @@ -203,7 +187,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_nopmi_10MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_nopmi_10MHz_NB_IoT 22 typedef struct __attribute__((packed)) { @@ -213,7 +196,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_10MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank1_2A_10MHz_NB_IoT 24 typedef struct __attribute__((packed)) { @@ -225,7 +207,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_10MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank2_2A_10MHz_NB_IoT 45 typedef struct __attribute__((packed)) { @@ -234,7 +215,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_10MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_modes123_10MHz_NB_IoT 22 typedef struct __attribute__((packed)) { @@ -243,7 +223,6 @@ typedef struct __attribute__((packed)) uint32_t mcs:5; } HLC_subband_cqi_mcs_CBA_10MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_mcs_CBA_10MHz_NB_IoT 21 // **********************************************20 MHz*************************************************************************** typedef struct __attribute__((packed)) @@ -253,7 +232,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } wideband_cqi_rank1_2A_20MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank1_2A_20MHz_NB_IoT 20 typedef struct __attribute__((packed)) { @@ -263,7 +241,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } wideband_cqi_rank2_2A_20MHz_NB_IoT ; -#define sizeof_wideband_cqi_rank2_2A_20MHz_NB_IoT 21 typedef struct __attribute__((packed)) { @@ -272,7 +249,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_nopmi_20MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_nopmi_20MHz_NB_IoT 30 typedef struct __attribute__((packed)) { @@ -282,7 +258,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_20MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank1_2A_20MHz_NB_IoT 32 typedef struct __attribute__((packed)) { @@ -294,7 +269,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_20MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_rank2_2A_20MHz_NB_IoT 61 typedef struct __attribute__((packed)) { @@ -303,7 +277,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_20MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_modes123_20MHz_NB_IoT 30 typedef struct __attribute__((packed)) { @@ -313,7 +286,6 @@ typedef struct __attribute__((packed)) } HLC_subband_cqi_mcs_CBA_20MHz_NB_IoT; -#define sizeof_HLC_subband_cqi_mcs_CBA_20MHz_NB_IoT 21 #define MAX_CQI_PAYLOAD_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT)*8*20) #define MAX_CQI_BITS_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT)*8) diff --git a/openair1/PHY/LTE_TRANSPORT/uci_common.h b/openair1/PHY/LTE_TRANSPORT/uci_common.h index 78555d4928..b2d13fb1d2 100644 --- a/openair1/PHY/LTE_TRANSPORT/uci_common.h +++ b/openair1/PHY/LTE_TRANSPORT/uci_common.h @@ -74,7 +74,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_1_5MHz; -#define sizeof_HLC_subband_cqi_rank1_2A_1_5MHz 18 typedef struct __attribute__((packed)) { @@ -86,7 +85,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_1_5MHz; -#define sizeof_HLC_subband_cqi_rank2_2A_1_5MHz 33 typedef struct __attribute__((packed)) { @@ -95,7 +93,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_1_5MHz; -#define sizeof_HLC_subband_cqi_modes123_1_5MHz 16 typedef struct __attribute__((packed)) { @@ -144,7 +141,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_5MHz; -#define sizeof_HLC_subband_cqi_rank1_2A_5MHz 20 typedef struct __attribute__((packed)) { @@ -156,7 +152,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_5MHz; -#define sizeof_HLC_subband_cqi_rank2_2A_5MHz 37 typedef struct __attribute__((packed)) { @@ -165,7 +160,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_5MHz; -#define sizeof_HLC_subband_cqi_modes123_5MHz 18 typedef struct __attribute__((packed)) { @@ -213,7 +207,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_10MHz; -#define sizeof_HLC_subband_cqi_rank1_2A_10MHz 24 typedef struct __attribute__((packed)) { @@ -225,7 +218,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_10MHz; -#define sizeof_HLC_subband_cqi_rank2_2A_10MHz 45 typedef struct __attribute__((packed)) { @@ -234,7 +226,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_10MHz; -#define sizeof_HLC_subband_cqi_modes123_10MHz 22 typedef struct __attribute__((packed)) { @@ -282,7 +273,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_rank1_2A_20MHz; -#define sizeof_HLC_subband_cqi_rank1_2A_20MHz 32 typedef struct __attribute__((packed)) { @@ -294,7 +284,6 @@ typedef struct __attribute__((packed)) uint64_t cqi1:4; } HLC_subband_cqi_rank2_2A_20MHz; -#define sizeof_HLC_subband_cqi_rank2_2A_20MHz 61 typedef struct __attribute__((packed)) { @@ -303,7 +292,6 @@ typedef struct __attribute__((packed)) uint32_t cqi1:4; } HLC_subband_cqi_modes123_20MHz; -#define sizeof_HLC_subband_cqi_modes123_20MHz 30 typedef struct __attribute__((packed)) { diff --git a/openair1/PHY/NR_REFSIG/dmrs_nr.c b/openair1/PHY/NR_REFSIG/dmrs_nr.c index 7dba224cdb..acf25e38c9 100644 --- a/openair1/PHY/NR_REFSIG/dmrs_nr.c +++ b/openair1/PHY/NR_REFSIG/dmrs_nr.c @@ -293,7 +293,6 @@ uint16_t get_dmrs_freq_idx_ul(uint16_t n, uint8_t k_prime, uint8_t delta, uint8_ * *********************************************************************/ -#define CHECK_DMRS_PBCH_SEQUENCE /* return the position of next dmrs symbol in a slot */ int8_t get_next_dmrs_symbol_in_slot(uint16_t ul_dmrs_symb_pos, uint8_t counter, uint8_t end_symbol) diff --git a/openair1/PHY/NR_REFSIG/nr_mod_table.h b/openair1/PHY/NR_REFSIG/nr_mod_table.h index 81969d9a40..3ad317ed0d 100644 --- a/openair1/PHY/NR_REFSIG/nr_mod_table.h +++ b/openair1/PHY/NR_REFSIG/nr_mod_table.h @@ -23,10 +23,6 @@ #define __PHY_NR_REFSIG_NR_MOD_TABLE__H__ #define NR_MOD_TABLE_SIZE_SHORT 686 -#define NR_MOD_TABLE_BPSK_OFFSET 1 -#define NR_MOD_TABLE_QAM16_OFFSET 7 -#define NR_MOD_TABLE_QAM64_OFFSET 23 -#define NR_MOD_TABLE_QAM256_OFFSET 87 extern c16_t nr_qpsk_mod_table[4]; extern simde__m128i nr_qpsk_byte_mod_table[256]; diff --git a/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h b/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h index 04fc884acc..ec8a6f590b 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h +++ b/openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h @@ -36,8 +36,6 @@ #include "PHY/defs_nr_common.h" #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h" -#define NR_PDSCH_DMRS_ANTENNA_PORT0 1000 -#define NR_PDSCH_DMRS_NB_ANTENNA_PORTS 12 void get_antenna_ports(uint8_t *ap, uint8_t n_symbs, uint8_t config); void get_Wt(int *Wt, const int ap, const nfapi_nr_dmrs_type_e config); diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c index 316a16c459..aa0da63558 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c +++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c @@ -15,7 +15,6 @@ #include #include "PHY/log_tools.h" -#define INVALID_VALUE 255 #if T_TRACER static void copy_c16_data_to_slot_memory(c16_t *src, c16_t *dst_slot, int nb_re_pusch, int symbol) diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h index 4804f41b21..9c414238d1 100644 --- a/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h +++ b/openair1/PHY/NR_UE_ESTIMATION/nr_estimation.h @@ -122,7 +122,7 @@ void nr_ue_ssb_rsrp_measurements(PHY_VARS_NR_UE *ue, typedef struct { UE_nr_rxtx_proc_t proc; PHY_VARS_NR_UE *ue; - c16_t *rxdata[NB_RX_ANTENNAS_MAX]; + c16_t *rxdata[NB_ANTENNAS_RX]; uint32_t rxdata_size; c16_t rxdata_ant[]; } nr_meas_task_args_t; diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c index 822389ebdc..cd233bca26 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c +++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c @@ -65,8 +65,6 @@ #endif #define NR_NBR_CORESET_ACT_BWP 3 // The number of CoreSets per BWP is limited to 3 (including initial CORESET: ControlResourceId 0) -#define NR_NBR_SEARCHSPACE_ACT_BWP \ - 10 // The number of SearSpaces per BWP is limited to 10 (including initial SEARCHSPACE: SearchSpaceId 0) #define RE_PER_RB 12 // after removing the 3 DMRS RE, the RB contains 9 RE with PDCCH diff --git a/openair1/PHY/TOOLS/dfts_load.c b/openair1/PHY/TOOLS/dfts_load.c index 2e4ddb595f..d2dcf316aa 100644 --- a/openair1/PHY/TOOLS/dfts_load.c +++ b/openair1/PHY/TOOLS/dfts_load.c @@ -35,7 +35,6 @@ #include #include "assertions.h" #include "common/utils/LOG/log.h" -#define OAIDFTS_LOADER #include "tools_defs.h" #include "common/config/config_userapi.h" #include "common/utils/load_module_shlib.h" diff --git a/openair1/PHY/defs_L1_NB_IoT.h b/openair1/PHY/defs_L1_NB_IoT.h index 97f243fae8..c9470a0f85 100644 --- a/openair1/PHY/defs_L1_NB_IoT.h +++ b/openair1/PHY/defs_L1_NB_IoT.h @@ -59,8 +59,6 @@ #define malloc16(x) memalign(32,x) #endif #define free16(y,x) free(y) -#define bigmalloc malloc -#define bigmalloc16 malloc16 #define openair_free(y,x) free((y)) #define PAGE_SIZE 4096 @@ -86,7 +84,6 @@ static inline void* malloc16_clear( size_t size ) */ -// #define PAGE_MASK 0xfffff000 // #define virt_to_phys(x) (x) // #define openair_sched_exit() exit(-1) diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h index dbb07a9bbb..04d99108a1 100644 --- a/openair1/PHY/defs_common.h +++ b/openair1/PHY/defs_common.h @@ -75,7 +75,6 @@ #define RX_NB_TH_MAX 2 #define RX_NB_TH 2 -#define RX_NB_TH_DL 14 #define LTE_SLOTS_PER_SUBFRAME 2 @@ -96,7 +95,6 @@ #define MAX_MBSFN_AREA 8 -#define NB_RX_ANTENNAS_MAX 64 #define TC_NSEC_x32768 16667 @@ -936,13 +934,11 @@ typedef enum {SF_DL, SF_UL, SF_S} lte_subframe_t; #define MAX_FRAME_NUMBER 0x400 -#define NUMBER_OF_RN_MAX 3 typedef enum {no_relay=1,unicast_relay_type1,unicast_relay_type2, multicast_relay} relaying_type_t; #define MCS_COUNT 29 -#define MCS_TABLE_LENGTH_MAX 64 #define NUM_DCI_MAX 32 diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h index e96927fe21..806fe7ed0c 100644 --- a/openair1/PHY/defs_nr_UE.h +++ b/openair1/PHY/defs_nr_UE.h @@ -69,12 +69,9 @@ #define malloc16(x) memalign(32,x) #endif #define free16(y,x) free(y) -#define bigmalloc malloc -#define bigmalloc16 malloc16 #define openair_free(y,x) free((y)) #define PAGE_SIZE 4096 -#define PAGE_MASK 0xfffff000 #define virt_to_phys(x) (x) #define openair_sched_exit() exit(-1) @@ -266,7 +263,6 @@ typedef struct { #define NR_PDCCH_DEFS_NR_UE #define NR_NBR_CORESET_ACT_BWP 3 // The number of CoreSets per BWP is limited to 3 (including initial CORESET: ControlResourceId 0) -#define NR_NBR_SEARCHSPACE_ACT_BWP 10 // The number of SearchSpaces per BWP is limited to 10 (including initial SEARCHSPACE: SearchSpaceId 0) #ifdef NR_PDCCH_DEFS_NR_UE #define MAX_NR_DCI_DECODED_SLOT 10 // This value is not specified @@ -288,8 +284,6 @@ typedef struct { fapi_nr_dl_config_dci_dl_pdu_rel15_t pdcch_config[FAPI_NR_MAX_SS]; } NR_UE_PDCCH_CONFIG; -#define NR_PSBCH_MAX_NB_CARRIERS 132 -#define NR_PSBCH_MAX_NB_MOD_SYMBOLS 99 #define NR_PSBCH_DMRS_LENGTH 297 // in mod symbols #define NR_PSBCH_DMRS_LENGTH_DWORD 20 // ceil(2(QPSK)*NR_PBCH_DMRS_LENGTH/32) diff --git a/openair1/PHY/defs_nr_common.h b/openair1/PHY/defs_nr_common.h index b9948eaf92..3cb17aa16a 100644 --- a/openair1/PHY/defs_nr_common.h +++ b/openair1/PHY/defs_nr_common.h @@ -46,23 +46,16 @@ #define NR_SYMBOLS_PER_SLOT NR_NUMBER_OF_SYMBOLS_PER_SLOT #define ONE_OVER_SQRT2_Q15 23170 -#define ONE_OVER_TWO_Q15 16384 #define NR_MOD_TABLE_SIZE_SHORT 686 -#define NR_MOD_TABLE_BPSK_OFFSET 1 -#define NR_MOD_TABLE_QAM16_OFFSET 7 -#define NR_MOD_TABLE_QAM64_OFFSET 23 -#define NR_MOD_TABLE_QAM256_OFFSET 87 #define NR_PSS_LENGTH 127 #define NR_SSS_LENGTH 127 #define NR_MAX_PRS_LENGTH 3264 //272*6(max allocation per RB)*2(QPSK) #define NR_MAX_PRS_INIT_LENGTH_DWORD 102 // ceil(NR_MAX_CSI_RS_LENGTH/32) -#define NR_MAX_NUM_PRS_SYMB 12 #define NR_MAX_PRS_COMB_SIZE 12 #define NR_MAX_PRS_RESOURCES_PER_SET 64 -#define NR_MAX_PRS_MUTING_PATTERN_LENGTH 32 #define NR_PBCH_DMRS_LENGTH 144 // in mod symbols #define NR_PBCH_DMRS_LENGTH_DWORD 10 // ceil(2(QPSK)*NR_PBCH_DMRS_LENGTH/32) @@ -70,7 +63,6 @@ /*used for the resource mapping*/ #define NR_MAX_PDCCH_DMRS_LENGTH 576 // 16(L)*2(QPSK)*3(3 DMRS symbs per REG)*6(REG per CCE) #define NR_MAX_PDCCH_SIZE 8192 // It seems it is the max polar coded block size -#define NR_MAX_DCI_PAYLOAD_SIZE 64 #define NR_MAX_DCI_SIZE 1728 //16(L)*2(QPSK)*9(12 RE per REG - 3(DMRS))*6(REG per CCE) #define NR_MAX_DCI_SIZE_DWORD 54 // ceil(NR_MAX_DCI_SIZE/32) @@ -87,7 +79,6 @@ #define MAX_NUM_NR_SRS_SYMBOLS 4 #define MAX_NUM_NR_SRS_AP 4 -#define NR_NB_NSCID 2 #define MAX_DELAY_COMP 20 diff --git a/openair1/PHY/defs_nr_sl_UE.h b/openair1/PHY/defs_nr_sl_UE.h index 4fec84f550..e082223434 100644 --- a/openair1/PHY/defs_nr_sl_UE.h +++ b/openair1/PHY/defs_nr_sl_UE.h @@ -46,7 +46,6 @@ // 11 RBs for PSBCH in one symbol * 12 REs #define SL_NR_NUM_PSBCH_RE_IN_ONE_SYMBOL 132 // 3 DMRS REs per RB * 11 RBS in one symbol -#define SL_NR_NUM_PSBCH_DMRS_RE_IN_ONE_SYMBOL 33 // 9 PSBCH DATA REs * 11 RBS in one symbol #define SL_NR_NUM_PSBCH_DATA_RE_IN_ONE_SYMBOL 99 #define SL_NR_NUM_PSBCH_RBS_IN_ONE_SYMBOL 11 @@ -54,7 +53,6 @@ // 11 * (12-3 DMRS REs) * 9 symbols for PSBCH #define SL_NR_NUM_PSBCH_MODULATED_SYMBOLS 891 #define SL_NR_NUM_PSBCH_DATA_RE_IN_ONE_RB 9 -#define SL_NR_NUM_PSBCH_DMRS_RE_IN_ONE_RB 3 // 11 * (12-3 DMRS REs) * 9 symbols for PSBCH #define SL_NR_NUM_PSBCH_DATA_RE_IN_ALL_SYMBOLS 891 @@ -63,7 +61,6 @@ #define SL_NR_NUM_PSS_SYMBOLS 2 #define SL_NR_NUM_SSS_SYMBOLS 2 #define SL_NR_PSS_START_SYMBOL 1 -#define SL_NR_SSS_START_SYMBOL 3 #define SL_NR_NUM_PSS_OR_SSS_SYMBOLS 2 #define SL_NR_PSS_SEQUENCE_LENGTH 127 #define SL_NR_SSS_SEQUENCE_LENGTH 127 diff --git a/openair1/PHY/impl_defs_lte_NB_IoT.h b/openair1/PHY/impl_defs_lte_NB_IoT.h index b9e5965452..d70c577c72 100644 --- a/openair1/PHY/impl_defs_lte_NB_IoT.h +++ b/openair1/PHY/impl_defs_lte_NB_IoT.h @@ -489,10 +489,6 @@ typedef struct { uint16_t dl_GapDurationCoeff; } DL_GapConfig_NB_IoT; -#define NBIOT_INBAND_LTEPCI 0 -#define NBIOT_INBAND_IOTPCI 1 -#define NBIOT_INGUARD 2 -#define NBIOT_STANDALONE 3 typedef struct { diff --git a/openair1/PHY/impl_defs_nr.h b/openair1/PHY/impl_defs_nr.h index 9db686d664..41a38291c6 100644 --- a/openair1/PHY/impl_defs_nr.h +++ b/openair1/PHY/impl_defs_nr.h @@ -325,9 +325,6 @@ typedef struct { * ************************************************************************/ -#define MAX_NR_RATE_MATCH_PATTERNS 4 -#define MAX_NR_ZP_CSI_RS_RESOURCES 32 -#define MAX_NR_OF_DL_ALLOCATIONS 16 #define MAX_NR_OF_UL_ALLOCATIONS (16) typedef enum { diff --git a/openair1/PHY/impl_defs_top.h b/openair1/PHY/impl_defs_top.h index 178549e5cc..a59244a14b 100644 --- a/openair1/PHY/impl_defs_top.h +++ b/openair1/PHY/impl_defs_top.h @@ -128,10 +128,6 @@ #define EXTENSION_TYPE (PHY_config->PHY_framing.Extension_type) -#define NUMBER_OF_OFDM_CARRIERS_BYTES NUMBER_OF_OFDM_CARRIERS*4 -//#define NUMBER_OF_USEFUL_CARRIERS_BYTES NUMBER_OF_USEFUL_CARRIERS*4 -#define HALF_NUMBER_OF_USER_CARRIERS_BYTES NUMBER_OF_USEFUL_CARRIERS/2 - #define CYCLIC_PREFIX_LENGTH (frame_parms->nb_prefix_samples) #define CYCLIC_PREFIX_LENGTH_SAMPLES (CYCLIC_PREFIX_LENGTH*2) #define CYCLIC_PREFIX_LENGTH_BYTES (CYCLIC_PREFIX_LENGTH*4) @@ -191,8 +187,6 @@ #define MIN_RF_GAIN 80 #define PHY_SYNCH_OFFSET ((OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES)-1) // OFFSET of BEACON SYNCH -#define PHY_SYNCH_MIN_POWER 1000 -#define PHY_SYNCH_THRESHOLD 100 @@ -224,30 +218,6 @@ ///Third Amplitude for QAM256 (\f$ 2^{15} \times 2/\sqrt{170}\f$) #define QAM256_n3 5026 -/// First Amplitude for QAM16 for TM5 (\f$ 2^{15} \times 2/sqrt(20)\f$) -#define QAM16_TM5_n1 14654 -/// Second Amplitude for QAM16 for TM5 Receiver (\f$ 2^{15} \times 1/\sqrt{20}\f$) -#define QAM16_TM5_n2 7327 - -///First Amplitude for QAM64 (\f$ 2^{15} \times 4/\sqrt{84}\f$) -#define QAM64_TM5_n1 14301 -///Second Amplitude for QAM64 (\f$ 2^{15} \times 2/\sqrt{84}\f$) -#define QAM64_TM5_n2 7150 -///Third Amplitude for QAM64 for TM5 Receiver (\f$ 2^{15} \times 1/\sqrt{84}\f$) -#define QAM64_TM5_n3 3575 - - -#ifdef BIT8_RXMUX -#define PERROR_SHIFT 0 -#else -#define PERROR_SHIFT 10 -#endif - -#define BIT8_TX_SHIFT 2 -#define BIT8_TX_SHIFT_DB 12 - -//#define CHBCH_RSSI_MIN -75 - #ifdef BIT8_TX #define AMP_SHIFT 7 #else @@ -259,14 +229,6 @@ #define AMP_OVER_SQRT2 ((AMP*ONE_OVER_SQRT2_Q15)>>15) #define AMP_OVER_2 (AMP>>1) -/// Threshold for PUCCH Format 1 detection -#define PUCCH1_THRES 0 -/// Threshold for PUCCH Format 1a/1b detection -#define PUCCH1a_THRES 4 - -//#if defined(UPGRADE_RAT_NR) -#if 1 - #define NB_NUMEROLOGIES_NR (5) #define NR_MAX_SLOTS_PER_FRAME (160) /* number of slots per frame */ @@ -277,7 +239,6 @@ #define NR_MAX_ULSCH_HARQ_PROCESSES (NR_MAX_HARQ_PROCESSES) /* cf 38.214 6.1 UE procedure for receiving the physical uplink shared channel */ #define NR_MAX_DLSCH_HARQ_PROCESSES (NR_MAX_HARQ_PROCESSES) /* cf 38.214 5.1 UE procedure for receiving the physical downlink shared channel */ -#endif /// Data structure for transmission. typedef struct { diff --git a/openair1/PHY/impl_defs_top_NB_IoT.h b/openair1/PHY/impl_defs_top_NB_IoT.h index 8b3360c087..a6409839a4 100644 --- a/openair1/PHY/impl_defs_top_NB_IoT.h +++ b/openair1/PHY/impl_defs_top_NB_IoT.h @@ -34,7 +34,6 @@ #define __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__ #include "common/openairinterface5g_limits.h" -#define ONE_OVER_SQRT2_Q15_NB_IoT 23170 #define NUMBER_OF_SUBBANDS_MAX_NB_IoT 13 typedef enum {no_relay_NB_IoT=1,unicast_relay_type1_NB_IoT,unicast_relay_type2_NB_IoT, multicast_relay_NB_IoT} relaying_type_t_NB_IoT; diff --git a/openair1/SCHED/sched_eNB.h b/openair1/SCHED/sched_eNB.h index 50c6dc2efa..408dfeb520 100644 --- a/openair1/SCHED/sched_eNB.h +++ b/openair1/SCHED/sched_eNB.h @@ -38,10 +38,6 @@ enum THREAD_INDEX { OPENAIR_THREAD_INDEX = 0, openair_SCHED_NB_THREADS }; // do not modify this line - -#define OPENAIR_THREAD_PRIORITY 255 - - #define OPENAIR_THREAD_STACK_SIZE PTHREAD_STACK_MIN //4096 //RTL_PTHREAD_STACK_MIN*6 //#define DLC_THREAD_STACK_SIZE 4096 //DLC stack size //#define UE_SLOT_PARALLELISATION @@ -77,10 +73,6 @@ enum openair_HARQ_TYPE { openair_harq_RA }; -#define DAQ_AGC_ON 1 -#define DAQ_AGC_OFF 0 - - /** @addtogroup _PHY_PROCEDURES_ * @{ */ diff --git a/openair1/SCHED_NR_UE/defs.h b/openair1/SCHED_NR_UE/defs.h index 3ba5226542..5fe6e0c1bb 100644 --- a/openair1/SCHED_NR_UE/defs.h +++ b/openair1/SCHED_NR_UE/defs.h @@ -38,10 +38,6 @@ openair_SCHED_NB_THREADS };*/ // do not modify this line - -#define OPENAIR_THREAD_PRIORITY 255 - - #define OPENAIR_THREAD_STACK_SIZE PTHREAD_STACK_MIN //4096 //RTL_PTHREAD_STACK_MIN*6 //#define DLC_THREAD_STACK_SIZE 4096 //DLC stack size //#define UE_SLOT_PARALLELISATION @@ -78,9 +74,6 @@ openair_harq_RA };*/ -#define DAQ_AGC_ON 1 -#define DAQ_AGC_OFF 0 - /** @addtogroup _PHY_PROCEDURES_ * @{ */ diff --git a/openair2/COMMON/e1ap_messages_types.h b/openair2/COMMON/e1ap_messages_types.h index 6906d54704..711c126dab 100644 --- a/openair2/COMMON/e1ap_messages_types.h +++ b/openair2/COMMON/e1ap_messages_types.h @@ -33,7 +33,6 @@ /* Definitions according to 3GPP TS 38.463 */ #define E1AP_MAX_NUM_TRANSAC_IDS 4 #define E1AP_MAX_NUM_PLMNS 4 -#define E1AP_MAX_NUM_SLICES 1024 #define E1AP_MAX_NUM_CELL_GROUPS 4 #define E1AP_MAX_NUM_QOS_FLOWS 64 #define E1AP_MAX_NUM_PDU_SESSIONS 4 diff --git a/openair2/COMMON/f1ap_messages_types.h b/openair2/COMMON/f1ap_messages_types.h index a92f14ca50..15bb1ba4a1 100644 --- a/openair2/COMMON/f1ap_messages_types.h +++ b/openair2/COMMON/f1ap_messages_types.h @@ -74,7 +74,6 @@ */ #define F1AP_TRANSPORT_LAYER_ADDRESS_SIZE (160 / 8) -#define F1AP_MAX_NB_CU_IP_ADDRESS 10 // Note this should be 512 from maxval in 38.473 #define F1AP_MAX_NB_CELLS 2 @@ -82,7 +81,6 @@ #define F1AP_MAX_NO_OF_TNL_ASSOCIATIONS 32 #define F1AP_MAX_NO_UE_ID 1024 -#define F1AP_MAX_NO_OF_INDIVIDUAL_CONNECTIONS_TO_RESET 65536 /* 9.3.1.42 of 3GPP TS 38.473 - gNB-CU System Information */ #define F1AP_MAX_NO_SIB_TYPES 32 diff --git a/openair2/COMMON/mac_rrc_primitives.h b/openair2/COMMON/mac_rrc_primitives.h index d65b31b145..3ec4959a4c 100644 --- a/openair2/COMMON/mac_rrc_primitives.h +++ b/openair2/COMMON/mac_rrc_primitives.h @@ -83,11 +83,6 @@ result could be based on an event-driven measurement report. #define NUMBER_OF_MEASUREMENT_SUBBANDS 16 -#define RRC_RACH_ASS_REQ 0 -#define MAC_RACH_BW_REQ 1 - - - /*! MAC/PHY Measurement Structure*/ /*! \brief Logical Channel ID structure */ typedef struct { @@ -325,20 +320,11 @@ typedef struct { //RRC_INTERFACE_FUNCTIONS } RRC_XFACE; //#define IDLE 0 -#define NEED_RADIO_CONFIG 3 #define RADIO_CONFIG_TX 2 #define RADIO_CONFIG_OK 1 -#define MEAS_CONFIGURED 4 -#define MEAS_OK 5 -#define MEAS_TRIGGER 6 -#define RRC_MEAS_REPORT_REQ 7 #define MEAS_REPORT 8 -#define RAB_MEAS_IND 0 -#define DEF_MEAS_IND 1 -#define ADD_LC 0 -#define REMOVE_LC 1 #endif diff --git a/openair2/COMMON/networkDef.h b/openair2/COMMON/networkDef.h index 89f8d5fc44..14e629b3bc 100644 --- a/openair2/COMMON/networkDef.h +++ b/openair2/COMMON/networkDef.h @@ -228,9 +228,6 @@ typedef struct { */ typedef struct { unsigned char id; /* Packet filter identifier */ -#define NET_PACKET_FILTER_DOWNLINK 0x01 -#define NET_PACKET_FILTER_UPLINK 0x02 -#define NET_PACKET_FILTER_BIDIR 0x03 unsigned char dir; /* Packet filter direction */ unsigned char precedence; /* Evaluation precedence */ union { diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h index 0aad7b8598..b7c6c281ec 100644 --- a/openair2/COMMON/ngap_messages_types.h +++ b/openair2/COMMON/ngap_messages_types.h @@ -88,7 +88,6 @@ #define NGAP_TRANSPORT_LAYER_ADDRESS_SIZE (160 / 8) #define NGAP_MAX_NB_AMF_IP_ADDRESS 10 -#define NGAP_IMSI_LENGTH 16 #define NGAP_MAX_NO_TAI_PAGING 16 // 9.2.4.1 3GPP TS 38.413 diff --git a/openair2/COMMON/ral_messages_types.h b/openair2/COMMON/ral_messages_types.h index 9858d420ca..9a8e9e6160 100644 --- a/openair2/COMMON/ral_messages_types.h +++ b/openair2/COMMON/ral_messages_types.h @@ -86,23 +86,7 @@ typedef MIH_C_CONFIG_STATUS_T ral_config_status_t; typedef MIH_C_TH_ACTION_T ral_th_action_t; typedef MIH_C_LINK_ACTION_T ral_link_action_t; - -#define RAL_STATUS_SUCCESS MIH_C_STATUS_SUCCESS -#define RAL_STATUS_UNSPECIFIED_FAILURE MIH_C_STATUS_UNSPECIFIED_FAILURE -#define RAL_STATUS_REJECTED MIH_C_STATUS_REJECTED -#define RAL_STATUS_AUTHORIZATION_FAILURE MIH_C_STATUS_AUTHORIZATION_FAILURE -#define RAL_STATUS_NETWORK_ERROR MIH_C_STATUS_NETWORK_ERROR - - -#define RAL_3GPP_ADDR_LENGTH MIH_C_3GPP_ADDR_LENGTH -#define RAL_3GPP2_ADDR_LENGTH MIH_C_3GPP2_ADDR_LENGTH -#define RAL_OTHER_L2_ADDR_LENGTH MIH_C_OTHER_L2_ADDR_LENGTH -#define RAL_LINK_SCAN_RSP_LENGTH MIH_C_LINK_SCAN_RSP_LENGTH -#define RAL_THRESHOLD_LIST_LENGTH MIH_C_THRESHOLD_LIST_LENGTH #define RAL_LINK_ADDR_LIST_LENGTH MIH_C_LINK_ADDR_LIST_LENGTH -#define RAL_QOS_LIST_LENGTH MIH_C_QOS_LIST_LENGTH -#define RAL_LINK_STATUS_REQ_LIST_LENGTH MIH_C_LINK_STATUS_REQ_LIST_LENGTH -#define RAL_LINK_CFG_PARAM_LIST_LENGTH MIH_C_LINK_CFG_PARAM_LIST_LENGTH typedef struct ral_network_id_s { u_int16_t length; @@ -206,12 +190,6 @@ typedef struct rrc_ral_connection_reconfiguration_ho_ind_s { //unsigned int cell_id:28; } rrc_ral_connection_reconfiguration_ho_ind_t; - - - -#define RAL_ABOVE_THRESHOLD MIH_C_ABOVE_THRESHOLD -#define RAL_BELOW_THRESHOLD MIH_C_BELOW_THRESHOLD -#define RAL_NO_THRESHOLD 0xFF typedef struct ral_threshold_s { uint16_t threshold_val; uint8_t threshold_xdir; @@ -219,39 +197,17 @@ typedef struct ral_threshold_s { typedef MIH_C_LINK_PARAM_GEN_T ral_link_param_gen_t; -#define RAL_LINK_PARAM_GEN_DATA_RATE MIH_C_LINK_PARAM_GEN_DATA_RATE -#define RAL_LINK_PARAM_GEN_SIGNAL_STRENGTH MIH_C_LINK_PARAM_GEN_SIGNAL_STRENGTH -#define RAL_LINK_PARAM_GEN_SINR MIH_C_LINK_PARAM_GEN_SINR -#define RAL_LINK_PARAM_GEN_THROUGHPUT MIH_C_LINK_PARAM_GEN_THROUGHPUT #define RAL_LINK_PARAM_GEN_PACKET_ERROR_RATE MIH_C_LINK_PARAM_GEN_PACKET_ERROR_RATE #define RAL_LINK_PARAM_GEN_MAX RAL_LINK_PARAM_GEN_PACKET_ERROR_RATE typedef MIH_C_LINK_PARAM_QOS_T ral_link_param_qos_t; -#define RAL_LINK_PARAM_QOS_MAX_NUM_DIF_COS_SUPPORTED MIH_C_LINK_PARAM_QOS_MAX_NUM_DIF_COS_SUPPORTED -#define RAL_LINK_PARAM_QOS_MIN_PACKET_TRANSFER_DELAY_ALL_COS MIH_C_LINK_PARAM_QOS_MIN_PACKET_TRANSFER_DELAY_ALL_COS -#define RAL_LINK_PARAM_QOS_AVG_PACKET_TRANSFER_DELAY_ALL_COS MIH_C_LINK_PARAM_QOS_AVG_PACKET_TRANSFER_DELAY_ALL_COS -#define RAL_LINK_PARAM_QOS_MAX_PACKET_TRANSFER_DELAY_ALL_COS MIH_C_LINK_PARAM_QOS_MAX_PACKET_TRANSFER_DELAY_ALL_COS -#define RAL_LINK_PARAM_QOS_STD_DEVIATION_PACKET_TRANSFER_DELAY MIH_C_LINK_PARAM_QOS_STD_DEVIATION_PACKET_TRANSFER_DELAY #define RAL_LINK_PARAM_QOS_PACKET_LOSS_RATE_ALL_COS_FRAME_RATIO MIH_C_LINK_PARAM_QOS_PACKET_LOSS_RATE_ALL_COS_FRAME_RATIO -#define RAL_LINK_PARAM_QOS_MAX RAL_LINK_PARAM_QOS_PACKET_LOSS_RATE_ALL_COS_FRAME_RATIO typedef MIH_C_LINK_PARAM_LTE_T ral_link_param_lte_t; -#define RAL_LINK_PARAM_LTE_UE_RSRP MIH_C_LINK_PARAM_LTE_UE_RSRP -#define RAL_LINK_PARAM_LTE_UE_RSRQ MIH_C_LINK_PARAM_LTE_UE_RSRQ -#define RAL_LINK_PARAM_LTE_UE_CQI MIH_C_LINK_PARAM_LTE_UE_CQI -#define RAL_LINK_PARAM_LTE_AVAILABLE_BW MIH_C_LINK_PARAM_LTE_AVAILABLE_BW -#define RAL_LINK_PARAM_LTE_PACKET_DELAY MIH_C_LINK_PARAM_LTE_PACKET_DELAY -#define RAL_LINK_PARAM_LTE_PACKET_LOSS_RATE MIH_C_LINK_PARAM_LTE_PACKET_LOSS_RATE -#define RAL_LINK_PARAM_LTE_L2_BUFFER_STATUS MIH_C_LINK_PARAM_LTE_L2_BUFFER_STATUS -#define RAL_LINK_PARAM_LTE_MOBILE_NODE_CAPABILITIES MIH_C_LINK_PARAM_LTE_MOBILE_NODE_CAPABILITIES -#define RAL_LINK_PARAM_LTE_EMBMS_CAPABILITY MIH_C_LINK_PARAM_LTE_EMBMS_CAPABILITY -#define RAL_LINK_PARAM_LTE_JUMBO_FEASIBILITY MIH_C_LINK_PARAM_LTE_JUMBO_FEASIBILITY -#define RAL_LINK_PARAM_LTE_JUMBO_SETUP_STATUS MIH_C_LINK_PARAM_LTE_JUMBO_SETUP_STATUS #define RAL_LINK_PARAM_LTE_NUM_ACTIVE_EMBMS_RECEIVERS_PER_FLOW MIH_C_LINK_PARAM_LTE_NUM_ACTIVE_EMBMS_RECEIVERS_PER_FLOW #define RAL_LINK_PARAM_LTE_MAX RAL_LINK_PARAM_LTE_NUM_ACTIVE_EMBMS_RECEIVERS_PER_FLOW #define RAL_LINK_PARAM_TYPE_CHOICE_GEN MIH_C_LINK_PARAM_TYPE_CHOICE_GEN // 0 -#define RAL_LINK_PARAM_TYPE_CHOICE_QOS MIH_C_LINK_PARAM_TYPE_CHOICE_QOS #define RAL_LINK_PARAM_TYPE_CHOICE_LTE MIH_C_LINK_PARAM_TYPE_CHOICE_LTE // 12 typedef struct ral_link_param_type_s { @@ -277,12 +233,6 @@ typedef struct ral_qos_param_val_s { LIST(MIH_C_PK_LOSS_RATE, pk_loss_rate) } _union; } ral_qos_param_val_t; -#define RAL_QOS_PARAM_VAL_CHOICE_NUM_QOS_TYPES MIH_C_QOS_PARAM_VAL_CHOICE_NUM_QOS_TYPES -#define RAL_QOS_PARAM_VAL_CHOICE_MIN_PK_TX_DELAY MIH_C_QOS_PARAM_VAL_CHOICE_MIN_PK_TX_DELAY -#define RAL_QOS_PARAM_VAL_CHOICE_AVG_PK_TX_DELAY MIH_C_QOS_PARAM_VAL_CHOICE_AVG_PK_TX_DELAY -#define RAL_QOS_PARAM_VAL_CHOICE_MAX_PK_TX_DELAY MIH_C_QOS_PARAM_VAL_CHOICE_MAX_PK_TX_DELAY -#define RAL_QOS_PARAM_VAL_CHOICE_PK_DELAY_JITTER MIH_C_QOS_PARAM_VAL_CHOICE_PK_DELAY_JITTER -#define RAL_QOS_PARAM_VAL_CHOICE_PK_LOSS_RATE MIH_C_QOS_PARAM_VAL_CHOICE_PK_LOSS_RATE typedef struct ral_link_param_s { ral_link_param_type_t link_param_type; @@ -292,21 +242,14 @@ typedef struct ral_link_param_s { ral_qos_param_val_t qos_param_val; } _union; } ral_link_param_t; -#define RAL_LINK_PARAM_CHOICE_LINK_PARAM_VAL MIH_C_LINK_PARAM_CHOICE_LINK_PARAM_VAL -#define RAL_LINK_PARAM_CHOICE_QOS_PARAM_VAL MIH_C_LINK_PARAM_CHOICE_QOS_PARAM_VAL typedef struct ral_link_cfg_param_s { ral_link_param_type_t link_param_type; -#define RAL_LINK_CFG_PARAM_CHOICE_TIMER_NULL 0 -#define RAL_LINK_CFG_PARAM_CHOICE_TIMER 1 uint8_t union_choice; union { uint8_t null_attr; uint16_t timer_interval; // This timer value (ms) is used to set the interval between periodic reports. } _union; -#define RAL_TH_ACTION_SET_NORMAL_THRESHOLD MIH_C_SET_NORMAL_THRESHOLD -#define RAL_TH_ACTION_SET_ONE_SHOT_THRESHOLD MIH_C_SET_ONE_SHOT_THRESHOLD -#define RAL_TH_ACTION_CANCEL_THRESHOLD MIH_C_CANCEL_THRESHOLD ral_th_action_t th_action; // indicates what action to apply to the listed thresholds. // When “Cancel threshold” is selected and no thresholds are specified, then // all currently configured thresholds for the given LINK_PARAM_TYPE are can- diff --git a/openair2/COMMON/rtos_header.h b/openair2/COMMON/rtos_header.h deleted file mode 100644 index 05fc33463d..0000000000 --- a/openair2/COMMON/rtos_header.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The OpenAirInterface Software Alliance licenses this file to You under - * the OAI Public License, Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.openairinterface.org/?page_id=698 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *------------------------------------------------------------------------------- - * For more information about the OpenAirInterface (OAI) Software Alliance: - * contact@openairinterface.org - */ - -#ifndef _RTOS_HEADER_H_ -#define _RTOS_HEADER_H_ -#include -#include -#include -#include -#include -#include -#define rtf_get read -#define rtf_put write -#endif diff --git a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.c b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.c index 1a134d24da..742b450d9e 100644 --- a/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.c +++ b/openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc_subs.c @@ -26,7 +26,6 @@ #include #include -#define MAX_NUM_RIC_REQ_ID 64 static pthread_mutex_t rc_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/openair2/ENB_APP/RRC_paramsvalues.h b/openair2/ENB_APP/RRC_paramsvalues.h index 3aeee1417e..c577abcf58 100644 --- a/openair2/ENB_APP/RRC_paramsvalues.h +++ b/openair2/ENB_APP/RRC_paramsvalues.h @@ -35,7 +35,6 @@ #define ENB_CONFIG_STRING_ENB_LIST "eNBs" /* component carriers configuration section name */ #define ENB_CONFIG_STRING_COMPONENT_CARRIERS "component_carriers" -#define ENB_CONFIG_STRING_COMPONENT_BR_PARAMETERS "br_parameters" #define ENB_CONFIG_STRING_FRAME_TYPE "frame_type" @@ -43,7 +42,6 @@ #define ENB_CONFIG_STRING_TDD_CONFIG "tdd_config" #define ENB_CONFIG_STRING_TDD_CONFIG_S "tdd_config_s" #define ENB_CONFIG_STRING_PREFIX_TYPE "prefix_type" -#define ENB_CONFIG_STRING_PREFIX_TYPE_UL "prefix_type_UL" #define ENB_CONFIG_STRING_EUTRA_BAND "eutra_band" #define ENB_CONFIG_STRING_DOWNLINK_FREQUENCY "downlink_frequency" #define ENB_CONFIG_STRING_UPLINK_FREQUENCY_OFFSET "uplink_frequency_offset" @@ -51,24 +49,12 @@ #define ENB_CONFIG_STRING_N_RB_DL "N_RB_DL" #define ENB_CONFIG_STRING_CELL_MBSFN "Nid_cell_mbsfn" - -#define FRAMETYPE_OKVALUES {"FDD","TDD"} -#define FRAMETYPE_MODVALUES { FDD, TDD} - #define TDDCFG(A) TDD_Config__subframeAssignment_ ## A #define TDDCONFIG_OKRANGE { TDDCFG(sa0), TDDCFG(sa6)} #define TDDCFGS(A) TDD_Config__specialSubframePatterns_ ## A #define TDDCONFIGS_OKRANGE { TDDCFGS(ssp0), TDDCFGS(ssp8)} -#define PREFIX_OKVALUES {"NORMAL","EXTENDED"} -#define PREFIX_MODVALUES { NORMAL, EXTENDED} - -#define PREFIXUL_OKVALUES {"NORMAL","EXTENDED"} -#define PREFIXUL_MODVALUES { NORMAL, EXTENDED} - -#define NRBDL_OKVALUES {6,15,25,50,75,100} - #define UETIMER_T300_OKVALUES {100,200,300,400,600,1000,1500,2000} #define UETT300(A) LTE_UE_TimersAndConstants__t300_ ## A #define UETIMER_T300_MODVALUES { UETT300(ms100), UETT300(ms200),UETT300(ms300),UETT300(ms400),UETT300(ms600),UETT300(ms1000),UETT300(ms1500),UETT300(ms2000)} diff --git a/openair2/ENB_APP/enb_config.h b/openair2/ENB_APP/enb_config.h index dc182faf4b..14af6158dd 100644 --- a/openair2/ENB_APP/enb_config.h +++ b/openair2/ENB_APP/enb_config.h @@ -63,10 +63,6 @@ // Hard to find a defined value for max enb... #define MAX_ENB 16 -#define MAX_DU 4 -#define CU_BALANCING_ALL 127 -#define CU_BALANCING_ROUND_ROBIN 126 - typedef struct mme_ip_address_s { unsigned ipv4:1; unsigned ipv6:1; diff --git a/openair2/ENB_APP/enb_paramdef.h b/openair2/ENB_APP/enb_paramdef.h index 7be234262f..c6bb82c1ae 100644 --- a/openair2/ENB_APP/enb_paramdef.h +++ b/openair2/ENB_APP/enb_paramdef.h @@ -36,16 +36,6 @@ #include "RRC_paramsvalues.h" #include "s1ap_eNB_default_values.h" -#define ENB_CONFIG_STRING_CC_NODE_FUNCTION "node_function" -#define ENB_CONFIG_STRING_CC_NODE_TIMING "node_timing" -#define ENB_CONFIG_STRING_CC_NODE_SYNCH_REF "node_synch_ref" - -// OTG config per ENB-UE DL -#define ENB_CONF_STRING_OTG_CONFIG "otg_config" -#define ENB_CONF_STRING_OTG_UE_ID "ue_id" -#define ENB_CONF_STRING_OTG_APP_TYPE "app_type" -#define ENB_CONF_STRING_OTG_BG_TRAFFIC "bg_traffic" - #ifdef LIBCONFIG_LONG #define libconfig_int long #else @@ -62,11 +52,9 @@ typedef enum { } RC_config_functions_t; -#define CONFIG_STRING_ACTIVE_RUS "Active_RUs" /*------------------------------------------------------------------------------------------------------------------------------------------*/ /* RUs configuration section name */ #define CONFIG_STRING_RU_LIST "RUs" -#define CONFIG_STRING_RU_CONFIG "ru_config" /* RUs configuration parameters name */ #define CONFIG_STRING_RU_LOCAL_IF_NAME "local_if_name" @@ -86,7 +74,6 @@ typedef enum { #define CONFIG_STRING_RU_ATT_RX "att_rx" #define CONFIG_STRING_RU_MAX_RS_EPRE "max_pdschReferenceSignalPower" #define CONFIG_STRING_RU_MAX_RXGAIN "max_rxgain" -#define CONFIG_STRING_RU_IF_COMPRESSION "if_compression" #define CONFIG_STRING_RU_IS_SLAVE "is_slave" #define CONFIG_STRING_RU_NBIOTRRC_LIST "NbIoT_RRC_instances" #define CONFIG_STRING_RU_SDR_ADDRS "sdr_addrs" @@ -226,8 +213,6 @@ typedef enum { /*---------------------------------------------------------------------------------------------------------------------------------------*/ /* value definitions for ASN1 verbosity parameter */ #define ENB_CONFIG_STRING_ASN1_VERBOSITY_NONE "none" -#define ENB_CONFIG_STRING_ASN1_VERBOSITY_ANNOYING "annoying" -#define ENB_CONFIG_STRING_ASN1_VERBOSITY_INFO "info" /* global parameters, not under a specific section */ @@ -338,28 +323,6 @@ typedef enum { #define ENB_SCTP_REQ_COUNT_IDX 23 #define TRACKING_AREA_CODE_OKRANGE {0x0001,0xFFFD} -// clang-format off -#define ENBPARAMS_CHECK { \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s2 = { config_check_intrange, TRACKING_AREA_CODE_OKRANGE } },\ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - } -// clang-format on /*-------------------------------------------------------------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -401,7 +364,6 @@ typedef enum { #define ENB_CONFIG_STRING_MBMS_SYNC_AREA "mbms_sync_area" -#define ENB_MBMS_SYNC_AREA_IDX 0 // clang-format off #define MBMS_CONFIG_PARAMS_DESC { \ @@ -427,10 +389,6 @@ typedef enum { /* component carries configuration parameters name */ #define ENB_CONFIG_STRING_NB_ANT_PORTS "nb_antenna_ports" -#define ENB_CONFIG_STRING_NB_ANT_TX "nb_antennas_tx" -#define ENB_CONFIG_STRING_NB_ANT_RX "nb_antennas_rx" -#define ENB_CONFIG_STRING_TX_GAIN "tx_gain" -#define ENB_CONFIG_STRING_RX_GAIN "rx_gain" #define ENB_CONFIG_STRING_PRACH_ROOT "prach_root" #define ENB_CONFIG_STRING_PRACH_CONFIG_INDEX "prach_config_index" #define ENB_CONFIG_STRING_PRACH_HIGH_SPEED "prach_high_speed" @@ -453,7 +411,6 @@ typedef enum { #define ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL2 "pucch_NumRepetitionCE_Msg4_Level2_r13" #define ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL3 "pucch_NumRepetitionCE_Msg4_Level3_r13" -#define ENB_CONFIG_STRING_FREQ_HOPPING_PARAMETERS_R13 "sib2_freq_hoppingParameters_r13" #define ENB_CONFIG_STRING_PDSCH_RS_EPRE "pdsch_referenceSignalPower" #define ENB_CONFIG_STRING_PDSCH_PB "pdsch_p_b" @@ -521,12 +478,9 @@ typedef enum { #define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pdsch_maxNumRepetitionCEmodeA_r13" -#define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_B_R13 "pdsch_maxNumRepetitionCEmodeB_r13" #define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pusch_maxNumRepetitionCEmodeA_r13" -#define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_B_R13 "pusch_maxNumRepetitionCEmodeB_r13" #define ENB_CONFIG_STRING_PUSCH_REPETITION_LEVEL_CE_MODE_A_R13 "pusch_repetitionLevelCEmodeA_r13" -#define ENB_CONFIG_STRING_PUSCH_HOPPING_OFFSET_V1310 "pusch_HoppingOffset_v1310" //TTN - for D2D @@ -840,83 +794,6 @@ typedef struct ccparams_lte_s { // clang-format on -#define ENB_CONFIG_FRAME_TYPE_IDX 0 -#define ENB_CONFIG_TDD_CONFIG_IDX 1 -#define ENB_CONFIG_TDD_CONFIG_S_IDX 2 -#define ENB_CONFIG_PREFIX_TYPE_IDX 3 -#define ENB_CONFIG_PBCH_REPETITION_IDX 4 -#define ENB_CONFIG_EUTRA_BAND_IDX 5 -#define ENB_CONFIG_DOWNLINK_FREQUENCY_IDX 6 -#define ENB_CONFIG_UPLINK_FREQUENCY_OFFSET_IDX 7 -#define ENB_CONFIG_NID_CELL_IDX 8 -#define ENB_CONFIG_N_RB_DL_IDX 9 -#define ENB_CONFIG_CELL_MBSFN_IDX 10 -#define ENB_CONFIG_NB_ANT_PORTS_IDX 11 -#define ENB_CONFIG_PRACH_ROOT_IDX 12 -#define ENB_CONFIG_PRACH_CONFIG_INDEX_IDX 13 -#define ENB_CONFIG_PRACH_HIGH_SPEED_IDX 14 -#define ENB_CONFIG_PRACH_ZERO_CORRELATION_IDX 15 -#define ENB_CONFIG_PRACH_FREQ_OFFSET_IDX 16 -#define ENB_CONFIG_PUCCH_DELTA_SHIFT_IDX 17 -#define ENB_CONFIG_PUCCH_NRB_CQI_IDX 18 -#define ENB_CONFIG_PUCCH_NCS_AN_IDX 19 -#define ENB_CONFIG_PUCCH_N1_AN_IDX 20 -#define ENB_CONFIG_PDSCH_RS_EPRE_IDX 21 -#define ENB_CONFIG_PDSCH_PB_IDX 22 -#define ENB_CONFIG_PUSCH_N_SB_IDX 23 -#define ENB_CONFIG_PUSCH_HOPPINGMODE_IDX 24 -#define ENB_CONFIG_PUSCH_HOPPINGOFFSET_IDX 25 -#define ENB_CONFIG_PUSCH_ENABLE64QAM_IDX 26 -#define ENB_CONFIG_PUSCH_GROUP_HOPPING_EN_IDX 27 -#define ENB_CONFIG_PUSCH_GROUP_ASSIGNMENT_IDX 28 -#define ENB_CONFIG_PUSCH_SEQUENCE_HOPPING_EN_IDX 29 -#define ENB_CONFIG_PUSCH_NDMRS1_IDX 30 -#define ENB_CONFIG_PHICH_DURATION_IDX 31 -#define ENB_CONFIG_PHICH_RESOURCE_IDX 32 -#define ENB_CONFIG_SRS_ENABLE_IDX 33 -#define ENB_CONFIG_SRS_BANDWIDTH_CONFIG_IDX 34 -#define ENB_CONFIG_SRS_SUBFRAME_CONFIG_IDX 35 -#define ENB_CONFIG_SRS_ACKNACKST_CONFIG_IDX 36 -#define ENB_CONFIG_SRS_MAXUPPTS_IDX 37 -#define ENB_CONFIG_PUSCH_PO_NOMINAL_IDX 38 -#define ENB_CONFIG_PUSCH_ALPHA_IDX 39 -#define ENB_CONFIG_PUCCH_PO_NOMINAL_IDX 40 -#define ENB_CONFIG_MSG3_DELTA_PREAMBLE_IDX 41 -#define ENB_CONFIG_PUCCH_DELTAF_FORMAT1_IDX 42 -#define ENB_CONFIG_PUCCH_DELTAF_FORMAT1b_IDX 43 -#define ENB_CONFIG_PUCCH_DELTAF_FORMAT2_IDX 44 -#define ENB_CONFIG_PUCCH_DELTAF_FORMAT2A_IDX 45 -#define ENB_CONFIG_PUCCH_DELTAF_FORMAT2B_IDX 46 -#define ENB_CONFIG_RACH_NUM_RA_PREAMBLES_IDX 47 -#define ENB_CONFIG_RACH_PREAMBLESGROUPACONFIG_IDX 48 -#define ENB_CONFIG_RACH_SIZEOFRA_PREAMBLESGROUPA_IDX 49 -#define ENB_CONFIG_RACH_MESSAGESIZEGROUPA_IDX 50 -#define ENB_CONFIG_RACH_MESSAGEPOWEROFFSETGROUPB_IDX 51 -#define ENB_CONFIG_RACH_POWERRAMPINGSTEP_IDX 52 -#define ENB_CONFIG_RACH_PREAMBLEINITIALRECEIVEDTARGETPOWER_IDX 53 -#define ENB_CONFIG_RACH_PREAMBLETRANSMAX_IDX 54 -#define ENB_CONFIG_RACH_RARESPONSEWINDOWSIZE_IDX 55 -#define ENB_CONFIG_RACH_MACCONTENTIONRESOLUTIONTIMER_IDX 56 -#define ENB_CONFIG_RACH_MAXHARQMSG3TX_IDX 57 -#define ENB_CONFIG_PCCH_DEFAULT_PAGING_CYCLE_IDX 58 -#define ENB_CONFIG_PCCH_NB_IDX 59 -#define ENB_CONFIG_STRING_DRX_CONFIG_PRESENT_IDX 60 -#define ENB_CONFIG_STRING_DRX_ONDURATIONTIMER_IDX 61 -#define ENB_CONFIG_STRING_DRX_INACTIVITYTIMER_IDX 62 -#define ENB_CONFIG_STRING_DRX_RETRANSMISSIONTIMER_IDX 63 -#define ENB_CONFIG_STRING_DRX_LONGDRX_CYCLESTARTOFFSET_PRESENT_IDX 64 -#define ENB_CONFIG_STRING_DRX_LONGDRX_CYCLESTARTOFFSET_IDX 65 -#define ENB_CONFIG_STRING_DRX_SHORTDRX_CYCLE_IDX 66 -#define ENB_CONFIG_STRING_DRX_SHORTDRX_SHORTCYCLETIMER_IDX 67 -#define ENB_CONFIG_BCCH_MODIFICATIONPERIODCOEFF_IDX 68 -#define ENB_CONFIG_UETIMERS_T300_IDX 69 -#define ENB_CONFIG_UETIMERS_T301_IDX 70 -#define ENB_CONFIG_UETIMERS_T310_IDX 71 -#define ENB_CONFIG_UETIMERS_T311_IDX 72 -#define ENB_CONFIG_UETIMERS_N310_IDX 73 -#define ENB_CONFIG_UETIMERS_N311_IDX 74 -#define ENB_CONFIG_UE_TRANSMISSION_MODE_IDX 75 -#define ENB_CONFIG_MBMS_DEDICATED_SERVING_CELL_IDX 76 /*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ /* SRB1 configuration parameters section name */ @@ -1119,12 +996,10 @@ typedef struct srb1_params_s { /* L1 configuration section names */ #define CONFIG_STRING_L1_LIST "L1s" -#define CONFIG_STRING_L1_CONFIG "l1_config" /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /* MACRLC configuration section names */ #define CONFIG_STRING_MACRLC_LIST "MACRLCs" -#define CONFIG_STRING_MACRLC_CONFIG "macrlc_config" /* MACRLC configuration parameters names */ diff --git a/openair2/ENB_APP/enb_paramdef_emtc.h b/openair2/ENB_APP/enb_paramdef_emtc.h index 52f5b2a60f..b19ca2fadd 100644 --- a/openair2/ENB_APP/enb_paramdef_emtc.h +++ b/openair2/ENB_APP/enb_paramdef_emtc.h @@ -62,14 +62,9 @@ #define ENB_CONFIG_STRING_INTERVAL_DL_HOPPING_CONFIG_COMMON_MODE_B_R13_VAL "interval_DLHoppingConfigCommonModeB_r13_val" #define ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_OFFSET_R13 "mpdcch_pdsch_HoppingOffset_r13" #define ENB_CONFIG_STRING_PREAMBLE_TRANSMAX_CE_R13 "preamble_TransMax_ce_r13" -#define ENB_CONFIG_STRING_PREAMBLE_TRANSMAX_CE_R13_VAL "preamble_TransMax_ce_r13_val" #define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pdsch_maxNumRepetitionCEmodeA_r13" -#define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_B_R13 "pdsch_maxNumRepetitionCEmodeB_r13" #define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pusch_maxNumRepetitionCEmodeA_r13" -#define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_B_R13 "pusch_maxNumRepetitionCEmodeB_r13" #define ENB_CONFIG_STRING_PUSCH_REPETITION_LEVEL_CE_MODE_A_R13 "pusch_repetitionLevelCEmodeA_r13" -#define ENB_CONFIG_STRING_PUSCH_HOPPING_OFFSET_V1310 "pusch_HoppingOffset_v1310" -#define ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_LIST "system_info_value_tag_SI" #define ENB_CONFIG_STRING_FIRST_PREAMBLE_R13 "firstPreamble_r13" #define ENB_CONFIG_STRING_LAST_PREAMBLE_R13 "lastPreamble_r13" #define ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13 "ra_ResponseWindowSize_r13" diff --git a/openair2/ENB_APP/enb_paramdef_mce.h b/openair2/ENB_APP/enb_paramdef_mce.h index c93fb4097e..20a45ba464 100644 --- a/openair2/ENB_APP/enb_paramdef_mce.h +++ b/openair2/ENB_APP/enb_paramdef_mce.h @@ -54,16 +54,6 @@ #define MCE_MCE_ID_IDX 0 #define MCE_MCE_NAME_IDX 1 -#define MCE_ENABLE_MCE_M2_IDX 2 -#define MCE_ENABLE_MCE_M3_IDX 3 - -#define MCE_PARAMS_CHECK { \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ -} - #define MCE_CONFIG_STRING_NETWORK_INTERFACES_CONFIG "NETWORK_INTERFACES" diff --git a/openair2/ENB_APP/enb_paramdef_mme.h b/openair2/ENB_APP/enb_paramdef_mme.h index b1deee0e8e..42533c69d6 100644 --- a/openair2/ENB_APP/enb_paramdef_mme.h +++ b/openair2/ENB_APP/enb_paramdef_mme.h @@ -36,37 +36,8 @@ #include "common/config/config_paramdesc.h" #include "RRC_paramsvalues.h" - - -/* mme configuration parameters names */ - -#define MME_CONFIG_STRING_MME_ID "MME_ID" -#define MME_CONFIG_STRING_MME_NAME "MME_name" -#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}, \ -} - -#define MME_MME_ID_IDX 0 -#define MME_MME_NAME_IDX 1 -#define MME_ENABLE_MME_M3_IDX 2 - -#define MMEPARAMS_CHECK { \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ -} - - #define MME_CONFIG_STRING_NETWORK_INTERFACES_CONFIG "NETWORK_INTERFACES" -#define MME_INTERFACE_NAME_FOR_M3_MME_IDX 0 -#define MME_IPV4_ADDRESS_FOR_M3C_IDX 1 -#define MME_PORT_FOR_M3C_IDX 2 - /* interface configuration parameters names */ /* M3 interface configuration parameters names */ #define MME_CONFIG_STRING_MME_INTERFACE_NAME_FOR_M3_MCE "MME_INTERFACE_NAME_FOR_M3_MCE" diff --git a/openair2/F1AP/f1ap_common.h b/openair2/F1AP/f1ap_common.h index 83781484c7..664599c2f2 100644 --- a/openair2/F1AP/f1ap_common.h +++ b/openair2/F1AP/f1ap_common.h @@ -36,7 +36,6 @@ #include "oai_asn1.h" #include -#define F1AP_UE_IDENTIFIER_NUMBER 3 #define F1AP_TRANSACTION_IDENTIFIER_NUMBER 3 #include "F1AP_RAT-FrequencyPriorityInformation.h" @@ -357,7 +356,6 @@ # error "You are compiling f1ap with the wrong version of ASN1C" #endif -#define F1AP_UE_ID_FMT "0x%06"PRIX32 #include "assertions.h" diff --git a/openair2/GNB_APP/RRC_nr_paramsvalues.h b/openair2/GNB_APP/RRC_nr_paramsvalues.h index 28d5f71ff9..6ac8443581 100644 --- a/openair2/GNB_APP/RRC_nr_paramsvalues.h +++ b/openair2/GNB_APP/RRC_nr_paramsvalues.h @@ -51,7 +51,6 @@ #define GNB_CONFIG_STRING_INITIALDLBWPLOCATIONANDBANDWIDTH "initialDLBWPlocationAndBandwidth" #define GNB_CONFIG_STRING_INITIALDLBWPSUBCARRIERSPACING "initialDLBWPsubcarrierSpacing" -#define GNB_CONFIG_STRING_INITIALDLBWPCYCLICPREFIX "initialDLBWPcyclicPrefix" #define GNB_CONFIG_STRING_INITIALDLBWPCONTROLRESOURCESETZERO "initialDLBWPcontrolResourceSetZero" #define GNB_CONFIG_STRING_INITIALDLBWPSEARCHSPACEZERO "initialDLBWPsearchSpaceZero" @@ -116,7 +115,6 @@ #define GNB_CONFIG_STRING_NROFDOWNLINKSYMBOLS "nrofDownlinkSymbols" #define GNB_CONFIG_STRING_NROFUPLINKSLOTS "nrofUplinkSlots" #define GNB_CONFIG_STRING_NROFUPLINKSYMBOLS "nrofUplinkSymbols" -#define GNB_CONFIG_STRING_PATTERN2 "pattern2" #define GNB_CONFIG_STRING_DLULTRANSMISSIONPERIODICITY2 "dl_UL_TransmissionPeriodicity2" #define GNB_CONFIG_STRING_NROFDOWNLINKSLOTS2 "nrofDownlinkSlots2" #define GNB_CONFIG_STRING_NROFDOWNLINKSYMBOLS2 "nrofDownlinkSymbols2" @@ -135,7 +133,6 @@ #define GNB_CONFIG_STRING_TA_COMMON "ta-Common-r17" #define GNB_CONFIG_STRING_TA_COMMONDRIFT "ta-CommonDrift-r17" -#define CARRIERBANDWIDTH_OKVALUES {11,18,24,25,31,32,38,51,52,65,66,78,79,93,106,107,121,132,133,135,160,162,189,216,217,245,264,270,273} /*--------------------------------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -143,11 +140,6 @@ /* optname helpstr paramflags XXXptr defXXXval type numelt */ /*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ -#define GNB_CONFIG_PHYSCELLID_IDX 0 -#define GNB_CONFIG_ABSOLUTEFREQUENCYSSB_IDX 5 -#define GNB_CONFIG_DLFREQUENCYBAND_IDX 6 -#define GNB_CONFIG_ABSOLUTEFREQUENCYPOINTA_IDX 7 -#define GNB_CONFIG_DLCARRIERBANDWIDTH_IDX 10 #define SCCPARAMS_DESC(scc) { \ diff --git a/openair2/GNB_APP/gnb_app.c b/openair2/GNB_APP/gnb_app.c index 3b97dfe515..98546413a0 100644 --- a/openair2/GNB_APP/gnb_app.c +++ b/openair2/GNB_APP/gnb_app.c @@ -55,9 +55,6 @@ #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h" extern RAN_CONTEXT_t RC; - -#define GNB_REGISTER_RETRY_DELAY 10 - /*------------------------------------------------------------------------------*/ diff --git a/openair2/GNB_APP/gnb_config.h b/openair2/GNB_APP/gnb_config.h index 96cf898ba0..c33c6964dc 100644 --- a/openair2/GNB_APP/gnb_config.h +++ b/openair2/GNB_APP/gnb_config.h @@ -37,23 +37,11 @@ #include "f1ap_messages_types.h" #include "intertask_interface.h" -#define IPV4_STR_ADDR_TO_INT_NWBO(AdDr_StR,NwBo,MeSsAgE ) do {\ - struct in_addr inp;\ - if ( inet_aton(AdDr_StR, &inp ) < 0 ) {\ - AssertFatal (0, MeSsAgE);\ - } else {\ - NwBo = inp.s_addr;\ - }\ - } while (0); - -// Hard to find a defined value for max enb... -#define MAX_GNB 16 - void RCconfig_verify(configmodule_interface_t *cfg, ngran_node_t node_type); -extern void RCconfig_nr_prs(void); -extern void RCconfig_NR_L1(void); -extern void RCconfig_nr_macrlc(configmodule_interface_t *cfg); -extern void NRRCConfig(void); +void RCconfig_nr_prs(void); +void RCconfig_NR_L1(void); +void RCconfig_nr_macrlc(configmodule_interface_t *cfg); +void NRRCConfig(void); gNB_RRC_INST *RCconfig_NRRRC(); int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i); diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index eb90b2f1bf..4a34e8d0e0 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -37,18 +37,6 @@ #include "common/ngran_types.h" #include "RRC_nr_paramsvalues.h" - -#define GNB_CONFIG_STRING_CC_NODE_FUNCTION "node_function" -#define GNB_CONFIG_STRING_CC_NODE_TIMING "node_timing" -#define GNB_CONFIG_STRING_CC_NODE_SYNCH_REF "node_synch_ref" - - -// OTG config per GNB-UE DL -#define GNB_CONF_STRING_OTG_CONFIG "otg_config" -#define GNB_CONF_STRING_OTG_UE_ID "ue_id" -#define GNB_CONF_STRING_OTG_APP_TYPE "app_type" -#define GNB_CONF_STRING_OTG_BG_TRAFFIC "bg_traffic" - #ifdef LIBCONFIG_LONG #define libconfig_int long #else @@ -64,7 +52,6 @@ typedef enum { NRlastel = 5 } NRRC_config_functions_t; -#define CONFIG_STRING_ACTIVE_RUS "Active_RUs" /*------------------------------------------------------------------------------------------------------------------------------------------*/ /* RUs configuration for gNB is the same for eNB */ @@ -74,8 +61,6 @@ typedef enum { /*---------------------------------------------------------------------------------------------------------------------------------------*/ /* value definitions for ASN1 verbosity parameter */ #define GNB_CONFIG_STRING_ASN1_VERBOSITY_NONE "none" -#define GNB_CONFIG_STRING_ASN1_VERBOSITY_ANNOYING "annoying" -#define GNB_CONFIG_STRING_ASN1_VERBOSITY_INFO "info" /* global parameters, not under a specific section */ #define GNB_CONFIG_STRING_ASN1_VERBOSITY "Asn1_verbosity" @@ -338,8 +323,6 @@ typedef enum { // clang-format on #define GNB_CONFIG_STRING_NEIGHBOUR_CELL_LIST "neighbour_cell_configuration" -#define GNB_CONFIG_STRING_NEIGHBOUR_GNB_ID "gNB_ID" -#define GNB_CONFIG_STRING_NEIGHBOUR_NR_CELLID "nr_cellid" #define GNB_CONFIG_STRING_NEIGHBOUR_CELL_PHYSICAL_ID "physical_cellId" #define GNB_CONFIG_STRING_NEIGHBOUR_CELL_ABS_FREQ_SSB "absoluteFrequencySSB" #define GNB_CONFIG_STRING_NEIGHBOUR_CELL_SCS "subcarrierSpacing" @@ -642,7 +625,6 @@ typedef enum { #define GNB_PORT_FOR_X2C_IDX 4 /* S1 interface configuration parameters names */ -#define GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_S1_MME "GNB_IPV4_ADDRESS_FOR_S1_MME" #define GNB_CONFIG_STRING_GNB_IPV4_ADDRESS_FOR_S1U "GNB_IPV4_ADDRESS_FOR_S1U" #define GNB_CONFIG_STRING_GNB_PORT_FOR_S1U "GNB_PORT_FOR_S1U" @@ -690,14 +672,12 @@ typedef enum { // clang-format on /* L1 configuration section names */ #define CONFIG_STRING_L1_LIST "L1s" -#define CONFIG_STRING_L1_CONFIG "l1_config" /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /* MACRLC configuration section names */ #define CONFIG_STRING_MACRLC_LIST "MACRLCs" -#define CONFIG_STRING_MACRLC_CONFIG "macrlc_config" /* MACRLC configuration parameters names */ diff --git a/openair2/LAYER2/MAC/defs_NB_IoT.h b/openair2/LAYER2/MAC/defs_NB_IoT.h index 92e267324e..d0b2570719 100644 --- a/openair2/LAYER2/MAC/defs_NB_IoT.h +++ b/openair2/LAYER2/MAC/defs_NB_IoT.h @@ -22,15 +22,12 @@ // MAC definition #define MAX_FRAME 0xfffff #define NUM_FRAME 0x100000 -#define MAX_SUBFRAME 10485760 #define MAX(a, b) (((a)>(b))?(a):(b)) // RA-RNTI: 1+SFN_id>>2 #define RA_RNTI_LOW 0x0001 // SFN_id = 0 #define RA_RNTI_HIGH 0x0100 // SFN_id = 1023 -#define C_RNTI_LOW 0x0101 -#define C_RNTI_HIGH // ULSCH LCHAN IDs /*!\brief LCID of extended power headroom for ULSCH */ @@ -46,7 +43,6 @@ /*!\brief LCID of long BSR for ULSCH */ #define LONG_BSR 30 /*! \brief Values of CCCH LCID for DLSCH */ -#define CCCH_LCHANID 0 /*!\brief Values of BCCH logical channel */ #define BCCH 3 // SI /*!\brief Values of PCCH logical channel */ @@ -107,7 +103,6 @@ typedef enum{ #define BCCH1_NB_IoT 12 // SI-SIB-NB_IoTs /*!\brief Values of PCCH logical channel */ #define PCCH_NB_IoT 13 // Paging XXX not used for the moment -#define MCCH_NB_IoT 14 /*!\brief Value of CCCH / SRB0 logical channel */ #define CCCH_NB_IoT 0 // srb0 ---> XXX exactly the same as in LTE (commented for compilation purposes) /*!\brief DCCH0 / SRB1bis logical channel */ @@ -119,7 +114,6 @@ typedef enum{ /*!\brief DTCH1 DRB1 logical channel */ #define DTCH1_NB_IoT 5 // DRB1 /*Index of UE contention resoulution logical channel*/ -#define UE_CONTENTION_RESOLUTION 28 /*Index of TIMING_ADVANCE logical channel*/ #define TIMING_ADVANCE 29 /*Index of DRX_COMMAND logical channel*/ diff --git a/openair2/LAYER2/MAC/mac.h b/openair2/LAYER2/MAC/mac.h index f10941c3ab..1e51704185 100644 --- a/openair2/LAYER2/MAC/mac.h +++ b/openair2/LAYER2/MAC/mac.h @@ -110,9 +110,6 @@ /*!\brief MAX MCCH payload size */ #define MCCH_PAYLOAD_SIZE_MAX 128 //#define MCH_PAYLOAD_SIZE_MAX 16384// this value is using in case mcs and TBS index are hi - -#define printk printf - /*!\brief Maximum number of logical channl group IDs */ #define MAX_NUM_LCGID 4 /*!\brief logical channl group ID 0 */ @@ -213,7 +210,6 @@ typedef struct { uint64_t t_crnti:16; } __attribute__((__packed__))RAR_PDU; -#define sizeof_RAR_PDU 6 */ /*!\brief MAC subheader short with 7bit Length field */ typedef struct { @@ -402,8 +398,6 @@ typedef struct { uint8_t lcid:5; // octet 2 MSB uint8_t stop_sf_LSB:8; } __attribute__ ((__packed__)) MSI_ELEMENT; -/*! \brief Values of CCCH LCID for DLSCH */ -#define CCCH_LCHANID 0 /*!\brief Values of BCCH logical channel (fake)*/ #define BCCH 3 // SI /*!\brief Values of PCCH logical channel (fake)*/ @@ -448,8 +442,6 @@ typedef struct { #define MCCH_LCHANID 0 /*!\brief LCID of MCH scheduling info for DL */ #define MCH_SCHDL_INFO 30 -/*!\brief LCID of Carrier component activation/deactivation */ -#define CC_ACT_DEACT 27 //TTN (for D2D) #define SL_DISCOVERY 8 //LCID (fake) #define MAX_NUM_DEST 10 diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h index f73c1f2db3..53349cae8d 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac.h @@ -45,18 +45,6 @@ #define NR_SHORT_BSR_TABLE_SIZE 32 #define NR_LONG_BSR_TABLE_SIZE 256 -#define TABLE_38213_13_1_NUM_INDEXES 15 -#define TABLE_38213_13_2_NUM_INDEXES 14 -#define TABLE_38213_13_3_NUM_INDEXES 9 -#define TABLE_38213_13_4_NUM_INDEXES 16 -#define TABLE_38213_13_5_NUM_INDEXES 9 -#define TABLE_38213_13_6_NUM_INDEXES 10 -#define TABLE_38213_13_7_NUM_INDEXES 12 -#define TABLE_38213_13_8_NUM_INDEXES 8 -#define TABLE_38213_13_9_NUM_INDEXES 4 -#define TABLE_38213_13_10_NUM_INDEXES 8 -#define TABLE_38213_13_11_NUM_INDEXES 16 -#define TABLE_38213_13_12_NUM_INDEXES 14 // Definitions for MAC control and data #define NR_BCCH_DL_SCH 3 // SI @@ -432,7 +420,6 @@ typedef struct { #define UL_SCH_LCID_PADDING 0x3F #define NR_MAX_NUM_LCGID 8 -#define MAX_RLC_SDU_SUBHEADER_SIZE 3 //========= // DCI defs diff --git a/openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h b/openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h index 10eaea3862..405ba8e1cc 100644 --- a/openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h +++ b/openair2/LAYER2/NR_MAC_UE/mac_defs_sl.h @@ -30,7 +30,6 @@ #define SL_NR_MAC_NUM_RX_RESOURCE_POOLS 1 #define SL_NR_MAC_NUM_TX_RESOURCE_POOLS 1 -#define SL_NUM_BYTES_TIMERESOURCEBITMAP 20 // every 16 frames, SSB is repeated. #define SL_NR_SSB_REPETITION_IN_FRAMES 16 diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c index 5dd7e89fec..921003d110 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c @@ -47,7 +47,6 @@ /////* DLSCH MAC PDU generation (6.1.2 TS 38.321) *///// //////////////////////////////////////////////////////// #define OCTET 8 -#define HALFWORD 16 #define WORD 32 //#define SIZE_OF_POINTER sizeof (void *) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c index 4207f6de93..2dea54ea4a 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c @@ -54,7 +54,6 @@ #include "SIMULATION/TOOLS/sim.h" // for taus #define ENABLE_MAC_PAYLOAD_DEBUG -#define DEBUG_gNB_SCHEDULER 1 #include "common/ran_context.h" #include "nfapi/oai_integration/vendor_ext.h" @@ -62,7 +61,6 @@ #include "common/utils/alg/find.h" // 3GPP TS 38.331 Section 12 Table 12.1-1: UE performance requirements for RRC procedures for UEs -#define NR_RRC_SETUP_DELAY_MS 10 #define NR_RRC_RECONFIGURATION_DELAY_MS 10 #define NR_RRC_BWP_SWITCHING_DELAY_MS 6 diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h index 136fb0365e..e620e2f37d 100644 --- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h +++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h @@ -94,7 +94,6 @@ /* Defs */ #define MAX_NUM_BWP 5 #define MAX_NUM_CORESET 12 -#define MAX_NUM_CCE 90 /*!\brief Maximum number of random access process */ #define NR_NB_RA_PROC_MAX 4 #define MAX_NUM_OF_SSB 64 @@ -566,15 +565,6 @@ struct CSI_Report { RSRP_report_t csirs_rsrp_report; }; -#define MAX_SR_BITLEN 8 - -/*! As per the spec 38.212 and table: 6.3.1.1.2-12 in a single UCI sequence we can have multiple CSI_report - the number of CSI_report will depend on number of CSI resource sets that are configured in CSI-ResourceConfig RRC IE - From spec 38.331 from the IE CSI-ResourceConfig for SSB RSRP reporting we can configure only one resource set - From spec 38.214 section 5.2.1.2 For periodic and semi-persistent CSI Resource Settings, the number of CSI-RS Resource Sets configured is limited to S=1 - */ -#define MAX_CSI_RESOURCE_SET_IN_CSI_RESOURCE_CONFIG 16 - typedef enum { INACTIVE = 0, ACTIVE_NOT_SCHED, @@ -609,7 +599,6 @@ typedef struct nr_lc_config { } nr_lc_config_t; /*! \brief scheduling control information set through an API */ -#define MAX_CSI_REPORTS 48 typedef struct { /// CCE index and aggregation, should be coherent with cce_list NR_SearchSpace_t *search_space; diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h index 7a2ce5b84c..d1bd545614 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.h +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.h @@ -355,8 +355,6 @@ uint64_t pdcp_module_init (uint64_t pdcp_optmask, int ue_id); void pdcp_module_cleanup (void); void pdcp_layer_init (void); void pdcp_layer_cleanup (void); -#define PDCP2NW_DRIVER_FIFO 21 -#define NW_DRIVER2PDCP_FIFO 22 int pdcp_fifo_flush_sdus ( const protocol_ctxt_t *const ctxt_pP); int pdcp_fifo_read_input_sdus_remaining_bytes ( const protocol_ctxt_t *const ctxt_pP); @@ -440,7 +438,6 @@ typedef struct { /* * Reordering_Window: half of the PDCP SN space */ -#define REORDERING_WINDOW_SN_5BIT 16 #define REORDERING_WINDOW_SN_7BIT 64 #define REORDERING_WINDOW_SN_12BIT 2048 diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c index aeac4b3b98..0deeb692cc 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c @@ -29,7 +29,6 @@ * @ingroup pdcp */ -#define PDCP_FIFO_C extern int otg_enabled; @@ -42,8 +41,6 @@ extern int otg_enabled; #include #include #include -#define rtf_put write -#define rtf_get read #include "../MAC/mac_extern.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h b/openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h index 6adcde8f74..49a3930aec 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_primitives.h @@ -40,12 +40,6 @@ #define PDCP_CONTROL_PDU_BIT_SET 0x00 #define PDCP_DATA_PDU_BIT_SET 0x01 -/* - * PDU-type (3-bit, see 6.3.8) - */ -#define PDCP_STATUS_REPORT 0x00 -#define INTERSPERSED_ROHC_FEEDBACK_PACKET 0x01 - /* * 6.1 Protocol Data Units * 6.2.2 Control Plane PDCP Data PDU @@ -83,7 +77,6 @@ typedef struct { uint8_t dc; uint8_t pdu_type; // PDU type (see 6.3.8) } pdcp_control_pdu_for_interspersed_rohc_feedback_packet_header; -#define PDCP_CONTROL_PDU_INTERSPERSED_ROHC_FEEDBACK_HEADER_SIZE 1 /* * 6.2.6 PDCP Control PDU for PDCP status report @@ -95,11 +88,6 @@ typedef struct { unsigned char* window_bitmap; // Ack/Nack information coded as a bitmap uint16_t window_bitmap_size; } pdcp_control_pdu_for_pdcp_status_report; -/* - * Following symbolic constant is the size of FIXED part of this PDU - * so bitmap size should be added to find total header size - */ -#define PDCP_CONTROL_PDU_STATUS_REPORT_HEADER_SIZE 2 /* * Parses sequence number out of buffer of User Plane PDCP Data PDU with diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.h b/openair2/NR_PHY_INTERFACE/NR_IF_Module.h index 49219a0af1..e53f04d859 100644 --- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.h +++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.h @@ -46,13 +46,6 @@ #define MAX_NUM_HI_DCI0_PDU 100 #define MAX_NUM_TX_REQUEST_PDU 100 -#define MAX_NUM_HARQ_IND 100 -#define MAX_NUM_CRC_IND 100 -#define MAX_NUM_SR_IND 100 -#define MAX_NUM_CQI_IND 100 -#define MAX_NUM_RACH_IND 100 -#define MAX_NUM_SRS_IND 100 - #define MAX_NUM_NR_RX_RACH_PDUS 4 #define MAX_UL_PDUS_PER_SLOT 8 #define MAX_NUM_NR_SRS_PDUS 8 diff --git a/openair2/PHY_INTERFACE/IF_Module.h b/openair2/PHY_INTERFACE/IF_Module.h index 27eea78fc6..d413a13bd6 100644 --- a/openair2/PHY_INTERFACE/IF_Module.h +++ b/openair2/PHY_INTERFACE/IF_Module.h @@ -44,13 +44,6 @@ #define MAX_NUM_HI_DCI0_PDU 100 #define MAX_NUM_TX_REQUEST_PDU 100 -#define MAX_NUM_HARQ_IND 100 -#define MAX_NUM_CRC_IND 100 -#define MAX_NUM_SR_IND 100 -#define MAX_NUM_CQI_IND 100 -#define MAX_NUM_RACH_IND 100 -#define MAX_NUM_SRS_IND 100 - typedef struct { /// Module ID module_id_t module_id; diff --git a/openair2/PHY_INTERFACE/IF_Module_NB_IoT.h b/openair2/PHY_INTERFACE/IF_Module_NB_IoT.h index 8aec51d85d..ec5e7e5370 100644 --- a/openair2/PHY_INTERFACE/IF_Module_NB_IoT.h +++ b/openair2/PHY_INTERFACE/IF_Module_NB_IoT.h @@ -9,16 +9,8 @@ #define __IF_MODULE_NB_IoT__H__ #include "nfapi_interface.h" -//#include "openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h" #include "LTE_PhysicalConfigDedicated-NB-r13.h" -//#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" #include "common/platform_types.h" -//#include "openair1/SCHED/IF_Module_L1_primitives_NB_IoT.h" - -//#define SCH_PAYLOAD_SIZE_MAX 4096 -#define BCCH_PAYLOAD_SIZE_MAX_NB_IoT 128 - - // P5 FAPI-like configuration structures------------------------------------------------------------------------------- diff --git a/openair2/PHY_INTERFACE/phy_interface.h b/openair2/PHY_INTERFACE/phy_interface.h index 09e95988a4..2bb9a6c53f 100644 --- a/openair2/PHY_INTERFACE/phy_interface.h +++ b/openair2/PHY_INTERFACE/phy_interface.h @@ -32,10 +32,6 @@ #include "LAYER2/MAC/mac.h" - -#define MAX_NUMBER_OF_MAC_INSTANCES 16 - -#define NULL_PDU 255 #define DCI 0 #define DLSCH 1 #define ULSCH 2 diff --git a/openair2/RRC/LTE/defs_NB_IoT.h b/openair2/RRC/LTE/defs_NB_IoT.h index 51835cc181..14b11b52af 100644 --- a/openair2/RRC/LTE/defs_NB_IoT.h +++ b/openair2/RRC/LTE/defs_NB_IoT.h @@ -442,7 +442,6 @@ typedef struct eNB_RRC_INST_NB_IoT_s { } eNB_RRC_INST_NB_IoT; -#define RRC_HEADER_SIZE_MAX_NB_IoT 64 #define MAX_UE_CAPABILITY_SIZE_NB_IoT 255 //not needed for the moment @@ -453,10 +452,6 @@ typedef struct OAI_UECapability_NB_IoT_s { LTE_UE_Capability_NB_r13_t UE_Capability_NB_IoT; //replace the UE_EUTRA_Capability of LTE } OAI_UECapability_NB_IoT_t; -#define RRC_BUFFER_SIZE_MAX_NB_IoT 1024 - - - typedef struct UE_RRC_INST_NB_IoT_s { Rrc_State_NB_IoT_t RrcState; Rrc_Sub_State_NB_IoT_t RrcSubState; diff --git a/openair2/RRC/LTE/rrc_defs.h b/openair2/RRC/LTE/rrc_defs.h index 70897c16b7..85fd3b9d83 100644 --- a/openair2/RRC/LTE/rrc_defs.h +++ b/openair2/RRC/LTE/rrc_defs.h @@ -50,26 +50,17 @@ #include "LAYER2/MAC/mac.h" #include "openair2/RRC/common.h" // for D2D -#define DEBUG_CTRL_SOCKET #define CONTROL_SOCKET_PORT_NO 8888 #define MAX_NUM_DEST 10 //netlink //#define DEBUG_PDCP -#define UE_IP_PDCP_NETLINK_ID 31 -#define PDCP_PID 1 -#define NETLINK_HEADER_SIZE 16 -#define SL_DEFAULT_RAB_ID 3 -#define SLRB_ID 3 #define MAX_PAYLOAD 1024 /* maximum payload size*/ #define MAX_NUM_NEIGH_CELLs 6 /* maximum neighbouring cells number */ #define MAX_NUM_GNB_CELLs 1 /* maximum gNB cells number */ - -#define UE_STATE_NOTIFICATION_INTERVAL 50 - #define IPV4_ADDR "%u.%u.%u.%u" #define IPV4_ADDR_FORMAT(aDDRESS) \ (uint8_t)((aDDRESS) & 0x000000ff), \ @@ -308,9 +299,6 @@ typedef enum SL_TRIGGER_e { #define UNDEF_SECURITY_MODE 0xff #define NO_SECURITY_MODE 0x20 -#define CBA_OFFSET 0xfff4 -// #define NUM_MAX_CBA_GROUP 4 // in the platform_constants - /* TS 36.331: RRC-TransactionIdentifier ::= INTEGER (0..3) */ #define RRC_TRANSACTION_IDENTIFIER_NUMBER 3 diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c index 4ddd7fc625..5ba32bd17b 100644 --- a/openair2/RRC/LTE/rrc_eNB.c +++ b/openair2/RRC/LTE/rrc_eNB.c @@ -28,7 +28,6 @@ * \email: navid.nikaein@eurecom.fr and raymond.knopp@eurecom.fr */ #define RRC_ENB -#define RRC_ENB_C #include "oai_asn1.h" #include #include "uper_encoder.h" @@ -102,7 +101,6 @@ #include "openair1/PHY/LTE_TRANSPORT/transport_proto.h" #define ASN_MAX_ENCODE_SIZE 4096 -#define NUMBEROF_DRBS_TOBE_ADDED 1 static int encode_CG_ConfigInfo(char *buffer,int buffer_size,rrc_eNB_ue_context_t *const ue_context_pP,int *enc_size); mui_t rrc_eNB_mui = 0; diff --git a/openair2/RRC/LTE/rrc_rrm_interface.h b/openair2/RRC/LTE/rrc_rrm_interface.h deleted file mode 100644 index 0880859a59..0000000000 --- a/openair2/RRC/LTE/rrc_rrm_interface.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The OpenAirInterface Software Alliance licenses this file to You under - * the OAI Public License, Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.openairinterface.org/?page_id=698 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *------------------------------------------------------------------------------- - * For more information about the OpenAirInterface (OAI) Software Alliance: - * contact@openairinterface.org - */ - -/*! -******************************************************************************* - -\file rrm_sock.h - -\brief common header for the communication between RRM and RRC/CMM/PUSU. - -\author BURLOT Pascal - -\date 15/07/08 - - -\par History: - $Author$ $Date$ $Revision$ - $Id$ - $Log$ - -******************************************************************************* -*/ - -#ifndef __RRC_RRM_INTERFACE_H__ -#define __RRC_RRM_INTERFACE_H__ - - -//#ifdef RRC_RRM_XFACE - -/*! -******************************************************************************* -\brief Entete des messages de RRM/CMM/RRC -*/ -typedef struct { - unsigned short start ; ///< Identification du debut de message - unsigned char inst ; ///< Identification de l'instance RRM - unsigned char msg_type ; ///< Identification du type message - unsigned int size ; ///< taille du message - unsigned int Trans_id ; ///< Identification de la transaction -} msg_head_t ; - -/*! -******************************************************************************* -\brief Definition de la structure d'un message a envoyer sur un socket: - - RRM->RRC - - RRC->RRM - - RRCI->RRC - - RRC->RRCI - - CMM->RRM - - RRM->CMM -*/ -typedef struct { - msg_head_t head ; ///< entete du message - char *data ; ///< message -} msg_t ; - - - - -#ifdef __cplusplus -extern "C" { -#endif - -//! \brief Socket path associated to RRM-CMM interface -#define RRM_CMM_SOCK_PATH "/tmp/rrm_cmm_socket" -//! \brief Socket path associated to CMM-RRM interface -#define CMM_RRM_SOCK_PATH "/tmp/cmm_rrm_socket" - -//! \brief Socket path associated to RRM-RRC interface -#define RRM_RRC_SOCK_PATH "/tmp/rrm_rrc_socket" -//! \brief Socket path associated to RRC-RRM interface -#define RRC_RRM_SOCK_PATH "/tmp/rrc_rrm_socket" - -//! \brief Socket path associated to RRM-PUSU interface -#define RRM_PUSU_SOCK_PATH "/tmp/rrm_pusu_socket" -//! \brief Socket path associated to PUSU-RRM interface -#define PUSU_RRM_SOCK_PATH "/tmp/pusu_rrm_socket" - - -//! \brief Identification of the RRM/CMM/RRC message begin -#define START_MSG 0xA533 -//! \brief Identification of the PUSU message begin -#define START_MSG_PUSU 0xCC - - -#include -#include - - -/*! -******************************************************************************* -\brief Definition de la structure definissant le socket pour envoyer les messages -*/ -typedef struct { - int s ; ///< identification du socket - struct sockaddr_un un_local_addr ; ///< Adresse local si unix socket - struct sockaddr_un un_dest_addr ; ///< Adresse destinataire si unix socket -} sock_rrm_t ; - - -/* *** Fonctions relatives aux interfaces CMM ou RRC *** */ - -int open_socket( sock_rrm_t *s ,char *path_local, char *path_dest , int rrm_inst ) ; -void close_socket(sock_rrm_t *sock ) ; -int send_msg_sock(sock_rrm_t *s ,msg_t *msg ) ; -char *recv_msg( sock_rrm_t *s ) ; -#ifdef __cplusplus -} -#endif - -int send_msg(void *, msg_t *); - -#endif diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index 7a1c96e33b..a2cc04b948 100644 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -27,8 +27,6 @@ * \company Eurecom, NTUST * \email: navid.nikaein@eurecom.fr and raymond.knopp@eurecom.fr, kroempa@gmail.com */ -#define RRC_GNB_C -#define RRC_GNB_C #include #include diff --git a/openair2/RRC/NR_UE/rrc_sl_preconfig.c b/openair2/RRC/NR_UE/rrc_sl_preconfig.c index 212899f866..fdf6fb37b4 100644 --- a/openair2/RRC/NR_UE/rrc_sl_preconfig.c +++ b/openair2/RRC/NR_UE/rrc_sl_preconfig.c @@ -19,8 +19,6 @@ * contact@openairinterface.org */ -#define RRC_SL_PRECONFIG -#define RRC_SL_PRECONFIG_C #include "oai_asn1.h" #include "NR_SL-PreconfigurationNR-r16.h" diff --git a/openair2/RRC/NR_UE/sl_preconfig_paramvalues.h b/openair2/RRC/NR_UE/sl_preconfig_paramvalues.h index a44c5e4d1f..b12c9b4c83 100644 --- a/openair2/RRC/NR_UE/sl_preconfig_paramvalues.h +++ b/openair2/RRC/NR_UE/sl_preconfig_paramvalues.h @@ -49,12 +49,6 @@ #define SL_CONFIG_STRING_SL_NUMSSB_WITHINPERIOD_0 "sl_NumSSB_WithinPeriod_0" #define SL_CONFIG_STRING_SL_TIMEOFFSET_SSB_0 "sl_TimeOffsetSSB_0" #define SL_CONFIG_STRING_SL_TIMEINTERVAL_0 "sl_TimeInterval_0" -#define SL_CONFIG_STRING_SL_NUMSSB_WITHINPERIOD_1 "sl_NumSSB_WithinPeriod_1" -#define SL_CONFIG_STRING_SL_TIMEOFFSET_SSB_1 "sl_TimeOffsetSSB_1" -#define SL_CONFIG_STRING_SL_TIMEINTERVAL_1 "sl_TimeInterval_1" -#define SL_CONFIG_STRING_SL_NUMSSB_WITHINPERIOD_2 "sl_NumSSB_WithinPeriod_2" -#define SL_CONFIG_STRING_SL_TIMEOFFSET_SSB_2 "sl_TimeOffsetSSB_2" -#define SL_CONFIG_STRING_SL_TIMEINTERVAL_2 "sl_TimeInterval_2" /*Sidelink Bandwidth related parameters in SL-Preconfig */ diff --git a/openair2/UTIL/CLI/cli_server.c b/openair2/UTIL/CLI/cli_server.c index 1994855b5d..951358e255 100644 --- a/openair2/UTIL/CLI/cli_server.c +++ b/openair2/UTIL/CLI/cli_server.c @@ -47,7 +47,6 @@ #include "UTIL/LOG/log.h" #define MAX_NUM_CLIENTS 15 -#define MAX_LINE 100 struct sockaddr_in saddr; unsigned short server_port = 1352; diff --git a/openair2/UTIL/OMG/omg_constants.h b/openair2/UTIL/OMG/omg_constants.h index 1d70551b03..98661cf387 100644 --- a/openair2/UTIL/OMG/omg_constants.h +++ b/openair2/UTIL/OMG/omg_constants.h @@ -69,9 +69,6 @@ typedef enum { #define omg_eps 0.10 //10.99 #define SLEEP 1 -#define GET_DATA 0 -#define GET_DATA_UPDATE 1 - #endif /* __OMG_H_ */ diff --git a/openair2/UTIL/OTG/otg_config.h b/openair2/UTIL/OTG/otg_config.h index 2302c71f00..d2255b9e1f 100644 --- a/openair2/UTIL/OTG/otg_config.h +++ b/openair2/UTIL/OTG/otg_config.h @@ -36,7 +36,6 @@ /*!\brief It indicates that: the payload and the transport header (not otg header) are copied from static strings (HEADER_STRING and PAYLOAD_STRING) */ -#define STRING_STATIC 1 /*!\brief Define the max number of states*/ #define MAX_NUM_TRAFFIC_STATE 4 // we have 4 state: OFF, PU, ED, PE @@ -50,8 +49,6 @@ /*!\brief Define the max number of traffic runing in the same time - using their ID in the customized traffic*/ #define MAX_EMU_TRAFFIC 10 -#define OTG_FLAG_SIZE 3 -#define OTG_FLAG "OTG" #define IDT_TH 100 #define SIZE_COEF 1000 @@ -74,7 +71,6 @@ /*!\brief Define the size of IP version header, in bytes*/ #define HDR_IP_v4_MIN 20 -#define HDR_IP_v4_MAX 60 #define HDR_IP_v6 60 /*!\brief Define the size of TCP header, in bytes*/ @@ -87,16 +83,12 @@ #define RTP_HEADER 12 /*!\brief Define the max size of the header*/ -#define MAX_HEADER_SIZE 80 /*!\brief Define the Alphabet string to generate the payload of the packet*/ -#define ALPHABET_NUM_LETTER "abcdefghijklmnopqrstuvwyzABCDEFGHIGKLMNOPQRSTUVWXYZ0123456789" -#define ALPHABET_LETTER "abcdefghijklmnopqrstuvwyzABCDEFGHIGKLMNOPQRSTUVWXZ" /*!\brief Define the Alphabet string to generate the header of the packet*/ -#define ALPHABET_NUM "0123456789" /*!\brief Define the static string to generate the header of the packet*/ //#define HEADER_STRING "5048717272261061594909177115977673656394812939088509638561159848103044447631759621785741859753883189" @@ -108,7 +100,6 @@ /*!\brief We describe below different M2M domains and we present their associated latencies in LTE/LTE-A network REF: "Latency for Real-Time Machine-to-Machine Communication in LTE-Based System Architecture"*/ /*!\brief Latency budget for M2M capillary domain(unit millisecond)*/ -#define APPLICATION_PROCESSING_DEVICE_DELAY 1 #define MIN_APPLICATION_PROCESSING_GATEWAY_DELAY 1 #define MAX_APPLICATION_PROCESSING_GATEWAY_DELAY 3 #define MIN_FORMATING_TRANSFERRING_DELAY 1 @@ -118,8 +109,6 @@ #define TERMINAL_ACCESS_DELAY 1 /*!\brief Latency budget for access domain(unit millisecond)*/ -#define MIN_U_PLANE_GW_PROCESSING_DELAY 1 -#define MAX_U_PLANE_GW_PROCESSING_DELAY 4 #define MIN_U_PLANE_CORE_IP_ACCESS_DELAY 1 #define MAX_U_PLANE_CORE_IP_ACCESS_DELAY 2 #define MIN_FW_PROXY_DELAY 1 @@ -128,8 +117,6 @@ /*!\brief Latency budget for core and application domain(unit millisecond)*/ #define MIN_NETWORK_ACCESS_DELAY 15 #define MAX_NETWORK_ACCESS_DELAY 150 -#define MIN_SERVICE_ENABLERS_DELAY 300 -#define MAX_SERVICE_ENABLERS_DELAY 500 #define MIN_APPLICATION_ACESS_DELAY 1 #define MAX_APPLICATION_ACESS_DELAY 3 diff --git a/openair2/UTIL/OTG/traffic_config.h b/openair2/UTIL/OTG/traffic_config.h index c0a64a3465..6787af4831 100644 --- a/openair2/UTIL/OTG/traffic_config.h +++ b/openair2/UTIL/OTG/traffic_config.h @@ -30,7 +30,6 @@ #define IDT_LAMBDA 3 //TRANSPORT PROTOCOL -#define TRANS_PROTO TCP #define IP_V IPV4 //DATA PACKET SIZE DISTRIBUTION PARAMETERS diff --git a/openair3/COMMON/common_types.h b/openair3/COMMON/common_types.h index 51f1f83391..c32176ab3f 100644 --- a/openair3/COMMON/common_types.h +++ b/openair3/COMMON/common_types.h @@ -50,7 +50,6 @@ typedef enum { RAT_EHRPD = 2003, } rat_type_t; -#define NUMBER_OF_RAT_TYPE 11 typedef enum { SS_SERVICE_GRANTED = 0, diff --git a/openair3/COMMON/security_types.h b/openair3/COMMON/security_types.h index d78534e176..e6010bb610 100644 --- a/openair3/COMMON/security_types.h +++ b/openair3/COMMON/security_types.h @@ -62,9 +62,6 @@ typedef struct { } res_t; #define FORMAT_128BITS "%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x" -#define RAND_FORMAT FORMAT_128BITS -#define AUTN_FORMAT FORMAT_128BITS -#define KASME_FORMAT FORMAT_128BITS #define DISPLAY_128BITS(bUFFER) \ bUFFER[0], bUFFER[1], bUFFER[2], bUFFER[3], bUFFER[4], bUFFER[5], bUFFER[6], bUFFER[7], \ diff --git a/openair3/MME_APP/enb_paramdef_mme.h b/openair3/MME_APP/enb_paramdef_mme.h deleted file mode 100644 index 127c1855e7..0000000000 --- a/openair3/MME_APP/enb_paramdef_mme.h +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The OpenAirInterface Software Alliance licenses this file to You under - * the OAI Public License, Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.openairinterface.org/?page_id=698 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *------------------------------------------------------------------------------- - * For more information about the OpenAirInterface (OAI) Software Alliance: - * contact@openairinterface.org - */ - -/*! \file openair2/ENB_APP/enb_paramdef_mce.h - * \brief definition of configuration parameters for MME modules - * \author Javier MORGADE - * \date 2019 - * \version 0.1 - * \company VICOMTECH Spain - * \email: javier.morgade@ieee.org - * \note - * \warning - */ - -#ifndef __MME_APP_ENB_PARAMDEF_MME__H__ -#define __MME_APP_ENB_PARAMDEF_MME__H__ - -#include "common/config/config_paramdesc.h" -#include "RRC_paramsvalues.h" - -#define ENB_CONFIG_STRING_MME_PARAMETERS "mme_parameters" -//#define ENB_CONFIG_STRING_SCHEDULING_INFO_BR "scheduling_info_br" -//#define ENB_CONFIG_STRING_RSRP_RANGE_LIST "rsrp_range_list" -//#define ENB_CONFIG_STRING_PRACH_CONFIG_COMMON_V1310 "prach_ConfigCommon_v1310" -//#define ENB_CONFIG_STRING_MPDCCH_START_SF_CSS_RA_R13 "mpdcch_startSF_CSS_RA_r13" -//#define ENB_CONFIG_STRING_MPDCCH_START_SF_CSS_RA_R13_VAL "mpdcch_startSF_CSS_RA_r13_val" -//#define ENB_CONFIG_STRING_PRACH_HOPPING_OFFSET_R13 "prach_HoppingOffset_r13" -//#define ENB_CONFIG_STRING_SCHEDULING_INFO_SIB1_BR_R13 "schedulingInfoSIB1_BR_r13" -//#define ENB_CONFIG_STRING_CELL_SELECTION_INFO_CE_R13 "cellSelectionInfoCE_r13" -//#define ENB_CONFIG_STRING_Q_RX_LEV_MIN_CE_R13 "q_RxLevMinCE_r13" -//#define ENB_CONFIG_STRING_BANDWIDTH_REDUCED_ACCESS_RELATED_INFO_R13 "bandwidthReducedAccessRelatedInfo_r13" -//#define ENB_CONFIG_STRING_SI_WINDOW_LENGTH_BR_R13 "si_WindowLength_BR_r13" -//#define ENB_CONFIG_STRING_SI_REPETITION_PATTERN_R13 "si_RepetitionPattern_r13" -//#define ENB_CONFIG_STRING_FDD_DOWNLINK_OR_TDD_SUBFRAME_BITMAP_BR_R13 "fdd_DownlinkOrTddSubframeBitmapBR_r13" -//#define ENB_CONFIG_STRING_FDD_DOWNLINK_OR_TDD_SUBFRAME_BITMAP_BR_VAL_R13 "fdd_DownlinkOrTddSubframeBitmapBR_val_r13" -//#define ENB_CONFIG_STRING_START_SYMBOL_BR_R13 "startSymbolBR_r13" -//#define ENB_CONFIG_STRING_SI_HOPPING_CONFIG_COMMON_R13 "si_HoppingConfigCommon_r13" -//#define ENB_CONFIG_STRING_SI_VALIDITY_TIME_R13 "si_ValidityTime_r13" -//#define ENB_CONFIG_STRING_FREQ_HOPPING_PARAMETERS_DL_R13 "freqHoppingParametersDL_r13" -//#define ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_NB_R13 "mpdcch_pdsch_HoppingNB_r13" -//#define ENB_CONFIG_STRING_INTERVAL_DL_HOPPING_CONFIG_COMMON_MODE_A_R13 "interval_DLHoppingConfigCommonModeA_r13" -//#define ENB_CONFIG_STRING_INTERVAL_DL_HOPPING_CONFIG_COMMON_MODE_A_R13_VAL "interval_DLHoppingConfigCommonModeA_r13_val" -//#define ENB_CONFIG_STRING_INTERVAL_DL_HOPPING_CONFIG_COMMON_MODE_B_R13 "interval_DLHoppingConfigCommonModeB_r13" -//#define ENB_CONFIG_STRING_INTERVAL_DL_HOPPING_CONFIG_COMMON_MODE_B_R13_VAL "interval_DLHoppingConfigCommonModeB_r13_val" -//#define ENB_CONFIG_STRING_MPDCCH_PDSCH_HOPPING_OFFSET_R13 "mpdcch_pdsch_HoppingOffset_r13" -//#define ENB_CONFIG_STRING_PREAMBLE_TRANSMAX_CE_R13 "preamble_TransMax_ce_r13" -//#define ENB_CONFIG_STRING_PREAMBLE_TRANSMAX_CE_R13_VAL "preamble_TransMax_ce_r13_val" -//#define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pdsch_maxNumRepetitionCEmodeA_r13" -//#define ENB_CONFIG_STRING_PDSCH_MAX_NUM_REPETITION_CE_MODE_B_R13 "pdsch_maxNumRepetitionCEmodeB_r13" -//#define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_A_R13 "pusch_maxNumRepetitionCEmodeA_r13" -//#define ENB_CONFIG_STRING_PUSCH_MAX_NUM_REPETITION_CE_MODE_B_R13 "pusch_maxNumRepetitionCEmodeB_r13" -//#define ENB_CONFIG_STRING_PUSCH_HOPPING_OFFSET_V1310 "pusch_HoppingOffset_v1310" -//#define ENB_CONFIG_STRING_SYSTEM_INFO_VALUE_TAG_LIST "system_info_value_tag_SI" -//#define ENB_CONFIG_STRING_FIRST_PREAMBLE_R13 "firstPreamble_r13" -//#define ENB_CONFIG_STRING_LAST_PREAMBLE_R13 "lastPreamble_r13" -//#define ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13 "ra_ResponseWindowSize_r13" -//#define ENB_CONFIG_STRING_MAC_CONTENTION_RESOLUTION_TIMER_R13 "mac_ContentionResolutionTimer_r13" -//#define ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13 "rar_HoppingConfig_r13" -//#define ENB_CONFIG_STRING_RACH_CE_LEVELINFOLIST_R13 "rach_CE_LevelInfoList_r13" -//#define ENB_CONFIG_STRING_PRACH_CONFIG_INDEX_BR "prach_config_index_br" -//#define ENB_CONFIG_STRING_PRACH_FREQ_OFFSET_BR "prach_freq_offset_br" -//#define ENB_CONFIG_STRING_PRACH_STARTING_SUBFRAME_R13 "prach_StartingSubframe_r13" -//#define ENB_CONFIG_STRING_MAX_NUM_PER_PREAMBLE_ATTEMPT_CE_R13 "maxNumPreambleAttemptCE_r13" -//#define ENB_CONFIG_STRING_NUM_REPETITION_PER_PREAMBLE_ATTEMPT_R13 "numRepetitionPerPreambleAttempt_r13" -//#define ENB_CONFIG_STRING_MPDCCH_NUM_REPETITION_RA_R13 "mpdcch_NumRepetition_RA_r13" -//#define ENB_CONFIG_STRING_PRACH_HOPPING_CONFIG_R13 "prach_HoppingConfig_r13" -//#define ENB_CONFIG_SRING_MAX_AVAILABLE_NARROW_BAND "max_available_narrow_band" -//#define ENB_CONFIG_STRING_PRACH_PARAMETERS_CE_R13 "prach_parameters_ce_r13" -//#define ENB_CONFIG_STRING_PUCCH_INFO_VALUE "pucch_info_value" -//#define ENB_CONFIG_STRING_N1PUCCH_AN_INFOLIST_R13 "n1PUCCH_AN_InfoList_r13" -//#define ENB_CONFIG_STRING_PCCH_CONFIG_V1310 "pcch_config_v1310" -//#define ENB_CONFIG_STRING_PAGING_NARROWBANDS_R13 "paging_narrowbands_r13" -//#define ENB_CONFIG_STRING_MPDCCH_NUMREPETITION_PAGING_R13 "mpdcch_numrepetition_paging_r13" -//#define ENB_CONFIG_STRING_NB_V1310 "nb_v1310" -//#define ENB_CONFIG_STRING_SIB2_FREQ_HOPPINGPARAMETERS_R13 "sib2_freq_hoppingParameters_r13" - -typedef struct ccparams_MME_s { - /// indicator that eMTC is configured for this cell - int32_t MME_configured; - // /// the SIB2 parameters for eMTC SIB2 - // ccparams_lte_t ccparams; - // int si_Narrowband_r13; - // int si_TBS_r13; - // int systemInfoValueTagSi_r13; - // int firstPreamble_r13; - // int lastPreamble_r13; - // int ra_ResponseWindowSize_r13; - // int mac_ContentionResolutionTimer_r13; - // int rar_HoppingConfig_r13; - // int rsrp_range_br; - // int prach_config_index_br; - // int prach_freq_offset_br; - // int prach_StartingSubframe_r13; - // int maxNumPreambleAttemptCE_r13; - // int numRepetitionPerPreambleAttempt_r13; - // int mpdcch_NumRepetition_RA_r13; - // int prach_HoppingConfig_r13; - // int *maxavailablenarrowband; - // int pucch_info_value; - // int paging_narrowbands_r13; - // int mpdcch_numrepetition_paging_r13; - // int nb_v1310; - // char *pucch_NumRepetitionCE_Msg4_Level0_r13; - // char *pucch_NumRepetitionCE_Msg4_Level1_r13; - // char *pucch_NumRepetitionCE_Msg4_Level2_r13; - // char *pucch_NumRepetitionCE_Msg4_Level3_r13; - // int sib2_mpdcch_pdsch_hoppingNB_r13; - // char *sib2_interval_DLHoppingConfigCommonModeA_r13; - // int sib2_interval_DLHoppingConfigCommonModeA_r13_val; - // char *sib2_interval_DLHoppingConfigCommonModeB_r13; - // int sib2_interval_DLHoppingConfigCommonModeB_r13_val; - // char *sib2_interval_ULHoppingConfigCommonModeA_r13; - // int sib2_interval_ULHoppingConfigCommonModeA_r13_val; - // char *sib2_interval_ULHoppingConfigCommonModeB_r13; - // int sib2_interval_ULHoppingConfigCommonModeB_r13_val; - // int sib2_mpdcch_pdsch_hoppingOffset_r13; - // int pusch_HoppingOffset_v1310; - // int hyperSFN_r13; - // int eDRX_Allowed_r13; - // int q_RxLevMinCE_r13; - // int q_QualMinRSRQ_CE_r13; - // char *si_WindowLength_BR_r13; - // char *si_RepetitionPattern_r13; - // int startSymbolBR_r13; - // char *si_HoppingConfigCommon_r13; - // char *si_ValidityTime_r13; - // char *mpdcch_pdsch_HoppingNB_r13; - // int interval_DLHoppingConfigCommonModeA_r13_val; - // int interval_DLHoppingConfigCommonModeB_r13_val; - // int mpdcch_pdsch_HoppingOffset_r13; - // char *preambleTransMax_CE_r13; - // int prach_HoppingOffset_r13; - // int schedulingInfoSIB1_BR_r13; - // int64_t fdd_DownlinkOrTddSubframeBitmapBR_val_r13; - // char *cellSelectionInfoCE_r13; - // char *bandwidthReducedAccessRelatedInfo_r13; - // char *fdd_DownlinkOrTddSubframeBitmapBR_r13; - // char *fdd_UplinkSubframeBitmapBR_r13; - // char *freqHoppingParametersDL_r13; - // char *interval_DLHoppingConfigCommonModeA_r13; - // char *interval_DLHoppingConfigCommonModeB_r13; - // char *prach_ConfigCommon_v1310; - // char *mpdcch_startSF_CSS_RA_r13; - // char *mpdcch_startSF_CSS_RA_r13_val; - // char *pdsch_maxNumRepetitionCEmodeA_r13; - // char *pdsch_maxNumRepetitionCEmodeB_r13; - // char *pusch_maxNumRepetitionCEmodeA_r13; - // char *pusch_maxNumRepetitionCEmodeB_r13; -} ccparams_MME_t; - - -#define MMEPARAMS_DESC(MMEconfig) { \ - {"MME_configured", NULL, 0, iptr:&MMEconfig->MME_configured, defintval:0, TYPE_UINT, 0} \ -} - -#define MMEPARAMS_CHECK { \ - { .s5= {NULL }} \ -} - -#endif diff --git a/openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h b/openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h index b95e140595..3e82fec02a 100644 --- a/openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h +++ b/openair3/NAS/COMMON/EMM/MSG/emm_msgDef.h @@ -45,7 +45,6 @@ Description Defines identifiers of the EPS Mobility Management messages. /* Header length boundaries of EPS Mobility Management messages */ #define EMM_HEADER_LENGTH sizeof(emm_msg_header_t) -#define EMM_HEADER_MINIMUM_LENGTH EMM_HEADER_LENGTH #define EMM_HEADER_MAXIMUM_LENGTH EMM_HEADER_LENGTH /* EPS Mobility Management Security header type */ diff --git a/openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h b/openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h index 48e6a18a90..b75ce1e77f 100644 --- a/openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h +++ b/openair3/NAS/COMMON/ESM/MSG/esm_msgDef.h @@ -46,8 +46,6 @@ Description Defines identifiers of the EPS Session Management messages /* Header length boundaries of EPS Session Management messages */ #define ESM_HEADER_LENGTH sizeof(esm_msg_header_t) -#define ESM_HEADER_MINIMUM_LENGTH ESM_HEADER_LENGTH -#define ESM_HEADER_MAXIMUM_LENGTH ESM_HEADER_LENGTH /* Message identifiers for EPS Session Management */ # define ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST 0b11000001 /* 193 = 0xc1 */ diff --git a/openair3/NAS/COMMON/IES/AdditionalUpdateType.h b/openair3/NAS/COMMON/IES/AdditionalUpdateType.h index 57a2f0e075..5686d50853 100644 --- a/openair3/NAS/COMMON/IES/AdditionalUpdateType.h +++ b/openair3/NAS/COMMON/IES/AdditionalUpdateType.h @@ -27,8 +27,6 @@ #ifndef ADDITIONAL_UPDATE_TYPE_H_ #define ADDITIONAL_UPDATE_TYPE_H_ - -#define ADDITIONAL_UPDATE_TYPE_MINIMUM_LENGTH 1 #define ADDITIONAL_UPDATE_TYPE_MAXIMUM_LENGTH 1 typedef uint8_t AdditionalUpdateType; diff --git a/openair3/NAS/COMMON/IES/EpsMobileIdentity.h b/openair3/NAS/COMMON/IES/EpsMobileIdentity.h index d9b13f250c..387bb8820e 100644 --- a/openair3/NAS/COMMON/IES/EpsMobileIdentity.h +++ b/openair3/NAS/COMMON/IES/EpsMobileIdentity.h @@ -34,7 +34,6 @@ typedef struct { uint8_t spare:4; #define EPS_MOBILE_IDENTITY_EVEN 0 -#define EPS_MOBILE_IDENTITY_ODD 1 uint8_t oddeven:1; uint8_t typeofidentity:3; uint8_t mccdigit2:4; diff --git a/openair3/NAS/COMMON/IES/MessageType.h b/openair3/NAS/COMMON/IES/MessageType.h index d926f09cdc..8e05f506ca 100644 --- a/openair3/NAS/COMMON/IES/MessageType.h +++ b/openair3/NAS/COMMON/IES/MessageType.h @@ -28,9 +28,6 @@ #ifndef MESSAGE_TYPE_H_ #define MESSAGE_TYPE_H_ -#define MESSAGE_TYPE_MINIMUM_LENGTH 1 -#define MESSAGE_TYPE_MAXIMUM_LENGTH 1 - typedef uint8_t MessageType; int encode_message_type(MessageType *messagetype, uint8_t iei, uint8_t *buffer, uint32_t len); diff --git a/openair3/NAS/COMMON/IES/MobileStationClassmark3.h b/openair3/NAS/COMMON/IES/MobileStationClassmark3.h index 80c4d4e8e2..bab12742f2 100644 --- a/openair3/NAS/COMMON/IES/MobileStationClassmark3.h +++ b/openair3/NAS/COMMON/IES/MobileStationClassmark3.h @@ -28,7 +28,6 @@ #ifndef MOBILE_STATION_CLASSMARK_3_H_ #define MOBILE_STATION_CLASSMARK_3_H_ -#define MOBILE_STATION_CLASSMARK_3_MINIMUM_LENGTH 1 #define MOBILE_STATION_CLASSMARK_3_MAXIMUM_LENGTH 1 typedef struct { diff --git a/openair3/NAS/COMMON/IES/NasRequestType.h b/openair3/NAS/COMMON/IES/NasRequestType.h index 7eb98ff42b..7efb270b45 100644 --- a/openair3/NAS/COMMON/IES/NasRequestType.h +++ b/openair3/NAS/COMMON/IES/NasRequestType.h @@ -29,7 +29,6 @@ #define NAS_REQUEST_TYPE_H_ #define REQUEST_TYPE_MINIMUM_LENGTH 1 -#define REQUEST_TYPE_MAXIMUM_LENGTH 1 #define REQUEST_TYPE_INITIAL_REQUEST 0b001 #define REQUEST_TYPE_HANDOVER 0b010 diff --git a/openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h b/openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h index 0f56e764d4..0b0e78c8b3 100644 --- a/openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h +++ b/openair3/NAS/COMMON/IES/ProcedureTransactionIdentity.h @@ -28,9 +28,6 @@ #ifndef PROCEDURE_TRANSACTION_IDENTITY_H_ #define PROCEDURE_TRANSACTION_IDENTITY_H_ -#define PROCEDURE_TRANSACTION_IDENTITY_MINIMUM_LENGTH 1 -#define PROCEDURE_TRANSACTION_IDENTITY_MAXIMUM_LENGTH 1 - #define PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED 0 #define PROCEDURE_TRANSACTION_IDENTITY_FIRST 1 #define PROCEDURE_TRANSACTION_IDENTITY_LAST 254 diff --git a/openair3/NAS/COMMON/IES/ProtocolDiscriminator.h b/openair3/NAS/COMMON/IES/ProtocolDiscriminator.h index 465baf21f4..a0fcb1471f 100644 --- a/openair3/NAS/COMMON/IES/ProtocolDiscriminator.h +++ b/openair3/NAS/COMMON/IES/ProtocolDiscriminator.h @@ -28,9 +28,6 @@ #ifndef PROTOCOL_DISCRIMINATOR_H_ #define PROTOCOL_DISCRIMINATOR_H_ -#define PROTOCOL_DISCRIMINATOR_MINIMUM_LENGTH 1 -#define PROTOCOL_DISCRIMINATOR_MAXIMUM_LENGTH 1 - typedef uint8_t ProtocolDiscriminator; int encode_protocol_discriminator(ProtocolDiscriminator *protocoldiscriminator, uint8_t iei, uint8_t *buffer, uint32_t len); diff --git a/openair3/NAS/COMMON/IES/SecurityHeaderType.h b/openair3/NAS/COMMON/IES/SecurityHeaderType.h index dcfaea6f8a..72ab9492c1 100644 --- a/openair3/NAS/COMMON/IES/SecurityHeaderType.h +++ b/openair3/NAS/COMMON/IES/SecurityHeaderType.h @@ -28,9 +28,6 @@ #ifndef SECURITY_HEADER_TYPE_H_ #define SECURITY_HEADER_TYPE_H_ -#define SECURITY_HEADER_TYPE_MINIMUM_LENGTH 1 -#define SECURITY_HEADER_TYPE_MAXIMUM_LENGTH 1 - typedef uint8_t SecurityHeaderType; int encode_security_header_type(SecurityHeaderType *securityheadertype, uint8_t iei, uint8_t *buffer, uint32_t len); diff --git a/openair3/NAS/COMMON/IES/TransactionIdentifier.h b/openair3/NAS/COMMON/IES/TransactionIdentifier.h index cf19a2f6f5..dbe5d76249 100644 --- a/openair3/NAS/COMMON/IES/TransactionIdentifier.h +++ b/openair3/NAS/COMMON/IES/TransactionIdentifier.h @@ -28,7 +28,6 @@ #ifndef TRANSACTION_IDENTIFIER_H_ #define TRANSACTION_IDENTIFIER_H_ -#define TRANSACTION_IDENTIFIER_MINIMUM_LENGTH 1 #define TRANSACTION_IDENTIFIER_MAXIMUM_LENGTH 1 typedef struct { diff --git a/openair3/NAS/COMMON/IES/UeNetworkCapability.h b/openair3/NAS/COMMON/IES/UeNetworkCapability.h index a93587c33c..a006c0c45e 100644 --- a/openair3/NAS/COMMON/IES/UeNetworkCapability.h +++ b/openair3/NAS/COMMON/IES/UeNetworkCapability.h @@ -78,19 +78,14 @@ typedef struct UeNetworkCapability_tag { /* Bits 8 to 6 of octet 7 are spare and shall be coded as zero */ uint8_t spare:3; /* eNodeB-based access class control for CSFB capability */ -#define UE_NETWORK_CAPABILITY_CSFB 1 uint8_t csfb:1; /* LTE Positioning Protocol capability */ -#define UE_NETWORK_CAPABILITY_LPP 1 uint8_t lpp:1; /* Location services notification mechanisms capability */ -#define UE_NETWORK_CAPABILITY_LCS 1 uint8_t lcs:1; /* 1xSRVCC capability */ -#define UE_NETWORK_CAPABILITY_SRVCC 1 uint8_t srvcc:1; /* NF notification procedure capability */ -#define UE_NETWORK_CAPABILITY_NF 1 uint8_t nf:1; uint8_t umts_present; diff --git a/openair3/NAS/COMMON/IES/UeSecurityCapability.h b/openair3/NAS/COMMON/IES/UeSecurityCapability.h index d9726d76e0..0304eb94fc 100644 --- a/openair3/NAS/COMMON/IES/UeSecurityCapability.h +++ b/openair3/NAS/COMMON/IES/UeSecurityCapability.h @@ -33,54 +33,16 @@ typedef struct UeSecurityCapability_tag { /* EPS encryption algorithms supported (octet 3) */ -#define UE_SECURITY_CAPABILITY_EEA0 0b10000000 -#define UE_SECURITY_CAPABILITY_EEA1 0b01000000 -#define UE_SECURITY_CAPABILITY_EEA2 0b00100000 -#define UE_SECURITY_CAPABILITY_EEA3 0b00010000 -#define UE_SECURITY_CAPABILITY_EEA4 0b00001000 -#define UE_SECURITY_CAPABILITY_EEA5 0b00000100 -#define UE_SECURITY_CAPABILITY_EEA6 0b00000010 -#define UE_SECURITY_CAPABILITY_EEA7 0b00000001 uint8_t eea; /* EPS integrity algorithms supported (octet 4) */ -#define UE_SECURITY_CAPABILITY_EIA0 0b10000000 -#define UE_SECURITY_CAPABILITY_EIA1 0b01000000 -#define UE_SECURITY_CAPABILITY_EIA2 0b00100000 -#define UE_SECURITY_CAPABILITY_EIA3 0b00010000 -#define UE_SECURITY_CAPABILITY_EIA4 0b00001000 -#define UE_SECURITY_CAPABILITY_EIA5 0b00000100 -#define UE_SECURITY_CAPABILITY_EIA6 0b00000010 -#define UE_SECURITY_CAPABILITY_EIA7 0b00000001 uint8_t eia; uint8_t umts_present; uint8_t gprs_present; /* UMTS encryption algorithms supported (octet 5) */ -#define UE_SECURITY_CAPABILITY_UEA0 0b10000000 -#define UE_SECURITY_CAPABILITY_UEA1 0b01000000 -#define UE_SECURITY_CAPABILITY_UEA2 0b00100000 -#define UE_SECURITY_CAPABILITY_UEA3 0b00010000 -#define UE_SECURITY_CAPABILITY_UEA4 0b00001000 -#define UE_SECURITY_CAPABILITY_UEA5 0b00000100 -#define UE_SECURITY_CAPABILITY_UEA6 0b00000010 -#define UE_SECURITY_CAPABILITY_UEA7 0b00000001 uint8_t uea; /* UMTS integrity algorithms supported (octet 6) */ -#define UE_SECURITY_CAPABILITY_UIA1 0b01000000 -#define UE_SECURITY_CAPABILITY_UIA2 0b00100000 -#define UE_SECURITY_CAPABILITY_UIA3 0b00010000 -#define UE_SECURITY_CAPABILITY_UIA4 0b00001000 -#define UE_SECURITY_CAPABILITY_UIA5 0b00000100 -#define UE_SECURITY_CAPABILITY_UIA6 0b00000010 -#define UE_SECURITY_CAPABILITY_UIA7 0b00000001 uint8_t uia:7; /* GPRS encryption algorithms supported (octet 7) */ -#define UE_SECURITY_CAPABILITY_GEA1 0b01000000 -#define UE_SECURITY_CAPABILITY_GEA2 0b00100000 -#define UE_SECURITY_CAPABILITY_GEA3 0b00010000 -#define UE_SECURITY_CAPABILITY_GEA4 0b00001000 -#define UE_SECURITY_CAPABILITY_GEA5 0b00000100 -#define UE_SECURITY_CAPABILITY_GEA6 0b00000010 -#define UE_SECURITY_CAPABILITY_GEA7 0b00000001 uint8_t gea:7; } UeSecurityCapability; diff --git a/openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h b/openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h index b7dbe35de4..347d314082 100644 --- a/openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h +++ b/openair3/NAS/COMMON/IES/VoiceDomainPreferenceAndUeUsageSetting.h @@ -29,7 +29,6 @@ #define VOICE_DOMAIN_PREFERENCE_AND_UE_USAGE_SETTING_H_ #define VOICE_DOMAIN_PREFERENCE_AND_UE_USAGE_SETTING_MINIMUM_LENGTH 1 -#define VOICE_DOMAIN_PREFERENCE_AND_UE_USAGE_SETTING_MAXIMUM_LENGTH 1 typedef struct VoiceDomainPreferenceAndUeUsageSetting_tag { uint8_t spare:5; diff --git a/openair3/NAS/COMMON/UTIL/nas_log.h b/openair3/NAS/COMMON/UTIL/nas_log.h index de7b6357fe..334997aacb 100644 --- a/openair3/NAS/COMMON/UTIL/nas_log.h +++ b/openair3/NAS/COMMON/UTIL/nas_log.h @@ -61,17 +61,6 @@ Description Usefull logging functions * ON : Enables logging traces excepted FUNC. * ALL : Turns on ALL logging traces. */ -#define NAS_LOG_OFF 0x00 /* No trace */ -#define NAS_LOG_DEBUG 0x01 /* Debug trace */ -#define NAS_LOG_INFO 0x02 /* Informational trace */ -#define NAS_LOG_WARNING 0x04 /* Warning trace */ -#define NAS_LOG_ERROR 0x08 /* Error trace */ -#define NAS_LOG_FUNC 0x10 /* Entering/Leaving function trace */ -#define NAS_LOG_HEX 0x20 /* Dump trace */ - -#define NAS_LOG_ON 0x0F /* All traces excepted FUNC and HEX */ -#define NAS_LOG_ALL 0xFF /* All traces */ - /* Logging severity type */ typedef enum { DEBUG, @@ -83,18 +72,6 @@ typedef enum { LOG_SEVERITY_MAX } log_severity_t; -/****************************************************************************/ -/************************ G L O B A L T Y P E S ************************/ -/****************************************************************************/ - -/****************************************************************************/ -/******************** G L O B A L V A R I A B L E S ********************/ -/****************************************************************************/ - -/****************************************************************************/ -/****************** E X P O R T E D F U N C T I O N S ******************/ -/****************************************************************************/ - #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) #ifdef LOG_E diff --git a/openair3/NAS/COMMON/securityDef.h b/openair3/NAS/COMMON/securityDef.h index 30732f26f5..344bda5646 100644 --- a/openair3/NAS/COMMON/securityDef.h +++ b/openair3/NAS/COMMON/securityDef.h @@ -53,12 +53,9 @@ Description Contains global security definitions * Size of the authentication challenge parameters in bytes */ #define AUTH_SQN_SIZE 6 /* Sequence number: 48 bits */ -#define AUTH_AK_SIZE 6 /* Anonymity key: 48 bits */ #define AUTH_AMF_SIZE 2 /* Authentication Management Field: 16 bits */ -#define AUTH_MAC_SIZE 8 /* Message Authentication Code: 64 bits */ #define AUTH_AUTN_SIZE 16 /* Authentication token: 128 bits AUTN = (SQN ⊕ AK) || AMF || MAC */ -#define AUTH_MACS_SIZE 8 /* Re-synchronization MAC: 64 bits */ #define AUTH_AUTS_SIZE 16 /* Re-synchronization AUT: 128 bits */ #define AUTH_RAND_SIZE 16 /* Random challenge: 128 bits */ #define AUTH_CK_SIZE 16 /* Ciphering key: 128 bits */ diff --git a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGCNasMessageContainer.h b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGCNasMessageContainer.h index a81c1add67..51e589cc92 100644 --- a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGCNasMessageContainer.h +++ b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGCNasMessageContainer.h @@ -38,7 +38,6 @@ #define FGC_NAS_MESSAGE_CONTAINER_H_ #define FGC_NAS_MESSAGE_CONTAINER_MINIMUM_LENGTH 4 -#define FGC_NAS_MESSAGE_CONTAINER_MAXIMUM_LENGTH 65535 typedef struct FGCNasMessageContainer_tag { OctetString nasmessagecontainercontents; diff --git a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSDeregistrationType.h b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSDeregistrationType.h index 84a09657d4..9417266191 100644 --- a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSDeregistrationType.h +++ b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSDeregistrationType.h @@ -25,8 +25,6 @@ #include #include "OctetString.h" -#define FGS_DEREGISTRATION_TYPE_MINIMUM_LENGTH 1 -#define FGS_DEREGISTRATION_TYPE_MAXIMUM_LENGTH 1 typedef struct FGSDeregistrationType_tag { #define NORMAL_DEREGISTRATION 0 diff --git a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSRegistrationType.h b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSRegistrationType.h index 7a0e832942..856590495f 100644 --- a/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSRegistrationType.h +++ b/openair3/NAS/NR_UE/5GS/5GMM/IES/FGSRegistrationType.h @@ -35,8 +35,6 @@ #ifndef FGS_REGISTRATION_TYPE_H_ #define FGS_REGISTRATION_TYPE_H_ -#define FGS_REGISTRATION_TYPE_MINIMUM_LENGTH 1 -#define FGS_REGISTRATION_TYPE_MAXIMUM_LENGTH 1 typedef uint8_t FGSRegistrationType; diff --git a/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h b/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h index 80694814b4..e731d1fbdc 100644 --- a/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h +++ b/openair3/NAS/NR_UE/5GS/5GSM/MSG/PduSessionEstablishmentAccept.h @@ -51,7 +51,6 @@ typedef enum { FOREACH_IEI(TO_ENUM) } pduSessionEstablishment_IEI_t; #define PDU_SESSION_TYPE_IPV4V6 0b011 #define IPv4_ADDRESS_LENGTH 4 // length of the IPv4 address associated with a PDU session #define IPv6_INTERFACE_ID_LENGTH 8 // interface identifier for the IPv6 link local address -#define SMF_IPv6_LLA_LENGTH 16 /* Rule operation codes - TS 24.501 Table 9.11.4.13.1 */ diff --git a/openair3/NAS/NR_UE/nr_nas_msg.h b/openair3/NAS/NR_UE/nr_nas_msg.h index 7a19997444..d45b68a8d4 100644 --- a/openair3/NAS/NR_UE/nr_nas_msg.h +++ b/openair3/NAS/NR_UE/nr_nas_msg.h @@ -42,10 +42,7 @@ #define INITIAL_REGISTRATION 0b001 -#define PLAIN_5GS_NAS_MESSAGE_HEADER_LENGTH 3 #define SECURITY_PROTECTED_5GS_NAS_MESSAGE_HEADER_LENGTH 7 -#define PAYLOAD_CONTAINER_LENGTH_MIN 3 -#define PAYLOAD_CONTAINER_LENGTH_MAX 65537 #define NAS_INTEGRITY_SIZE 4 /* 3GPP TS 24.501: 9.11.3.50 Service type */ diff --git a/openair3/NAS/TOOLS/conf_network.h b/openair3/NAS/TOOLS/conf_network.h index a535841a4c..a9d738148e 100644 --- a/openair3/NAS/TOOLS/conf_network.h +++ b/openair3/NAS/TOOLS/conf_network.h @@ -12,9 +12,6 @@ #define MNC "MNC" #define MCC "MCC" -#define MIN_TAC 0x0000 -#define MAX_TAC 0xFFFE - /* * PLMN network operator record */ diff --git a/openair3/NAS/UE/API/USER/at_command.h b/openair3/NAS/UE/API/USER/at_command.h index 658dbc7a08..7358eb1f64 100644 --- a/openair3/NAS/UE/API/USER/at_command.h +++ b/openair3/NAS/UE/API/USER/at_command.h @@ -59,12 +59,6 @@ Description Defines the ATtention (AT) command set supported by the NAS #define AT_COMMAND_PARAM8 0x0080 /* 8th parameter is present */ #define AT_COMMAND_PARAM9 0x0100 /* 9th parameter is present */ #define AT_COMMAND_PARAM10 0x0200 /* 10th parameter is present */ -#define AT_COMMAND_PARAM11 0x0400 /* 11th parameter is present */ -#define AT_COMMAND_PARAM12 0x0800 /* 12th parameter is present */ -#define AT_COMMAND_PARAM13 0x1000 /* 13th parameter is present */ -#define AT_COMMAND_PARAM14 0x2000 /* 14th parameter is present */ -#define AT_COMMAND_PARAM15 0x4000 /* 15th parameter is present */ -#define AT_COMMAND_PARAM16 0x8000 /* 16th parameter is present */ /* Value of the mask parameter for AT commands without any parameters */ #define AT_COMMAND_NO_PARAM AT_COMMAND_PARAM0 @@ -249,8 +243,6 @@ typedef struct at_cimi_s { /* Functionality levels */ #define AT_CFUN_MIN 0 /* minimum functionality */ #define AT_CFUN_FULL 1 /* full functionality */ -#define AT_CFUN_SEND 2 /* disable phone transmit RF circuits only */ -#define AT_CFUN_RECV 3 /* disable phone receive RF circuits only */ #define AT_CFUN_BOTH 4 /* disable phone both transmit and receive * RF circuits */ #define AT_CFUN_MAX AT_CFUN_BOTH @@ -265,7 +257,6 @@ typedef struct at_cimi_s { * is not given) */ #define AT_CFUN_RST 1 /* reset the ME before setting it to * power level */ -#define AT_CFUN_RST_DEFAULT AT_CFUN_NORST /* Default resetting action applied when * no value is given */ /* Optional parameter bitmask */ @@ -468,12 +459,6 @@ typedef struct { * no value is given */ /* Access technology indicators */ #define AT_COPS_GSM NET_ACCESS_GSM /* GSM */ -#define AT_COPS_COMPACT NET_ACCESS_COMPACT /* GSM Compact */ -#define AT_COPS_UTRAN NET_ACCESS_UTRAN /* UTRAN */ -#define AT_COPS_EGPRS NET_ACCESS_EGPRS /* GSM w/EGPRS */ -#define AT_COPS_HSDPA NET_ACCESS_HSDPA /* UTRAN w/HSDPA */ -#define AT_COPS_HSUPA NET_ACCESS_HSUPA /* UTRAN w/HSUPA */ -#define AT_COPS_HSDUPA NET_ACCESS_HSDUPA /* w/HSDPA and HSUPA */ #define AT_COPS_EUTRAN NET_ACCESS_EUTRAN /* E-UTRAN */ #define AT_COPS_ACT_MIN AT_COPS_GSM /* Minimum value of supported access @@ -675,21 +660,15 @@ typedef struct { #define AT_CGDCONT_CID_DEFAULT AT_CGDCONT_CID_MIN /* PDP data compression parameter values */ #define AT_CGDCONT_D_COMP_OFF 0 /* PDP data compression is disabled */ -#define AT_CGDCONT_D_COMP_ON 1 /* manufacturer preferred compression */ -#define AT_CGDCONT_D_COMP_V42B 2 /* V.42bis */ #define AT_CGDCONT_D_COMP_V44 3 /* V.44 */ #define AT_CGDCONT_D_COMP_MIN AT_CGDCONT_D_COMP_OFF #define AT_CGDCONT_D_COMP_MAX AT_CGDCONT_D_COMP_V44 -#define AT_CGDCONT_D_COMP_DEFAULT AT_CGDCONT_D_COMP_OFF /* PDP header compression parameter values */ #define AT_CGDCONT_H_COMP_OFF 0 /* PDP header compression is disabled */ -#define AT_CGDCONT_H_COMP_ON 1 /* manufacturer preferred compression */ #define AT_CGDCONT_H_COMP_1144 2 /* RFC1144 (applicable for SNDCP only) */ -#define AT_CGDCONT_H_COMP_2507 3 /* RFC2507 */ #define AT_CGDCONT_H_COMP_3095 4 /* RFC3095 (applicable for PDCP only) */ #define AT_CGDCONT_H_COMP_MIN AT_CGDCONT_H_COMP_OFF #define AT_CGDCONT_H_COMP_MAX AT_CGDCONT_H_COMP_3095 -#define AT_CGDCONT_H_COMP_DEFAULT AT_CGDCONT_H_COMP_OFF /* IPv4AddrAlloc parameter values */ #define AT_CGDCONT_IPV4_NAS 0 /* IPv4 Address Allocation through NAS * Signalling */ @@ -708,8 +687,6 @@ typedef struct { /* P_CSCF_discovery parameter values */ #define AT_CGDCONT_PCSCF_OFF 0 /* Preference of P-CSCF address discovery * not influenced by +CGDCONTPDP */ -#define AT_CGDCONT_PCSCF_NAS 1 /* Preference of P-CSCF address discovery - * through NAS Signalling */ #define AT_CGDCONT_PCSCF_DHCP 2 /* Preference of P-CSCF address discovery * through DHCP */ #define AT_CGDCONT_PCSCF_MIN AT_CGDCONT_PCSCF_OFF diff --git a/openair3/NAS/UE/API/USIM/usim_api.h b/openair3/NAS/UE/API/USIM/usim_api.h index e1b379c050..b83ed28f66 100644 --- a/openair3/NAS/UE/API/USIM/usim_api.h +++ b/openair3/NAS/UE/API/USIM/usim_api.h @@ -52,7 +52,6 @@ Description Implements the API used by the NAS layer to read/write * Subscriber authentication security key */ #define USIM_API_K_SIZE 16 -#define USIM_API_K_VALUE "fec86ba6eb707ed08905757b1bb44b8f" /* * The name of the file where are stored data of the USIM application @@ -156,7 +155,6 @@ typedef struct { */ typedef struct { /* Length of all subsequent data */ -#define USIM_EPS_NAS_SECURITY_CONTEXT_TAG 0xA0U uint8_t length; /* Key set identifier KSI_ASME */ #define USIM_KSI_ASME_TAG 0x80U diff --git a/openair3/NAS/UE/EMM/SAP/emm_fsm.c b/openair3/NAS/UE/EMM/SAP/emm_fsm.c index 5a715727ad..edfd9c05ae 100644 --- a/openair3/NAS/UE/EMM/SAP/emm_fsm.c +++ b/openair3/NAS/UE/EMM/SAP/emm_fsm.c @@ -44,19 +44,6 @@ Description Defines the EPS Mobility Management procedures executed at #include "emmData.h" #include "user_defs.h" - - - -/****************************************************************************/ -/**************** E X T E R N A L D E F I N I T I O N S ****************/ -/****************************************************************************/ - -#define EMM_FSM_NB_UE_MAX 1 - -/****************************************************************************/ -/******************* L O C A L D E F I N I T I O N S *******************/ -/****************************************************************************/ - /* * ----------------------------------------------------------------------------- * Data used for trace logging diff --git a/openair3/NAS/UE/EMM/SAP/emm_sap.h b/openair3/NAS/UE/EMM/SAP/emm_sap.h index 98088a66f3..50d42d4f10 100644 --- a/openair3/NAS/UE/EMM/SAP/emm_sap.h +++ b/openair3/NAS/UE/EMM/SAP/emm_sap.h @@ -123,7 +123,6 @@ typedef enum { #define EMMREG_PRIMITIVE_MIN _EMMREG_START #define EMMESM_PRIMITIVE_MIN _EMMESM_START #define EMMAS_PRIMITIVE_MIN _EMMAS_START -#define EMMCN_PRIMITIVE_MIN _EMMCN_START /* * Maximal identifier for EMM-SAP primitives @@ -131,7 +130,6 @@ typedef enum { #define EMMREG_PRIMITIVE_MAX _EMMREG_END #define EMMESM_PRIMITIVE_MAX _EMMESM_END #define EMMAS_PRIMITIVE_MAX _EMMAS_END -#define EMMCN_PRIMITIVE_MAX _EMMCN_END /****************************************************************************/ /************************ G L O B A L T Y P E S ************************/ diff --git a/openair3/NGAP/ngap_common.h b/openair3/NGAP/ngap_common.h index 9afaf47c4b..986a7b59bf 100644 --- a/openair3/NGAP/ngap_common.h +++ b/openair3/NGAP/ngap_common.h @@ -46,8 +46,6 @@ # error "You are compiling ngap with the wrong version of ASN1C" #endif -#define NGAP_UE_ID_FMT "0x%06"PRIX32 - # include "common/utils/LOG/log.h" # include "ngap_gNB_default_values.h" # define NGAP_ERROR(x, args...) LOG_E(NGAP, x, ##args) diff --git a/openair3/S1AP/s1ap_common.h b/openair3/S1AP/s1ap_common.h index 7ef7e589ca..93993c8d77 100644 --- a/openair3/S1AP/s1ap_common.h +++ b/openair3/S1AP/s1ap_common.h @@ -50,8 +50,6 @@ # error "You are compiling s1ap with the wrong version of ASN1C" #endif -#define S1AP_UE_ID_FMT "0x%06"PRIX32 - #include "common/utils/LOG/log.h" #include "s1ap_eNB_default_values.h" #define S1AP_ERROR(x, args...) LOG_E(S1AP, x, ##args) diff --git a/openair3/SECU/nas_stream_eia2.c b/openair3/SECU/nas_stream_eia2.c index ee19a8f603..8a050b3377 100644 --- a/openair3/SECU/nas_stream_eia2.c +++ b/openair3/SECU/nas_stream_eia2.c @@ -32,8 +32,6 @@ #include "assertions.h" #include "conversions.h" -#define SECU_DEBUG - /*! * @brief Create integrity cmac t for a given message. * @param[in] stream_cipher Structure containing various variables to setup encoding diff --git a/openair3/UICC/usim_interface.c b/openair3/UICC/usim_interface.c index f1019366b1..7ba83d2048 100644 --- a/openair3/UICC/usim_interface.c +++ b/openair3/UICC/usim_interface.c @@ -26,7 +26,6 @@ #include extern uint16_t NB_UE_INST; -#define UICC_SECTION "uicc" #define IMEISV_STR_MAX_LENGTH 16 #define UICC_CONFIG_HELP_OPTIONS " list of comma separated options to interface a simulated (real UICC to be developped). Available options: \n"\ " imsi: user imsi\n"\ diff --git a/openair3/UTILS/conversions.h b/openair3/UTILS/conversions.h index 31a479cab6..ec65f1727a 100644 --- a/openair3/UTILS/conversions.h +++ b/openair3/UTILS/conversions.h @@ -561,6 +561,5 @@ do { \ #define TAC_TO_ASN1 INT16_TO_OCTET_STRING #define GTP_TEID_TO_ASN1 INT32_TO_OCTET_STRING -#define OCTET_STRING_TO_TAC OCTET_STRING_TO_INT16 #endif /* CONVERSIONS_H_ */ diff --git a/radio/ETHERNET/ethernet_lib.h b/radio/ETHERNET/ethernet_lib.h index 2a5f2db4ca..1e5b3f0335 100644 --- a/radio/ETHERNET/ethernet_lib.h +++ b/radio/ETHERNET/ethernet_lib.h @@ -43,7 +43,6 @@ #include #define MAX_INST 4 -#define DEFAULT_IF "lo" #define TX_FLAG 1 #define RX_FLAG 0 diff --git a/radio/ETHERNET/if_defs.h b/radio/ETHERNET/if_defs.h index e2acf78a5c..df40c25aa3 100644 --- a/radio/ETHERNET/if_defs.h +++ b/radio/ETHERNET/if_defs.h @@ -83,6 +83,5 @@ // Mobipass packet sizes #define RAW_IF5_MOBIPASS_BLOCK_SIZE_BYTES 1280 #define RAW_IF5_MOBIPASS_SIZE_BYTES (MAC_HEADER_SIZE_BYTES + sizeof_IF5_mobipass_header_t + RAW_IF5_MOBIPASS_BLOCK_SIZE_BYTES) -#define PAYLOAD_MOBIPASS_NUM_SAMPLES 640 #endif diff --git a/radio/iqplayer/iqplayer_lib.c b/radio/iqplayer/iqplayer_lib.c index 2df57c9202..629b22bd00 100644 --- a/radio/iqplayer/iqplayer_lib.c +++ b/radio/iqplayer/iqplayer_lib.c @@ -23,8 +23,6 @@ * * \author:FrancoisTaburet: francois.taburet@nokia-bell-labs.com */ -#define _LARGEFILE_SOURCE -#define _FILE_OFFSET_BITS 64 #include #include #include diff --git a/radio/rfsimulator/simulator.cpp b/radio/rfsimulator/simulator.cpp index ef6be135e6..d1b00f3dd2 100644 --- a/radio/rfsimulator/simulator.cpp +++ b/radio/rfsimulator/simulator.cpp @@ -49,7 +49,6 @@ #include #include #include "common_lib.h" -#define CHANNELMOD_DYNAMICLOAD extern "C" { #include #include