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
spbro
OpenXG-RAN
Commits
9a3326b6
Commit
9a3326b6
authored
Jul 05, 2022
by
Roberto Louro Magueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes after merge
parent
06fa8c6a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
18 deletions
+22
-18
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+6
-2
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+5
-5
openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
+5
-5
openair1/PHY/defs_nr_common.h
openair1/PHY/defs_nr_common.h
+1
-1
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+5
-5
No files found.
openair1/PHY/INIT/nr_init.c
View file @
9a3326b6
...
...
@@ -614,8 +614,10 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
for
(
int
id
=
0
;
id
<
NUMBER_OF_NR_SRS_MAX
;
id
++
)
{
gNB
->
nr_srs_info
[
id
]
=
(
nr_srs_info_t
*
)
malloc16_clear
(
sizeof
(
nr_srs_info_t
));
gNB
->
nr_srs_info
[
id
]
->
k_0_p
=
(
uint8_t
**
)
malloc16_clear
(
MAX_NUM_NR_SRS_AP
*
sizeof
(
uint8_t
*
));
gNB
->
nr_srs_info
[
id
]
->
srs_generated_signal
=
(
int32_t
**
)
malloc16_clear
(
MAX_NUM_NR_SRS_AP
*
sizeof
(
int32_t
*
));
for
(
i
=
0
;
i
<
MAX_NUM_NR_SRS_AP
;
i
++
)
{
gNB
->
nr_srs_info
[
id
]
->
k_0_p
[
i
]
=
(
uint8_t
*
)
malloc16_clear
(
MAX_NUM_NR_SRS_SYMBOLS
*
sizeof
(
uint8_t
));
gNB
->
nr_srs_info
[
id
]
->
srs_generated_signal
[
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
ofdm_symbol_size
*
MAX_NUM_NR_SRS_SYMBOLS
*
sizeof
(
int32_t
));
}
}
...
...
@@ -774,10 +776,12 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero
(
gNB
->
nr_csi_rs_info
);
for
(
int
id
=
0
;
id
<
NUMBER_OF_NR_SRS_MAX
;
id
++
)
{
for
(
int
ap
=
0
;
ap
<
MAX_NUM_NR_SRS_AP
;
ap
++
)
{
free_and_zero
(
gNB
->
nr_srs_info
[
id
]
->
k_0_p
[
ap
]);
for
(
int
i
=
0
;
i
<
MAX_NUM_NR_SRS_AP
;
i
++
)
{
free_and_zero
(
gNB
->
nr_srs_info
[
id
]
->
k_0_p
[
i
]);
free_and_zero
(
gNB
->
nr_srs_info
[
id
]
->
srs_generated_signal
[
i
]);
}
free_and_zero
(
gNB
->
nr_srs_info
[
id
]
->
k_0_p
);
free_and_zero
(
gNB
->
nr_srs_info
[
id
]
->
srs_generated_signal
);
free_and_zero
(
gNB
->
nr_srs_info
[
id
]);
}
...
...
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
View file @
9a3326b6
...
...
@@ -965,12 +965,12 @@ int nr_srs_channel_estimation(const PHY_VARS_gNB *gNB,
const
int
slot
,
const
nfapi_nr_srs_pdu_t
*
srs_pdu
,
const
nr_srs_info_t
*
nr_srs_info
,
const
int32_t
*
srs_generated_signal
,
const
int32_t
*
*
srs_generated_signal
,
int32_t
srs_received_signal
[][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_ls_estimated_channel
[][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_freq
[][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_time
[][
gNB
->
frame_parms
.
ofdm_symbol_size
],
int32_t
srs_estimated_channel_time_shifted
[][
gNB
->
frame_parms
.
ofdm_symbol_size
],
int32_t
srs_ls_estimated_channel
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_freq
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_time
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
],
int32_t
srs_estimated_channel_time_shifted
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
],
uint32_t
*
signal_power
,
uint32_t
*
noise_power_per_rb
,
uint32_t
*
noise_power
,
...
...
openair1/PHY/NR_ESTIMATION/nr_ul_estimation.h
View file @
9a3326b6
...
...
@@ -71,12 +71,12 @@ int nr_srs_channel_estimation(const PHY_VARS_gNB *gNB,
const
int
slot
,
const
nfapi_nr_srs_pdu_t
*
srs_pdu
,
const
nr_srs_info_t
*
nr_srs_info
,
const
int32_t
*
srs_generated_signal
,
const
int32_t
*
*
srs_generated_signal
,
int32_t
srs_received_signal
[][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_ls_estimated_channel
[][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_freq
[][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_time
[][
gNB
->
frame_parms
.
ofdm_symbol_size
],
int32_t
srs_estimated_channel_time_shifted
[][
gNB
->
frame_parms
.
ofdm_symbol_size
],
int32_t
srs_ls_estimated_channel
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_freq
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
*
(
1
<<
srs_pdu
->
num_symbols
)],
int32_t
srs_estimated_channel_time
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
],
int32_t
srs_estimated_channel_time_shifted
[][
MAX_NUM_NR_SRS_AP
][
gNB
->
frame_parms
.
ofdm_symbol_size
],
uint32_t
*
signal_power
,
uint32_t
*
noise_power_per_rb
,
uint32_t
*
noise_power
,
...
...
openair1/PHY/defs_nr_common.h
View file @
9a3326b6
...
...
@@ -243,7 +243,7 @@ typedef struct {
typedef
struct
{
uint8_t
**
k_0_p
;
uint8_t
srs_generated_signal_bits
;
int32_t
srs_generated_signal
[
OFDM_SYMBOL_SIZE_SAMPLES_MAX
*
MAX_NUM_NR_SRS_SYMBOLS
]
;
int32_t
**
srs_generated_signal
;
}
nr_srs_info_t
;
typedef
struct
{
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
9a3326b6
...
...
@@ -854,10 +854,10 @@ 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
;
uint8_t
N_symb_SRS
=
1
<<
srs_pdu
->
num_symbols
;
int32_t
srs_received_signal
[
frame_parms
->
nb_antennas_rx
][
frame_parms
->
ofdm_symbol_size
*
N_symb_SRS
];
int32_t
srs_ls_estimated_channel
[
frame_parms
->
nb_antennas_rx
][
frame_parms
->
ofdm_symbol_size
*
N_symb_SRS
];
int32_t
srs_estimated_channel_freq
[
frame_parms
->
nb_antennas_rx
][
frame_parms
->
ofdm_symbol_size
*
N_symb_SRS
];
int32_t
srs_estimated_channel_time
[
frame_parms
->
nb_antennas_rx
][
frame_parms
->
ofdm_symbol_size
];
int32_t
srs_estimated_channel_time_shifted
[
frame_parms
->
nb_antennas_rx
][
frame_parms
->
ofdm_symbol_size
];
int32_t
srs_ls_estimated_channel
[
frame_parms
->
nb_antennas_rx
][
MAX_NUM_NR_SRS_AP
][
frame_parms
->
ofdm_symbol_size
*
N_symb_SRS
];
int32_t
srs_estimated_channel_freq
[
frame_parms
->
nb_antennas_rx
][
MAX_NUM_NR_SRS_AP
][
frame_parms
->
ofdm_symbol_size
*
N_symb_SRS
];
int32_t
srs_estimated_channel_time
[
frame_parms
->
nb_antennas_rx
][
MAX_NUM_NR_SRS_AP
][
frame_parms
->
ofdm_symbol_size
];
int32_t
srs_estimated_channel_time_shifted
[
frame_parms
->
nb_antennas_rx
][
MAX_NUM_NR_SRS_AP
][
frame_parms
->
ofdm_symbol_size
];
uint32_t
noise_power_per_rb
[
srs_pdu
->
bwp_size
];
int8_t
snr_per_rb
[
srs_pdu
->
bwp_size
];
uint32_t
signal_power
;
...
...
@@ -877,7 +877,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
slot_rx
,
srs_pdu
,
gNB
->
nr_srs_info
[
i
],
gNB
->
nr_srs_info
[
i
]
->
srs_generated_signal
,
(
const
int32_t
**
)
gNB
->
nr_srs_info
[
i
]
->
srs_generated_signal
,
srs_received_signal
,
srs_ls_estimated_channel
,
srs_estimated_channel_freq
,
...
...
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