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
常顺宇
OpenXG-RAN
Commits
f65c3902
Commit
f65c3902
authored
Aug 23, 2018
by
WANG Tsu-Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warning removal
parent
4bdf8e60
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
9 deletions
+3
-9
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+3
-6
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
+0
-3
No files found.
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @
f65c3902
...
@@ -549,13 +549,10 @@ int allocate_REs_in_RB_no_pilots_64QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
...
@@ -549,13 +549,10 @@ int allocate_REs_in_RB_no_pilots_64QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
uint32_t
tti_offset
;
uint32_t
tti_offset
;
uint8_t
re
;
uint8_t
re
;
uint8_t
*
x0p
;
uint8_t
*
x0p
;
uint8_t
first_re
,
last_re
;
uint8_t
first_re
;
last_re
=
12
;
first_re
=
0
;
first_re
=
0
;
if
(
skip_half
==
1
)
if
(
skip_half
==
2
)
last_re
=
6
;
else
if
(
skip_half
==
2
)
first_re
=
6
;
first_re
=
6
;
re
=
first_re
;
re
=
first_re
;
...
@@ -614,7 +611,7 @@ int allocate_REs_in_RB_no_pilots_64QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
...
@@ -614,7 +611,7 @@ int allocate_REs_in_RB_no_pilots_64QAM_siso(PHY_VARS_eNB* phy_vars_eNB,
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
16
]
=
qam_table_s0
[
qam64_table_offset_re
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
16
]
=
qam_table_s0
[
qam64_table_offset_re
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
17
]
=
qam_table_s0
[
qam64_table_offset_im
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
17
]
=
qam_table_s0
[
qam64_table_offset_im
];
qam64_table_offset_re
=
(
x0p
[
54
]
<<
2
)
|
(
x0p
[
56
]
<<
1
)
|
x0p
[
58
];
qam64_table_offset_re
=
(
x0p
[
54
]
<<
2
)
|
(
x0p
[
56
]
<<
1
)
|
x0p
[
58
];
qam64_table_offset_im
=
(
x0p
[
55
]
<<
2
)
|
(
x0p
[
57
]
<<
1
)
|
x0p
[
59
];
qam64_table_offset_im
=
(
x0p
[
55
]
<<
2
)
|
(
x0p
[
57
]
<<
1
)
|
x0p
[
59
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
18
]
=
qam_table_s0
[
qam64_table_offset_re
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
18
]
=
qam_table_s0
[
qam64_table_offset_re
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
19
]
=
qam_table_s0
[
qam64_table_offset_im
];
((
int16_t
*
)
&
txdataF
[
0
][
tti_offset
])[
19
]
=
qam_table_s0
[
qam64_table_offset_im
];
...
...
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
View file @
f65c3902
...
@@ -212,7 +212,6 @@ void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t s
...
@@ -212,7 +212,6 @@ void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t s
int
sched_frame
=
frameP
;
int
sched_frame
=
frameP
;
int
sched_subframe
=
(
subframeP
+
4
)
%
10
;
int
sched_subframe
=
(
subframeP
+
4
)
%
10
;
uint16_t
ul_req_index
;
uint16_t
ul_req_index
;
uint8_t
dlsch_flag
;
if
(
sched_subframe
<
subframeP
)
sched_frame
++
;
if
(
sched_subframe
<
subframeP
)
sched_frame
++
;
...
@@ -319,10 +318,8 @@ void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t s
...
@@ -319,10 +318,8 @@ void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t s
hi_dci0_req_body
->
number_of_dci
++
;
hi_dci0_req_body
->
number_of_dci
++
;
ul_req_index
=
0
;
ul_req_index
=
0
;
dlsch_flag
=
0
;
for
(
ul_req_index
=
0
;
ul_req_index
<
ul_req
->
number_of_pdus
;
ul_req_index
++
){
for
(
ul_req_index
=
0
;
ul_req_index
<
ul_req
->
number_of_pdus
;
ul_req_index
++
){
if
(
ul_req
->
ul_config_pdu_list
[
ul_req_index
].
pdu_type
==
NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE
){
if
(
ul_req
->
ul_config_pdu_list
[
ul_req_index
].
pdu_type
==
NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE
){
dlsch_flag
=
1
;
LOG_D
(
MAC
,
"Frame %d, Subframe %d:rnti %x ul_req_index %d Switched UCI HARQ to ULSCH HARQ(first)
\n
"
,
frameP
,
subframeP
,
rnti
,
ul_req_index
);
LOG_D
(
MAC
,
"Frame %d, Subframe %d:rnti %x ul_req_index %d Switched UCI HARQ to ULSCH HARQ(first)
\n
"
,
frameP
,
subframeP
,
rnti
,
ul_req_index
);
break
;
break
;
}
}
...
...
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