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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
cc41eb9d
Commit
cc41eb9d
authored
Jun 02, 2017
by
Cedric Roux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/ue_tdd_multiplexing' into develop
parents
c9de7cfe
8c6bd1d5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
102 additions
and
38 deletions
+102
-38
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+1
-1
openair1/SCHED/phy_procedures_lte_common.c
openair1/SCHED/phy_procedures_lte_common.c
+7
-7
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+94
-30
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
cc41eb9d
...
@@ -8030,7 +8030,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
...
@@ -8030,7 +8030,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
if
(
ulsch
->
bundling
)
if
(
ulsch
->
bundling
)
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
=
(
dai
==
3
)
?
0
:
1
;
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
=
(
dai
==
3
)
?
0
:
1
;
else
else
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
=
(
dai
+
1
)
&
3
;
ulsch
->
harq_processes
[
harq_pid
]
->
O_ACK
=
(
dai
>=
2
)
?
2
:
(
dai
+
1
)
&
3
;
//(dai
+1)&3;
// ulsch->harq_processes[harq_pid]->V_UL_DAI = dai+1;
// ulsch->harq_processes[harq_pid]->V_UL_DAI = dai+1;
}
}
...
...
openair1/SCHED/phy_procedures_lte_common.c
View file @
cc41eb9d
...
@@ -576,16 +576,16 @@ uint8_t get_reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
...
@@ -576,16 +576,16 @@ uint8_t get_reset_ack(LTE_DL_FRAME_PARMS *frame_parms,
case
4
:
case
4
:
if
(
subframe_tx
==
2
)
{
// ACK subframes 4, 5 and 0
if
(
subframe_tx
==
2
)
{
// ACK subframes 4, 5 and 0
subframe_dl0
=
4
;
subframe_dl0
=
0
;
subframe_dl1
=
5
;
subframe_dl1
=
4
;
subframe_dl2
=
0
;
subframe_dl2
=
5
;
subframe_ul
=
2
;
subframe_ul
=
2
;
//printf("subframe_tx 2, TDD config 3: harq_ack[5] = %d (%d),harq_ack[6] = %d (%d)\n",harq_ack[5].ack,harq_ack[5].send_harq_status,harq_ack[6].ack,harq_ack[6].send_harq_status);
//printf("subframe_tx 2, TDD config 3: harq_ack[5] = %d (%d),harq_ack[6] = %d (%d)\n",harq_ack[5].ack,harq_ack[5].send_harq_status,harq_ack[6].ack,harq_ack[6].send_harq_status);
}
else
if
(
subframe_tx
==
3
)
{
// ACK subframes 6, 7 8 and 9
}
else
if
(
subframe_tx
==
3
)
{
// ACK subframes 6, 7 8 and 9
subframe_dl0
=
6
;
subframe_dl0
=
7
;
subframe_dl1
=
7
;
subframe_dl1
=
8
;
subframe_dl2
=
8
;
subframe_dl2
=
9
;
subframe_dl3
=
9
;
subframe_dl3
=
6
;
subframe_ul
=
3
;
subframe_ul
=
3
;
//printf("Subframe 3, TDD config 3: harq_ack[7] = %d,harq_ack[8] = %d\n",harq_ack[7].ack,harq_ack[8].ack);
//printf("Subframe 3, TDD config 3: harq_ack[7] = %d,harq_ack[8] = %d\n",harq_ack[7].ack,harq_ack[8].ack);
//printf("status %d : o_ACK (%d,%d)\n", status,o_ACK[0],o_ACK[1]);
//printf("status %d : o_ACK (%d,%d)\n", status,o_ACK[0],o_ACK[1]);
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
cc41eb9d
...
@@ -633,7 +633,8 @@ PUCCH_FMT_t get_pucch_format(lte_frame_type_t frame_type,
...
@@ -633,7 +633,8 @@ PUCCH_FMT_t get_pucch_format(lte_frame_type_t frame_type,
uint8_t
SR_payload
,
uint8_t
SR_payload
,
uint8_t
nb_cw
,
uint8_t
nb_cw
,
uint8_t
cqi_status
,
uint8_t
cqi_status
,
uint8_t
ri_status
)
uint8_t
ri_status
,
uint8_t
bundling_flag
)
{
{
if
((
cqi_status
==
0
)
&&
(
ri_status
==
0
))
if
((
cqi_status
==
0
)
&&
(
ri_status
==
0
))
{
{
...
@@ -641,10 +642,14 @@ PUCCH_FMT_t get_pucch_format(lte_frame_type_t frame_type,
...
@@ -641,10 +642,14 @@ PUCCH_FMT_t get_pucch_format(lte_frame_type_t frame_type,
// 1- SR only ==> PUCCH format 1
// 1- SR only ==> PUCCH format 1
// 2- 1bit Ack/Nack with/without SR ==> PUCCH format 1a
// 2- 1bit Ack/Nack with/without SR ==> PUCCH format 1a
// 3- 2bits Ack/Nack with/without SR ==> PUCCH format 1b
// 3- 2bits Ack/Nack with/without SR ==> PUCCH format 1b
if
(
nb_cw
==
1
)
if
(
(
nb_cw
==
1
)
&&
(
bundling_flag
==
bundling
)
)
{
{
return
pucch_format1a
;
return
pucch_format1a
;
}
}
if
((
nb_cw
==
1
)
&&
(
bundling_flag
==
multiplexing
))
{
return
pucch_format1b
;
}
if
(
nb_cw
==
2
)
if
(
nb_cw
==
2
)
{
{
return
pucch_format1b
;
return
pucch_format1b
;
...
@@ -727,10 +732,10 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -727,10 +732,10 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
#ifdef DEBUG_PHY_PROC
#ifdef DEBUG_PHY_PROC
if
(
bundling_flag
==
bundling
)
{
if
(
bundling_flag
==
bundling
)
{
LOG_
I
(
PHY
,
"[UE%d] Frame %d subframe %d : get_n1_pucch, bundling, SR %d/%d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
subframe
,
SR
,
LOG_
D
(
PHY
,
"[UE%d] Frame %d subframe %d : get_n1_pucch, bundling, SR %d/%d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
subframe
,
SR
,
ue
->
scheduling_request_config
[
eNB_id
].
sr_PUCCH_ResourceIndex
);
ue
->
scheduling_request_config
[
eNB_id
].
sr_PUCCH_ResourceIndex
);
}
else
{
}
else
{
LOG_
I
(
PHY
,
"[UE%d] Frame %d subframe %d : get_n1_pucch, multiplexing, SR %d/%d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
subframe
,
SR
,
LOG_
D
(
PHY
,
"[UE%d] Frame %d subframe %d : get_n1_pucch, multiplexing, SR %d/%d
\n
"
,
ue
->
Mod_id
,
proc
->
frame_tx
,
subframe
,
SR
,
ue
->
scheduling_request_config
[
eNB_id
].
sr_PUCCH_ResourceIndex
);
ue
->
scheduling_request_config
[
eNB_id
].
sr_PUCCH_ResourceIndex
);
}
}
...
@@ -909,14 +914,13 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -909,14 +914,13 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
//last_dl = (subframe-2)<<1;
//last_dl = (subframe-2)<<1;
if
(
subframe
==
2
)
{
if
(
subframe
==
2
)
{
// i=0
// i=0
//nCCE0 = ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[2+subframe];
nCCE0
=
ue
->
pdcch_vars
[
proc
->
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[(
8
+
subframe
)
%
10
];
nCCE0
=
ue
->
pdcch_vars
[
proc
->
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[(
8
+
subframe
)
%
10
];
n1_pucch0
=
2
*
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE0
,
0
)
+
nCCE0
+
frame_parms
->
pucch_config_common
.
n1PUCCH_AN
;
n1_pucch0
=
2
*
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE0
,
0
)
+
nCCE0
+
frame_parms
->
pucch_config_common
.
n1PUCCH_AN
;
// i=1
// i=1
nCCE1
=
ue
->
pdcch_vars
[
proc
->
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[
2
+
subframe
];
nCCE1
=
ue
->
pdcch_vars
[
proc
->
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[
3
+
subframe
];
n1_pucch1
=
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE1
,
0
)
+
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE1
,
1
)
+
nCCE1
+
frame_parms
->
pucch_config_common
.
n1PUCCH_AN
;
n1_pucch1
=
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE1
,
0
)
+
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE1
,
1
)
+
nCCE1
+
frame_parms
->
pucch_config_common
.
n1PUCCH_AN
;
// i=2
// i=2
nCCE2
=
ue
->
pdcch_vars
[
proc
->
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[(
8
+
subframe
)
%
10
];
nCCE2
=
ue
->
pdcch_vars
[
proc
->
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[(
2
+
subframe
)
%
10
];
n1_pucch2
=
2
*
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE2
,
1
)
+
nCCE2
+
frame_parms
->
pucch_config_common
.
n1PUCCH_AN
;
n1_pucch2
=
2
*
get_Np
(
frame_parms
->
N_RB_DL
,
nCCE2
,
1
)
+
nCCE2
+
frame_parms
->
pucch_config_common
.
n1PUCCH_AN
;
// i=3
// i=3
//nCCE3 = ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[(9+subframe)%10];
//nCCE3 = ue->pdcch_vars[proc->subframe_rx & 0x1][eNB_id]->nCCE[(9+subframe)%10];
...
@@ -926,11 +930,11 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -926,11 +930,11 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
if
(
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[(
8
+
subframe
)
%
10
].
send_harq_status
>
0
)
// n-6 // subframe 6 is to be ACK/NAKed
if
(
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[(
8
+
subframe
)
%
10
].
send_harq_status
>
0
)
// n-6 // subframe 6 is to be ACK/NAKed
harq_ack0
=
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[(
8
+
subframe
)
%
10
].
ack
;
harq_ack0
=
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[(
8
+
subframe
)
%
10
].
ack
;
if
(
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
2
+
subframe
].
send_harq_status
>
0
)
// n-6 // subframe 5 is to be ACK/NAKed
if
(
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
3
+
subframe
].
send_harq_status
>
0
)
// n-6 // subframe 5 is to be ACK/NAKed
harq_ack1
=
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
2
+
subframe
].
ack
;
harq_ack1
=
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
3
+
subframe
].
ack
;
if
(
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
3
+
subframe
].
send_harq_status
>
0
)
// n-6 // subframe 6 is to be ACK/NAKed
if
(
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
(
2
+
subframe
)
%
10
].
send_harq_status
>
0
)
// n-6 // subframe 6 is to be ACK/NAKed
harq_ack2
=
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
3
+
subframe
].
ack
;
harq_ack2
=
ue
->
dlsch
[
proc
->
subframe_rx
&
0x1
][
eNB_id
][
0
]
->
harq_ack
[
(
2
+
subframe
)
%
10
].
ack
;
//if (ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack[(9+subframe)%10].send_harq_status>0) // n-6 // subframe 5 is to be ACK/NAKed
//if (ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack[(9+subframe)%10].send_harq_status>0) // n-6 // subframe 5 is to be ACK/NAKed
//harq_ack3 = ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack[(9+subframe)%10].ack;
//harq_ack3 = ue->dlsch[proc->subframe_rx&0x1][eNB_id][0]->harq_ack[(9+subframe)%10].ack;
...
@@ -976,28 +980,38 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -976,28 +980,38 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
// nCCE3, n1_pucch3, harq_ack3, bundling_flag);
// nCCE3, n1_pucch3, harq_ack3, bundling_flag);
if
((
bundling_flag
==
bundling
)
&&
(
SR
==
0
))
{
// This is for bundling without SR,
if
((
bundling_flag
==
bundling
)
&&
(
SR
==
0
))
{
// This is for bundling without SR,
b
[
0
]
=
1
;
ack_counter
=
0
;
if
((
harq_ack3
!=
2
)
)
{
b
[
0
]
=
b
[
0
]
&
harq_ack3
;
n1_pucch_inter
=
n1_pucch3
;
ack_counter
++
;
}
if
((
harq_ack0
!=
2
)
)
{
if
((
harq_ack0
!=
2
)
)
{
b
[
0
]
=
harq_ack0
;
b
[
0
]
=
b
[
0
]
&
harq_ack0
;
n1_pucch_inter
=
n1_pucch0
;
n1_pucch_inter
=
n1_pucch0
;
ack_counter
++
;
}
}
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
;
ack_counter
++
;
}
}
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
;
}
ack_counter
++
;
if
((
harq_ack3
!=
2
)
)
{
b
[
0
]
=
b
[
0
]
&
harq_ack3
;
n1_pucch_inter
=
n1_pucch3
;
}
}
if
(
subframe
==
3
)
{
if
(
ack_counter
==
0
)
b
[
0
]
=
0
;
/*if (subframe == 3) {
n1_pucch_inter = n1_pucch2;
n1_pucch_inter = n1_pucch2;
} else if (subframe == 2) {
} else if (subframe == 2) {
n1_pucch_inter
=
n1_pucch
2
;
n1_pucch_inter = n1_pucch
1
;
}
}
*/
//LOG_I(PHY,"SFN/SF %d/%d calculating n1_pucch n1_pucch_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,
...
@@ -1008,37 +1022,39 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -1008,37 +1022,39 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
}
else
if
((
bundling_flag
==
multiplexing
)
&&
(
SR
==
0
))
{
// Table 10.1
}
else
if
((
bundling_flag
==
multiplexing
)
&&
(
SR
==
0
))
{
// Table 10.1
if
(
subframe
==
3
)
{
LOG_I
(
PHY
,
"sbuframe=%d
\n
"
,
subframe
);
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
(
harq_ack2
==
1
)
&&
(
harq_ack3
==
1
))
{
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
(
harq_ack2
==
1
)
&&
(
harq_ack3
==
1
))
{
b
[
1
]
=
1
;
b
[
0
]
=
1
;
b
[
0
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch1
);
return
(
n1_pucch1
);
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
(
harq_ack2
==
1
)
&&
((
harq_ack3
==
2
)
||
(
harq_ack3
==
0
)))
{
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
(
harq_ack2
==
1
)
&&
((
harq_ack3
==
2
)
||
(
harq_ack3
==
0
)))
{
b
[
0
]
=
1
;
b
[
0
]
=
1
;
b
[
1
]
=
0
;
b
[
1
]
=
0
;
return
(
n1_pucch1
);
return
(
n1_pucch1
);
}
else
if
(((
harq_ack0
==
0
)
||
(
harq_ack0
==
2
))
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
0
)
&&
(
harq_ack3
==
2
))
{
}
else
if
(((
harq_ack0
==
0
)
||
(
harq_ack0
==
2
))
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
0
)
&&
(
harq_ack3
==
2
))
{
b
[
1
]
=
1
;
b
[
0
]
=
1
;
b
[
0
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch2
);
return
(
n1_pucch2
);
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
))
&&
(
harq_ack3
==
1
))
{
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
))
&&
(
harq_ack3
==
1
))
{
b
[
1
]
=
1
;
b
[
0
]
=
1
;
b
[
0
]
=
0
;
b
[
1
]
=
0
;
return
(
n1_pucch1
);
return
(
n1_pucch1
);
}
else
if
((
harq_ack0
==
0
)
&&
(
harq_ack1
==
2
)
&&
(
harq_ack2
==
2
)
&&
(
harq_ack3
==
2
))
{
}
else
if
((
harq_ack0
==
0
)
&&
(
harq_ack1
==
2
)
&&
(
harq_ack2
==
2
)
&&
(
harq_ack3
==
2
))
{
b
[
1
]
=
1
;
b
[
0
]
=
1
;
b
[
0
]
=
0
;
b
[
1
]
=
0
;
return
(
n1_pucch0
);
return
(
n1_pucch0
);
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
))
&&
((
harq_ack3
==
2
)
||
(
harq_ack3
==
0
)))
{
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
))
&&
((
harq_ack3
==
2
)
||
(
harq_ack3
==
0
)))
{
b
[
1
]
=
1
;
b
[
0
]
=
1
;
b
[
0
]
=
0
;
b
[
1
]
=
0
;
return
(
n1_pucch1
);
return
(
n1_pucch1
);
}
else
if
((
harq_ack0
==
1
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
1
)
&&
(
harq_ack3
==
1
))
{
}
else
if
((
harq_ack0
==
1
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
1
)
&&
(
harq_ack3
==
1
))
{
b
[
0
]
=
0
;
b
[
0
]
=
0
;
b
[
1
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch3
);
return
(
n1_pucch3
);
}
else
if
(((
harq_ack0
==
0
)
||
(
harq_ack0
==
2
))
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
))
&&
(
harq_ack3
==
0
))
{
}
else
if
(((
harq_ack0
==
0
)
||
(
harq_ack0
==
2
))
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
))
&&
(
harq_ack3
==
0
))
{
b
[
1
]
=
1
;
b
[
0
]
=
1
;
b
[
0
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch3
);
return
(
n1_pucch3
);
}
else
if
((
harq_ack0
==
1
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
1
)
&&
((
harq_ack3
==
2
)
||
(
harq_ack3
==
0
)))
{
}
else
if
((
harq_ack0
==
1
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
1
)
&&
((
harq_ack3
==
2
)
||
(
harq_ack3
==
0
)))
{
b
[
0
]
=
0
;
b
[
0
]
=
0
;
...
@@ -1085,9 +1101,53 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
...
@@ -1085,9 +1101,53 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
b
[
1
]
=
0
;
b
[
1
]
=
0
;
return
(
n1_pucch3
);
return
(
n1_pucch3
);
}
}
}
else
if
(
subframe
==
2
)
{
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
(
harq_ack2
==
1
))
{
b
[
0
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch2
);
}
else
if
((
harq_ack0
==
1
)
&&
(
harq_ack1
==
1
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
)))
{
b
[
0
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch1
);
}
else
if
((
harq_ack0
==
1
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
1
))
{
b
[
0
]
=
1
;
b
[
1
]
=
1
;
return
(
n1_pucch0
);
}
else
if
((
harq_ack0
==
1
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
)))
{
b
[
0
]
=
0
;
b
[
1
]
=
1
;
return
(
n1_pucch0
);
}
else
if
(((
harq_ack0
==
2
)
||
(
harq_ack0
==
0
))
&&
(
harq_ack1
==
1
)
&&
(
harq_ack2
==
1
))
{
b
[
0
]
=
1
;
b
[
1
]
=
0
;
return
(
n1_pucch2
);
}
else
if
(((
harq_ack0
==
2
)
||
(
harq_ack0
==
0
))
&&
(
harq_ack1
==
1
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
)))
{
b
[
1
]
=
0
;
b
[
0
]
=
0
;
return
(
n1_pucch1
);
}
else
if
(((
harq_ack0
==
2
)
||
(
harq_ack0
==
0
))
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
(
harq_ack2
==
1
))
{
b
[
0
]
=
0
;
b
[
1
]
=
0
;
return
(
n1_pucch2
);
}
else
if
((
harq_ack0
==
2
)
&&
(
harq_ack1
==
2
)
&&
(
harq_ack2
==
0
))
{
b
[
0
]
=
0
;
b
[
1
]
=
1
;
return
(
n1_pucch2
);
}
else
if
((
harq_ack0
==
2
)
&&
(
harq_ack1
==
0
)
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
)))
{
b
[
0
]
=
1
;
b
[
1
]
=
0
;
return
(
n1_pucch1
);
}
else
if
((
harq_ack0
==
0
)
&&
((
harq_ack1
==
2
)
||
(
harq_ack1
==
0
))
&&
((
harq_ack2
==
2
)
||
(
harq_ack2
==
0
)))
{
b
[
0
]
=
1
;
b
[
1
]
=
0
;
return
(
n1_pucch0
);
}
}
}
else
if
(
SR
==
1
)
{
// SR and 0,1,or 2 ACKS, (first 3 entries in Table 7.3-1 of 36.213)
}
else
if
(
SR
==
1
)
{
// SR and 0,1,or 2 ACKS, (first 3 entries in Table 7.3-1 of 36.213)
// this should be number of ACKs (including
// this should be number of ACKs (including
ack_counter
=
0
;
if
(
harq_ack0
==
1
)
if
(
harq_ack0
==
1
)
ack_counter
++
;
ack_counter
++
;
if
(
harq_ack1
==
1
)
if
(
harq_ack1
==
1
)
...
@@ -2132,7 +2192,8 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
...
@@ -2132,7 +2192,8 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
SR_payload
,
SR_payload
,
nb_cw
,
nb_cw
,
cqi_status
,
cqi_status
,
ri_status
);
ri_status
,
bundling_flag
);
// Determine PUCCH resources and payload: mandatory for pucch encoding
// Determine PUCCH resources and payload: mandatory for pucch encoding
get_pucch_param
(
ue
,
get_pucch_param
(
ue
,
proc
,
proc
,
...
@@ -3060,6 +3121,9 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
...
@@ -3060,6 +3121,9 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
#endif
#endif
uint8_t
*
nCCE_current
=
&
ue
->
pdcch_vars
[
subframe_rx
&
0x1
][
eNB_id
]
->
nCCE
[
subframe_rx
];
uint8_t
*
nCCE_dest
=
&
ue
->
pdcch_vars
[(
subframe_rx
+
1
)
&
0x1
][
eNB_id
]
->
nCCE
[
subframe_rx
];
memcpy
(
nCCE_dest
,
nCCE_current
,
sizeof
(
uint8_t
));
LOG_D
(
PHY
,
"[UE %d] AbsSubFrame %d.%d, Mode %s: DCI found %i --> rnti %x / crnti %x : format %d
\n
"
,
LOG_D
(
PHY
,
"[UE %d] AbsSubFrame %d.%d, Mode %s: DCI found %i --> rnti %x / crnti %x : format %d
\n
"
,
ue
->
Mod_id
,
frame_rx
%
1024
,
subframe_rx
,
mode_string
[
ue
->
UE_mode
[
eNB_id
]],
ue
->
Mod_id
,
frame_rx
%
1024
,
subframe_rx
,
mode_string
[
ue
->
UE_mode
[
eNB_id
]],
...
...
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