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
spbro
OpenXG-RAN
Commits
3a514bd4
Commit
3a514bd4
authored
Dec 20, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix for ghost mixed slot
parent
9662363d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/nr_ru_procedures.c
+2
-3
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
No files found.
openair1/SCHED_NR/nr_ru_procedures.c
View file @
3a514bd4
...
@@ -124,7 +124,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
...
@@ -124,7 +124,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
int
j
=
0
;
//symbol
int
j
=
0
;
//symbol
int
aa
=
0
;
//logical antenna number
int
aa
=
0
;
//logical antenna number
int
ret
=
0
;
int
ret
=
0
;
int
nb_antenna_ports
=
fp
->
L
_ssb
;
int
nb_antenna_ports
=
fp
->
L
max
;
int
ofdm_mask_full
=
(
1
<<
(
ru
->
nb_tx
*
2
))
-
1
;
int
ofdm_mask_full
=
(
1
<<
(
ru
->
nb_tx
*
2
))
-
1
;
int
txdataF_offset
=
((
tti_tx
%
2
)
*
fp
->
samples_per_slot_wCP
);
int
txdataF_offset
=
((
tti_tx
%
2
)
*
fp
->
samples_per_slot_wCP
);
...
@@ -136,7 +136,6 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
...
@@ -136,7 +136,6 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
start_meas
(
&
ru
->
ofdm_total_stats
);
start_meas
(
&
ru
->
ofdm_total_stats
);
//if (nr_slot_select(cfg,frame_tx,slot)==NR_DOWNLINK_SLOT) {
//if (nr_slot_select(cfg,frame_tx,slot)==NR_DOWNLINK_SLOT) {
if
(
ru
->
num_gNB
!=
0
){
//L1 RU on same machine
if
(
ru
->
num_gNB
!=
0
){
//L1 RU on same machine
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM
,
1
);
for
(
j
=
0
;
j
<
2
;
++
j
){
//half slot
for
(
j
=
0
;
j
<
2
;
++
j
){
//half slot
...
@@ -281,7 +280,7 @@ static void *nr_feptx_thread(void *param) {
...
@@ -281,7 +280,7 @@ static void *nr_feptx_thread(void *param) {
start_meas
(
&
ru
->
precoding_stats
);
start_meas
(
&
ru
->
precoding_stats
);
if
(
ru
->
nb_tx
==
1
)
{
if
(
ru
->
nb_tx
==
1
)
{
AssertFatal
(
fp
->
N_ssb
==
ru
->
nb_tx
,
"Attempting to transmit %d SSB while Nb_tx = %d"
,
fp
->
N_ssb
,
ru
->
nb_tx
);
AssertFatal
(
fp
->
N_ssb
==
ru
->
nb_tx
,
"Attempting to transmit %d SSB while Nb_tx = %d"
,
fp
->
N_ssb
,
ru
->
nb_tx
);
for
(
int
p
=
0
;
p
<
fp
->
Lmax
;
p
++
)
{
for
(
int
p
=
0
;
p
<
nb_antenna_ports
;
p
++
)
{
if
((
fp
->
L_ssb
>>
p
)
&
0x01
){
if
((
fp
->
L_ssb
>>
p
)
&
0x01
){
memcpy
((
void
*
)
&
ru
->
common
.
txdataF_BF
[
0
][
l
*
fp
->
ofdm_symbol_size
],
memcpy
((
void
*
)
&
ru
->
common
.
txdataF_BF
[
0
][
l
*
fp
->
ofdm_symbol_size
],
(
void
*
)
&
ru
->
gNB_list
[
0
]
->
common_vars
.
txdataF
[
p
][
txdataF_offset
+
l
*
fp
->
ofdm_symbol_size
],
(
void
*
)
&
ru
->
gNB_list
[
0
]
->
common_vars
.
txdataF
[
p
][
txdataF_offset
+
l
*
fp
->
ofdm_symbol_size
],
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
3a514bd4
...
@@ -164,7 +164,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
...
@@ -164,7 +164,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
ssb_frame_periodicity
=
1
<<
(
cfg
->
ssb_table
.
ssb_period
.
value
-
1
)
;
// 10ms is the frame length
ssb_frame_periodicity
=
1
<<
(
cfg
->
ssb_table
.
ssb_period
.
value
-
1
)
;
// 10ms is the frame length
if
((
cfg
->
cell_config
.
frame_duplex_type
.
value
==
TDD
)
&&
if
((
cfg
->
cell_config
.
frame_duplex_type
.
value
==
TDD
)
&&
(
(
nr_slot_select
(
cfg
,
frame
,
slot
)
&
NR_UPLINK_SLOT
)
>
0
))
return
;
(
nr_slot_select
(
cfg
,
frame
,
slot
)
==
NR_UPLINK_SLOT
))
return
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
+
offset
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
+
offset
,
1
);
...
...
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