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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
bbfa23e9
Commit
bbfa23e9
authored
5 years ago
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for carrier frequency (now according to number of PRBs
parent
d25a13fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+7
-2
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+7
-2
No files found.
openair1/PHY/INIT/nr_init.c
View file @
bbfa23e9
...
...
@@ -405,15 +405,20 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
*/
memcpy
((
void
*
)
gNB_config
,
phy_config
->
cfg
,
sizeof
(
*
phy_config
->
cfg
));
RC
.
gNB
[
Mod_id
]
->
mac_enabled
=
1
;
fp
->
dl_CarrierFreq
=
(
gNB_config
->
carrier_config
.
dl_frequency
.
value
)
*
1e3
+
(
gNB_config
->
carrier_config
.
dl_bandwidth
.
value
)
*
5e5
;
uint64_t
dl_bw_khz
=
(
12
*
gNB_config
->
carrier_config
.
dl_grid_size
[
gNB_config
->
ssb_config
.
scs_common
.
value
].
value
)
*
(
15
<<
gNB_config
->
ssb_config
.
scs_common
.
value
);
fp
->
dl_CarrierFreq
=
((
dl_bw_khz
>>
1
)
+
gNB_config
->
carrier_config
.
dl_frequency
.
value
)
*
1000
;
int32_t
dlul_offset
=
0
;
lte_frame_type_t
frame_type
=
0
;
get_band
(
fp
->
dl_CarrierFreq
,
&
fp
->
nr_band
,
&
dlul_offset
,
&
frame_type
);
fp
->
ul_CarrierFreq
=
(
gNB_config
->
carrier_config
.
uplink_frequency
.
value
)
*
1e3
+
(
gNB_config
->
carrier_config
.
uplink_bandwidth
.
value
)
*
5e5
;
uint64_t
ul_bw_khz
=
(
12
*
gNB_config
->
carrier_config
.
ul_grid_size
[
gNB_config
->
ssb_config
.
scs_common
.
value
].
value
)
*
(
15
<<
gNB_config
->
ssb_config
.
scs_common
.
value
);
fp
->
ul_CarrierFreq
=
((
ul_bw_khz
>>
1
)
+
gNB_config
->
carrier_config
.
uplink_frequency
.
value
)
*
1000
;
AssertFatal
(
fp
->
ul_CarrierFreq
==
(
fp
->
dl_CarrierFreq
+
dlul_offset
),
"Disagreement in uplink frequency for band %d
\n
"
,
fp
->
nr_band
);
fp
->
threequarter_fs
=
openair0_cfg
[
0
].
threequarter_fs
;
LOG_I
(
PHY
,
"Configuring MIB for instance %d, : (Nid_cell %d,DL freq %llu, UL freq %llu)
\n
"
,
Mod_id
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/INIT/nr_parms.c
View file @
bbfa23e9
...
...
@@ -290,8 +290,11 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
int
Ncp
)
{
fp
->
dl_CarrierFreq
=
(
config
->
carrier_config
.
dl_frequency
)
*
1e3
+
(
config
->
carrier_config
.
dl_bandwidth
)
*
5e5
;
fp
->
ul_CarrierFreq
=
(
config
->
carrier_config
.
uplink_frequency
)
*
1e3
+
(
config
->
carrier_config
.
uplink_bandwidth
)
*
5e5
;
uint64_t
dl_bw_khz
=
(
12
*
config
->
carrier_config
.
dl_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
fp
->
dl_CarrierFreq
=
((
dl_bw_khz
>>
1
)
+
config
->
carrier_config
.
dl_frequency
)
*
1000
;
uint64_t
ul_bw_khz
=
(
12
*
config
->
carrier_config
.
ul_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
fp
->
ul_CarrierFreq
=
((
ul_bw_khz
>>
1
)
+
config
->
carrier_config
.
uplink_frequency
)
*
1000
;
fp
->
numerology_index
=
config
->
ssb_config
.
scs_common
;
fp
->
N_RB_UL
=
config
->
carrier_config
.
ul_grid_size
[
fp
->
numerology_index
];
...
...
@@ -317,6 +320,8 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
set_scs_parameters
(
fp
,
fp
->
numerology_index
);
fp
->
slots_per_frame
=
10
*
fp
->
slots_per_subframe
;
fp
->
nb_antenna_ports_gNB
=
1
;
// default value until overwritten by RRCConnectionReconfiguration
fp
->
nb_antennas_rx
=
1
;
// default value until overwritten by RRCConnectionReconfiguration
fp
->
nb_antennas_tx
=
1
;
// default value until overwritten by RRCConnectionReconfiguration
...
...
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