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
3b53d82b
Commit
3b53d82b
authored
Oct 28, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoiding to use tx_lev since it was breaking prachsim (also some formatting)
parent
21b14ddd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
61 deletions
+42
-61
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+17
-18
openair1/SCHED_NR/nr_prach_procedures.c
openair1/SCHED_NR/nr_prach_procedures.c
+5
-23
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+20
-20
No files found.
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
3b53d82b
...
...
@@ -416,11 +416,10 @@ void rx_nr_prach(PHY_VARS_gNB *gNB,
nfapi_nr_prach_pdu_t
*
prach_pdu
,
int
prachOccasion
,
int
frame
,
int
subframe
,
int
slot
,
uint16_t
*
max_preamble
,
uint16_t
*
max_preamble_energy
,
uint16_t
*
max_preamble_delay
)
uint16_t
*
max_preamble_delay
)
{
AssertFatal
(
gNB
!=
NULL
,
"Can only be called from gNB
\n
"
);
...
...
@@ -481,7 +480,7 @@ void rx_nr_prach(PHY_VARS_gNB *gNB,
prach_ifft
=
gNB
->
prach_vars
.
prach_ifft
;
prachF
=
gNB
->
prach_vars
.
prachF
;
if
(
LOG_DEBUGFLAG
(
PRACH
)){
if
((
frame
&
1023
)
<
20
)
LOG_D
(
PHY
,
"PRACH (gNB) : running rx_prach for s
ubframe %d, msg1_frequencystart %d, rootSequenceIndex %d
\n
"
,
subframe
,
msg1_frequencystart
,
rootSequenceIndex
);
if
((
frame
&
1023
)
<
20
)
LOG_D
(
PHY
,
"PRACH (gNB) : running rx_prach for s
lot %d, msg1_frequencystart %d, rootSequenceIndex %d
\n
"
,
slot
,
msg1_frequencystart
,
rootSequenceIndex
);
}
start_meas
(
&
gNB
->
rx_prach
);
...
...
@@ -506,7 +505,7 @@ void rx_nr_prach(PHY_VARS_gNB *gNB,
if
(
LOG_DEBUGFLAG
(
PRACH
)){
int
en
=
dB_fixed
(
signal_energy
((
int32_t
*
)
&
rxsigF
[
0
][
0
],(
N_ZC
==
839
)
?
840
:
140
));
if
(
en
>
60
)
LOG_D
(
PHY
,
"frame %d, s
ubframe %d : Trying preamble %d
\n
"
,
frame
,
subframe
,
preamble_index
);
if
(
en
>
60
)
LOG_D
(
PHY
,
"frame %d, s
lot %d : Trying preamble %d
\n
"
,
frame
,
slot
,
preamble_index
);
}
if
(
restricted_set
==
0
)
{
// This is the relative offset in the root sequence table (5.7.2-4 from 36.211) for the given preamble index
...
...
@@ -585,8 +584,8 @@ void rx_nr_prach(PHY_VARS_gNB *gNB,
// Compute DFT of RX signal (conjugate input, results in conjugate output) for each new rootSequenceIndex
if
(
LOG_DEBUGFLAG
(
PRACH
))
{
int
en
=
dB_fixed
(
signal_energy
((
int32_t
*
)
&
rxsigF
[
0
][
0
],
840
));
if
(
en
>
60
)
LOG_
I
(
PHY
,
"frame %d, subframe
%d : preamble index %d, NCS %d, N_ZC/NCS %d: offset %d, preamble shift %d , en %d)
\n
"
,
frame
,
s
ubframe
,
preamble_index
,
NCS
,
N_ZC
/
NCS
,
preamble_offset
,
preamble_shift
,
en
);
if
(
en
>
60
)
LOG_
D
(
PHY
,
"frame %d, slot
%d : preamble index %d, NCS %d, N_ZC/NCS %d: offset %d, preamble shift %d , en %d)
\n
"
,
frame
,
s
lot
,
preamble_index
,
NCS
,
N_ZC
/
NCS
,
preamble_offset
,
preamble_shift
,
en
);
}
LOG_D
(
PHY
,
"PRACH RX preamble_index %d, preamble_offset %d
\n
"
,
preamble_index
,
preamble_offset
);
...
...
openair1/SCHED_NR/nr_prach_procedures.c
View file @
3b53d82b
...
...
@@ -127,24 +127,6 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
uint8_t
prachStartSymbol
;
uint8_t
N_dur
=
get_nr_prach_duration
(
prach_pdu
->
prach_format
);
/*
uint16_t format,RA_sfn_index;
uint8_t start_symbol,N_t_slot,N_dur,N_RA_slot,config_period;
get_nr_prach_info_from_index(gNB->gNB_config.prach_config.prach_ConfigurationIndex.value,
frame,slot,
gNB->gNB_config.carrier_config.dl_frequency.value,
gNB->frame_parms.numerology_index,
gNB->frame_parms.frame_type,
&format,
&start_symbol,
&N_t_slot,
&N_dur,
&RA_sfn_index,
&N_RA_slot,
&config_period);
*/
for
(
int
prach_oc
=
0
;
prach_oc
<
prach_pdu
->
num_prach_ocas
;
prach_oc
++
)
{
for
(
ru_aa
=
0
,
aa
=
0
;
ru_aa
<
ru
->
nb_rx
;
ru_aa
++
,
aa
++
)
{
gNB
->
prach_vars
.
rxsigF
[
aa
]
=
ru
->
prach_rxsigF
[
prach_oc
][
ru_aa
];
...
...
@@ -160,8 +142,8 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int slot) {
slot
,
&
max_preamble
[
0
],
&
max_preamble_energy
[
0
],
&
max_preamble_delay
[
0
]
);
&
max_preamble_delay
[
0
]
);
free_nr_prach_entry
(
gNB
,
prach_id
);
LOG_D
(
PHY
,
"[RAPROC] Frame %d, slot %d, occasion %d (prachStartSymbol %d) : Most likely preamble %d, energy %d.%d dB delay %d (prach_energy counter %d)
\n
"
,
frame
,
slot
,
prach_oc
,
prachStartSymbol
,
...
...
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
3b53d82b
...
...
@@ -766,7 +766,7 @@ int main(int argc, char **argv){
ue_prach_config
->
num_prach_fd_occasions_list
[
fd_occasion
].
prach_root_sequence_index
,
UE
->
X_u
);
tx_lev
=
generate_nr_prach
(
UE
,
0
,
frame
,
slot
);
generate_nr_prach
(
UE
,
0
,
frame
,
slot
);
/* tx_lev_dB not used later, no need to set */
//tx_lev_dB = (unsigned int) dB_fixed(tx_lev);
...
...
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