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
46db55b1
Commit
46db55b1
authored
Apr 22, 2021
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings
parent
39e506e3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
8 deletions
+13
-8
executables/nr-gnb.c
executables/nr-gnb.c
+2
-0
openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
+0
-4
openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
+2
-0
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+9
-4
No files found.
executables/nr-gnb.c
View file @
46db55b1
...
@@ -86,6 +86,8 @@
...
@@ -86,6 +86,8 @@
#include "T.h"
#include "T.h"
#include "nfapi/oai_integration/vendor_ext.h"
#include "nfapi/oai_integration/vendor_ext.h"
#include <nfapi/oai_integration/nfapi_pnf.h>
#include <nfapi/oai_integration/nfapi_pnf.h>
#include <PHY/NR_TRANSPORT/nr_ulsch.h>
#include <PHY/NR_ESTIMATION/nr_ul_estimation.h>
//#define DEBUG_THREADS 1
//#define DEBUG_THREADS 1
//#define USRP_DEBUG 1
//#define USRP_DEBUG 1
...
...
openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
View file @
46db55b1
...
@@ -102,12 +102,8 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB,int first_symb,int num_symb) {
...
@@ -102,12 +102,8 @@ void gNB_I0_measurements(PHY_VARS_gNB *gNB,int first_symb,int num_symb) {
NR_DL_FRAME_PARMS
*
frame_parms
=
&
gNB
->
frame_parms
;
NR_DL_FRAME_PARMS
*
frame_parms
=
&
gNB
->
frame_parms
;
NR_gNB_COMMON
*
common_vars
=
&
gNB
->
common_vars
;
NR_gNB_COMMON
*
common_vars
=
&
gNB
->
common_vars
;
PHY_MEASUREMENTS_gNB
*
measurements
=
&
gNB
->
measurements
;
PHY_MEASUREMENTS_gNB
*
measurements
=
&
gNB
->
measurements
;
NR_DL_FRAME_PARMS
*
fp
=
&
gNB
->
frame_parms
;
double
rx_gain
=
openair0_cfg
[
0
].
rx_gain
[
0
];
double
rx_gain_offset
=
openair0_cfg
[
0
].
rx_gain_offset
[
0
];
uint32_t
*
rb_mask
=
gNB
->
rb_mask_ul
;
uint32_t
*
rb_mask
=
gNB
->
rb_mask_ul
;
int
rb
,
offset
,
offset0
,
nb_rb
,
len
;
int
rb
,
offset
,
offset0
,
nb_rb
,
len
;
uint32_t
n0_subband_power_temp
=
0
;
int32_t
*
ul_ch
;
int32_t
*
ul_ch
;
int32_t
n0_power_tot
;
int32_t
n0_power_tot
;
int64_t
n0_power_tot2
;
int64_t
n0_power_tot2
;
...
...
openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
View file @
46db55b1
...
@@ -47,6 +47,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
...
@@ -47,6 +47,8 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
unsigned
short
bwp_start_subcarrier
,
unsigned
short
bwp_start_subcarrier
,
nfapi_nr_pusch_pdu_t
*
pusch_pdu
);
nfapi_nr_pusch_pdu_t
*
pusch_pdu
);
void
dump_nr_I0_stats
(
FILE
*
fd
,
PHY_VARS_gNB
*
gNB
);
void
gNB_I0_measurements
(
PHY_VARS_gNB
*
gNB
,
int
first_symb
,
int
num_symb
);
void
gNB_I0_measurements
(
PHY_VARS_gNB
*
gNB
,
int
first_symb
,
int
num_symb
);
void
nr_gnb_measurements
(
PHY_VARS_gNB
*
gNB
,
uint8_t
ulsch_id
,
unsigned
char
harq_pid
,
unsigned
char
symbol
);
void
nr_gnb_measurements
(
PHY_VARS_gNB
*
gNB
,
uint8_t
ulsch_id
,
unsigned
char
harq_pid
,
unsigned
char
symbol
);
...
...
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
46db55b1
...
@@ -287,9 +287,14 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
...
@@ -287,9 +287,14 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
#endif
#endif
}
}
}
}
int32_t
corr_re
[
2
],
corr_im
[
2
],
no_corr
=
0
;
int32_t
corr_re
[
2
];
int32_t
corr_im
[
2
];
//int32_t no_corr = 0;
int
seq_index
;
int
seq_index
;
int64_t
temp
,
av_corr
=
0
;
int64_t
temp
;
int64_t
av_corr
=
0
;
for
(
i
=
0
;
i
<
nr_sequences
;
i
++
){
for
(
i
=
0
;
i
<
nr_sequences
;
i
++
){
for
(
l
=
0
;
l
<
pucch_pdu
->
nr_of_symbols
;
l
++
)
{
for
(
l
=
0
;
l
<
pucch_pdu
->
nr_of_symbols
;
l
++
)
{
corr_re
[
l
]
=
0
;
corr_im
[
l
]
=
0
;
corr_re
[
l
]
=
0
;
corr_im
[
l
]
=
0
;
...
@@ -331,8 +336,8 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
...
@@ -331,8 +336,8 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
if
(
l
==
2
)
uci_stats
->
current_pucch0_stat1
=
dB_fixed64
((
int64_t
)
corr_re
[
1
]
*
corr_re
[
1
]
+
(
int64_t
)
corr_im
[
1
]
*
corr_im
[
1
]);
if
(
l
==
2
)
uci_stats
->
current_pucch0_stat1
=
dB_fixed64
((
int64_t
)
corr_re
[
1
]
*
corr_re
[
1
]
+
(
int64_t
)
corr_im
[
1
]
*
corr_im
[
1
]);
}
}
}
}
if
(
nr_sequences
>
1
)
//
if(nr_sequences>1)
no_corr
=
(
av_corr
-
xrtmag
)
/
(
nr_sequences
-
1
)
/
l
;
//
no_corr=(av_corr-xrtmag)/(nr_sequences-1)/l;
av_corr
/=
nr_sequences
/
l
;
av_corr
/=
nr_sequences
/
l
;
uint8_t
xrtmag_dB
=
dB_fixed64
(
xrtmag
);
uint8_t
xrtmag_dB
=
dB_fixed64
(
xrtmag
);
...
...
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