Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
promise
OpenXG-RAN
Commits
a09cfd1d
Commit
a09cfd1d
authored
May 10, 2017
by
Navid Nikaein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update the CMakeLists.txt for lte-softmodem target
parent
abaf6ba7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+4
-2
openair2/ENB_APP/enb_app.c
openair2/ENB_APP/enb_app.c
+10
-8
No files found.
cmake_targets/CMakeLists.txt
View file @
a09cfd1d
...
...
@@ -1783,6 +1783,7 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
add_executable
(
lte-softmodem
${
rrc_h
}
${
s1ap_h
}
${
x2ap_h
}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
...
...
@@ -1807,7 +1808,7 @@ add_executable(lte-softmodem
target_link_libraries
(
lte-softmodem -ldl
-Wl,--start-group
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
RRC_LIB S1AP_LIB S1AP_ENB
${
X2AP_LIB
}
${
X2AP_ENB
}
GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
-Wl,--end-group
)
target_link_libraries
(
lte-softmodem
${
LIBXML2_LIBRARIES
}
)
...
...
@@ -1820,6 +1821,7 @@ target_link_libraries (lte-softmodem ${T_LIB})
add_executable
(
lte-softmodem-nos1
${
rrc_h
}
${
s1ap_h
}
${
x2ap_h
}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
...
...
@@ -1842,7 +1844,7 @@ add_executable(lte-softmodem-nos1
)
target_link_libraries
(
lte-softmodem-nos1
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
RRC_LIB SECU_CN SECU_OSA
${
X2AP_LIB
}
${
X2AP_ENB
}
UTIL HASHTABLE SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
-Wl,--end-group
)
target_link_libraries
(
lte-softmodem-nos1
${
LIBXML2_LIBRARIES
}
)
...
...
openair2/ENB_APP/enb_app.c
View file @
a09cfd1d
...
...
@@ -385,7 +385,9 @@ void *eNB_app_task(void *args_p)
itti_mark_task_ready
(
TASK_ENB_APP
);
# if defined(ENABLE_ITTI)
enb_properties_p
=
enb_config_get
();
# if defined(ENABLE_ITTI)
# if defined(OAI_EMU)
enb_nb
=
oai_emulation
.
info
.
nb_enb_local
;
enb_id_start
=
oai_emulation
.
info
.
first_enb_local
;
...
...
@@ -394,10 +396,12 @@ void *eNB_app_task(void *args_p)
AssertFatal
(
enb_id_end
<=
NUMBER_OF_eNB_MAX
,
"Last eNB index is greater or equal to maximum eNB index (%d/%d)!"
,
enb_id_end
,
NUMBER_OF_eNB_MAX
);
#else
enb_nb
=
enb_properties_p
->
number
;
enb_id_start
=
0
;
enb_id_end
=
enb_properties_p
->
number
;
# endif
# endif
enb_properties_p
=
enb_config_get
();
#endif
AssertFatal
(
enb_nb
<=
enb_properties_p
->
number
,
"Number of eNB is greater than eNB defined in configuration file (%d/%d)!"
,
...
...
@@ -427,9 +431,7 @@ void *eNB_app_task(void *args_p)
# endif
# if defined(ENABLE_USE_X2)
enb_nb
=
oai_emulation
.
info
.
nb_enb_local
;
enb_id_start
=
oai_emulation
.
info
.
first_enb_local
;
enb_id_end
=
oai_emulation
.
info
.
first_enb_local
+
enb_nb
;
/* Try to register each eNB with each other */
x2_registered_enb
=
0
;
x2_register_enb_pending
=
eNB_app_register_x2
(
enb_id_start
,
enb_id_end
,
enb_properties_p
);
...
...
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