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
5bb1893f
Commit
5bb1893f
authored
Sep 15, 2020
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
forgot to account for prachStartSymbol in rx_nr_prach_ru
parent
a98cf887
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+6
-1
openair1/SCHED_NR/nr_prach_procedures.c
openair1/SCHED_NR/nr_prach_procedures.c
+6
-6
No files found.
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
5bb1893f
...
@@ -175,13 +175,18 @@ void rx_nr_prach_ru(RU_t *ru,
...
@@ -175,13 +175,18 @@ void rx_nr_prach_ru(RU_t *ru,
int
msg1_frequencystart
=
ru
->
config
.
prach_config
.
num_prach_fd_occasions_list
[
numRA
].
k1
.
value
;
int
msg1_frequencystart
=
ru
->
config
.
prach_config
.
num_prach_fd_occasions_list
[
numRA
].
k1
.
value
;
int
sample_offset_slot
=
(
prachStartSymbol
==
0
?
0
:
fp
->
ofdm_symbol_size
*
prachStartSymbol
+
fp
->
nb_prefix_samples0
+
fp
->
nb_prefix_samples
*
(
prachStartSymbol
-
1
));
//to be checked for mu=0;
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
);
rxsigF
=
ru
->
prach_rxsigF
[
prachOccasion
];
rxsigF
=
ru
->
prach_rxsigF
[
prachOccasion
];
AssertFatal
(
ru
->
if_south
==
LOCAL_RF
,
"we shouldn't call this if if_south != LOCAL_RF
\n
"
);
AssertFatal
(
ru
->
if_south
==
LOCAL_RF
,
"we shouldn't call this if if_south != LOCAL_RF
\n
"
);
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
){
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
){
if
(
prach_sequence_length
==
0
)
slot2
=
(
slot
/
fp
->
slots_per_subframe
)
*
fp
->
slots_per_subframe
;
if
(
prach_sequence_length
==
0
)
slot2
=
(
slot
/
fp
->
slots_per_subframe
)
*
fp
->
slots_per_subframe
;
prach
[
aa
]
=
(
int16_t
*
)
&
ru
->
common
.
rxdata
[
aa
][(
slot2
*
fp
->
get_samples_per_slot
(
slot
,
fp
))
-
ru
->
N_TA_offset
];
prach
[
aa
]
=
(
int16_t
*
)
&
ru
->
common
.
rxdata
[
aa
][(
slot2
*
fp
->
get_samples_per_slot
(
slot
,
fp
))
+
sample_offset_slot
-
ru
->
N_TA_offset
];
}
}
...
...
openair1/SCHED_NR/nr_prach_procedures.c
View file @
5bb1893f
...
@@ -110,12 +110,12 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
...
@@ -110,12 +110,12 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
&
max_preamble_delay
[
0
]
&
max_preamble_delay
[
0
]
);
);
free_nr_prach_entry
(
gNB
,
prach_id
);
free_nr_prach_entry
(
gNB
,
prach_id
);
LOG_I
(
PHY
,
"[RAPROC] Frame %d, slot %d : Most likely preamble %d, energy %d dB delay %d (prach_energy counter %d)
\n
"
,
LOG_I
(
PHY
,
"[RAPROC] Frame %d, slot %d
, occasion %d (prachStartSymbol %d)
: Most likely preamble %d, energy %d dB delay %d (prach_energy counter %d)
\n
"
,
frame
,
slot
,
frame
,
slot
,
prach_oc
,
prachStartSymbol
,
max_preamble
[
0
],
max_preamble
[
0
],
max_preamble_energy
[
0
]
/
10
,
max_preamble_energy
[
0
]
/
10
,
max_preamble_delay
[
0
],
max_preamble_delay
[
0
],
gNB
->
prach_energy_counter
);
gNB
->
prach_energy_counter
);
if
((
gNB
->
prach_energy_counter
==
100
)
&&
if
((
gNB
->
prach_energy_counter
==
100
)
&&
(
max_preamble_energy
[
0
]
>
gNB
->
measurements
.
prach_I0
+
100
))
{
(
max_preamble_energy
[
0
]
>
gNB
->
measurements
.
prach_I0
+
100
))
{
...
...
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