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
82d40a65
Commit
82d40a65
authored
Feb 02, 2021
by
dir
Committed by
Thomas Schlichter
Feb 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transform precoding related changes
parent
bca9f74e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
18 deletions
+15
-18
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+13
-17
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+2
-1
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
82d40a65
...
...
@@ -2389,35 +2389,31 @@ uint8_t get_transformPrecoding(NR_ServingCellConfigCommon_t *scc,
int
rnti_type
,
uint8_t
configuredGrant
){
uint8_t
cg_transformPrecoder
=
0
;
if
(
configuredGrant
)
{
if
(
ubwp
->
bwp_Dedicated
->
configuredGrantConfig
){
if
(
ubwp
->
bwp_Dedicated
->
configuredGrantConfig
->
choice
.
setup
->
transformPrecoder
){
if
(
ubwp
->
bwp_Dedicated
->
configuredGrantConfig
)
{
if
(
ubwp
->
bwp_Dedicated
->
configuredGrantConfig
->
choice
.
setup
->
transformPrecoder
)
{
return
*
ubwp
->
bwp_Dedicated
->
configuredGrantConfig
->
choice
.
setup
->
transformPrecoder
;
}
else
{
cg_transformPrecoder
=
1
;
}
}
}
if
(
rnti_type
==
NR_RNTI_RA
||
*
dci_format
==
NR_UL_DCI_FORMAT_0_0
||
cg_transformPrecoder
){
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
==
NULL
)
{
return
1
;
}
else
{
return
0
;
if
(
rnti_type
!=
NR_RNTI_RA
)
{
if
(
*
dci_format
!=
NR_UL_DCI_FORMAT_0_0
)
{
if
(
pusch_config
->
transformPrecoder
!=
NULL
)
{
return
*
pusch_config
->
transformPrecoder
;
}
}
}
}
else
if
(
*
dci_format
!=
NR_UL_DCI_FORMAT_0_0
&&
pusch_config
->
transformPrecoder
!=
NULL
)
{
return
*
pusch_config
->
transformPrecoder
;
if
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
==
NULL
)
{
return
1
;
// Transformprecoding disabled
}
else
{
LOG_D
(
PHY
,
"MAC_COMMON: Transform Precodig enabled through msg3_transformPrecoder
\n
"
);
return
0
;
// Enabled
}
LOG_E
(
MAC
,
"In %s: could not fetch transform precoder status...
\n
"
,
__FUNCTION__
);
return
-
1
;
}
uint16_t
nr_dci_size
(
NR_ServingCellConfigCommon_t
*
scc
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
82d40a65
...
...
@@ -689,7 +689,8 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
/* DMRS */
l_prime_mask
=
get_l_prime
(
pusch_config_pdu
->
nr_of_symbols
,
typeB
,
pusch_dmrs_pos0
,
pusch_len1
);
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
=
1
;
if
(
pusch_config_pdu
->
transform_precoding
==
transform_precoder_disabled
)
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
=
1
;
// Num PRB Overhead from PUSCH-ServingCellConfig
if
(
mac
->
scg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
pusch_ServingCellConfig
->
choice
.
setup
->
xOverhead
==
NULL
)
{
...
...
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