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
6f478734
Commit
6f478734
authored
May 19, 2017
by
gabrielC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warning compilation
parent
49eb46d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+3
-7
No files found.
openair1/SCHED/phy_procedures_lte_ue.c
View file @
6f478734
...
@@ -702,7 +702,7 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -702,7 +702,7 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
LTE_DL_FRAME_PARMS
*
frame_parms
=&
ue
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
frame_parms
=&
ue
->
frame_parms
;
uint8_t
nCCE0
,
nCCE1
,
nCCE2
,
nCCE3
,
harq_ack1
,
harq_ack0
,
harq_ack3
,
harq_ack2
;
uint8_t
nCCE0
,
nCCE1
,
nCCE2
,
nCCE3
,
harq_ack1
,
harq_ack0
,
harq_ack3
,
harq_ack2
;
ANFBmode_t
bundling_flag
;
ANFBmode_t
bundling_flag
;
uint16_t
n1_pucch0
=
0
,
n1_pucch1
=
0
,
n1_pucch2
=
0
,
n1_pucch3
=
0
,
n1_pucch_inter
,
pucch_sel_inter
;
uint16_t
n1_pucch0
=
0
,
n1_pucch1
=
0
,
n1_pucch2
=
0
,
n1_pucch3
=
0
,
n1_pucch_inter
;
static
uint8_t
candidate_dl
[
9
];
// which downlink(s) the current ACK/NACK is associating to
static
uint8_t
candidate_dl
[
9
];
// which downlink(s) the current ACK/NACK is associating to
uint8_t
last_dl
=
0xff
;
// the last downlink with valid DL-DCI. for calculating the PUCCH resource index
uint8_t
last_dl
=
0xff
;
// the last downlink with valid DL-DCI. for calculating the PUCCH resource index
int
sf
;
int
sf
;
...
@@ -979,22 +979,18 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -979,22 +979,18 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
if
((
harq_ack0
!=
2
)
)
{
if
((
harq_ack0
!=
2
)
)
{
b
[
0
]
=
harq_ack0
;
b
[
0
]
=
harq_ack0
;
n1_pucch_inter
=
n1_pucch0
;
n1_pucch_inter
=
n1_pucch0
;
pucch_sel_inter
=
0
;
}
}
if
((
harq_ack1
!=
2
)
)
{
if
((
harq_ack1
!=
2
)
)
{
b
[
0
]
=
b
[
0
]
&
harq_ack1
;
b
[
0
]
=
b
[
0
]
&
harq_ack1
;
n1_pucch_inter
=
n1_pucch1
;
n1_pucch_inter
=
n1_pucch1
;
pucch_sel_inter
=
1
;
}
}
if
((
harq_ack2
!=
2
)
)
{
if
((
harq_ack2
!=
2
)
)
{
b
[
0
]
=
b
[
0
]
&
harq_ack2
;
b
[
0
]
=
b
[
0
]
&
harq_ack2
;
n1_pucch_inter
=
n1_pucch2
;
n1_pucch_inter
=
n1_pucch2
;
pucch_sel_inter
=
2
;
}
}
if
((
harq_ack3
!=
2
)
)
{
if
((
harq_ack3
!=
2
)
)
{
b
[
0
]
=
b
[
0
]
&
harq_ack3
;
b
[
0
]
=
b
[
0
]
&
harq_ack3
;
n1_pucch_inter
=
n1_pucch3
;
n1_pucch_inter
=
n1_pucch3
;
pucch_sel_inter
=
3
;
}
}
if
(
subframe
==
3
)
{
if
(
subframe
==
3
)
{
...
@@ -1003,10 +999,10 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -1003,10 +999,10 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
n1_pucch_inter
=
n1_pucch2
;
n1_pucch_inter
=
n1_pucch2
;
}
}
//LOG_I(PHY,"SFN/SF %d/%d calculating n1_pucch n1_pucch_inter=%d
pucch_sel_inter=%d
b[0]=%d b[1]=%d \n",
//LOG_I(PHY,"SFN/SF %d/%d calculating n1_pucch n1_pucch_inter=%d b[0]=%d b[1]=%d \n",
// proc->frame_tx%1024,
// proc->frame_tx%1024,
// proc->subframe_tx,n1_pucch_inter,
// proc->subframe_tx,n1_pucch_inter,
//
pucch_sel_inter,
b[0],b[1]);
// b[0],b[1]);
return
(
n1_pucch_inter
);
return
(
n1_pucch_inter
);
...
...
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