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
spbro
OpenXG-RAN
Commits
4fd78ce1
Commit
4fd78ce1
authored
Nov 18, 2021
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fixes for 15 kHz SCS
parent
cbf57d7b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
13 deletions
+37
-13
executables/nr-ru.c
executables/nr-ru.c
+11
-4
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+13
-5
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+13
-4
No files found.
executables/nr-ru.c
View file @
4fd78ce1
...
...
@@ -726,10 +726,17 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
AssertFatal
(
txsymb
>
0
,
"illegal txsymb %d
\n
"
,
txsymb
);
if
(
slot
%
(
fp
->
slots_per_subframe
/
2
))
siglen
=
txsymb
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
);
else
siglen
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
)
+
(
txsymb
-
1
)
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
);
if
(
fp
->
slots_per_subframe
==
1
)
{
if
(
txsymb
<=
7
)
siglen
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
)
+
(
txsymb
-
1
)
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
);
else
siglen
=
2
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
)
+
(
txsymb
-
2
)
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
);
}
else
{
if
(
slot
%
(
fp
->
slots_per_subframe
/
2
))
siglen
=
txsymb
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
);
else
siglen
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
)
+
(
txsymb
-
1
)
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
);
}
//+ ru->end_of_burst_delay;
flags
=
3
;
// end of burst
...
...
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
4fd78ce1
...
...
@@ -175,11 +175,19 @@ void rx_nr_prach_ru(RU_t *ru,
int
msg1_frequencystart
=
ru
->
config
.
prach_config
.
num_prach_fd_occasions_list
[
numRA
].
k1
.
value
;
int
sample_offset_slot
;
if
(
!
(
slot
%
(
fp
->
slots_per_subframe
/
2
)))
sample_offset_slot
=
(
prachStartSymbol
==
0
?
0
:
fp
->
ofdm_symbol_size
*
prachStartSymbol
+
fp
->
nb_prefix_samples0
+
fp
->
nb_prefix_samples
*
(
prachStartSymbol
-
1
));
else
sample_offset_slot
=
(
prachStartSymbol
==
0
?
0
:
prachStartSymbol
*
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
));
//to be checked for mu=0;
if
(
prachStartSymbol
==
0
)
{
sample_offset_slot
=
0
;
}
else
if
(
fp
->
slots_per_subframe
==
1
)
{
if
(
prachStartSymbol
<=
7
)
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
(
prachStartSymbol
-
1
)
+
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
);
else
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
(
prachStartSymbol
-
2
)
+
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
)
*
2
;
}
else
{
if
(
!
(
slot
%
(
fp
->
slots_per_subframe
/
2
)))
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
(
prachStartSymbol
-
1
)
+
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
);
else
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
prachStartSymbol
;
}
LOG_D
(
PHY
,
"frame %d, slot %d: doing rx_nr_prach_ru for format %d, numRA %d, prachStartSymbol %d, prachOccasion %d
\n
"
,
frame
,
slot
,
prachFormat
,
numRA
,
prachStartSymbol
,
prachOccasion
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
View file @
4fd78ce1
...
...
@@ -102,10 +102,19 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, uint8_t slot){
nrUE_config
->
prach_config
.
num_prach_fd_occasions_list
[
fd_occasion
].
prach_root_sequence_index
,
ue
->
X_u
);
if
(
slot
%
(
fp
->
slots_per_subframe
/
2
)
==
0
)
sample_offset_slot
=
(
prachStartSymbol
==
0
?
0
:
fp
->
ofdm_symbol_size
*
prachStartSymbol
+
fp
->
nb_prefix_samples0
+
fp
->
nb_prefix_samples
*
(
prachStartSymbol
-
1
));
else
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
prachStartSymbol
;
if
(
prachStartSymbol
==
0
)
{
sample_offset_slot
=
0
;
}
else
if
(
fp
->
slots_per_subframe
==
1
)
{
if
(
prachStartSymbol
<=
7
)
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
(
prachStartSymbol
-
1
)
+
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
);
else
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
(
prachStartSymbol
-
2
)
+
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
)
*
2
;
}
else
{
if
(
slot
%
(
fp
->
slots_per_subframe
/
2
)
==
0
)
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
(
prachStartSymbol
-
1
)
+
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples0
);
else
sample_offset_slot
=
(
fp
->
ofdm_symbol_size
+
fp
->
nb_prefix_samples
)
*
prachStartSymbol
;
}
prach_start
=
fp
->
get_samples_slot_timestamp
(
slot
,
fp
,
0
)
+
sample_offset_slot
;
...
...
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