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
alex037yang
OpenXG-RAN
Commits
17aefade
Commit
17aefade
authored
Dec 12, 2016
by
hbilel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove temporary harq process for ue (ul)
parent
e0bf855f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+3
-3
openair1/PHY/LTE_TRANSPORT/defs.h
openair1/PHY/LTE_TRANSPORT/defs.h
+1
-1
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/phich.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
17aefade
...
@@ -6453,11 +6453,11 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
...
@@ -6453,11 +6453,11 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
// subframe,
// subframe,
// ulsch->Mlimit);
// ulsch->Mlimit);
//#endif
//#endif
/*
if (ulsch->harq_processes[harq_pid]->round > 0) // NACK detected on phich
if (ulsch->harq_processes[harq_pid]->round > 0) // NACK detected on phich
{
{
// ulsch->harq_processes[harq_pid]->round++; already done on phich_rx
// ulsch->harq_processes[harq_pid]->round++; already done on phich_rx
ulsch
->
harq_processes
[
harq_pid
]
=
ulsch
->
harq_processes
[
8
];
//
ulsch->harq_processes[harq_pid] = ulsch->harq_processes[8];
// LOG_I(PHY," Adaptative retransmission - copy temporary harq Process to current harq process. [harqId %d round %d] \n",harq_pid, ulsch->harq_processes[8]->round);
// LOG_I(PHY," Adaptative retransmission - copy temporary harq Process to current harq process. [harqId %d round %d] \n",harq_pid, ulsch->harq_processes[8]->round);
if (ulsch->harq_processes[harq_pid]->round >= ulsch->Mlimit) //UE_mac_inst[eNB_id].scheduling_info.maxHARQ_Tx)
if (ulsch->harq_processes[harq_pid]->round >= ulsch->Mlimit) //UE_mac_inst[eNB_id].scheduling_info.maxHARQ_Tx)
...
@@ -6479,7 +6479,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
...
@@ -6479,7 +6479,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
//LOG_I(PHY," [HARQ-UL harqId: %d] Adaptative retransmission NACK ==> subframe_scheduling_flag = %d round: %d\n", harq_pid, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag,ulsch->harq_processes[harq_pid]->round);
//LOG_I(PHY," [HARQ-UL harqId: %d] Adaptative retransmission NACK ==> subframe_scheduling_flag = %d round: %d\n", harq_pid, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag,ulsch->harq_processes[harq_pid]->round);
}
}
}
}
*/
}
}
}
}
...
...
openair1/PHY/LTE_TRANSPORT/defs.h
View file @
17aefade
...
@@ -283,7 +283,7 @@ typedef struct {
...
@@ -283,7 +283,7 @@ typedef struct {
/// SRS active flag
/// SRS active flag
uint8_t
srs_active
;
uint8_t
srs_active
;
/// Pointers to 8 HARQ processes for the ULSCH
/// Pointers to 8 HARQ processes for the ULSCH
LTE_UL_UE_HARQ_t
*
harq_processes
[
9
];
LTE_UL_UE_HARQ_t
*
harq_processes
[
8
];
/// Pointer to CQI data
/// Pointer to CQI data
uint8_t
o
[
MAX_CQI_BYTES
];
uint8_t
o
[
MAX_CQI_BYTES
];
/// Length of CQI data (bits)
/// Length of CQI data (bits)
...
...
openair1/PHY/LTE_TRANSPORT/phich.c
View file @
17aefade
...
@@ -1441,7 +1441,7 @@ void rx_phich(PHY_VARS_UE *ue,
...
@@ -1441,7 +1441,7 @@ void rx_phich(PHY_VARS_UE *ue,
// rely only on DCI0 decoding and check if NDI has toggled
// rely only on DCI0 decoding and check if NDI has toggled
// save current harq_processes content in temporary struct
// save current harq_processes content in temporary struct
// harqId-8 corresponds to the temporary struct. In total we have 8 harq process(0 ..7) + 1 temporary harq process()
// harqId-8 corresponds to the temporary struct. In total we have 8 harq process(0 ..7) + 1 temporary harq process()
ulsch
->
harq_processes
[
8
]
=
ulsch
->
harq_processes
[
harq_pid
];
//
ulsch->harq_processes[8] = ulsch->harq_processes[harq_pid];
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
0
;
ulsch
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
0
;
ulsch
->
harq_processes
[
harq_pid
]
->
status
=
IDLE
;
ulsch
->
harq_processes
[
harq_pid
]
->
status
=
IDLE
;
...
...
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