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
770c7509
Commit
770c7509
authored
Mar 08, 2018
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix pdcch_alloc2ul_subframe when TDD config1
parent
fad64532
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
13 deletions
+20
-13
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+20
-13
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
770c7509
...
...
@@ -6665,10 +6665,13 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
uint8_t
ul_subframe
=
255
;
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
1
)
&&
((
n
==
1
)
||
(
n
==
6
)))
// tdd_config 0,1 SF 1,5
(
frame_parms
->
tdd_config
==
1
)
)
{
if
((
n
==
1
)
||
(
n
==
6
))
{
// tdd_config 0,1 SF 1,5
ul_subframe
=
((
n
+
6
)
%
10
);
else
if
((
frame_parms
->
frame_type
==
TDD
)
&&
}
else
if
((
n
==
4
)
||
(
n
==
9
))
{
ul_subframe
=
((
n
+
4
)
%
10
);
}
}
else
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
6
)
&&
((
n
==
0
)
||
(
n
==
1
)
||
(
n
==
5
)
||
(
n
==
6
)))
ul_subframe
=
((
n
+
7
)
%
10
);
...
...
@@ -6688,10 +6691,13 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
uint8_t
ul_subframe2pdcch_alloc_subframe
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
uint8_t
n
)
{
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
1
)
&&
((
n
==
7
)
||
(
n
==
2
)))
// tdd_config 0,1 SF 1,5
(
frame_parms
->
tdd_config
==
1
)
)
{
if
((
n
==
7
)
||
(
n
==
2
))
{
// tdd_config 0,1 SF 1,5
return
((
n
==
7
)
?
1
:
6
);
else
if
((
frame_parms
->
frame_type
==
TDD
)
&&
}
else
if
((
n
==
3
)
||
(
n
==
8
))
{
return
((
n
==
3
)
?
9
:
4
);
}
}
else
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
6
)
&&
((
n
==
7
)
||
(
n
==
8
)
||
(
n
==
2
)
||
(
n
==
3
)))
return
((
n
+
3
)
%
10
);
...
...
@@ -6705,13 +6711,14 @@ uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t
uint32_t
pdcch_alloc2ul_frame
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
uint32_t
frame
,
uint8_t
n
)
{
uint32_t
ul_frame
;
uint32_t
ul_frame
=
frame
;
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
1
)
&&
((
n
==
1
)
||
(
n
==
6
)))
// tdd_config 0,1 SF 1,5
ul_frame
=
(
frame
+
(
n
==
1
?
0
:
1
));
else
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
1
))
{
if
((
n
==
1
)
||
(
n
==
6
)
||
(
n
==
4
)
||
(
n
==
9
))
{
// tdd_config 0,1 SF 1,5
ul_frame
=
(
frame
+
(
n
<
5
?
0
:
1
));
}
}
else
if
((
frame_parms
->
frame_type
==
TDD
)
&&
(
frame_parms
->
tdd_config
==
6
)
&&
((
n
==
0
)
||
(
n
==
1
)
||
(
n
==
5
)
||
(
n
==
6
)))
ul_frame
=
(
frame
+
(
n
>=
5
?
1
:
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