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
10a63f3d
Commit
10a63f3d
authored
Oct 05, 2017
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add T trace
parent
4e7f9312
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
+15
-6
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+15
-6
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
10a63f3d
...
@@ -1694,8 +1694,8 @@ void fill_ulsch_cqi_indication(PHY_VARS_eNB *eNB,uint16_t frame,uint8_t subframe
...
@@ -1694,8 +1694,8 @@ void fill_ulsch_cqi_indication(PHY_VARS_eNB *eNB,uint16_t frame,uint8_t subframe
}
}
void
fill_ulsch_harq_indication
(
PHY_VARS_eNB
*
eNB
,
LTE_UL_eNB_HARQ_t
*
ulsch_harq
,
uint16_t
rnti
,
int
frame
,
int
subframe
,
int
bundling
)
{
void
fill_ulsch_harq_indication
(
PHY_VARS_eNB
*
eNB
,
LTE_UL_eNB_HARQ_t
*
ulsch_harq
,
uint16_t
rnti
,
int
frame
,
int
subframe
,
int
bundling
)
{
int
UE_id
=
find_dlsch
(
rnti
,
eNB
,
SEARCH_EXIST
);
int
UE_id
=
find_dlsch
(
rnti
,
eNB
,
SEARCH_EXIST
);
AssertFatal
(
UE_id
>=
0
,
"UE_id doesn't exist
\n
"
);
AssertFatal
(
UE_id
>=
0
,
"UE_id doesn't exist
\n
"
);
...
@@ -1709,7 +1709,7 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1709,7 +1709,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
.
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
;
for
(
i
=
0
;
i
<
ulsch_harq
->
O_ACK
;
i
++
)
{
for
(
i
=
0
;
i
<
ulsch_harq
->
O_ACK
;
i
++
)
{
...
@@ -1718,14 +1718,23 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1718,14 +1718,23 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
i
]
=
2
-
ulsch_harq
->
o_ACK
[
i
];
pdu
->
harq_indication_fdd_rel13
.
harq_tb_n
[
i
]
=
2
-
ulsch_harq
->
o_ACK
[
i
];
// release DLSCH if needed
// release DLSCH if needed
if
(
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
);
if
(
ulsch_harq
->
o_ACK
[
i
]
==
1
)
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
);
#if T_TRACER
/* TODO: get correct harq pid */
if
(
ulsch_harq
->
o_ACK
[
i
]
!=
1
)
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[(
subframe
+
6
)
%
10
]));
else
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[(
subframe
+
6
)
%
10
]));
#endif
}
}
}
}
else
{
// TDD
else
{
// TDD
M
=
ul_ACK_subframe2_M
(
&
eNB
->
frame_parms
,
M
=
ul_ACK_subframe2_M
(
&
eNB
->
frame_parms
,
subframe
);
subframe
);
pdu
->
harq_indication_fdd_rel13
.
mode
=
1
-
bundling
;
pdu
->
harq_indication_fdd_rel13
.
mode
=
1
-
bundling
;
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
;
for
(
i
=
0
;
i
<
ulsch_harq
->
O_ACK
;
i
++
)
{
for
(
i
=
0
;
i
<
ulsch_harq
->
O_ACK
;
i
++
)
{
...
@@ -1743,9 +1752,9 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1743,9 +1752,9 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
}
}
}
}
}
}
eNB
->
UL_INFO
.
harq_ind
.
number_of_harqs
++
;
eNB
->
UL_INFO
.
harq_ind
.
number_of_harqs
++
;
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
pthread_mutex_unlock
(
&
eNB
->
UL_INFO_mutex
);
}
}
void
fill_uci_harq_indication
(
PHY_VARS_eNB
*
eNB
,
void
fill_uci_harq_indication
(
PHY_VARS_eNB
*
eNB
,
...
...
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