Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
afcc9aab
Commit
afcc9aab
authored
Jan 11, 2018
by
Mongazon
Browse files
Fix #582, USER_MODE flag removed
parent
a2d16b34
Changes
125
Hide whitespace changes
Inline
Side-by-side
cmake_targets/CMakeLists.txt
View file @
afcc9aab
...
...
@@ -587,7 +587,6 @@ Message("CPU_Affinity flag is ${CPU_AFFINITY}")
add_boolean_option
(
ENABLE_SECURITY True
"Enable LTE integrity and ciphering between RRC UE and eNB"
)
add_boolean_option
(
ENABLE_USE_MME True
"eNB connected to MME (INTERFACE S1-C), not standalone eNB"
)
add_boolean_option
(
NO_RRM True
"DO WE HAVE A RADIO RESSOURCE MANAGER: NO"
)
add_boolean_option
(
USER_MODE True
"????"
)
add_boolean_option
(
RRC_DEFAULT_RAB_IS_AM False
"set the RLC mode to AM for the default bearer"
)
add_boolean_option
(
OAI_NW_DRIVER_TYPE_ETHERNET False
"????"
)
...
...
@@ -2136,7 +2135,6 @@ get_directory_property(DirDefs COMPILE_DEFINITIONS )
foreach
(
d
${
DirDefs
}
)
set
(
module_cc_opt_tmp
"
${
module_cc_opt_tmp
}
-D
${
d
}
"
)
endforeach
()
string
(
REPLACE
"-DUSER_MODE"
""
module_cc_opt
${
module_cc_opt_tmp
}
)
get_directory_property
(
DirDefs INCLUDE_DIRECTORIES
)
foreach
(
d
${
DirDefs
}
)
set
(
module_cc_opt
"
${
module_cc_opt
}
-I
${
d
}
"
)
...
...
cmake_targets/epc_test/CMakeLists.template
View file @
afcc9aab
...
...
@@ -75,5 +75,4 @@ set ( SECU False )
set ( SMBV False )
set ( TEST_OMG False )
set ( USE_MME "R10" )
set ( USER_MODE True )
set ( XER_PRINT True )
cmake_targets/oaisim_build_oai/CMakeLists.template
View file @
afcc9aab
...
...
@@ -76,5 +76,4 @@ set ( SPECTRA False )
set ( TEST_OMG False )
set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
set ( USE_MME "R10" )
set ( USER_MODE True )
set ( XER_PRINT False )
cmake_targets/oaisim_mme_build_oai/CMakeLists.template
View file @
afcc9aab
...
...
@@ -78,6 +78,5 @@ set ( UPDATE_RELEASE_9 True)
set ( UPDATE_RELEASE_10 True)
set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
set ( USE_MME "R10" )
set ( USER_MODE True )
set ( XER_PRINT False )
set ( XFORMS False )
cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
View file @
afcc9aab
...
...
@@ -77,7 +77,6 @@ set ( SPECTRA False )
set ( TEST_OMG False )
set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
set ( USE_MME "R10" )
set ( USER_MODE True )
set ( XER_PRINT False )
set ( DEBUG_PHY False )
set ( DEBUG_PHY_PROC False)
...
...
cmake_targets/s1c_mme_test/CMakeLists.template
View file @
afcc9aab
...
...
@@ -80,6 +80,5 @@ set ( TEST_S1C_MME True )
set ( USE_3GPP_ADDR_AS_LINK_ADDR False )
set ( USE_MME "R10" )
set ( USER_MODE True )
set ( XER_PRINT False )
set ( XFORMS False )
common/utils/itti/itti_types.h
View file @
afcc9aab
...
...
@@ -27,11 +27,7 @@
#ifndef _ITTI_TYPES_H_
#define _ITTI_TYPES_H_
#ifdef USER_MODE
#include
<stdint.h>
#else
#include
<linux/types.h>
#endif
#define CHARS_TO_UINT32(c1, c2, c3, c4) (((c4) << 24) | ((c3) << 16) | ((c2) << 8) | (c1))
...
...
common/utils/telnetsrv/CMakeLists.txt
View file @
afcc9aab
...
...
@@ -24,7 +24,7 @@ set(OPENAIR_NFAPIINC $ENV{NFAPI_DIR} )
set
(
CMAKE_INSTALL_PREFIX $ENV{OPENAIR_TARGETS}
)
add_definitions
(
-DRel14 -DCMAKER -DENABLE_FXP -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 -DPC_DSP -DPC_TARGET -DPHYSIM -DPHY_CONTEXT -DPUCCH -DRel10=1 -DS1AP_VERSION=R10 -DTRACE_RLC_MUTEX
-DUSER_MODE
-DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3
)
add_definitions
(
-DRel14 -DCMAKER -DENABLE_FXP -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 -DPC_DSP -DPC_TARGET -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
)
include_directories
(
./
${
OPENAIR_COMMON_DIR
}
${
OPENAIR_DIR
}
${
OPENAIR1_DIR
}
${
OPENAIR2_DIR
}
${
OPENAIR2_COMMON_DIR
}
${
OPENAIR2_DIR
}
/UTIL/LOG
...
...
openair1/PHY/CODING/Makefile.arm
View file @
afcc9aab
...
...
@@ -5,7 +5,7 @@ RATE12CC_SRC = ccoding_byte.c viterbi.c crc_byte.c
all
:
3gpplte_sse
3gpplte_sse
:
$(TURBO_SRC)
gcc
-O3
-gdwarf-2
-mfloat-abi
=
hard
-mfpu
=
neon
-lm
-lgcc
-lrt
../../SIMULATION/TOOLS/taus.c
-I
$$
OPENAIR1_DIR
-I
$$
OPENAIR_TARGETS
-I
$$
OPENAIR2_DIR/COMMON
-DUSER_MODE
-DTC_MAIN
-DNB_ANTENNAS_RX
=
1
-o
3gpplte_sse 3gpplte_sse.c
-Wall
-g
-ggdb
-DTC_MAIN
gcc
-O3
-gdwarf-2
-mfloat-abi
=
hard
-mfpu
=
neon
-lm
-lgcc
-lrt
../../SIMULATION/TOOLS/taus.c
-I
$$
OPENAIR1_DIR
-I
$$
OPENAIR_TARGETS
-I
$$
OPENAIR2_DIR/COMMON
-DTC_MAIN
-DNB_ANTENNAS_RX
=
1
-o
3gpplte_sse 3gpplte_sse.c
-Wall
-g
-ggdb
-DTC_MAIN
...
...
openair1/PHY/CODING/TESTBENCH/Makefile
View file @
afcc9aab
...
...
@@ -7,7 +7,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
OPENAIR3
=
$(OPENAIR3_DIR)
CFLAGS
+=
-DNODE_RG
-DUSER_MODE
-DPC_TARGET
-DNO_UL_REF
-DNB_ANTENNAS_RX
=
2
-DNB_ANTENNAS_TXRX
=
2
-DNB_ANTENNAS_TX
=
2
-DOPENAIR_LTE
-DMAX_NUM_CCs
=
1
CFLAGS
+=
-DNODE_RG
-DPC_TARGET
-DNO_UL_REF
-DNB_ANTENNAS_RX
=
2
-DNB_ANTENNAS_TXRX
=
2
-DNB_ANTENNAS_TX
=
2
-DOPENAIR_LTE
-DMAX_NUM_CCs
=
1
ASN1_MSG_INC
=
$(OPENAIR2_DIR)
/RRC/LITE/MESSAGES
...
...
openair1/PHY/CODING/crc_byte.c
View file @
afcc9aab
...
...
@@ -31,13 +31,6 @@
*/
#ifndef USER_MODE
#define __NO_VERSION__
#endif
//#include "PHY/types.h"
#include
"defs.h"
...
...
openair1/PHY/CODING/viterbi_lte.c
View file @
afcc9aab
...
...
@@ -28,10 +28,6 @@
date: 21.10.2009
*/
#ifdef USER_MODE
#include
<stdio.h>
#endif
#ifndef TEST_DEBUG
#include
"PHY/defs.h"
#include
"PHY/extern.h"
...
...
@@ -126,7 +122,7 @@ void print_shorts(__m128i x,char *s) {
}
*/
#endif //
USER_MODE
#endif //
DEBUG_VITERBI
...
...
openair1/PHY/INIT/init_top.c
View file @
afcc9aab
...
...
@@ -20,10 +20,6 @@
*/
/*!\brief Initilization and reconfiguration routines for LTE PHY */
#ifndef USER_MODE
#define __NO_VERSION__
#endif
#include
"defs.h"
#include
"PHY/extern.h"
#include
"MAC_INTERFACE/extern.h"
...
...
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
View file @
afcc9aab
...
...
@@ -149,10 +149,8 @@ int lte_est_timing_advance(LTE_DL_FRAME_PARMS *frame_parms,
int
temp
,
i
,
aa
,
max_pos
=
0
,
ind
;
int
max_val
=
0
;
short
Re
,
Im
,
ncoef
;
#ifdef USER_MODE
#ifdef DEBUG_PHY
char
fname
[
100
],
vname
[
100
];
#endif
#endif
ncoef
=
32768
-
coef
;
...
...
@@ -187,12 +185,10 @@ int lte_est_timing_advance(LTE_DL_FRAME_PARMS *frame_parms,
1
);
break
;
}
#ifdef USER_MODE
#ifdef DEBUG_PHY
sprintf
(
fname
,
"srs_ch_estimates_time_%d%d.m"
,
ind
,
aa
);
sprintf
(
vname
,
"srs_time_%d%d"
,
ind
,
aa
);
write_output
(
fname
,
vname
,
lte_eNB_srs
->
srs_ch_estimates_time
[
aa
],
frame_parms
->
ofdm_symbol_size
*
2
,
2
,
1
);
#endif
#endif
}
...
...
openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
View file @
afcc9aab
...
...
@@ -19,9 +19,7 @@
* contact@openairinterface.org
*/
#ifdef USER_MODE
#include
<string.h>
#endif
#include
"defs.h"
#include
"PHY/defs.h"
#include
"filt16_32.h"
...
...
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
View file @
afcc9aab
...
...
@@ -19,9 +19,7 @@
* contact@openairinterface.org
*/
#ifdef USER_MODE
#include
<string.h>
#endif
#include
"defs.h"
#include
"SCHED/defs.h"
#include
"PHY/defs.h"
...
...
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation_emos.c
View file @
afcc9aab
...
...
@@ -19,9 +19,7 @@
* contact@openairinterface.org
*/
#ifdef USER_MODE
#include
<string.h>
#endif
#include
"defs.h"
#include
"PHY/defs.h"
#include
"SCHED/phy_procedures_emos.h"
...
...
openair1/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
View file @
afcc9aab
...
...
@@ -19,9 +19,7 @@
* contact@openairinterface.org
*/
#ifdef USER_MODE
#include
<string.h>
#endif
#include
"defs.h"
#include
"PHY/defs.h"
...
...
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
View file @
afcc9aab
...
...
@@ -38,7 +38,6 @@
int16_t
cond_num_threshold
=
0
;
#ifdef USER_MODE
void
print_shorts
(
char
*
s
,
short
*
x
)
{
...
...
@@ -57,8 +56,6 @@ void print_ints(char *s,int *x)
);
}
#endif
int16_t
get_PL
(
uint8_t
Mod_id
,
uint8_t
CC_id
,
uint8_t
eNB_index
)
{
...
...
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
View file @
afcc9aab
...
...
@@ -91,7 +91,6 @@ int32_t temp_in_ifft_0[2048*2] __attribute__((aligned(32)));
eNB
->
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
n_DMRS2
+
frame_parms
->
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
nPRS
[(
subframe
<<
1
)
+
Ns
])
%
12
;
#if defined(USER_MODE)
Msc_idx_ptr
=
(
uint16_t
*
)
bsearch
(
&
Msc_RS
,
dftsizes
,
33
,
sizeof
(
uint16_t
),
compareints
);
if
(
Msc_idx_ptr
)
...
...
@@ -101,26 +100,14 @@ int32_t temp_in_ifft_0[2048*2] __attribute__((aligned(32)));
return
(
-
1
);
}
#else
uint8_t
b
;
for
(
b
=
0
;
b
<
33
;
b
++
)
if
(
Msc_RS
==
dftsizes
[
b
])
Msc_RS_idx
=
b
;
#endif
// LOG_I(PHY,"subframe %d, Ns %d, l %d, Msc_RS = %d, Msc_RS_idx = %d, u %d, v %d, cyclic_shift %d\n",subframe,Ns,l,Msc_RS, Msc_RS_idx,u,v,cyclic_shift);
#ifdef DEBUG_CH
#ifdef USER_MODE
if
(
Ns
==
0
)
write_output
(
"drs_seq0.m"
,
"drsseq0"
,
ul_ref_sigs_rx
[
u
][
v
][
Msc_RS_idx
],
2
*
Msc_RS
,
2
,
1
);
else
write_output
(
"drs_seq1.m"
,
"drsseq1"
,
ul_ref_sigs_rx
[
u
][
v
][
Msc_RS_idx
],
2
*
Msc_RS
,
2
,
1
);
#endif
#endif
...
...
@@ -489,12 +476,10 @@ int32_t lte_srs_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
15
,
0
);
#ifdef USER_MODE
#ifdef DEBUG_SRS
sprintf
(
fname
,
"srs_ch_est%d.m"
,
aa
);
sprintf
(
vname
,
"srs_est%d"
,
aa
);
write_output
(
fname
,
vname
,
srs_vars
->
srs_ch_estimates
[
aa
],
frame_parms
->
ofdm_symbol_size
,
1
,
1
);
#endif
#endif
}
...
...
Prev
1
2
3
4
5
…
7
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment