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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
da3e4ced
Commit
da3e4ced
authored
Oct 22, 2018
by
Y_Tomita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for TDD's ULSCH HARQ in L2 FAPI simulator.
parent
7f826450
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
1 deletion
+19
-1
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+19
-1
No files found.
openair2/PHY_INTERFACE/phy_stub_UE.c
100644 → 100755
View file @
da3e4ced
...
@@ -311,6 +311,7 @@ void fill_uci_harq_indication_UE_MAC(int Mod_id,
...
@@ -311,6 +311,7 @@ void fill_uci_harq_indication_UE_MAC(int Mod_id,
else
if
(
SNRtimes10
>
635
)
pdu
->
ul_cqi_information
.
ul_cqi
=
255
;
else
if
(
SNRtimes10
>
635
)
pdu
->
ul_cqi_information
.
ul_cqi
=
255
;
else
pdu
->
ul_cqi_information
.
ul_cqi
=
(
640
+
SNRtimes10
)
/
5
;
else
pdu
->
ul_cqi_information
.
ul_cqi
=
(
640
+
SNRtimes10
)
/
5
;
pdu
->
ul_cqi_information
.
channel
=
0
;
pdu
->
ul_cqi_information
.
channel
=
0
;
if
(
harq_information
->
harq_information_rel9_fdd
.
tl
.
tag
==
NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL9_FDD_TAG
){
if
((
harq_information
->
harq_information_rel9_fdd
.
ack_nack_mode
==
0
)
&&
if
((
harq_information
->
harq_information_rel9_fdd
.
ack_nack_mode
==
0
)
&&
(
harq_information
->
harq_information_rel9_fdd
.
harq_size
==
1
))
{
(
harq_information
->
harq_information_rel9_fdd
.
harq_size
==
1
))
{
...
@@ -332,7 +333,24 @@ void fill_uci_harq_indication_UE_MAC(int Mod_id,
...
@@ -332,7 +333,24 @@ void fill_uci_harq_indication_UE_MAC(int Mod_id,
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
1
]
=
1
;
// Assuming always an ACK (No NACK or DTX)
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
1
]
=
1
;
// Assuming always an ACK (No NACK or DTX)
}
}
else
AssertFatal
(
1
==
0
,
"only format 1a/b for now, received
\n
"
);
}
else
if
(
harq_information
->
harq_information_rel10_tdd
.
tl
.
tag
==
NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG
){
if
((
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
==
0
)
&&
(
harq_information
->
harq_information_rel10_tdd
.
harq_size
==
1
))
{
pdu
->
harq_indication_tdd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_TDD_REL13_TAG
;
pdu
->
harq_indication_tdd_rel13
.
mode
=
0
;
pdu
->
harq_indication_tdd_rel13
.
number_of_ack_nack
=
1
;
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
bundling
.
value_0
=
1
;
}
else
if
((
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
==
1
)
&&
(
harq_information
->
harq_information_rel10_tdd
.
harq_size
==
2
))
{
pdu
->
harq_indication_tdd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_TDD_REL13_TAG
;
pdu
->
harq_indication_tdd_rel13
.
mode
=
0
;
pdu
->
harq_indication_tdd_rel13
.
number_of_ack_nack
=
1
;
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
0
].
bundling
.
value_0
=
1
;
pdu
->
harq_indication_tdd_rel13
.
harq_data
[
1
].
bundling
.
value_0
=
1
;
}
}
else
AssertFatal
(
1
==
0
,
"only format 1a/b for now, received
\n
"
);
UL_INFO
->
harq_ind
.
harq_indication_body
.
number_of_harqs
++
;
UL_INFO
->
harq_ind
.
harq_indication_body
.
number_of_harqs
++
;
...
...
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