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
74ea4e5b
Commit
74ea4e5b
authored
Dec 16, 2021
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor name of two variables
parent
13116299
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
48 deletions
+48
-48
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+36
-36
openair1/PHY/NR_TRANSPORT/srs_rx.c
openair1/PHY/NR_TRANSPORT/srs_rx.c
+6
-6
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
+3
-3
openair1/PHY/defs_nr_common.h
openair1/PHY/defs_nr_common.h
+2
-2
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
No files found.
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
View file @
74ea4e5b
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/srs_rx.c
View file @
74ea4e5b
...
...
@@ -95,7 +95,7 @@ int nr_get_srs_signal(PHY_VARS_gNB *gNB,
nr_srs_info_t
*
nr_srs_info
,
int32_t
**
srs_received_signal
)
{
if
(
nr_srs_info
->
n_symbs
==
0
)
{
if
(
nr_srs_info
->
sc_list_length
==
0
)
{
LOG_E
(
NR_PHY
,
"(%d.%d) nr_srs_info was not generated yet!
\n
"
,
frame
,
slot
);
return
-
1
;
}
...
...
@@ -113,12 +113,12 @@ int nr_get_srs_signal(PHY_VARS_gNB *gNB,
memset
(
srs_received_signal
[
ant
],
0
,
frame_parms
->
samples_per_frame
*
sizeof
(
int32_t
));
rx_signal
=
&
rxdataF
[
ant
][
symbol_offset
];
for
(
int
sc_idx
=
0
;
sc_idx
<
nr_srs_info
->
n_symbs
;
sc_idx
++
)
{
srs_received_signal
[
ant
][
nr_srs_info
->
s
ubcarrier_idx
[
sc_idx
]]
=
rx_signal
[
nr_srs_info
->
subcarrier_idx
[
sc_idx
]];
for
(
int
sc_idx
=
0
;
sc_idx
<
nr_srs_info
->
sc_list_length
;
sc_idx
++
)
{
srs_received_signal
[
ant
][
nr_srs_info
->
s
c_list
[
sc_idx
]]
=
rx_signal
[
nr_srs_info
->
sc_list
[
sc_idx
]];
#ifdef SRS_DEBUG
uint64_t
subcarrier_offset
=
frame_parms
->
first_carrier_offset
+
srs_pdu
->
bwp_start
*
12
;
int
subcarrier_log
=
nr_srs_info
->
s
ubcarrier_idx
[
sc_idx
]
-
subcarrier_offset
;
int
subcarrier_log
=
nr_srs_info
->
s
c_list
[
sc_idx
]
-
subcarrier_offset
;
if
(
subcarrier_log
<
0
)
{
subcarrier_log
=
subcarrier_log
+
frame_parms
->
ofdm_symbol_size
;
}
...
...
@@ -130,8 +130,8 @@ int nr_get_srs_signal(PHY_VARS_gNB *gNB,
}
LOG_I
(
NR_PHY
,
"(%i)
\t
%i
\t
%i
\n
"
,
subcarrier_log
,
(
int16_t
)(
srs_received_signal
[
ant
][
nr_srs_info
->
s
ubcarrier_idx
[
sc_idx
]]
&
0xFFFF
),
(
int16_t
)((
srs_received_signal
[
ant
][
nr_srs_info
->
s
ubcarrier_idx
[
sc_idx
]]
>>
16
)
&
0xFFFF
));
(
int16_t
)(
srs_received_signal
[
ant
][
nr_srs_info
->
s
c_list
[
sc_idx
]]
&
0xFFFF
),
(
int16_t
)((
srs_received_signal
[
ant
][
nr_srs_info
->
s
c_list
[
sc_idx
]]
>>
16
)
&
0xFFFF
));
#endif
}
}
...
...
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
View file @
74ea4e5b
...
...
@@ -119,7 +119,7 @@ int generate_srs_nr(nfapi_nr_srs_pdu_t *srs_config_pdu,
uint64_t
subcarrier_offset
=
frame_parms
->
first_carrier_offset
+
srs_config_pdu
->
bwp_start
*
N_SC_RB
;
if
(
nr_srs_info
)
{
nr_srs_info
->
n_symbs
=
0
;
nr_srs_info
->
sc_list_length
=
0
;
nr_srs_info
->
srs_generated_signal_bits
=
log2_approx
(
amp
);
}
...
...
@@ -374,8 +374,8 @@ int generate_srs_nr(nfapi_nr_srs_pdu_t *srs_config_pdu,
txptr
[
subcarrier
]
=
(
real_amp
&
0xFFFF
)
+
((
imag_amp
<<
16
)
&
0xFFFF0000
);
if
(
nr_srs_info
)
{
nr_srs_info
->
s
ubcarrier_idx
[
nr_srs_info
->
n_symbs
]
=
subcarrier
;
nr_srs_info
->
n_symbs
++
;
nr_srs_info
->
s
c_list
[
nr_srs_info
->
sc_list_length
]
=
subcarrier
;
nr_srs_info
->
sc_list_length
++
;
}
#ifdef SRS_DEBUG
...
...
openair1/PHY/defs_nr_common.h
View file @
74ea4e5b
...
...
@@ -243,8 +243,8 @@ typedef struct {
}
NR_PRACH_RESOURCES_t
;
typedef
struct
{
uint16_t
n_symbs
;
uint16_t
s
ubcarrier_idx
[
6
*
NR_MAX_NB_RB
];
uint16_t
sc_list_length
;
uint16_t
s
c_list
[
6
*
NR_MAX_NB_RB
];
uint8_t
srs_generated_signal_bits
;
int32_t
*
srs_generated_signal
;
int32_t
**
srs_received_signal
;
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
74ea4e5b
...
...
@@ -813,7 +813,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
nfapi_nr_srs_pdu_t
*
srs_pdu
=
&
srs
->
srs_pdu
;
// At least currently, the configuration is constant, so it is enough to generate the sequence just once.
if
(
gNB
->
nr_srs_info
[
i
]
->
n_symbs
==
0
)
{
if
(
gNB
->
nr_srs_info
[
i
]
->
sc_list_length
==
0
)
{
generate_srs_nr
(
srs_pdu
,
&
gNB
->
frame_parms
,
gNB
->
nr_srs_info
[
i
]
->
srs_generated_signal
,
gNB
->
nr_srs_info
[
i
],
AMP
,
frame_rx
,
slot_rx
);
}
...
...
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