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
4c6c4954
Commit
4c6c4954
authored
Aug 13, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/fix-softmodem-restart' into develop_integration_2020_w33
parents
4ff959fe
e761819e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
10 deletions
+0
-10
executables/main-ocp.c
executables/main-ocp.c
+0
-3
executables/nr-softmodem.c
executables/nr-softmodem.c
+0
-3
openair1/PHY/INIT/lte_init_ru.c
openair1/PHY/INIT/lte_init_ru.c
+0
-1
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+0
-3
No files found.
executables/main-ocp.c
View file @
4c6c4954
...
@@ -1123,9 +1123,6 @@ int restart_L1L2(module_id_t enb_id) {
...
@@ -1123,9 +1123,6 @@ int restart_L1L2(module_id_t enb_id) {
sync_var
=
-
1
;
sync_var
=
-
1
;
pthread_mutex_unlock
(
&
sync_mutex
);
pthread_mutex_unlock
(
&
sync_mutex
);
RC
.
ru_mask
|=
(
1
<<
ru
->
idx
);
RC
.
ru_mask
|=
(
1
<<
ru
->
idx
);
/* copy the changed frame parameters to the RU */
/* TODO this should be done for all RUs associated to this eNB */
memcpy
(
&
ru
->
frame_parms
,
&
RC
.
eNB
[
enb_id
][
0
]
->
frame_parms
,
sizeof
(
LTE_DL_FRAME_PARMS
));
/* reset the list of connected UEs in the MAC, since in this process with
/* reset the list of connected UEs in the MAC, since in this process with
* loose all UEs (have to reconnect) */
* loose all UEs (have to reconnect) */
init_UE_info
(
&
RC
.
mac
[
enb_id
]
->
UE_info
);
init_UE_info
(
&
RC
.
mac
[
enb_id
]
->
UE_info
);
...
...
executables/nr-softmodem.c
View file @
4c6c4954
...
@@ -726,9 +726,6 @@ int restart_L1L2(module_id_t gnb_id) {
...
@@ -726,9 +726,6 @@ int restart_L1L2(module_id_t gnb_id) {
RC
.
ru_mask
|=
(
1
<<
ru
->
idx
);
RC
.
ru_mask
|=
(
1
<<
ru
->
idx
);
/* copy the changed frame parameters to the RU */
/* TODO this should be done for all RUs associated to this gNB */
memcpy
(
&
ru
->
nr_frame_parms
,
&
RC
.
gNB
[
gnb_id
]
->
frame_parms
,
sizeof
(
NR_DL_FRAME_PARMS
));
set_function_spec_param
(
RC
.
ru
[
gnb_id
]);
set_function_spec_param
(
RC
.
ru
[
gnb_id
]);
LOG_I
(
GNB_APP
,
"attempting to create ITTI tasks
\n
"
);
LOG_I
(
GNB_APP
,
"attempting to create ITTI tasks
\n
"
);
// No more rrc thread, as many race conditions are hidden behind
// No more rrc thread, as many race conditions are hidden behind
...
...
openair1/PHY/INIT/lte_init_ru.c
View file @
4c6c4954
...
@@ -186,7 +186,6 @@ void phy_free_RU(RU_t *ru) {
...
@@ -186,7 +186,6 @@ void phy_free_RU(RU_t *ru) {
int
i
,
j
,
p
;
int
i
,
j
,
p
;
RU_CALIBRATION
*
calibration
=
&
ru
->
calibration
;
RU_CALIBRATION
*
calibration
=
&
ru
->
calibration
;
LOG_I
(
PHY
,
"Feeing RU signal buffers (if_south %s) nb_tx %d
\n
"
,
ru_if_types
[
ru
->
if_south
],
ru
->
nb_tx
);
LOG_I
(
PHY
,
"Feeing RU signal buffers (if_south %s) nb_tx %d
\n
"
,
ru_if_types
[
ru
->
if_south
],
ru
->
nb_tx
);
free_and_zero
(
ru
->
frame_parms
);
if
(
ru
->
if_south
<=
REMOTE_IF5
)
{
// this means REMOTE_IF5 or LOCAL_RF, so free memory for time-domain signals
if
(
ru
->
if_south
<=
REMOTE_IF5
)
{
// this means REMOTE_IF5 or LOCAL_RF, so free memory for time-domain signals
for
(
i
=
0
;
i
<
ru
->
nb_tx
;
i
++
)
free_and_zero
(
ru
->
common
.
txdata
[
i
]);
for
(
i
=
0
;
i
<
ru
->
nb_tx
;
i
++
)
free_and_zero
(
ru
->
common
.
txdata
[
i
]);
...
...
targets/RT/USER/lte-softmodem.c
View file @
4c6c4954
...
@@ -438,9 +438,6 @@ int restart_L1L2(module_id_t enb_id) {
...
@@ -438,9 +438,6 @@ int restart_L1L2(module_id_t enb_id) {
}
}
RC
.
ru_mask
|=
(
1
<<
ru
->
idx
);
RC
.
ru_mask
|=
(
1
<<
ru
->
idx
);
/* copy the changed frame parameters to the RU */
/* TODO this should be done for all RUs associated to this eNB */
memcpy
(
&
ru
->
frame_parms
,
&
RC
.
eNB
[
enb_id
][
0
]
->
frame_parms
,
sizeof
(
LTE_DL_FRAME_PARMS
));
set_function_spec_param
(
RC
.
ru
[
enb_id
]);
set_function_spec_param
(
RC
.
ru
[
enb_id
]);
/* reset the list of connected UEs in the MAC, since in this process with
/* reset the list of connected UEs in the MAC, since in this process with
* loose all UEs (have to reconnect) */
* loose all UEs (have to reconnect) */
...
...
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