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
canghaiwuhen
OpenXG-RAN
Commits
02d18cc5
Commit
02d18cc5
authored
Dec 28, 2017
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
noS1 will compile and run correctly on develop, also for oaisim/RRU
parent
1a5a0297
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-0
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+1
-1
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+1
-1
targets/SIMU/USER/oaisim_functions.c
targets/SIMU/USER/oaisim_functions.c
+4
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
02d18cc5
...
@@ -1803,6 +1803,7 @@ add_executable(lte-softmodem-nos1
...
@@ -1803,6 +1803,7 @@ add_executable(lte-softmodem-nos1
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
...
@@ -1934,6 +1935,7 @@ add_executable(oaisim_nos1
...
@@ -1934,6 +1935,7 @@ add_executable(oaisim_nos1
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/SIMU/USER/channel_sim.c
${
OPENAIR_TARGETS
}
/SIMU/USER/channel_sim.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
02d18cc5
...
@@ -1540,7 +1540,7 @@ rrc_ue_process_radioResourceConfigDedicated(
...
@@ -1540,7 +1540,7 @@ rrc_ue_process_radioResourceConfigDedicated(
UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
eNB_index
].
State
=
RRC_CONNECTED
;
UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
eNB_index
].
State
=
RRC_CONNECTED
;
LOG_I
(
RRC
,
"[UE %d] State = RRC_CONNECTED (eNB %d)
\n
"
,
ctxt_pP
->
module_id
,
eNB_index
);
LOG_I
(
RRC
,
"[UE %d] State = RRC_CONNECTED (eNB %d)
\n
"
,
ctxt_pP
->
module_id
,
eNB_index
);
#if !defined(ENABLE_USE_MME) && defined(OAI_EMU)
#if
0//
!defined(ENABLE_USE_MME) && defined(OAI_EMU)
# ifdef OAI_EMU
# ifdef OAI_EMU
rrc_eNB_emulation_notify_ue_module_id(
rrc_eNB_emulation_notify_ue_module_id(
ctxt_pP->module_id,
ctxt_pP->module_id,
...
...
openair2/RRC/LITE/rrc_eNB.c
View file @
02d18cc5
...
@@ -608,7 +608,7 @@ rrc_eNB_get_next_free_ue_context(
...
@@ -608,7 +608,7 @@ rrc_eNB_get_next_free_ue_context(
}
}
}
}
#if !defined(ENABLE_USE_MME)
#if
0 //
!defined(ENABLE_USE_MME)
void rrc_eNB_emulation_notify_ue_module_id(
void rrc_eNB_emulation_notify_ue_module_id(
const module_id_t ue_module_idP,
const module_id_t ue_module_idP,
const rnti_t rntiP,
const rnti_t rntiP,
...
...
targets/SIMU/USER/oaisim_functions.c
View file @
02d18cc5
...
@@ -782,6 +782,9 @@ void get_simulation_options(int argc, char *argv[])
...
@@ -782,6 +782,9 @@ void get_simulation_options(int argc, char *argv[])
}
}
}
}
if
(
load_configmodule
(
argc
,
argv
)
==
NULL
)
{
exit_fun
(
"[SOFTMODEM] Error, configuration module init failed
\n
"
);
}
if
(
RC
.
config_file_name
!=
NULL
)
{
if
(
RC
.
config_file_name
!=
NULL
)
{
/* Read eNB configuration file */
/* Read eNB configuration file */
...
...
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