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
2ada0edd
Commit
2ada0edd
authored
Mar 09, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for no data in dmrs in ulsch procedures
parent
f9ca54e9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
+0
-1
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+6
-3
No files found.
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
View file @
2ada0edd
...
@@ -62,7 +62,6 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
...
@@ -62,7 +62,6 @@ void nr_rx_pusch(PHY_VARS_gNB *gNB,
@param start_rb The starting RB in the RB allocation (used for Resource Allocation Type 1 in NR)
@param start_rb The starting RB in the RB allocation (used for Resource Allocation Type 1 in NR)
@param nb_rb_pusch The number of RBs allocated (used for Resource Allocation Type 1 in NR)
@param nb_rb_pusch The number of RBs allocated (used for Resource Allocation Type 1 in NR)
@param frame_parms, Pointer to frame descriptor structure
@param frame_parms, Pointer to frame descriptor structure
@param is_dmrs_symbol, flag to indicate wether this OFDM symbol contains DMRS symbols or not.
*/
*/
void
nr_ulsch_extract_rbs_single
(
int
**
rxdataF
,
void
nr_ulsch_extract_rbs_single
(
int
**
rxdataF
,
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
2ada0edd
...
@@ -215,7 +215,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
...
@@ -215,7 +215,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
NR_DL_FRAME_PARMS
*
frame_parms
=
&
gNB
->
frame_parms
;
NR_DL_FRAME_PARMS
*
frame_parms
=
&
gNB
->
frame_parms
;
nfapi_nr_pusch_pdu_t
*
pusch_pdu
=
&
gNB
->
ulsch
[
ULSCH_id
][
0
]
->
harq_processes
[
harq_pid
]
->
ulsch_pdu
;
nfapi_nr_pusch_pdu_t
*
pusch_pdu
=
&
gNB
->
ulsch
[
ULSCH_id
][
0
]
->
harq_processes
[
harq_pid
]
->
ulsch_pdu
;
uint8_t
ret
;
uint8_t
ret
,
nodata_dmrs
=
1
;
uint8_t
l
,
number_dmrs_symbols
=
0
;
uint8_t
l
,
number_dmrs_symbols
=
0
;
uint32_t
G
;
uint32_t
G
;
uint16_t
start_symbol
,
number_symbols
,
nb_re_dmrs
;
uint16_t
start_symbol
,
number_symbols
,
nb_re_dmrs
;
...
@@ -226,6 +226,9 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
...
@@ -226,6 +226,9 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int ULSCH
for
(
l
=
start_symbol
;
l
<
start_symbol
+
number_symbols
;
l
++
)
for
(
l
=
start_symbol
;
l
<
start_symbol
+
number_symbols
;
l
++
)
number_dmrs_symbols
+=
((
pusch_pdu
->
ul_dmrs_symb_pos
)
>>
l
)
&
0x01
;;
number_dmrs_symbols
+=
((
pusch_pdu
->
ul_dmrs_symb_pos
)
>>
l
)
&
0x01
;;
if
(
nodata_dmrs
)
nb_re_dmrs
=
12
*
number_dmrs_symbols
;
else
nb_re_dmrs
=
((
pusch_pdu
->
dmrs_config_type
==
pusch_dmrs_type1
)
?
6
:
4
)
*
number_dmrs_symbols
;
nb_re_dmrs
=
((
pusch_pdu
->
dmrs_config_type
==
pusch_dmrs_type1
)
?
6
:
4
)
*
number_dmrs_symbols
;
G
=
nr_get_G
(
pusch_pdu
->
rb_size
,
G
=
nr_get_G
(
pusch_pdu
->
rb_size
,
...
...
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