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
zzha zzha
OpenXG-RAN
Commits
88cbf8c9
Commit
88cbf8c9
authored
Feb 13, 2023
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix regression, to squash with previous commit
parent
dc12dfd7
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
100 additions
and
127 deletions
+100
-127
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+64
-125
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
+6
-1
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+29
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+1
-0
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
88cbf8c9
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
View file @
88cbf8c9
...
...
@@ -599,7 +599,12 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
uint32_t
dl_valid_re
[
NR_SYMBOLS_PER_SLOT
],
c16_t
rxdataF
[][
ue
->
frame_parms
.
samples_per_slot_wCP
],
uint32_t
llr_offset
[
NR_SYMBOLS_PER_SLOT
],
int32_t
*
log2_maxh
);
int32_t
*
log2_maxhrx_size_symbol
,
int
rx_size_symbol
,
int
nbRx
,
int32_t
rxdataF_comp
[][
nbRx
][
rx_size_symbol
],
c16_t
ptrs_phase_per_slot
[][
NR_SYMBOLS_PER_SLOT
],
int32_t
ptrs_re_per_slot
[][
NR_SYMBOLS_PER_SLOT
]);
int32_t
generate_nr_prach
(
PHY_VARS_NR_UE
*
ue
,
uint8_t
gNB_id
,
int
frame
,
uint8_t
slot
);
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
88cbf8c9
...
...
@@ -581,6 +581,16 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue,
__attribute__
((
aligned
(
32
)))
int32_t
pdsch_dl_ch_estimates
[
ue
->
frame_parms
.
nb_antennas_rx
*
dlsch0
->
Nl
][
pdsch_est_size
];
memset
(
pdsch_dl_ch_estimates
,
0
,
sizeof
(
int32_t
)
*
ue
->
frame_parms
.
nb_antennas_rx
*
dlsch0
->
Nl
*
pdsch_est_size
);
c16_t
ptrs_phase_per_slot
[
ue
->
frame_parms
.
nb_antennas_rx
][
NR_SYMBOLS_PER_SLOT
];
memset
(
ptrs_phase_per_slot
,
0
,
sizeof
(
ptrs_phase_per_slot
));
int32_t
ptrs_re_per_slot
[
ue
->
frame_parms
.
nb_antennas_rx
][
NR_SYMBOLS_PER_SLOT
];
memset
(
ptrs_re_per_slot
,
0
,
sizeof
(
ptrs_re_per_slot
));
const
uint32_t
rx_size_symbol
=
dlsch
[
0
].
dlsch_config
.
number_rbs
*
NR_NB_SC_PER_RB
;
__attribute__
((
aligned
(
32
)))
int32_t
rxdataF_comp
[
ue
->
frame_parms
.
nb_antennas_tx
][
ue
->
frame_parms
.
nb_antennas_rx
][
rx_size_symbol
*
NR_SYMBOLS_PER_SLOT
];
memset
(
rxdataF_comp
,
0
,
sizeof
(
rxdataF_comp
));
for
(
m
=
s0
;
m
<
(
s0
+
s1
);
m
++
)
{
if
(
dlsch0
->
dlsch_config
.
dlDmrsSymbPos
&
(
1
<<
m
))
{
for
(
uint8_t
aatx
=
0
;
aatx
<
dlsch0
->
Nl
;
aatx
++
)
{
//for MIMO Config: it shall loop over no_layers
...
...
@@ -653,7 +663,25 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue,
start_meas
(
&
ue
->
dlsch_llr_stats_parallelization
[
slot
]);
// process DLSCH received symbols in the slot
// symbol by symbol processing (if data/DMRS are multiplexed is checked inside the function)
if
(
nr_rx_pdsch
(
ue
,
proc
,
dlsch
,
m
,
first_symbol_flag
,
harq_pid
,
pdsch_est_size
,
pdsch_dl_ch_estimates
,
llr
,
dl_valid_re
,
rxdataF
,
llr_offset
,
&
log2_maxh
)
<
0
)
if
(
nr_rx_pdsch
(
ue
,
proc
,
dlsch
,
m
,
first_symbol_flag
,
harq_pid
,
pdsch_est_size
,
pdsch_dl_ch_estimates
,
llr
,
dl_valid_re
,
rxdataF
,
llr_offset
,
&
log2_maxh
,
rx_size_symbol
,
ue
->
frame_parms
.
nb_antennas_rx
,
rxdataF_comp
,
ptrs_phase_per_slot
,
ptrs_re_per_slot
)
<
0
)
return
-
1
;
stop_meas
(
&
ue
->
dlsch_llr_stats_parallelization
[
slot
]);
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
88cbf8c9
...
...
@@ -309,6 +309,7 @@ int NB_UE_INST = 1;
int
main
(
int
argc
,
char
**
argv
)
{
setbuf
(
stdout
,
NULL
);
char
c
;
int
i
,
aa
;
//,l;
double
sigma2
,
sigma2_dB
=
10
,
SNR
,
snr0
=-
2
.
0
,
snr1
=
2
.
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