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
d04b4c0e
Commit
d04b4c0e
authored
Jul 24, 2020
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ont bug in DFT and some performance improvements
parent
afc93b0f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1910 additions
and
2825 deletions
+1910
-2825
executables/ocp-gnb.c
executables/ocp-gnb.c
+5
-5
openair1/PHY/TOOLS/oai_dfts.c
openair1/PHY/TOOLS/oai_dfts.c
+1746
-2661
openair3/NAS/COMMON/NR_NAS_defs.h
openair3/NAS/COMMON/NR_NAS_defs.h
+159
-159
No files found.
executables/ocp-gnb.c
View file @
d04b4c0e
...
@@ -840,7 +840,6 @@ static void *ru_thread( void *param ) {
...
@@ -840,7 +840,6 @@ static void *ru_thread( void *param ) {
proc
->
timestamp_rx
=
nextRxTSlogical
;
proc
->
timestamp_rx
=
nextRxTSlogical
;
nextRxTSlogical
+=
samples_per_slot
;
nextRxTSlogical
+=
samples_per_slot
;
int64_t
HW_to_logical_RxTSoffset
=
(
int64_t
)
HWtimeStamp
-
(
int64_t
)
proc
->
timestamp_rx
;
int64_t
HW_to_logical_RxTSoffset
=
(
int64_t
)
HWtimeStamp
-
(
int64_t
)
proc
->
timestamp_rx
;
printf
(
"%lu, %lu
\n
"
,
HWtimeStamp
,
(
slot
+
1
)
*
fp
->
samples_per_subframe
);
proc
->
frame_rx
=
(
proc
->
timestamp_rx
/
(
fp
->
samples_per_subframe
*
10
))
&
1023
;
proc
->
frame_rx
=
(
proc
->
timestamp_rx
/
(
fp
->
samples_per_subframe
*
10
))
&
1023
;
uint32_t
idx_sf
=
proc
->
timestamp_rx
/
fp
->
samples_per_subframe
;
uint32_t
idx_sf
=
proc
->
timestamp_rx
/
fp
->
samples_per_subframe
;
float
offsetInSubframe
=
proc
->
timestamp_rx
%
fp
->
samples_per_subframe
;
float
offsetInSubframe
=
proc
->
timestamp_rx
%
fp
->
samples_per_subframe
;
...
@@ -852,7 +851,7 @@ static void *ru_thread( void *param ) {
...
@@ -852,7 +851,7 @@ static void *ru_thread( void *param ) {
(
unsigned
long
long
int
)
proc
->
timestamp_rx
,
(
unsigned
long
long
int
)
proc
->
timestamp_rx
,
(
int
)
ru
->
ts_offset
,
proc
->
frame_rx
,
proc
->
tti_rx
,
proc
->
tti_tx
,
fp
->
slots_per_frame
);
(
int
)
ru
->
ts_offset
,
proc
->
frame_rx
,
proc
->
tti_rx
,
proc
->
tti_tx
,
fp
->
slots_per_frame
);
int
slot_type
=
nr_slot_select
(
&
ru
->
gNB_list
[
0
]
->
gNB_config
,
proc
->
frame_rx
,
proc
->
tti_rx
);
int
slot_type
=
nr_slot_select
(
&
ru
->
gNB_list
[
0
]
->
gNB_config
,
proc
->
frame_rx
,
proc
->
tti_rx
);
if
(
slot_type
==
NR_UPLINK_SLOT
||
slot_type
==
NR_MIXED_SLOT
)
{
if
(
slot_type
==
NR_UPLINK_SLOT
||
slot_type
==
NR_MIXED_SLOT
)
{
nr_fep_full
(
ru
,
proc
->
tti_rx
);
nr_fep_full
(
ru
,
proc
->
tti_rx
);
...
@@ -862,13 +861,14 @@ static void *ru_thread( void *param ) {
...
@@ -862,13 +861,14 @@ static void *ru_thread( void *param ) {
LOG_D
(
PHY
,
"rxdataF energy: %d
\n
"
,
signal_energy
(
ru
->
common
.
rxdataF
[
0
],
fp
->
symbols_per_slot
*
fp
->
ofdm_symbol_size
));
LOG_D
(
PHY
,
"rxdataF energy: %d
\n
"
,
signal_energy
(
ru
->
common
.
rxdataF
[
0
],
fp
->
symbols_per_slot
*
fp
->
ofdm_symbol_size
));
}
}
gNB_top
(
&
RC
.
gNB
[
0
][
0
].
proc
,
ru
);
gNB_top
(
&
RC
.
gNB
[
0
][
0
].
proc
,
ru
);
gNB_L1_rxtx_proc_t
*
L1_proc
=
&
RC
.
gNB
[
0
][
0
].
proc
.
L1_proc
;
gNB_L1_rxtx_proc_t
*
L1_proc
=
&
RC
.
gNB
[
0
][
0
].
proc
.
L1_proc
;
if
(
rxtx
(
&
RC
.
gNB
[
0
][
0
],
L1_proc
)
<
0
)
if
(
rxtx
(
&
RC
.
gNB
[
0
][
0
],
L1_proc
)
<
0
)
LOG_E
(
PHY
,
"gNB %d CC_id %d failed during execution
\n
"
,
RC
.
gNB
[
0
][
0
].
Mod_id
,
RC
.
gNB
[
0
][
0
].
CC_id
);
LOG_E
(
PHY
,
"gNB %d CC_id %d failed during execution
\n
"
,
RC
.
gNB
[
0
][
0
].
Mod_id
,
RC
.
gNB
[
0
][
0
].
CC_id
);
// do TX front-end processing if needed (precoding and/or IDFTs)
// do TX front-end processing if needed (precoding and/or IDFTs)
//ru->feptx_prec(ru,proc->frame_tx,proc->tti_tx);
//ru->feptx_prec(ru,proc->frame_tx,proc->tti_tx);
nr_feptx_prec
(
ru
,
proc
->
frame_tx
,
proc
->
tti_tx
);
nr_feptx_prec
(
ru
,
proc
->
frame_tx
,
proc
->
tti_tx
);
...
@@ -887,7 +887,7 @@ static void *ru_thread( void *param ) {
...
@@ -887,7 +887,7 @@ static void *ru_thread( void *param ) {
proc
->
frame_tx
,
proc
->
tti_tx
,
proc
->
timestamp_tx
,
dB_fixed
(
signal_energy
((
int32_t
*
)
txdata
,
fp
->
get_samples_per_slot
(
proc
->
frame_tx
,
proc
->
tti_tx
,
proc
->
timestamp_tx
,
dB_fixed
(
signal_energy
((
int32_t
*
)
txdata
,
fp
->
get_samples_per_slot
(
proc
->
tti_tx
,
fp
))),
dB_fixed
(
signal_energy_nodc
(
ru
->
common
.
txdataF_BF
[
aa
],
2
*
slot_sizeF
)));
proc
->
tti_tx
,
fp
))),
dB_fixed
(
signal_energy_nodc
(
ru
->
common
.
txdataF_BF
[
aa
],
2
*
slot_sizeF
)));
}
}
// do outgoing fronthaul (south) if needed
// do outgoing fronthaul (south) if needed
tx_rf
(
ru
,
proc
->
frame_tx
,
proc
->
tti_tx
,
proc
->
timestamp_tx
+
HW_to_logical_RxTSoffset
);
tx_rf
(
ru
,
proc
->
frame_tx
,
proc
->
tti_tx
,
proc
->
timestamp_tx
+
HW_to_logical_RxTSoffset
);
slot
++
;
slot
++
;
...
...
openair1/PHY/TOOLS/oai_dfts.c
View file @
d04b4c0e
This diff is collapsed.
Click to expand it.
openair3/NAS/COMMON/NR_NAS_defs.h
View file @
d04b4c0e
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