Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG UE
Commits
a29ebe15
Commit
a29ebe15
authored
Feb 01, 2021
by
Laurent Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remainign bug after merge develop
parent
dfe0dff0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
13 deletions
+4
-13
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-13
executables/nr-softmodem.c
executables/nr-softmodem.c
+1
-0
openair3/ocp-gtpu/gtp_itf.h
openair3/ocp-gtpu/gtp_itf.h
+1
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
a29ebe15
...
@@ -405,7 +405,7 @@ add_boolean_option(UE_AUTOTEST_TRACE False "Activate UE autotest specific logs
...
@@ -405,7 +405,7 @@ add_boolean_option(UE_AUTOTEST_TRACE False "Activate UE autotest specific logs
add_boolean_option
(
UE_DEBUG_TRACE False
"Activate UE debug trace"
)
add_boolean_option
(
UE_DEBUG_TRACE False
"Activate UE debug trace"
)
add_boolean_option
(
UE_TIMING_TRACE False
"Activate UE timing trace"
)
add_boolean_option
(
UE_TIMING_TRACE False
"Activate UE timing trace"
)
add_boolean_option
(
DEBUG_CONSOLE False
"makes debugging easier, disables stdout/stderr buffering"
)
add_boolean_option
(
DEBUG_CONSOLE False
"makes debugging easier, disables stdout/stderr buffering"
)
add_boolean_option
(
NEW_GTPU
Tru
e
"NEW_GTP"
)
add_boolean_option
(
NEW_GTPU
Fals
e
"NEW_GTP"
)
set
(
OCP_ITTI
${
OPENAIR_DIR
}
/common/utils/ocp_itti
)
set
(
OCP_ITTI
${
OPENAIR_DIR
}
/common/utils/ocp_itti
)
add_library
(
ITTI
add_library
(
ITTI
...
@@ -2207,16 +2207,6 @@ add_library(CN_UTILS
...
@@ -2207,16 +2207,6 @@ add_library(CN_UTILS
)
)
set
(
GTPV1U_DIR
${
OPENAIR3_DIR
}
/GTPV1-U
)
set
(
GTPV1U_DIR
${
OPENAIR3_DIR
}
/GTPV1-U
)
set
(
GTPV1U_SRC
${
RRC_DIR
}
/rrc_eNB_GTPV1U.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uTrxn.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uMsg.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1u.c
${
GTPV1U_DIR
}
/gtpv1u_teid_pool.c
)
add_library
(
GTPV1U
${
GTPV1U_SRC
}
)
add_dependencies
(
GTPV1U rrc_flag
)
add_library
(
GTPV1U_OCP
add_library
(
GTPV1U_OCP
${
NR_RRC_DIR
}
/rrc_gNB_GTPV1U.c
${
NR_RRC_DIR
}
/rrc_gNB_GTPV1U.c
...
@@ -2231,6 +2221,7 @@ set (NR_GTPV1U_SRC
...
@@ -2231,6 +2221,7 @@ set (NR_GTPV1U_SRC
${
NR_RRC_DIR
}
/rrc_gNB_GTPV1U.c
${
NR_RRC_DIR
}
/rrc_gNB_GTPV1U.c
${
RRC_DIR
}
/rrc_eNB_GTPV1U.c
${
RRC_DIR
}
/rrc_eNB_GTPV1U.c
${
GTPV1U_DIR
}
/gtpv1u_eNB.c
${
GTPV1U_DIR
}
/gtpv1u_eNB.c
${
GTPV1U_DIR
}
/gtpv1u_gNB.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uTunnelEndPoint.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uTrxn.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uTrxn.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uMsg.c
${
GTPV1U_DIR
}
/nw-gtpv1u/src/NwGtpv1uMsg.c
...
@@ -3022,7 +3013,6 @@ add_executable(nr-softmodem
...
@@ -3022,7 +3013,6 @@ add_executable(nr-softmodem
${
OPENAIR_TARGETS
}
/ARCH/COMMON/record_player.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/record_player.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
${
OPENAIR3_DIR
}
/GTPV1-U/gtpv1u_gNB.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR_DIR
}
/common/utils/utils.c
${
OPENAIR_DIR
}
/common/utils/utils.c
${
OPENAIR_DIR
}
/common/utils/system.c
${
OPENAIR_DIR
}
/common/utils/system.c
...
@@ -3539,7 +3529,6 @@ add_executable(nr-ittisim
...
@@ -3539,7 +3529,6 @@ add_executable(nr-ittisim
${
OPENAIR_TARGETS
}
/ARCH/COMMON/record_player.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/record_player.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
${
OPENAIR3_DIR
}
/GTPV1-U/gtpv1u_gNB.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR3_DIR
}
/NAS/UE/nas_ue_task.c
${
OPENAIR3_DIR
}
/NAS/UE/nas_ue_task.c
${
OPENAIR_DIR
}
/common/utils/utils.c
${
OPENAIR_DIR
}
/common/utils/utils.c
...
...
executables/nr-softmodem.c
View file @
a29ebe15
...
@@ -85,6 +85,7 @@ unsigned short config_frames[4] = {2,9,11,13};
...
@@ -85,6 +85,7 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "x2ap_eNB.h"
#include "x2ap_eNB.h"
#include "ngap_gNB.h"
#include "ngap_gNB.h"
#include "gnb_paramdef.h"
#include "gnb_paramdef.h"
#include <openair3/ocp-gtpu/gtp_itf.h>
pthread_cond_t
nfapi_sync_cond
;
pthread_cond_t
nfapi_sync_cond
;
pthread_mutex_t
nfapi_sync_mutex
;
pthread_mutex_t
nfapi_sync_mutex
;
...
...
openair3/ocp-gtpu/gtp_itf.h
View file @
a29ebe15
...
@@ -14,6 +14,7 @@ extern "C" {
...
@@ -14,6 +14,7 @@ extern "C" {
#define gtpv1u_delete_s1u_tunnel ocp_gtpv1u_delete_s1u_tunnel
#define gtpv1u_delete_s1u_tunnel ocp_gtpv1u_delete_s1u_tunnel
#define gtpv1u_create_x2u_tunnel ocp_gtpv1u_create_x2u_tunnel
#define gtpv1u_create_x2u_tunnel ocp_gtpv1u_create_x2u_tunnel
#define gtpv1u_eNB_task ocp_gtpv1uTask
#define gtpv1u_eNB_task ocp_gtpv1uTask
#define gtpv1u_gNB_task ocp_gtpv1uTask
#define TASK_VARIABLE OCP_GTPV1_U
#define TASK_VARIABLE OCP_GTPV1_U
#else
#else
#define TASK_VARIABLE TASK_GTPV1_U
#define TASK_VARIABLE TASK_GTPV1_U
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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