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
wangjie
OpenXG-RAN
Commits
54ebd39b
Commit
54ebd39b
authored
6 years ago
by
Khalid Ahmed
Committed by
Thomas Schlichter
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changing txdataF to contain one slot only
parent
d9e077ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
openair1/PHY/INIT/nr_init_ue.c
openair1/PHY/INIT/nr_init_ue.c
+1
-1
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+3
-6
No files found.
openair1/PHY/INIT/nr_init_ue.c
View file @
54ebd39b
...
...
@@ -788,7 +788,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
{
common_vars
->
txdata
[
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
samples_per_subframe
*
10
*
sizeof
(
int32_t
)
);
common_vars
->
txdataF
[
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
samples_per_
frame
_wCP
*
sizeof
(
int32_t
)
);
common_vars
->
txdataF
[
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
samples_per_
slot
_wCP
*
sizeof
(
int32_t
)
);
}
// init RX buffers
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
54ebd39b
...
...
@@ -166,7 +166,6 @@ int main(int argc, char **argv) {
int
ap
;
int
tx_offset
;
int
sample_offsetF
;
int
slot_offsetF
;
int
txlev
;
cpuf
=
get_cpu_freq_GHz
();
...
...
@@ -626,8 +625,6 @@ int main(int argc, char **argv) {
if
(
start_sc
>=
frame_parms
->
ofdm_symbol_size
)
start_sc
-=
frame_parms
->
ofdm_symbol_size
;
slot_offsetF
=
slot
*
frame_parms
->
symbols_per_slot
*
frame_parms
->
ofdm_symbol_size
;
for
(
ap
=
0
;
ap
<
harq_process_ul_ue
->
Nl
;
ap
++
)
{
// DMRS params for this ap
...
...
@@ -643,7 +640,7 @@ int main(int argc, char **argv) {
for
(
l
=
start_symbol
;
l
<
start_symbol
+
nb_symb_sch
;
l
++
)
{
k
=
start_sc
;
sample_offsetF
=
l
*
frame_parms
->
ofdm_symbol_size
+
k
+
slot_offsetF
;
sample_offsetF
=
l
*
frame_parms
->
ofdm_symbol_size
+
k
;
for
(
i
=
0
;
i
<
nb_rb
*
NR_NB_SC_PER_RB
;
i
++
)
{
if
((
l
==
dmrs_symbol
)
&&
(
k
==
((
start_sc
+
get_dmrs_freq_idx
(
n
,
k_prime
,
delta
,
dmrs_type
))
%
(
frame_parms
->
ofdm_symbol_size
))))
{
...
...
@@ -688,14 +685,14 @@ m, l, k, ((int16_t*)txdataF[ap])[(sample_offsetF)<<1],
for
(
ap
=
0
;
ap
<
harq_process_ul_ue
->
Nl
;
ap
++
)
{
if
(
frame_parms
->
Ncp
==
1
)
{
// extended cyclic prefix
PHY_ofdm_mod
(
&
txdataF
[
ap
][
slot_offsetF
],
PHY_ofdm_mod
(
txdataF
[
ap
],
&
txdata
[
ap
][
tx_offset
],
frame_parms
->
ofdm_symbol_size
,
12
,
frame_parms
->
nb_prefix_samples
,
CYCLIC_PREFIX
);
}
else
{
// normal cyclic prefix
nr_normal_prefix_mod
(
&
txdataF
[
ap
][
slot_offsetF
],
nr_normal_prefix_mod
(
txdataF
[
ap
],
&
txdata
[
ap
][
tx_offset
],
14
,
frame_parms
);
...
...
This diff is collapsed.
Click to expand it.
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