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
canghaiwuhen
OpenXG-RAN
Commits
2cf11502
Commit
2cf11502
authored
Apr 15, 2019
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove a global in phy simulator
parent
904a198c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+3
-4
openair1/SIMULATION/LTE_PHY/ulsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
+1
-1
No files found.
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
2cf11502
...
@@ -1320,7 +1320,6 @@ int main(int argc, char **argv) {
...
@@ -1320,7 +1320,6 @@ int main(int argc, char **argv) {
}
}
for
(
SNR
=
snr0
;
SNR
<
snr1
;
SNR
+=
snr_step
)
{
for
(
SNR
=
snr0
;
SNR
<
snr1
;
SNR
+=
snr_step
)
{
UE
->
proc
.
proc_rxtx
[
UE
->
current_thread_id
[
subframe
]].
frame_rx
=
0
;
errs
[
0
]
=
0
;
errs
[
0
]
=
0
;
errs
[
1
]
=
0
;
errs
[
1
]
=
0
;
errs
[
2
]
=
0
;
errs
[
2
]
=
0
;
...
@@ -1398,6 +1397,7 @@ int main(int argc, char **argv) {
...
@@ -1398,6 +1397,7 @@ int main(int argc, char **argv) {
varArray_t
*
table_rx_dec
=
initVarArray
(
1000
,
sizeof
(
double
));
varArray_t
*
table_rx_dec
=
initVarArray
(
1000
,
sizeof
(
double
));
for
(
trials
=
0
;
trials
<
n_frames
;
trials
++
)
{
for
(
trials
=
0
;
trials
<
n_frames
;
trials
++
)
{
UE_rxtx_proc_t
*
proc
=
calloc
(
sizeof
(
UE_rxtx_proc_t
),
1
);
//printf("Trial %d\n",trials);
//printf("Trial %d\n",trials);
fflush
(
stdout
);
fflush
(
stdout
);
round
=
0
;
round
=
0
;
...
@@ -1522,7 +1522,6 @@ int main(int argc, char **argv) {
...
@@ -1522,7 +1522,6 @@ int main(int argc, char **argv) {
}
}
DL_channel
(
ru
,
UE
,
subframe
,
awgn_flag
,
SNR
,
tx_lev
,
hold_channel
,
abstx
,
num_rounds
,
trials
,
round
,
eNB2UE
,
s_re
,
s_im
,
r_re
,
r_im
,
csv_fd
);
DL_channel
(
ru
,
UE
,
subframe
,
awgn_flag
,
SNR
,
tx_lev
,
hold_channel
,
abstx
,
num_rounds
,
trials
,
round
,
eNB2UE
,
s_re
,
s_im
,
r_re
,
r_im
,
csv_fd
);
UE_rxtx_proc_t
*
proc
=
&
UE
->
proc
.
proc_rxtx
[
UE
->
current_thread_id
[
subframe
]];
proc
->
subframe_rx
=
subframe
;
proc
->
subframe_rx
=
subframe
;
UE
->
UE_mode
[
0
]
=
PUSCH
;
UE
->
UE_mode
[
0
]
=
PUSCH
;
// first symbol has to be done separately in one-shot mode
// first symbol has to be done separately in one-shot mode
...
@@ -1761,7 +1760,7 @@ int main(int argc, char **argv) {
...
@@ -1761,7 +1760,7 @@ int main(int argc, char **argv) {
subframe
);
subframe
);
}
}
UE
->
proc
.
proc_rxtx
[
UE
->
current_thread_id
[
subframe
]].
frame_rx
++
;
proc
->
frame_rx
++
;
}
//round
}
//round
// printf("\n");
// printf("\n");
...
@@ -1772,7 +1771,7 @@ int main(int argc, char **argv) {
...
@@ -1772,7 +1771,7 @@ int main(int argc, char **argv) {
//len = chbch_stats_read(stats_buffer,NULL,0,4096);
//len = chbch_stats_read(stats_buffer,NULL,0,4096);
//printf("%s\n\n",stats_buffer);
//printf("%s\n\n",stats_buffer);
if
(
UE
->
proc
.
proc_rxtx
[
UE
->
current_thread_id
[
subframe
]].
frame_rx
%
10
==
0
)
{
if
(
proc
->
frame_rx
%
10
==
0
)
{
UE
->
bitrate
[
eNB_id
]
=
(
UE
->
total_TBS
[
eNB_id
]
-
UE
->
total_TBS_last
[
eNB_id
])
*
10
;
UE
->
bitrate
[
eNB_id
]
=
(
UE
->
total_TBS
[
eNB_id
]
-
UE
->
total_TBS_last
[
eNB_id
])
*
10
;
LOG_D
(
PHY
,
"[UE %d] Calculating bitrate: total_TBS = %d, total_TBS_last = %d, bitrate = %d kbits/s
\n
"
,
UE
->
Mod_id
,
UE
->
total_TBS
[
eNB_id
],
UE
->
total_TBS_last
[
eNB_id
],
LOG_D
(
PHY
,
"[UE %d] Calculating bitrate: total_TBS = %d, total_TBS_last = %d, bitrate = %d kbits/s
\n
"
,
UE
->
Mod_id
,
UE
->
total_TBS
[
eNB_id
],
UE
->
total_TBS_last
[
eNB_id
],
UE
->
bitrate
[
eNB_id
]
/
1000
);
UE
->
bitrate
[
eNB_id
]
/
1000
);
...
...
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @
2cf11502
...
@@ -786,7 +786,7 @@ int main(int argc, char **argv) {
...
@@ -786,7 +786,7 @@ int main(int argc, char **argv) {
eNB
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
=
0
;
eNB
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
=
0
;
UE
->
mac_enabled
=
0
;
UE
->
mac_enabled
=
0
;
L1_rxtx_proc_t
*
proc_rxtx
=
&
eNB
->
proc
.
L1_proc
;
L1_rxtx_proc_t
*
proc_rxtx
=
&
eNB
->
proc
.
L1_proc
;
UE_rxtx_proc_t
*
proc_rxtx_ue
=
&
UE
->
proc
.
proc_rxtx
[
subframe
&
1
]
;
UE_rxtx_proc_t
*
proc_rxtx_ue
=
calloc
(
sizeof
(
UE_rxtx_proc_t
),
0
)
;
proc_rxtx
->
frame_rx
=
1
;
proc_rxtx
->
frame_rx
=
1
;
proc_rxtx
->
subframe_rx
=
subframe
;
proc_rxtx
->
subframe_rx
=
subframe
;
proc_rxtx
->
frame_tx
=
pdcch_alloc2ul_frame
(
&
eNB
->
frame_parms
,
1
,
subframe
);
proc_rxtx
->
frame_tx
=
pdcch_alloc2ul_frame
(
&
eNB
->
frame_parms
,
1
,
subframe
);
...
...
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