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
Michael Black
OpenXG-RAN
Commits
703f2e20
Commit
703f2e20
authored
Jun 07, 2023
by
Melissa Elkadi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing Lmax setting and reverting f0 calc to non-SL mode
parent
29e2f675
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+7
-8
openair1/PHY/MODULATION/nr_modulation.c
openair1/PHY/MODULATION/nr_modulation.c
+6
-2
No files found.
openair1/PHY/INIT/nr_parms.c
View file @
703f2e20
...
...
@@ -46,10 +46,10 @@ void set_Lmax(NR_DL_FRAME_PARMS *fp) {
int
sl_NumSSB_WithinPeriod
=
1
;
//TODO: Needs to be updated from RRC parameters
int
sl_TimeOffsetSSB
=
1
;
//TODO: Needs to be updated from RRC parameters
int
sl_TimeInterval
=
1
;
//TODO: Needs to be updated from RRC parameters
if
((
sl_NumSSB_WithinPeriod
==
4
)
&&
((
sl_TimeOffsetSSB
%
fp
->
slots_per_frame
)
+
3
*
sl_TimeInterval
<
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
))
fp
->
Lmax
=
2
;
else
if
((
sl_NumSSB_WithinPeriod
==
2
)
&&
((
sl_TimeOffsetSSB
%
fp
->
slots_per_frame
)
+
sl_TimeInterval
<
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
))
if
((
sl_NumSSB_WithinPeriod
==
4
)
&&
((
sl_TimeOffsetSSB
%
fp
->
slots_per_frame
)
+
3
*
sl_TimeInterval
<
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
*
2
))
fp
->
Lmax
=
4
;
else
if
((
sl_NumSSB_WithinPeriod
==
2
)
&&
((
sl_TimeOffsetSSB
%
fp
->
slots_per_frame
)
+
sl_TimeInterval
<
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
))
fp
->
Lmax
=
2
;
else
fp
->
Lmax
=
1
;
return
;
...
...
@@ -163,11 +163,10 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu, int N_RB_DL)
while
(
fp
->
ofdm_symbol_size
<
N_RB_DL
*
12
)
fp
->
ofdm_symbol_size
<<=
1
;
//TODO: The following 'if' setting needs to be removed later;
fp
->
first_carrier_offset
=
fp
->
ofdm_symbol_size
-
(
N_RB_DL
*
12
/
2
);
// TODO: Temporarily setting fp->first_carrier_offset = 0 for SL until MAC is developed
if
(
get_softmodem_params
()
->
sl_mode
==
2
)
fp
->
first_carrier_offset
=
0
;
else
fp
->
first_carrier_offset
=
fp
->
ofdm_symbol_size
-
(
N_RB_DL
*
12
/
2
);
fp
->
nb_prefix_samples
=
fp
->
ofdm_symbol_size
/
128
*
9
;
fp
->
nb_prefix_samples0
=
fp
->
ofdm_symbol_size
/
128
*
(
9
+
(
1
<<
mu
));
LOG_W
(
PHY
,
"Init: N_RB_DL %d, first_carrier_offset %d, nb_prefix_samples %d,nb_prefix_samples0 %d, ofdm_symbol_size %d
\n
"
,
...
...
@@ -301,7 +300,7 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
LOG_D
(
PHY
,
"dl_CarrierFreq %lu
\n
"
,
fp
->
dl_CarrierFreq
);
if
(
get_softmodem_params
()
->
sl_mode
==
2
)
{
uint64_t
sl_bw_khz
=
(
12
*
config
->
carrier_config
.
sl_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
uint64_t
sl_bw_khz
=
(
12
*
config
->
carrier_config
.
sl_grid_size
[
config
->
ssb_config
.
scs_common
])
*
(
15
<<
config
->
ssb_config
.
scs_common
);
fp
->
sl_CarrierFreq
=
((
sl_bw_khz
>>
1
)
+
config
->
carrier_config
.
sl_frequency
)
*
1000
;
}
...
...
@@ -355,7 +354,7 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
}
fp
->
ssb_start_subcarrier
=
(
12
*
config
->
ssb_table
.
ssb_offset_point_a
+
sco
);
//
TODO: The following setting needs to be removed later;
//
TODO: Temporarily setting fp->ssb_start_subcarrier = 0 for SL until MAC is developed
if
(
get_softmodem_params
()
->
sl_mode
==
2
)
{
fp
->
ssb_start_subcarrier
=
0
;
}
...
...
openair1/PHY/MODULATION/nr_modulation.c
View file @
703f2e20
...
...
@@ -601,7 +601,7 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
uint64_t
dl_CarrierFreq
=
fp
->
dl_CarrierFreq
;
uint64_t
ul_CarrierFreq
=
fp
->
ul_CarrierFreq
;
uint64_t
sl_CarrierFreq
=
fp
->
sl_CarrierFreq
;
double
f
[
3
]
=
{(
double
)
dl_CarrierFreq
,
(
double
)
ul_CarrierFreq
,
(
double
)
s
l_CarrierFreq
};
double
f
[
2
]
=
{(
double
)
dl_CarrierFreq
,
(
double
)
u
l_CarrierFreq
};
const
int
nsymb
=
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
/
10
;
const
double
Tc
=
(
1
/
480e3
/
4096
);
...
...
@@ -609,11 +609,15 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
const
double
Ncp0
=
16
*
64
+
(
144
*
64
*
(
1
/
(
float
)(
1
<<
fp
->
numerology_index
)));
const
double
Ncp1
=
(
144
*
64
*
(
1
/
(
float
)(
1
<<
fp
->
numerology_index
)));
for
(
uint8_t
ll
=
0
;
ll
<
sizeof
(
f
)
/
sizeof
(
f
[
0
])
;
ll
++
){
for
(
uint8_t
ll
=
0
;
ll
<
2
;
ll
++
){
double
f0
=
f
[
ll
];
LOG_D
(
PHY
,
"Doing symbol rotation calculation for gNB TX/RX, f0 %f Hz, Nsymb %d
\n
"
,
f0
,
nsymb
);
c16_t
*
symbol_rotation
=
fp
->
symbol_rotation
[
ll
];
if
(
get_softmodem_params
()
->
sl_mode
==
2
)
{
f0
=
(
double
)
sl_CarrierFreq
;
symbol_rotation
=
fp
->
symbol_rotation
[
link_type_sl
];
}
double
tl
=
0
.
0
;
double
poff
=
0
.
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