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
lizhongxiao
OpenXG-RAN
Commits
ac0d39af
Commit
ac0d39af
authored
Nov 23, 2017
by
Xu Bo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ULSCH harq_pid calculate issue
parent
ad859ddf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+1
-1
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
ac0d39af
...
...
@@ -6492,7 +6492,7 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
else
ul_subframe
=
((
n
+
4
)
%
10
);
if
(
subframe_select
(
frame_parms
,
ul_subframe
)
!=
SF_UL
)
return
(
255
);
if
(
(
subframe_select
(
frame_parms
,
ul_subframe
)
!=
SF_UL
)
&&
(
frame_parms
->
frame_type
==
TDD
)
)
return
(
255
);
LOG_D
(
PHY
,
"subframe %d: PUSCH subframe = %d
\n
"
,
n
,
ul_subframe
);
return
ul_subframe
;
...
...
openair2/LAYER2/MAC/pre_processor.c
View file @
ac0d39af
...
...
@@ -2075,7 +2075,7 @@ void ulsch_scheduler_pre_ue_select(
cc
=
&
eNB
->
common_channels
[
CC_id
];
//harq_pid
harq_pid
=
subframe2harqpid
(
cc
,
frameP
,
subframeP
);
harq_pid
=
subframe2harqpid
(
cc
,
(
frameP
+
(
subframeP
>=
6
?
1
:
0
)),((
subframeP
+
4
)
%
10
)
);
//round
round
=
UE_list
->
UE_sched_ctrl
[
UE_id
].
round_UL
[
CC_id
][
harq_pid
];
...
...
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