Skip to content

O
OpenXG UE
Commit ca092977 authored by bruno mongazon's avatar bruno mongazon
Browse files
Options

Fix #582, NEW_FFT removed

parent affee54f
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 10 deletions
cmake_targets/CMakeLists.txt
View file @ ca092977
...@@ -629,7 +629,6 @@ add_boolean_option(LARGE_SCALE False "specific to oaisim: defines ma ...@@ -629,7 +629,6 @@ add_boolean_option(LARGE_SCALE False "specific to oaisim: defines ma
add_boolean_option(LOCALIZATION False "???") add_boolean_option(LOCALIZATION False "???")
add_integer_option(MAX_NUM_CCs 1 "????") add_integer_option(MAX_NUM_CCs 1 "????")
add_boolean_option(MU_RECEIVER False "????") add_boolean_option(MU_RECEIVER False "????")
add_boolean_option(NEW_FFT True "????")
add_boolean_option(OPENAIR1 True "????") add_boolean_option(OPENAIR1 True "????")
add_boolean_option(PERFECT_CE False "????") add_boolean_option(PERFECT_CE False "????")
add_boolean_option(PHYSIM True "for L1 simulators (dlsim, ulsim, ...)") add_boolean_option(PHYSIM True "for L1 simulators (dlsim, ulsim, ...)")
......
cmake_targets/epc_test/CMakeLists.template
View file @ ca092977
...@@ -39,7 +39,6 @@ set ( NAS_UE True ) ...@@ -39,7 +39,6 @@ set ( NAS_UE True )
set ( NB_ANTENNAS_RX "2" ) set ( NB_ANTENNAS_RX "2" )
set ( NB_ANTENNAS_TX "2" ) set ( NB_ANTENNAS_TX "2" )
set ( NB_ANTENNAS_TXRX "2" ) set ( NB_ANTENNAS_TXRX "2" )
set ( NEW_FFT True )
set ( NO_RRM True ) set ( NO_RRM True )
set ( OAISIM False ) set ( OAISIM False )
set ( OAI_NW_DRIVER_TYPE_ETHERNET False ) set ( OAI_NW_DRIVER_TYPE_ETHERNET False )
......
cmake_targets/oaisim_build_oai/CMakeLists.template
View file @ ca092977
...@@ -38,7 +38,6 @@ set ( NAS_UE True ) ...@@ -38,7 +38,6 @@ set ( NAS_UE True )
set ( NB_ANTENNAS_RX "2" ) set ( NB_ANTENNAS_RX "2" )
set ( NB_ANTENNAS_TX "2" ) set ( NB_ANTENNAS_TX "2" )
set ( NB_ANTENNAS_TXRX "2" ) set ( NB_ANTENNAS_TXRX "2" )
set ( NEW_FFT True )
set ( NO_RRM True ) set ( NO_RRM True )
set ( OAISIM True ) set ( OAISIM True )
set ( OAI_NW_DRIVER_TYPE_ETHERNET False ) set ( OAI_NW_DRIVER_TYPE_ETHERNET False )
......
cmake_targets/oaisim_mme_build_oai/CMakeLists.template
View file @ ca092977
...@@ -39,7 +39,6 @@ set ( NAS_UE False ) ...@@ -39,7 +39,6 @@ set ( NAS_UE False )
set ( NB_ANTENNAS_RX "2" ) set ( NB_ANTENNAS_RX "2" )
set ( NB_ANTENNAS_TX "2" ) set ( NB_ANTENNAS_TX "2" )
set ( NB_ANTENNAS_TXRX "2" ) set ( NB_ANTENNAS_TXRX "2" )
set ( NEW_FFT False )
set ( NO_RRM False ) set ( NO_RRM False )
set ( OAISIM False ) set ( OAISIM False )
set ( OAI_NW_DRIVER_TYPE_ETHERNET False ) set ( OAI_NW_DRIVER_TYPE_ETHERNET False )
......
cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
View file @ ca092977
...@@ -39,7 +39,6 @@ set ( NAS_UE False ) ...@@ -39,7 +39,6 @@ set ( NAS_UE False )
set ( NB_ANTENNAS_RX "2" ) set ( NB_ANTENNAS_RX "2" )
set ( NB_ANTENNAS_TX "2" ) set ( NB_ANTENNAS_TX "2" )
set ( NB_ANTENNAS_TXRX "2" ) set ( NB_ANTENNAS_TXRX "2" )
set ( NEW_FFT True )
set ( NO_RRM True ) set ( NO_RRM True )
set ( OAISIM True ) set ( OAISIM True )
set ( OAI_NW_DRIVER_TYPE_ETHERNET False ) set ( OAI_NW_DRIVER_TYPE_ETHERNET False )
......
cmake_targets/s1c_mme_test/CMakeLists.template
View file @ ca092977
...@@ -39,7 +39,6 @@ set ( NAS_UE True ) ...@@ -39,7 +39,6 @@ set ( NAS_UE True )
set ( NB_ANTENNAS_RX "2" ) set ( NB_ANTENNAS_RX "2" )
set ( NB_ANTENNAS_TX "2" ) set ( NB_ANTENNAS_TX "2" )
set ( NB_ANTENNAS_TXRX "2" ) set ( NB_ANTENNAS_TXRX "2" )
set ( NEW_FFT True )
set ( NO_RRM True ) set ( NO_RRM True )
set ( OAISIM True ) set ( OAISIM True )
set ( OAI_NW_DRIVER_TYPE_ETHERNET False ) set ( OAI_NW_DRIVER_TYPE_ETHERNET False )
......
common/utils/telnetsrv/CMakeLists.txt
View file @ ca092977
...@@ -24,7 +24,7 @@ set(OPENAIR_NFAPIINC $ENV{NFAPI_DIR} ) ...@@ -24,7 +24,7 @@ set(OPENAIR_NFAPIINC $ENV{NFAPI_DIR} )
set(CMAKE_INSTALL_PREFIX $ENV{OPENAIR_TARGETS}) set(CMAKE_INSTALL_PREFIX $ENV{OPENAIR_TARGETS})
add_definitions (-DRel14 -DCMAKER -DENABLE_ITTI -DENABLE_NAS_UE_LOGGING -DENABLE_SECURITY -DENABLE_USE_CPU_EXECUTION_TIME -DENABLE_USE_MME -DENABLE_VCD -DENB_AGENT -DENB_MODE -DETHERNET=1 -DEXMIMO_IOT -DJUMBO_FRAME -DLINK_ENB_PDCP_TO_GTPV1U -DLOG_NO_THREAD -DMAC_CONTEXT -DMAX_NUM_CCs=1 -DNAS_BUILT_IN_UE -DNAS_UE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DNEW_FFT -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK -DOPENAIR1 -DOPENAIR2 -DOPENAIR_LTE -DPHYSIM -DPHY_CONTEXT -DPUCCH -DRel10=1 -DS1AP_VERSION=R10 -DTRACE_RLC_MUTEX -DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3) add_definitions (-DRel14 -DCMAKER -DENABLE_ITTI -DENABLE_NAS_UE_LOGGING -DENABLE_SECURITY -DENABLE_USE_CPU_EXECUTION_TIME -DENABLE_USE_MME -DENABLE_VCD -DENB_AGENT -DENB_MODE -DETHERNET=1 -DEXMIMO_IOT -DJUMBO_FRAME -DLINK_ENB_PDCP_TO_GTPV1U -DLOG_NO_THREAD -DMAC_CONTEXT -DMAX_NUM_CCs=1 -DNAS_BUILT_IN_UE -DNAS_UE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK -DOPENAIR1 -DOPENAIR2 -DOPENAIR_LTE -DPHYSIM -DPHY_CONTEXT -DPUCCH -DRel10=1 -DS1AP_VERSION=R10 -DTRACE_RLC_MUTEX -DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3)
add_compile_options( -fPIC -march=native -Ofast) add_compile_options( -fPIC -march=native -Ofast)
include_directories( ./ ${OPENAIR_COMMON_DIR} ${OPENAIR_DIR} ${OPENAIR1_DIR} ${OPENAIR2_DIR} ${OPENAIR2_COMMON_DIR} ${OPENAIR2_DIR}/UTIL/LOG include_directories( ./ ${OPENAIR_COMMON_DIR} ${OPENAIR_DIR} ${OPENAIR1_DIR} ${OPENAIR2_DIR} ${OPENAIR2_COMMON_DIR} ${OPENAIR2_DIR}/UTIL/LOG
......
targets/SIMU/USER/Makefile
View file @ ca092977
...@@ -35,7 +35,6 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ...@@ -35,7 +35,6 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1
CFLAGS += -DNEW_FFT
#CFLAGS += -DLLR8 #CFLAGS += -DLLR8
CFLAGS += -DPACKAGE_NAME='"oaisim"' CFLAGS += -DPACKAGE_NAME='"oaisim"'
......
targets/TEST/RLC_AM_V9.3.0/Makefile
View file @ ca092977
...@@ -14,7 +14,6 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ...@@ -14,7 +14,6 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1
CFLAGS += -DNEW_FFT
#CFLAGS += -DLLR8 #CFLAGS += -DLLR8
ifndef OPENAIR2 ifndef OPENAIR2
......
targets/TEST/RLC_UM_V9.3.0/Makefile
View file @ ca092977
...@@ -14,7 +14,6 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ...@@ -14,7 +14,6 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1
CFLAGS += -DNEW_FFT
#CFLAGS += -DLLR8 #CFLAGS += -DLLR8
ifndef OPENAIR2 ifndef OPENAIR2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment