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
5c2f5736
Commit
5c2f5736
authored
Feb 14, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implementation of SS block pattern choice
parent
db1eb5d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+15
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
+2
-2
No files found.
openair1/PHY/INIT/nr_parms.c
View file @
5c2f5736
...
@@ -47,20 +47,29 @@ int nr_init_frame_parms0(NR_DL_FRAME_PARMS *fp,
...
@@ -47,20 +47,29 @@ int nr_init_frame_parms0(NR_DL_FRAME_PARMS *fp,
fp
->
Ncp
=
Ncp
;
fp
->
Ncp
=
Ncp
;
fp
->
N_RB_DL
=
N_RB_DL
;
fp
->
N_RB_DL
=
N_RB_DL
;
fp
->
L_ssb
=
255
;
// TODO get the number of SSB value from higher layers (and config file finally)
fp
->
L_ssb
=
255
;
// TODO get the number of SSB value from higher layers (and config file finally)
fp
->
ssb_type
=
nr_ssb_type_B
;
// TODO get the type from higher layers (and config file finally)
switch
(
mu
)
{
switch
(
mu
)
{
case
NR_MU_0
:
//15kHz scs
case
NR_MU_0
:
//15kHz scs
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_0
];
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_0
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_0
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_0
];
fp
->
ssb_type
=
nr_ssb_type_A
;
break
;
break
;
case
NR_MU_1
:
//30kHz scs
case
NR_MU_1
:
//30kHz scs
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_1
];
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_1
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_1
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_1
];
// selection of SS block pattern according to TS 38101-1 Table 5.4.3.3-1 for SCS 30kHz
if
(
fp
->
eutra_band
==
5
||
fp
->
eutra_band
==
66
)
fp
->
ssb_type
=
nr_ssb_type_B
;
else
{
if
(
fp
->
eutra_band
==
41
||
(
fp
->
eutra_band
>
76
&&
fp
->
eutra_band
<
80
)
)
fp
->
ssb_type
=
nr_ssb_type_C
;
else
AssertFatal
(
1
==
0
,
"NR Operating Band n%d not available for SS block SCS with mu=%d
\n
"
,
fp
->
eutra_band
,
mu
);
}
switch
(
N_RB_DL
){
switch
(
N_RB_DL
){
case
11
:
case
11
:
case
24
:
case
24
:
...
@@ -147,11 +156,13 @@ int nr_init_frame_parms0(NR_DL_FRAME_PARMS *fp,
...
@@ -147,11 +156,13 @@ int nr_init_frame_parms0(NR_DL_FRAME_PARMS *fp,
case
NR_MU_3
:
case
NR_MU_3
:
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_3
];
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_3
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_3
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_3
];
fp
->
ssb_type
=
nr_ssb_type_D
;
break
;
break
;
case
NR_MU_4
:
case
NR_MU_4
:
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_4
];
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_4
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_4
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_4
];
fp
->
ssb_type
=
nr_ssb_type_E
;
break
;
break
;
default:
default:
...
@@ -184,7 +195,8 @@ int nr_init_frame_parms(nfapi_nr_config_request_t* config,
...
@@ -184,7 +195,8 @@ int nr_init_frame_parms(nfapi_nr_config_request_t* config,
NR_DL_FRAME_PARMS
*
fp
)
NR_DL_FRAME_PARMS
*
fp
)
{
{
fp
->
eutra_band
=
config
->
nfapi_config
.
rf_bands
.
rf_band
[
0
];
fp
->
frame_type
=
!
(
config
->
subframe_config
.
duplex_mode
.
value
);
return
nr_init_frame_parms0
(
fp
,
return
nr_init_frame_parms0
(
fp
,
config
->
subframe_config
.
numerology_index_mu
.
value
,
config
->
subframe_config
.
numerology_index_mu
.
value
,
config
->
subframe_config
.
dl_cyclic_prefix_type
.
value
,
config
->
subframe_config
.
dl_cyclic_prefix_type
.
value
,
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
View file @
5c2f5736
...
@@ -26,10 +26,10 @@ gNBs =
...
@@ -26,10 +26,10 @@ gNBs =
node_function
=
"3GPP_gNODEB"
;
node_function
=
"3GPP_gNODEB"
;
node_timing
=
"synch_to_ext_device"
;
node_timing
=
"synch_to_ext_device"
;
node_synch_ref
=
0
;
node_synch_ref
=
0
;
frame_type
=
"
F
DD"
;
frame_type
=
"
T
DD"
;
DL_prefix_type
=
"NORMAL"
;
DL_prefix_type
=
"NORMAL"
;
UL_prefix_type
=
"NORMAL"
;
UL_prefix_type
=
"NORMAL"
;
eutra_band
=
22
;
eutra_band
=
78
;
downlink_frequency
=
3510000000
L
;
downlink_frequency
=
3510000000
L
;
uplink_frequency_offset
= -
120000000
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
Nid_cell
=
0
;
...
...
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