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
ZhouShuya
OpenXG-RAN
Commits
97430b5d
Commit
97430b5d
authored
Dec 22, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create lists for HARQ management
parent
a0536503
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
0 deletions
+45
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+38
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+7
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
97430b5d
...
...
@@ -1573,6 +1573,26 @@ int find_nr_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP) {
return
-
1
;
}
int
get_nrofHARQ_ProcessesForPDSCH
(
e_NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH
n
)
{
switch
(
n
)
{
case
NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH_n2
:
return
2
;
case
NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH_n4
:
return
4
;
case
NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH_n6
:
return
6
;
case
NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH_n10
:
return
10
;
case
NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH_n12
:
return
12
;
case
NR_PDSCH_ServingCellConfig__nrofHARQ_ProcessesForPDSCH_n16
:
return
16
;
default:
return
8
;
}
}
//------------------------------------------------------------------------------
int
add_new_nr_ue
(
module_id_t
mod_idP
,
rnti_t
rntiP
,
NR_CellGroupConfig_t
*
secondaryCellGroup
)
{
...
...
@@ -1617,6 +1637,20 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *secon
"uplinkBWP_ToAddModList has %d BWP!
\n
"
,
ubwpList
->
list
.
count
);
sched_ctrl
->
active_ubwp
=
ubwpList
->
list
.
array
[
bwp_id
-
1
];
/* get Number of HARQ processes for this UE */
AssertFatal
(
servingCellConfig
->
pdsch_ServingCellConfig
->
present
==
NR_SetupRelease_PDSCH_ServingCellConfig_PR_setup
,
"no pdsch-ServingCellConfig found for UE %d
\n
"
,
UE_id
);
const
NR_PDSCH_ServingCellConfig_t
*
pdsch
=
servingCellConfig
->
pdsch_ServingCellConfig
->
choice
.
setup
;
const
int
nrofHARQ
=
pdsch
->
nrofHARQ_ProcessesForPDSCH
?
get_nrofHARQ_ProcessesForPDSCH
(
*
pdsch
->
nrofHARQ_ProcessesForPDSCH
)
:
8
;
create_nr_list
(
&
sched_ctrl
->
available_dl_harq
,
nrofHARQ
);
// add all available HARQ processes for this UE
for
(
int
harq
=
0
;
harq
<
nrofHARQ
;
harq
++
)
add_tail_nr_list
(
&
sched_ctrl
->
available_dl_harq
,
harq
);
create_nr_list
(
&
sched_ctrl
->
feedback_dl_harq
,
nrofHARQ
);
create_nr_list
(
&
sched_ctrl
->
retrans_dl_harq
,
nrofHARQ
);
LOG_I
(
MAC
,
"gNB %d] Add NR UE_id %d : rnti %x
\n
"
,
mod_idP
,
UE_id
,
...
...
@@ -1656,6 +1690,10 @@ void mac_remove_nr_ue(module_id_t mod_id, rnti_t rnti)
UE_info
->
active
[
UE_id
]
=
FALSE
;
UE_info
->
rnti
[
UE_id
]
=
0
;
remove_nr_list
(
&
UE_info
->
list
,
UE_id
);
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
destroy_nr_list
(
&
sched_ctrl
->
available_dl_harq
);
destroy_nr_list
(
&
sched_ctrl
->
feedback_dl_harq
);
destroy_nr_list
(
&
sched_ctrl
->
retrans_dl_harq
);
LOG_I
(
MAC
,
"[gNB %d] Remove NR UE_id %d : rnti %x
\n
"
,
mod_id
,
UE_id
,
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
97430b5d
...
...
@@ -430,7 +430,14 @@ typedef struct {
uint8_t
tpc0
;
uint8_t
tpc1
;
uint16_t
ul_rssi
;
/// information about every HARQ process
NR_UE_harq_t
harq_processes
[
NR_MAX_NB_HARQ_PROCESSES
];
/// HARQ processes that are free
NR_list_t
available_dl_harq
;
/// HARQ processes that await feedback
NR_list_t
feedback_dl_harq
;
/// HARQ processes that await retransmission
NR_list_t
retrans_dl_harq
;
NR_UE_ul_harq_t
ul_harq_processes
[
NR_MAX_NB_HARQ_PROCESSES
];
int
dummy
;
NR_UE_mac_ce_ctrl_t
UE_mac_ce_ctrl
;
// MAC CE related information
...
...
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