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
lizhongxiao
OpenXG-RAN
Commits
79bbca5e
Commit
79bbca5e
authored
Mar 22, 2023
by
Stone WU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #126520: apply SS UL grant info(prb,mcs) to mac scheduling
parent
62ed2639
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
1 deletion
+20
-1
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+16
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-0
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
79bbca5e
...
@@ -439,6 +439,22 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, int pusch_AntennaPorts,
...
@@ -439,6 +439,22 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, int pusch_AntennaPorts,
}
}
int
rrc_mac_config_dedicate_scheduling
(
module_id_t
Mod_idP
,
NR_DcchDtchConfig_t
*
dcchDtchConfig
)
{
gNB_MAC_INST
*
nrmac
=
RC
.
nrmac
[
Mod_idP
];
if
(
dcchDtchConfig
!=
NULL
){
if
(
dcchDtchConfig
->
ul
&&
dcchDtchConfig
->
ul
->
dci_info
){
NR_DciFormat_0_X_ResourceAssignment_t
*
dci0_resouceAssignment
=
dcchDtchConfig
->
ul
->
dci_info
->
resoure_assignment
;
if
(
dci0_resouceAssignment
){
nrmac
->
min_grant_prb
=
dci0_resouceAssignment
->
Nprb
;
nrmac
->
min_grant_mcs
=
dci0_resouceAssignment
->
transportBlock_scheduling
.
imcs
;
LOG_I
(
NR_MAC
,
"config mac PUSCH scheduler rbSize:%d, mcs:%d
\n
"
,
nrmac
->
min_grant_prb
,
nrmac
->
min_grant_mcs
);
}
}
}
return
0
;
}
int
nr_mac_enable_ue_rrc_processing_timer
(
module_id_t
Mod_idP
,
rnti_t
rnti
,
NR_SubcarrierSpacing_t
subcarrierSpacing
,
uint32_t
rrc_reconfiguration_delay
)
{
int
nr_mac_enable_ue_rrc_processing_timer
(
module_id_t
Mod_idP
,
rnti_t
rnti
,
NR_SubcarrierSpacing_t
subcarrierSpacing
,
uint32_t
rrc_reconfiguration_delay
)
{
if
(
rrc_reconfiguration_delay
==
0
)
{
if
(
rrc_reconfiguration_delay
==
0
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
79bbca5e
...
@@ -1584,7 +1584,7 @@ void pf_ul(module_id_t module_id,
...
@@ -1584,7 +1584,7 @@ void pf_ul(module_id_t module_id,
gNB_MAC_INST
*
nrmac
=
RC
.
nrmac
[
module_id
];
gNB_MAC_INST
*
nrmac
=
RC
.
nrmac
[
module_id
];
NR_ServingCellConfigCommon_t
*
scc
=
nrmac
->
common_channels
[
CC_id
].
ServingCellConfigCommon
;
NR_ServingCellConfigCommon_t
*
scc
=
nrmac
->
common_channels
[
CC_id
].
ServingCellConfigCommon
;
const
int
min_rb
=
5
;
int
min_rb
=
max
(
nrmac
->
min_grant_prb
,
5
)
;
// UEs that could be scheduled
// UEs that could be scheduled
UEsched_t
UE_sched
[
MAX_MOBILES_PER_GNB
]
=
{
0
};
UEsched_t
UE_sched
[
MAX_MOBILES_PER_GNB
]
=
{
0
};
int
remainUEs
=
max_num_ue
;
int
remainUEs
=
max_num_ue
;
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
79bbca5e
...
@@ -48,6 +48,8 @@ int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP,
...
@@ -48,6 +48,8 @@ int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP,
NR_SubcarrierSpacing_t
subcarrierSpacing
,
NR_SubcarrierSpacing_t
subcarrierSpacing
,
uint32_t
rrc_reconfiguration_delay
);
uint32_t
rrc_reconfiguration_delay
);
int
rrc_mac_config_dedicate_scheduling
(
module_id_t
Mod_idP
,
NR_DcchDtchConfig_t
*
dcchDtchConfig
);
int
rrc_mac_config_req_gNB
(
module_id_t
Mod_idP
,
int
rrc_mac_config_req_gNB
(
module_id_t
Mod_idP
,
rrc_pdsch_AntennaPorts_t
pdsch_AntennaPorts
,
rrc_pdsch_AntennaPorts_t
pdsch_AntennaPorts
,
int
pusch_AntennaPorts
,
int
pusch_AntennaPorts
,
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
79bbca5e
...
@@ -182,6 +182,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
...
@@ -182,6 +182,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
NULL
);
NULL
);
mac_common_config_done
=
1
;
mac_common_config_done
=
1
;
}
}
rrc_mac_config_dedicate_scheduling
(
rrc
->
module_id
,
rrc
->
carrier
.
dcchDtchConfig
);
}
}
/* set flag to indicate that cell information is configured. This is required
/* set flag to indicate that cell information is configured. This is required
...
...
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