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
zzha zzha
OpenXG-RAN
Commits
7018b7c8
Commit
7018b7c8
authored
May 19, 2022
by
Roberto Louro Magueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes after merge
parent
9887982e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
+3
-0
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+5
-0
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
View file @
7018b7c8
...
...
@@ -541,6 +541,9 @@ typedef struct nr_csi_report {
uint8_t
nb_of_csi_ssb_report
;
L1_RSRP_bitlen_t
CSI_report_bitlen
;
CSI_Meas_bitlen_t
csi_meas_bitlen
;
int
codebook_mode
;
int
N1
;
int
N2
;
}
nr_csi_report_t
;
#endif
/*__LAYER2_MAC_H__ */
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
7018b7c8
...
...
@@ -4543,6 +4543,8 @@ void compute_pmi_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
if
(
codebookConfig
->
codebookType
.
choice
.
type1
->
subType
.
present
==
NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel
)
{
if
(
codebookConfig
->
codebookType
.
choice
.
type1
->
subType
.
choice
.
typeI_SinglePanel
->
nrOfAntennaPorts
.
present
==
NR_CodebookConfig__codebookType__type1__subType__typeI_SinglePanel__nrOfAntennaPorts_PR_two
)
{
csi_report
->
N1
=
1
;
csi_report
->
N2
=
1
;
if
(
i
==
0
)
csi_report
->
csi_meas_bitlen
.
pmi_x2_bitlen
[
i
]
=
2
;
if
(
i
==
1
)
...
...
@@ -4552,6 +4554,9 @@ void compute_pmi_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
int
n1
,
n2
,
o1
,
o2
,
x1
,
x2
;
get_n1n2_o1o2_singlepanel
(
&
n1
,
&
n2
,
&
o1
,
&
o2
,
codebookConfig
->
codebookType
.
choice
.
type1
->
subType
.
choice
.
typeI_SinglePanel
->
nrOfAntennaPorts
.
choice
.
moreThanTwo
);
get_x1x2_bitlen_singlepanel
(
n1
,
n2
,
o1
,
o2
,
&
x1
,
&
x2
,
i
+
1
,
codebookConfig
->
codebookType
.
choice
.
type1
->
codebookMode
);
csi_report
->
N1
=
n1
;
csi_report
->
N2
=
n2
;
csi_report
->
codebook_mode
=
codebookConfig
->
codebookType
.
choice
.
type1
->
codebookMode
;
csi_report
->
csi_meas_bitlen
.
pmi_x1_bitlen
[
i
]
=
x1
;
csi_report
->
csi_meas_bitlen
.
pmi_x2_bitlen
[
i
]
=
x2
;
}
...
...
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