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
ZhouShuya
OpenXG-RAN
Commits
fe0c9ba0
Commit
fe0c9ba0
authored
Nov 27, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for number of slots in half frame for different numerologies
parent
433e3edd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+7
-4
No files found.
openair1/PHY/INIT/nr_parms.c
View file @
fe0c9ba0
...
@@ -83,10 +83,12 @@ int nr_is_ssb_slot(nfapi_nr_config_request_t *cfg, int slot, int frame)
...
@@ -83,10 +83,12 @@ int nr_is_ssb_slot(nfapi_nr_config_request_t *cfg, int slot, int frame)
{
{
uint8_t
n_hf
;
uint8_t
n_hf
;
uint16_t
p
;
uint16_t
p
,
mu
,
hf_slots
;
uint64_t
ssb_map
;
uint64_t
ssb_map
;
int
rel_slot
;
int
rel_slot
;
mu
=
cfg
->
subframe_config
.
numerology_index_mu
.
value
;
ssb_map
=
cfg
->
sch_config
.
ssb_scg_position_in_burst
.
value
;
ssb_map
=
cfg
->
sch_config
.
ssb_scg_position_in_burst
.
value
;
p
=
cfg
->
sch_config
.
ssb_periodicity
.
value
;
p
=
cfg
->
sch_config
.
ssb_periodicity
.
value
;
n_hf
=
cfg
->
sch_config
.
half_frame_index
.
value
;
n_hf
=
cfg
->
sch_config
.
half_frame_index
.
value
;
...
@@ -95,16 +97,17 @@ int nr_is_ssb_slot(nfapi_nr_config_request_t *cfg, int slot, int frame)
...
@@ -95,16 +97,17 @@ int nr_is_ssb_slot(nfapi_nr_config_request_t *cfg, int slot, int frame)
if
(
(
p
>
10
)
&&
(
frame
%
(
p
/
10
))
)
if
(
(
p
>
10
)
&&
(
frame
%
(
p
/
10
))
)
return
0
;
return
0
;
else
{
else
{
hf_slots
=
(
10
<<
mu
)
>>
1
;
// number of slots per half frame
// if SSB periodicity is 5ms, they are transmitted in both half frames
// if SSB periodicity is 5ms, they are transmitted in both half frames
if
(
p
==
5
)
{
if
(
p
==
5
)
{
if
(
slot
<
10
)
//the value 10 needs to be changed for other numerologies (using slots_per_frame) in this function
if
(
slot
<
hf_slots
)
n_hf
=
0
;
n_hf
=
0
;
else
else
n_hf
=
1
;
n_hf
=
1
;
}
}
// to set a effective slot number between 0 to
9
in the half frame where the SSB is supposed to be
// to set a effective slot number between 0 to
hf_slots-1
in the half frame where the SSB is supposed to be
rel_slot
=
(
n_hf
)
?
(
slot
-
10
)
:
slot
;
rel_slot
=
(
n_hf
)
?
(
slot
-
hf_slots
)
:
slot
;
// there are two potential SSB per slot
// there are two potential SSB per slot
return
(
((
ssb_map
>>
rel_slot
*
2
)
&
0x01
)
||
((
ssb_map
>>
(
1
+
rel_slot
*
2
))
&
0x01
)
);
return
(
((
ssb_map
>>
rel_slot
*
2
)
&
0x01
)
||
((
ssb_map
>>
(
1
+
rel_slot
*
2
))
&
0x01
)
);
...
...
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