Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
9e94ac66
Commit
9e94ac66
authored
4 years ago
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix phy simulators, merge develop
parent
95c9371b
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
26 additions
and
26 deletions
+26
-26
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+2
-2
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
+2
-2
openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
+2
-2
openair1/SIMULATION/LTE_PHY/mbmssim.c
openair1/SIMULATION/LTE_PHY/mbmssim.c
+2
-2
openair1/SIMULATION/LTE_PHY/pbchsim.c
openair1/SIMULATION/LTE_PHY/pbchsim.c
+3
-3
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
+1
-1
openair1/SIMULATION/LTE_PHY/prachsim.c
openair1/SIMULATION/LTE_PHY/prachsim.c
+1
-1
openair1/SIMULATION/LTE_PHY/pucchsim.c
openair1/SIMULATION/LTE_PHY/pucchsim.c
+1
-1
openair1/SIMULATION/LTE_PHY/scansim.c
openair1/SIMULATION/LTE_PHY/scansim.c
+1
-1
openair1/SIMULATION/LTE_PHY/syncsim.c
openair1/SIMULATION/LTE_PHY/syncsim.c
+3
-3
openair1/SIMULATION/LTE_PHY/ulsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
+1
-1
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlschsim.c
+1
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+1
-1
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
+1
-1
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
+1
-1
openair1/SIMULATION/NR_PHY/ulschsim.c
openair1/SIMULATION/NR_PHY/ulschsim.c
+1
-1
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+1
-1
No files found.
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
9e94ac66
...
@@ -1179,7 +1179,7 @@ int main(int argc, char **argv) {
...
@@ -1179,7 +1179,7 @@ int main(int argc, char **argv) {
DS_TDL
,
DS_TDL
,
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
reset_meas
(
&
eNB2UE
[
0
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
0
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
0
]
->
interp_time
);
reset_meas
(
&
eNB2UE
[
0
]
->
interp_time
);
...
@@ -1193,7 +1193,7 @@ int main(int argc, char **argv) {
...
@@ -1193,7 +1193,7 @@ int main(int argc, char **argv) {
DS_TDL
,
DS_TDL
,
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
reset_meas
(
&
eNB2UE
[
n
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
n
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
n
]
->
interp_time
);
reset_meas
(
&
eNB2UE
[
n
]
->
interp_time
);
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
View file @
9e94ac66
...
@@ -988,7 +988,7 @@ int main(int argc, char **argv)
...
@@ -988,7 +988,7 @@ int main(int argc, char **argv)
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
if
(
num_rounds
>
1
)
{
if
(
num_rounds
>
1
)
{
for
(
n
=
1
;
n
<
8
;
n
++
)
for
(
n
=
1
;
n
<
8
;
n
++
)
...
@@ -999,7 +999,7 @@ int main(int argc, char **argv)
...
@@ -999,7 +999,7 @@ int main(int argc, char **argv)
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
}
}
if
(
eNB2UE
[
0
]
==
NULL
)
{
if
(
eNB2UE
[
0
]
==
NULL
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
View file @
9e94ac66
...
@@ -834,7 +834,7 @@ int main(int argc, char **argv) {
...
@@ -834,7 +834,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
if
(
num_rounds
>
1
)
{
if
(
num_rounds
>
1
)
{
for
(
n
=
1
;
n
<
4
;
n
++
)
for
(
n
=
1
;
n
<
4
;
n
++
)
...
@@ -845,7 +845,7 @@ int main(int argc, char **argv) {
...
@@ -845,7 +845,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
}
}
if
(
eNB2UE
[
0
]
==
NULL
)
{
if
(
eNB2UE
[
0
]
==
NULL
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/mbmssim.c
View file @
9e94ac66
...
@@ -1290,7 +1290,7 @@ int main(int argc, char **argv) {
...
@@ -1290,7 +1290,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
reset_meas
(
&
eNB2UE
[
0
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
0
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
0
]
->
interp_time
);
reset_meas
(
&
eNB2UE
[
0
]
->
interp_time
);
...
@@ -1303,7 +1303,7 @@ int main(int argc, char **argv) {
...
@@ -1303,7 +1303,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
forgetting_factor
,
forgetting_factor
,
rx_sample_offset
,
rx_sample_offset
,
0
);
0
,
0
);
reset_meas
(
&
eNB2UE
[
n
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
n
]
->
random_channel
);
reset_meas
(
&
eNB2UE
[
n
]
->
interp_time
);
reset_meas
(
&
eNB2UE
[
n
]
->
interp_time
);
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/pbchsim.c
View file @
9e94ac66
...
@@ -386,7 +386,7 @@ int main(int argc, char **argv) {
...
@@ -386,7 +386,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
interf1
>-
20
)
if
(
interf1
>-
20
)
eNB2UE1
=
new_channel_desc_scm
(
eNB
->
frame_parms
.
nb_antennas_tx
,
eNB2UE1
=
new_channel_desc_scm
(
eNB
->
frame_parms
.
nb_antennas_tx
,
...
@@ -396,7 +396,7 @@ int main(int argc, char **argv) {
...
@@ -396,7 +396,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
0
,
0
,
4
,
4
,
0
);
0
,
0
);
if
(
interf2
>-
20
)
if
(
interf2
>-
20
)
eNB2UE2
=
new_channel_desc_scm
(
eNB
->
frame_parms
.
nb_antennas_tx
,
eNB2UE2
=
new_channel_desc_scm
(
eNB
->
frame_parms
.
nb_antennas_tx
,
...
@@ -406,7 +406,7 @@ int main(int argc, char **argv) {
...
@@ -406,7 +406,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
0
,
0
,
8
,
8
,
0
);
0
,
0
);
if
(
eNB2UE
==
NULL
)
{
if
(
eNB2UE
==
NULL
)
{
msg
(
"Problem generating channel model. Exiting.
\n
"
);
msg
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/pdcchsim.c
View file @
9e94ac66
...
@@ -708,7 +708,7 @@ int main(int argc, char **argv) {
...
@@ -708,7 +708,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_DL
),
0
,
0
,
0
,
0
,
0
);
0
,
0
);
L1_rxtx_proc_t
*
proc_rxtx
=
(
subframe
==
0
)
?
&
eNB
->
proc
.
L1_proc
:
&
eNB
->
proc
.
L1_proc_tx
;
L1_rxtx_proc_t
*
proc_rxtx
=
(
subframe
==
0
)
?
&
eNB
->
proc
.
L1_proc
:
&
eNB
->
proc
.
L1_proc_tx
;
eNB
->
ulsch
[
0
]
=
new_eNB_ulsch
(
MAX_TURBO_ITERATIONS
,
N_RB_DL
,
0
);
eNB
->
ulsch
[
0
]
=
new_eNB_ulsch
(
MAX_TURBO_ITERATIONS
,
N_RB_DL
,
0
);
UE
->
ulsch
[
0
]
=
new_ue_ulsch
(
N_RB_DL
,
0
);
UE
->
ulsch
[
0
]
=
new_ue_ulsch
(
N_RB_DL
,
0
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/prachsim.c
View file @
9e94ac66
...
@@ -343,7 +343,7 @@ int main(int argc, char **argv) {
...
@@ -343,7 +343,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_UL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_UL
),
0
.
0
,
0
.
0
,
delay
,
delay
,
0
);
0
,
0
);
if
(
UE2eNB
==
NULL
)
{
if
(
UE2eNB
==
NULL
)
{
msg
(
"Problem generating channel model. Exiting.
\n
"
);
msg
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/pucchsim.c
View file @
9e94ac66
...
@@ -323,7 +323,7 @@ int main(int argc, char **argv) {
...
@@ -323,7 +323,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_UL
),
N_RB2channel_bandwidth
(
eNB
->
frame_parms
.
N_RB_UL
),
0
.
0
,
0
.
0
,
0
,
0
,
0
);
0
,
0
);
if
(
UE2eNB
==
NULL
)
{
if
(
UE2eNB
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/scansim.c
View file @
9e94ac66
...
@@ -335,7 +335,7 @@ int main(int argc, char **argv) {
...
@@ -335,7 +335,7 @@ int main(int argc, char **argv) {
N_RB2channel_bandwidth
(
PHY_vars_eNB
->
lte_frame_parms
.
N_RB_DL
),
N_RB2channel_bandwidth
(
PHY_vars_eNB
->
lte_frame_parms
.
N_RB_DL
),
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
eNB2UE
==
NULL
)
{
if
(
eNB2UE
==
NULL
)
{
msg
(
"Problem generating channel model. Exiting.
\n
"
);
msg
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/syncsim.c
View file @
9e94ac66
...
@@ -724,7 +724,7 @@ int main(int argc, char **argv) {
...
@@ -724,7 +724,7 @@ int main(int argc, char **argv) {
BW
,
BW
,
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
interf1
>-
20
)
if
(
interf1
>-
20
)
eNB2UE1
=
new_channel_desc_scm
(
PHY_vars_eNB
->
lte_frame_parms
.
nb_antennas_tx
,
eNB2UE1
=
new_channel_desc_scm
(
PHY_vars_eNB
->
lte_frame_parms
.
nb_antennas_tx
,
...
@@ -733,7 +733,7 @@ int main(int argc, char **argv) {
...
@@ -733,7 +733,7 @@ int main(int argc, char **argv) {
BW
,
BW
,
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
interf2
>-
20
)
if
(
interf2
>-
20
)
eNB2UE2
=
new_channel_desc_scm
(
PHY_vars_eNB
->
lte_frame_parms
.
nb_antennas_tx
,
eNB2UE2
=
new_channel_desc_scm
(
PHY_vars_eNB
->
lte_frame_parms
.
nb_antennas_tx
,
...
@@ -742,7 +742,7 @@ int main(int argc, char **argv) {
...
@@ -742,7 +742,7 @@ int main(int argc, char **argv) {
BW
,
BW
,
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
eNB2UE
==
NULL
)
{
if
(
eNB2UE
==
NULL
)
{
msg
(
"Problem generating channel model. Exiting.
\n
"
);
msg
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @
9e94ac66
...
@@ -734,7 +734,7 @@ int main(int argc, char **argv) {
...
@@ -734,7 +734,7 @@ int main(int argc, char **argv) {
30e-9
,
30e-9
,
forgetting_factor
,
forgetting_factor
,
delay
,
delay
,
0
);
0
,
0
);
// set Doppler
// set Doppler
UE2eNB
->
max_Doppler
=
maxDoppler
;
UE2eNB
->
max_Doppler
=
maxDoppler
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlschsim.c
View file @
9e94ac66
...
@@ -339,7 +339,7 @@ int main(int argc, char **argv)
...
@@ -339,7 +339,7 @@ int main(int argc, char **argv)
61.44e6
,
//N_RB2sampling_rate(N_RB_DL),
61.44e6
,
//N_RB2sampling_rate(N_RB_DL),
40e6
,
//N_RB2channel_bandwidth(N_RB_DL),
40e6
,
//N_RB2channel_bandwidth(N_RB_DL),
DS_TDL
,
DS_TDL
,
0
,
0
,
0
);
0
,
0
,
0
,
0
);
if
(
gNB2UE
==
NULL
)
{
if
(
gNB2UE
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
9e94ac66
...
@@ -757,7 +757,7 @@ int main(int argc, char **argv)
...
@@ -757,7 +757,7 @@ int main(int argc, char **argv)
30e-9
,
30e-9
,
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
gNB2UE
==
NULL
)
{
if
(
gNB2UE
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @
9e94ac66
...
@@ -479,7 +479,7 @@ int main(int argc, char **argv)
...
@@ -479,7 +479,7 @@ int main(int argc, char **argv)
300e-9
,
300e-9
,
0
,
0
,
0
,
0
,
0
);
0
,
0
);
if
(
gNB2UE
==
NULL
)
{
if
(
gNB2UE
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
9e94ac66
...
@@ -655,7 +655,7 @@ int main(int argc, char **argv){
...
@@ -655,7 +655,7 @@ int main(int argc, char **argv){
DS_TDL
,
DS_TDL
,
0
.
0
,
0
.
0
,
delay
,
delay
,
0
);
0
,
0
);
if
(
UE2gNB
==
NULL
)
{
if
(
UE2gNB
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/pucchsim.c
View file @
9e94ac66
...
@@ -418,7 +418,7 @@ int main(int argc, char **argv)
...
@@ -418,7 +418,7 @@ int main(int argc, char **argv)
printf
(
"FFO = %lf; IFO = %d
\n
"
,
eps
-
IFO
,
IFO
);
printf
(
"FFO = %lf; IFO = %d
\n
"
,
eps
-
IFO
,
IFO
);
}
}
UE2gNB
=
new_channel_desc_scm
(
n_tx
,
n_rx
,
channel_model
,
fs
,
bw
,
DS_TDL
,
0
,
0
,
0
);
UE2gNB
=
new_channel_desc_scm
(
n_tx
,
n_rx
,
channel_model
,
fs
,
bw
,
DS_TDL
,
0
,
0
,
0
,
0
);
if
(
UE2gNB
==
NULL
)
{
if
(
UE2gNB
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/ulschsim.c
View file @
9e94ac66
...
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
...
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
61.44e6
,
//N_RB2sampling_rate(N_RB_DL),
61.44e6
,
//N_RB2sampling_rate(N_RB_DL),
40e6
,
//N_RB2channel_bandwidth(N_RB_DL),
40e6
,
//N_RB2channel_bandwidth(N_RB_DL),
DS_TDL
,
DS_TDL
,
0
,
0
,
0
);
0
,
0
,
0
,
0
);
if
(
gNB2UE
==
NULL
)
{
if
(
gNB2UE
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
9e94ac66
...
@@ -592,7 +592,7 @@ int main(int argc, char **argv)
...
@@ -592,7 +592,7 @@ int main(int argc, char **argv)
sampling_frequency
,
sampling_frequency
,
bandwidth
,
bandwidth
,
DS_TDL
,
DS_TDL
,
0
,
0
,
0
);
0
,
0
,
0
,
0
);
if
(
UE2gNB
==
NULL
)
{
if
(
UE2gNB
==
NULL
)
{
printf
(
"Problem generating channel model. Exiting.
\n
"
);
printf
(
"Problem generating channel model. Exiting.
\n
"
);
...
...
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