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
常顺宇
OpenXG-RAN
Commits
10a98de7
Commit
10a98de7
authored
4 years ago
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for ssb vrb map in fr2
parent
f87c9794
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
15 deletions
+26
-15
executables/nr-ru.c
executables/nr-ru.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+25
-14
No files found.
executables/nr-ru.c
View file @
10a98de7
...
...
@@ -770,7 +770,7 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
flags |= beam<<8;
//}
LOG_
I
(HW,"slot %d, beam %d\n",slot,ru->common.beam_id[0][slot*fp->symbols_per_slot]);
LOG_
D
(HW,"slot %d, beam %d\n",slot,ru->common.beam_id[0][slot*fp->symbols_per_slot]);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_WRITE_FLAGS, flags );
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_RU, frame );
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
View file @
10a98de7
...
...
@@ -188,23 +188,34 @@ void schedule_nr_mib(module_id_t module_idP, frame_t frameP, sub_frame_t slotP,
"240kHZ subcarrier spacing currently not supported for SSBs
\n
"
);
if
((
abs_slot
%
slot_per_period
)
<
8
)
{
eff_120_slot
=
slotP
;
if
((
abs_slot
%
slot_per_period
)
<
3
)
buf
=
longBitmap
->
buf
[
0
];
}
else
if
((
abs_slot
%
slot_per_period
)
<
17
)
{
eff_120_slot
=
slotP
-
9
;
else
buf
=
longBitmap
->
buf
[
1
];
}
else
if
((
abs_slot
%
slot_per_period
)
<
26
)
{
eff_120_slot
=
slotP
-
18
;
}
else
if
((
abs_slot
%
slot_per_period
)
<
18
)
{
eff_120_slot
=
slotP
-
10
;
if
((
abs_slot
%
slot_per_period
)
<
13
)
buf
=
longBitmap
->
buf
[
2
];
}
else
if
((
abs_slot
%
slot_per_period
)
<
35
)
{
eff_120_slot
=
slotP
-
27
;
else
buf
=
longBitmap
->
buf
[
3
];
}
else
if
((
abs_slot
%
slot_per_period
)
<
28
)
{
eff_120_slot
=
slotP
-
20
;
if
((
abs_slot
%
slot_per_period
)
<
23
)
buf
=
longBitmap
->
buf
[
4
];
else
buf
=
longBitmap
->
buf
[
5
];
}
else
if
((
abs_slot
%
slot_per_period
)
<
38
)
{
eff_120_slot
=
slotP
-
30
;
if
((
abs_slot
%
slot_per_period
)
<
33
)
buf
=
longBitmap
->
buf
[
6
];
else
buf
=
longBitmap
->
buf
[
7
];
}
if
((
(
buf
>>
(
6
-
(
eff_120_slot
<<
1
)))
&
3
)
!=
0
)
if
((
eff_120_slot
>=
0
)
&&
(((
buf
>>
(
6
-
(
eff_120_slot
<<
1
)))
&
3
)
!=
0
)
)
fill_ssb_vrb_map
(
cc
,
ssb_offset0
/
(
ratio
*
12
)
-
10
,
CC_id
);
break
;
default:
AssertFatal
(
0
,
"SSB bitmap size value %d undefined (allowed values 1,2,3)
\n
"
,
AssertFatal
(
0
,
"SSB bitmap size value %d undefined (allowed values 1,2,3)
\n
"
,
cc
->
ServingCellConfigCommon
->
ssb_PositionsInBurst
->
present
);
}
}
...
...
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