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
95bd55d8
Commit
95bd55d8
authored
4 years ago
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup redundant setting of duplex mode after sync
parent
a9096bc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
executables/nr-ue.c
executables/nr-ue.c
+1
-9
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+3
-1
No files found.
executables/nr-ue.c
View file @
95bd55d8
...
@@ -171,8 +171,6 @@ typedef struct syncData_s {
...
@@ -171,8 +171,6 @@ typedef struct syncData_s {
PHY_VARS_NR_UE
*
UE
;
PHY_VARS_NR_UE
*
UE
;
}
syncData_t
;
}
syncData_t
;
extern
const
char
*
duplex_mode
[];
static
void
UE_synch
(
void
*
arg
)
{
static
void
UE_synch
(
void
*
arg
)
{
syncData_t
*
syncD
=
(
syncData_t
*
)
arg
;
syncData_t
*
syncD
=
(
syncData_t
*
)
arg
;
int
i
,
hw_slot_offset
;
int
i
,
hw_slot_offset
;
...
@@ -186,15 +184,9 @@ static void UE_synch(void *arg) {
...
@@ -186,15 +184,9 @@ static void UE_synch(void *arg) {
for
(
i
=
0
;
i
<
openair0_cfg
[
UE
->
rf_map
.
card
].
rx_num_channels
;
i
++
)
{
for
(
i
=
0
;
i
<
openair0_cfg
[
UE
->
rf_map
.
card
].
rx_num_channels
;
i
++
)
{
if
(
UE
->
frame_parms
.
frame_type
==
FDD
)
LOG_I
(
PHY
,
"[SCHED][UE] Check absolute frequency DL %f, UL %f (RF card %d, oai_exit %d, channel %d, rx_num_channels %d)
\n
"
,
openair0_cfg
[
UE
->
rf_map
.
card
].
duplex_mode
=
duplex_mode_FDD
;
else
openair0_cfg
[
UE
->
rf_map
.
card
].
duplex_mode
=
duplex_mode_TDD
;
LOG_I
(
PHY
,
"[SCHED][UE] Check absolute frequency DL %f, UL %f duplex mode %s (RF card %d, oai_exit %d, channel %d, rx_num_channels %d)
\n
"
,
openair0_cfg
[
UE
->
rf_map
.
card
].
rx_freq
[
UE
->
rf_map
.
chain
+
i
],
openair0_cfg
[
UE
->
rf_map
.
card
].
rx_freq
[
UE
->
rf_map
.
chain
+
i
],
openair0_cfg
[
UE
->
rf_map
.
card
].
tx_freq
[
UE
->
rf_map
.
chain
+
i
],
openair0_cfg
[
UE
->
rf_map
.
card
].
tx_freq
[
UE
->
rf_map
.
chain
+
i
],
duplex_mode
[
openair0_cfg
[
UE
->
rf_map
.
card
].
duplex_mode
],
UE
->
rf_map
.
card
,
UE
->
rf_map
.
card
,
oai_exit
,
oai_exit
,
i
,
i
,
...
...
This diff is collapsed.
Click to expand it.
executables/nr-uesoftmodem.c
View file @
95bd55d8
...
@@ -85,6 +85,8 @@ unsigned short config_frames[4] = {2,9,11,13};
...
@@ -85,6 +85,8 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "executables/softmodem-common.h"
#include "executables/softmodem-common.h"
#include "executables/thread-common.h"
#include "executables/thread-common.h"
extern
const
char
*
duplex_mode
[];
// Thread variables
// Thread variables
pthread_cond_t
nfapi_sync_cond
;
pthread_cond_t
nfapi_sync_cond
;
pthread_mutex_t
nfapi_sync_mutex
;
pthread_mutex_t
nfapi_sync_mutex
;
...
@@ -419,7 +421,7 @@ void init_openair0(void) {
...
@@ -419,7 +421,7 @@ void init_openair0(void) {
if
(
frame_parms
->
frame_type
==
TDD
)
if
(
frame_parms
->
frame_type
==
TDD
)
openair0_cfg
[
card
].
duplex_mode
=
duplex_mode_TDD
;
openair0_cfg
[
card
].
duplex_mode
=
duplex_mode_TDD
;
else
//FDD
else
openair0_cfg
[
card
].
duplex_mode
=
duplex_mode_FDD
;
openair0_cfg
[
card
].
duplex_mode
=
duplex_mode_FDD
;
LOG_I
(
PHY
,
"HW: Configuring card %d, nb_antennas_tx/rx %hhu/%hhu
\n
"
,
LOG_I
(
PHY
,
"HW: Configuring card %d, nb_antennas_tx/rx %hhu/%hhu
\n
"
,
...
...
This diff is collapsed.
Click to expand it.
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