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
Michael Black
OpenXG UE
Commits
ddf4ad7b
Commit
ddf4ad7b
authored
May 01, 2021
by
Melissa Elkadi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added in init function in RRC_NSA_NRUE task creation
parent
3b3c2cd9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
3 deletions
+12
-3
common/utils/LOG/log.h
common/utils/LOG/log.h
+1
-1
executables/nr-softmodem.c
executables/nr-softmodem.c
+7
-2
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+1
-0
openair2/RRC/NR_UE/rrc_proto.h
openair2/RRC/NR_UE/rrc_proto.h
+2
-0
targets/COMMON/create_tasks_ue.c
targets/COMMON/create_tasks_ue.c
+1
-0
No files found.
common/utils/LOG/log.h
View file @
ddf4ad7b
...
@@ -424,7 +424,7 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
...
@@ -424,7 +424,7 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
# define LOG_E(COMPONENT, ...) do if (1) logMinimal(COMPONENT, 'E', __VA_ARGS__); while (0)
# define LOG_E(COMPONENT, ...) do if (1) logMinimal(COMPONENT, 'E', __VA_ARGS__); while (0)
# define LOG_W(COMPONENT, ...) do if (1) logMinimal(COMPONENT, 'W', __VA_ARGS__); while (0)
# define LOG_W(COMPONENT, ...) do if (1) logMinimal(COMPONENT, 'W', __VA_ARGS__); while (0)
# define LOG_A(COMPONENT, ...) do if (1) logMinimal(COMPONENT, 'A', __VA_ARGS__); while (0)
/* logs intended for analysis */
# define LOG_A(COMPONENT, ...) do if (1) logMinimal(COMPONENT, 'A', __VA_ARGS__); while (0)
/* logs intended for analysis */
# define LOG_I(COMPONENT, ...) do if (
0
) logMinimal(COMPONENT, 'I', __VA_ARGS__); while (0)
# define LOG_I(COMPONENT, ...) do if (
1
) logMinimal(COMPONENT, 'I', __VA_ARGS__); while (0)
# define LOG_D(COMPONENT, ...) do if (0) logMinimal(COMPONENT, 'D', __VA_ARGS__); while (0)
# define LOG_D(COMPONENT, ...) do if (0) logMinimal(COMPONENT, 'D', __VA_ARGS__); while (0)
# define LOG_T(COMPONENT, ...) do if (0) logMinimal(COMPONENT, 'T', __VA_ARGS__); while (0)
# define LOG_T(COMPONENT, ...) do if (0) logMinimal(COMPONENT, 'T', __VA_ARGS__); while (0)
...
...
executables/nr-softmodem.c
View file @
ddf4ad7b
...
@@ -562,7 +562,10 @@ int stop_L1L2(module_id_t gnb_id) {
...
@@ -562,7 +562,10 @@ int stop_L1L2(module_id_t gnb_id) {
oai_exit
=
0
;
oai_exit
=
0
;
//free_transport(RC.gNB[gnb_id]);
//free_transport(RC.gNB[gnb_id]);
phy_free_nr_gNB
(
RC
.
gNB
[
gnb_id
]);
if
(
RC
.
gNB
[
gnb_id
])
{
phy_free_nr_gNB
(
RC
.
gNB
[
gnb_id
]);
RC
.
gNB
[
gnb_id
]
=
NULL
;
}
nr_phy_free_RU
(
RC
.
ru
[
gnb_id
]);
nr_phy_free_RU
(
RC
.
ru
[
gnb_id
]);
...
@@ -880,8 +883,10 @@ if(!IS_SOFTMODEM_NOS1)
...
@@ -880,8 +883,10 @@ if(!IS_SOFTMODEM_NOS1)
* threads have been stopped (they partially use the same memory) */
* threads have been stopped (they partially use the same memory) */
for
(
int
inst
=
0
;
inst
<
NB_gNB_INST
;
inst
++
)
{
for
(
int
inst
=
0
;
inst
<
NB_gNB_INST
;
inst
++
)
{
//free_transport(RC.gNB[inst]);
//free_transport(RC.gNB[inst]);
if
(
RC
.
gNB
[
inst
])
if
(
RC
.
gNB
[
inst
])
{
phy_free_nr_gNB
(
RC
.
gNB
[
inst
]);
phy_free_nr_gNB
(
RC
.
gNB
[
inst
]);
RC
.
gNB
[
inst
]
=
NULL
;
}
}
}
for
(
int
inst
=
0
;
inst
<
NB_RU
;
inst
++
)
{
for
(
int
inst
=
0
;
inst
<
NB_RU
;
inst
++
)
{
...
...
executables/nr-uesoftmodem.c
View file @
ddf4ad7b
...
@@ -193,6 +193,7 @@ int create_tasks_nrue(uint32_t ue_nb) {
...
@@ -193,6 +193,7 @@ int create_tasks_nrue(uint32_t ue_nb) {
}
}
}
}
if
(
ue_nb
>
0
&&
get_softmodem_params
()
->
nsa
==
1
)
{
if
(
ue_nb
>
0
&&
get_softmodem_params
()
->
nsa
==
1
)
{
init_connections_with_lte_ue
();
if
(
itti_create_task
(
TASK_RRC_NSA_NRUE
,
recv_msgs_from_lte_ue
,
NULL
)
<
0
)
{
if
(
itti_create_task
(
TASK_RRC_NSA_NRUE
,
recv_msgs_from_lte_ue
,
NULL
)
<
0
)
{
LOG_E
(
NR_RRC
,
"Create task for RRC NSA nr-UE failed
\n
"
);
LOG_E
(
NR_RRC
,
"Create task for RRC NSA nr-UE failed
\n
"
);
return
-
1
;
return
-
1
;
...
...
openair2/RRC/NR_UE/rrc_proto.h
View file @
ddf4ad7b
...
@@ -130,6 +130,8 @@ void *rrc_nrue_task(void *args_p);
...
@@ -130,6 +130,8 @@ void *rrc_nrue_task(void *args_p);
\param void *args_p Pointer on arguments to start the task. */
\param void *args_p Pointer on arguments to start the task. */
void
*
recv_msgs_from_lte_ue
(
void
*
args_p
);
void
*
recv_msgs_from_lte_ue
(
void
*
args_p
);
void
init_connections_with_lte_ue
(
void
);
/**\brief RRC UE generate RRCSetupRequest message.
/**\brief RRC UE generate RRCSetupRequest message.
\param ctxt_pP protocol context
\param ctxt_pP protocol context
\param gNB_index gNB index */
\param gNB_index gNB index */
...
...
targets/COMMON/create_tasks_ue.c
View file @
ddf4ad7b
...
@@ -66,6 +66,7 @@ int create_tasks_ue(uint32_t ue_nb) {
...
@@ -66,6 +66,7 @@ int create_tasks_ue(uint32_t ue_nb) {
LOG_E
(
RRC
,
"Create task for RRC UE failed
\n
"
);
LOG_E
(
RRC
,
"Create task for RRC UE failed
\n
"
);
return
-
1
;
return
-
1
;
}
}
if
(
get_softmodem_params
()
->
nsa
)
{
if
(
get_softmodem_params
()
->
nsa
)
{
init_connections_with_nr_ue
();
init_connections_with_nr_ue
();
LOG_I
(
RRC
,
"Started LTE-NR link in the LTE UE
\n
"
);
LOG_I
(
RRC
,
"Started LTE-NR link in the LTE UE
\n
"
);
...
...
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