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
Michael Black
OpenXG-RAN
Commits
3a7456df
Commit
3a7456df
authored
Nov 01, 2017
by
David Price
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bad harq configuration
parent
30c76c6d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+6
-7
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
3a7456df
...
@@ -712,8 +712,7 @@ void prach_procedures(PHY_VARS_eNB *eNB,
...
@@ -712,8 +712,7 @@ void prach_procedures(PHY_VARS_eNB *eNB,
eNB
->
preamble_list
[
0
].
preamble_rel13
.
rach_resource_type
=
0
;
eNB
->
preamble_list
[
0
].
preamble_rel13
.
rach_resource_type
=
0
;
eNB
->
preamble_list
[
0
].
instance_length
=
0
;
//don't know exactly what this is
eNB
->
preamble_list
[
0
].
instance_length
=
0
;
//don't know exactly what this is
// If NFAPI PNF then we need to send the message to the VNF
if
(
nfapi_mode
==
1
)
// If NFAPI PNF then we need to send the message to the VNF
if
(
nfapi_mode
==
1
)
{
{
LOG_E
(
PHY
,
"
\n\n\n\n
DJP - this needs to be sent to VNF **********************************************
\n\n\n\n
"
);
LOG_E
(
PHY
,
"
\n\n\n\n
DJP - this needs to be sent to VNF **********************************************
\n\n\n\n
"
);
LOG_E
(
PHY
,
"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d
\n
"
,
LOG_E
(
PHY
,
"Filling NFAPI indication for RACH : SFN_SF:%d TA %d, Preamble %d, rnti %x, rach_resource_type %d
\n
"
,
...
@@ -1750,7 +1749,7 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1750,7 +1749,7 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
pdu
->
rx_ue_information
.
rnti
=
rnti
;
pdu
->
rx_ue_information
.
rnti
=
rnti
;
if
(
eNB
->
frame_parms
.
frame_type
==
FDD
)
{
if
(
eNB
->
frame_parms
.
frame_type
==
FDD
)
{
pdu
->
harq_indication_fdd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_
T
DD_REL13_TAG
;
pdu
->
harq_indication_fdd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_
F
DD_REL13_TAG
;
pdu
->
harq_indication_fdd_rel13
.
mode
=
0
;
pdu
->
harq_indication_fdd_rel13
.
mode
=
0
;
pdu
->
harq_indication_fdd_rel13
.
number_of_ack_nack
=
ulsch_harq
->
O_ACK
;
pdu
->
harq_indication_fdd_rel13
.
number_of_ack_nack
=
ulsch_harq
->
O_ACK
;
...
@@ -1776,9 +1775,9 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1776,9 +1775,9 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
M
=
ul_ACK_subframe2_M
(
&
eNB
->
frame_parms
,
M
=
ul_ACK_subframe2_M
(
&
eNB
->
frame_parms
,
subframe
);
subframe
);
pdu
->
harq_indication_
f
dd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_TDD_REL13_TAG
;
pdu
->
harq_indication_
t
dd_rel13
.
tl
.
tag
=
NFAPI_HARQ_INDICATION_TDD_REL13_TAG
;
pdu
->
harq_indication_
f
dd_rel13
.
mode
=
1
-
bundling
;
pdu
->
harq_indication_
t
dd_rel13
.
mode
=
1
-
bundling
;
pdu
->
harq_indication_
f
dd_rel13
.
number_of_ack_nack
=
ulsch_harq
->
O_ACK
;
pdu
->
harq_indication_
t
dd_rel13
.
number_of_ack_nack
=
ulsch_harq
->
O_ACK
;
for
(
i
=
0
;
i
<
ulsch_harq
->
O_ACK
;
i
++
)
{
for
(
i
=
0
;
i
<
ulsch_harq
->
O_ACK
;
i
++
)
{
AssertFatal
(
ulsch_harq
->
o_ACK
[
i
]
==
0
||
ulsch_harq
->
o_ACK
[
i
]
==
1
,
"harq_ack[%d] is %d, should be 1,2 or 4
\n
"
,
i
,
ulsch_harq
->
o_ACK
[
i
]);
AssertFatal
(
ulsch_harq
->
o_ACK
[
i
]
==
0
||
ulsch_harq
->
o_ACK
[
i
]
==
1
,
"harq_ack[%d] is %d, should be 1,2 or 4
\n
"
,
i
,
ulsch_harq
->
o_ACK
[
i
]);
...
@@ -1811,7 +1810,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
...
@@ -1811,7 +1810,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
uint16_t
tdd_multiplexing_mask
)
{
uint16_t
tdd_multiplexing_mask
)
{
int
UE_id
=
find_dlsch
(
uci
->
rnti
,
eNB
,
SEARCH_EXIST
);
int
UE_id
=
find_dlsch
(
uci
->
rnti
,
eNB
,
SEARCH_EXIST
);
AssertFatal
(
UE_id
>=
0
,
"UE_id doesn't exist
\n
"
);
AssertFatal
(
UE_id
>=
0
,
"UE_id doesn't exist
rnti:%x
\n
"
,
uci
->
rnti
);
pthread_mutex_lock
(
&
eNB
->
UL_INFO_mutex
);
pthread_mutex_lock
(
&
eNB
->
UL_INFO_mutex
);
...
...
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