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
lizhongxiao
OpenXG-RAN
Commits
35877242
Commit
35877242
authored
2 years ago
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix asan failures
parent
721b8e9d
Branches unavailable
2024.w06
2024.w05
2024.w04
2024.w03
2024.w02
2024.w01
2023.w51
2023.w50
2023.w49
2023.w48
2023.w47
2023.w45
2023.w43
2023.w42
2023.w41
2023.w40
2023.w39
2023.w38
2023.w37
2023.w36
2023.w34
2023.w33
2023.w32
2023.w31
2023.w30
2023.w29
2023.w28
2023.w27
2023.w26
2023.w25
2023.w24
2023.w23
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
2023.w07
2023.w06
v2.1.0
v2.0.0
No related merge requests found
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
5 deletions
+36
-5
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+7
-3
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlschsim.c
+7
-0
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
+7
-0
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+1
-1
openair1/SIMULATION/NR_PHY/pucchsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
+7
-0
openair1/SIMULATION/NR_PHY/ulschsim.c
openair1/SIMULATION/NR_PHY/ulschsim.c
+7
-1
No files found.
openair1/PHY/INIT/nr_init.c
View file @
35877242
...
...
@@ -765,6 +765,7 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero
(
gNB
->
nr_srs_info
[
id
]
->
srs_generated_signal
);
free_and_zero
(
gNB
->
nr_srs_info
[
id
]);
}
free_and_zero
(
gNB
->
nr_srs_info
);
free_ul_reference_signal_sequences
();
free_gnb_lowpapr_sequences
();
...
...
@@ -1025,10 +1026,11 @@ void init_nr_transport(PHY_VARS_gNB *gNB)
nb_ul_slots_period
=
fp
->
slots_per_frame
;
int
buffer_ul_slots
;
// the UL channels are scheduled sl_ahead before they are transmitted
if
(
gNB
->
if_inst
->
sl_ahead
>
nb_slots_per_period
)
buffer_ul_slots
=
nb_ul_slots_period
+
(
gNB
->
if_inst
->
sl_ahead
-
nb_slots_per_period
);
int
slot_ahead
=
gNB
->
if_inst
?
gNB
->
if_inst
->
sl_ahead
:
6
;
if
(
slot_ahead
>
nb_slots_per_period
)
buffer_ul_slots
=
nb_ul_slots_period
+
(
slot_ahead
-
nb_slots_per_period
);
else
buffer_ul_slots
=
(
nb_ul_slots_period
<
gNB
->
if_inst
->
sl_ahead
)
?
nb_ul_slots_period
:
gNB
->
if_inst
->
sl
_ahead
;
buffer_ul_slots
=
(
nb_ul_slots_period
<
slot_ahead
)
?
nb_ul_slots_period
:
slot
_ahead
;
gNB
->
max_nb_pucch
=
MAX_MOBILES_PER_GNB
*
buffer_ul_slots
;
gNB
->
max_nb_srs
=
buffer_ul_slots
<<
1
;
// assuming at most 2 SRS per slot
...
...
@@ -1070,9 +1072,11 @@ void reset_nr_transport(PHY_VARS_gNB *gNB)
for
(
int
i
=
0
;
i
<
gNB
->
max_nb_pucch
;
i
++
)
free_gNB_pucch
(
gNB
->
pucch
[
i
]);
free
(
gNB
->
pucch
);
for
(
int
i
=
0
;
i
<
gNB
->
max_nb_srs
;
i
++
)
free_gNB_srs
(
gNB
->
srs
[
i
]);
free
(
gNB
->
srs
);
for
(
int
i
=
0
;
i
<
NUMBER_OF_NR_ULSCH_MAX
;
i
++
)
free_gNB_ulsch
(
&
gNB
->
ulsch
[
i
],
fp
->
N_RB_UL
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlschsim.c
View file @
35877242
...
...
@@ -366,6 +366,8 @@ int main(int argc, char **argv)
frame_parms
->
Ncp
=
extended_prefix_flag
?
EXTENDED
:
NORMAL
;
crcTableInit
();
nr_phy_config_request_sim
(
gNB
,
N_RB_DL
,
N_RB_DL
,
mu
,
Nid_cell
,
SSB_positions
);
gNB
->
gNB_config
.
tdd_table
.
tdd_period
.
value
=
6
;
set_tdd_config_nr
(
&
gNB
->
gNB_config
,
mu
,
7
,
6
,
2
,
4
);
phy_init_nr_gNB
(
gNB
);
//init_eNB_afterRU();
frame_length_complex_samples
=
frame_parms
->
samples_per_subframe
;
...
...
@@ -612,6 +614,11 @@ int main(int argc, char **argv)
reset_DLSCH_struct
(
gNB
,
&
msgDataTx
);
int
nb_slots_to_set
=
TDD_CONFIG_NB_FRAMES
*
(
1
<<
mu
)
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
;
for
(
int
i
=
0
;
i
<
nb_slots_to_set
;
++
i
)
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
[
i
].
max_num_of_symbol_per_slot_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
);
phy_free_nr_gNB
(
gNB
);
free
(
RC
.
gNB
[
0
]);
free
(
RC
.
gNB
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @
35877242
...
...
@@ -471,6 +471,8 @@ int main(int argc, char **argv)
frame_parms
->
freq_range
=
mu
<
2
?
nr_FR1
:
nr_FR2
;
nr_phy_config_request_sim_pbchsim
(
gNB
,
N_RB_DL
,
N_RB_DL
,
mu
,
Nid_cell
,
SSB_positions
);
gNB
->
gNB_config
.
tdd_table
.
tdd_period
.
value
=
6
;
set_tdd_config_nr
(
&
gNB
->
gNB_config
,
mu
,
7
,
6
,
2
,
4
);
phy_init_nr_gNB
(
gNB
);
frame_parms
->
ssb_start_subcarrier
=
12
*
gNB
->
gNB_config
.
ssb_table
.
ssb_offset_point_a
.
value
+
ssb_subcarrier_offset
;
...
...
@@ -816,6 +818,11 @@ int main(int argc, char **argv)
free_channel_desc_scm
(
gNB2UE
);
int
nb_slots_to_set
=
TDD_CONFIG_NB_FRAMES
*
(
1
<<
mu
)
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
;
for
(
int
i
=
0
;
i
<
nb_slots_to_set
;
++
i
)
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
[
i
].
max_num_of_symbol_per_slot_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
);
phy_free_nr_gNB
(
gNB
);
free
(
RC
.
gNB
[
0
]);
free
(
RC
.
gNB
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
35877242
...
...
@@ -672,9 +672,9 @@ int main(int argc, char **argv){
memcpy
((
void
*
)
&
ru
->
config
,(
void
*
)
&
RC
.
gNB
[
0
]
->
gNB_config
,
sizeof
(
ru
->
config
));
RC
.
nb_nr_L1_inst
=
1
;
set_tdd_config_nr
(
&
gNB
->
gNB_config
,
mu
,
7
,
6
,
2
,
4
);
phy_init_nr_gNB
(
gNB
);
nr_phy_init_RU
(
ru
);
set_tdd_config_nr
(
&
gNB
->
gNB_config
,
mu
,
7
,
6
,
2
,
4
);
// Configure UE
UE
=
malloc
(
sizeof
(
PHY_VARS_NR_UE
));
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/pucchsim.c
View file @
35877242
...
...
@@ -404,6 +404,8 @@ int main(int argc, char **argv)
cfg
->
carrier_config
.
num_tx_ant
.
value
=
n_tx
;
cfg
->
carrier_config
.
num_rx_ant
.
value
=
n_rx
;
nr_phy_config_request_sim
(
gNB
,
N_RB_DL
,
N_RB_DL
,
mu
,
Nid_cell
,
SSB_positions
);
gNB
->
gNB_config
.
tdd_table
.
tdd_period
.
value
=
6
;
set_tdd_config_nr
(
&
gNB
->
gNB_config
,
mu
,
7
,
6
,
2
,
4
);
phy_init_nr_gNB
(
gNB
);
/* RU handles rxdataF, and gNB just has a pointer. Here, we don't have an RU,
* so we need to allocate that memory as well. */
...
...
@@ -721,6 +723,11 @@ int main(int argc, char **argv)
free_channel_desc_scm
(
UE2gNB
);
term_freq_channel
();
int
nb_slots_to_set
=
TDD_CONFIG_NB_FRAMES
*
(
1
<<
mu
)
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
;
for
(
int
i
=
0
;
i
<
nb_slots_to_set
;
++
i
)
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
[
i
].
max_num_of_symbol_per_slot_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
);
for
(
i
=
0
;
i
<
n_rx
;
i
++
)
free
(
gNB
->
common_vars
.
rxdataF
[
i
]);
phy_free_nr_gNB
(
gNB
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/ulschsim.c
View file @
35877242
...
...
@@ -418,7 +418,8 @@ int main(int argc, char **argv)
gNB
->
frame_parms
.
nb_antennas_rx
=
n_rx
;
nr_phy_config_request_sim
(
gNB
,
N_RB_UL
,
N_RB_UL
,
mu
,
Nid_cell
,
SSB_positions
);
gNB
->
gNB_config
.
tdd_table
.
tdd_period
.
value
=
6
;
set_tdd_config_nr
(
&
gNB
->
gNB_config
,
mu
,
7
,
6
,
2
,
4
);
phy_init_nr_gNB
(
gNB
);
//configure UE
...
...
@@ -639,6 +640,11 @@ int main(int argc, char **argv)
free_nr_ue_ul_harq
(
UE
->
ul_harq_processes
,
NR_MAX_ULSCH_HARQ_PROCESSES
,
UE
->
frame_parms
.
N_RB_UL
,
UE
->
frame_parms
.
nb_antennas_tx
);
int
nb_slots_to_set
=
TDD_CONFIG_NB_FRAMES
*
(
1
<<
mu
)
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
;
for
(
int
i
=
0
;
i
<
nb_slots_to_set
;
++
i
)
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
[
i
].
max_num_of_symbol_per_slot_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
);
term_nr_ue_signal
(
UE
,
1
);
free
(
UE
);
...
...
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