Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
0bc73964
Commit
0bc73964
authored
Feb 26, 2018
by
Wang.shanshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix:harq_pid for TDD is not completely fixed in pre processer.
parent
de83c556
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
24 deletions
+11
-24
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+2
-7
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+1
-5
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+2
-0
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+6
-12
No files found.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
0bc73964
...
...
@@ -853,10 +853,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
// set HARQ process round to 0 for this UE
if
(
cc
->
tdd_Config
)
ra
->
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
else
ra
->
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
// Get RRCConnectionSetup for Piggyback
rrc_sdu_length
=
mac_rrc_data_req
(
module_idP
,
CC_idP
,
frameP
,
CCCH
,
1
,
// 1 transport block
...
...
@@ -1310,10 +1307,8 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
lcid
=
0
;
// put HARQ process round to 0
if
(
cc
->
tdd_Config
)
ra
->
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
else
ra
->
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
ra
->
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
UE_list
->
UE_sched_ctrl
[
UE_id
].
round
[
CC_idP
][
ra
->
harq_pid
]
=
0
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
0bc73964
...
...
@@ -689,10 +689,7 @@ schedule_ue_spec(module_id_t module_idP,
nb_available_rb
=
ue_sched_ctl
->
pre_nb_available_rbs
[
CC_id
];
if
(
cc
->
tdd_Config
)
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
else
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
round
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
...
...
@@ -1609,8 +1606,7 @@ fill_DLSCH_dci(
// clear scheduling flag
eNB_dlsch_info
[
module_idP
][
CC_id
][
UE_id
].
status
=
S_DL_WAITING
;
rnti
=
UE_RNTI
(
module_idP
,
UE_id
);
if
(
cc
->
tdd_Config
)
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
else
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
nb_rb
=
UE_list
->
UE_template
[
CC_id
][
UE_id
].
nb_rb
[
harq_pid
];
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
0bc73964
...
...
@@ -3789,6 +3789,8 @@ uint8_t frame_subframe2_dl_harq_pid(TDD_Config_t *tdd_Config, int abs_frameP, su
return
harq_pid
;
break
;
}
}
else
{
return
((
abs_frameP
*
10
)
+
subframeP
)
&
7
;
}
return
-
1
;
}
...
...
openair2/LAYER2/MAC/pre_processor.c
View file @
0bc73964
...
...
@@ -299,10 +299,8 @@ maxround(module_id_t Mod_id, uint16_t rnti, int frame,
cc
=
&
RC
.
mac
[
Mod_id
]
->
common_channels
[
CC_id
];
UE_id
=
find_UE_id
(
Mod_id
,
rnti
);
if
(
cc
->
tdd_Config
)
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frame
,
subframe
);
else
harq_pid
=
((
frame
*
10
)
+
subframe
)
&
7
;
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frame
,
subframe
);
round
=
UE_list
->
UE_sched_ctrl
[
UE_id
].
round
[
CC_id
][
harq_pid
];
if
(
round
>
round_max
)
{
...
...
@@ -676,8 +674,7 @@ void dlsch_scheduler_pre_ue_select(
continue;
}
#endif
if
(
cc
[
CC_id
].
tdd_Config
)
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
%
10
;
else
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
[
CC_id
].
tdd_Config
,
frameP
,
subframeP
);
round
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
if
(
round
!=
8
)
{
// retransmission
...
...
@@ -791,8 +788,7 @@ void dlsch_scheduler_pre_ue_select(
if
(
i
<
dlsch_ue_select
[
CC_id
].
ue_num
)
continue
;
if
(
cc
[
CC_id
].
tdd_Config
)
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
%
10
;
else
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
[
CC_id
].
tdd_Config
,
frameP
,
subframeP
);
round
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
if
(
round
==
8
)
{
...
...
@@ -905,8 +901,7 @@ void dlsch_scheduler_pre_ue_select(
if
(
i
<
dlsch_ue_select
[
CC_id
].
ue_num
)
continue
;
if
(
cc
[
CC_id
].
tdd_Config
)
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
%
10
;
else
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
round
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
if
(
round
==
8
)
{
...
...
@@ -1128,8 +1123,7 @@ void dlsch_scheduler_pre_processor (module_id_t Mod_id,
rnti
=
dlsch_ue_select
[
CC_id
].
list
[
i
].
rnti
;
ue_sched_ctl
=
&
UE_list
->
UE_sched_ctrl
[
UE_id
];
if
(
cc
->
tdd_Config
)
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
else
harq_pid
=
((
frameP
*
10
)
+
subframeP
)
&
7
;
harq_pid
=
frame_subframe2_dl_harq_pid
(
cc
->
tdd_Config
,
frameP
,
subframeP
);
Round
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
//if (mac_eNB_get_rrc_status(Mod_id, rnti) < RRC_RECONFIGURED || round > 0) {
...
...
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