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
canghaiwuhen
OpenXG-RAN
Commits
22107302
Commit
22107302
authored
Sep 03, 2020
by
r.karey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added debug logs
parent
532fdbb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+11
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+1
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
22107302
...
...
@@ -375,9 +375,18 @@ void update_csi_bitlen (NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_list_t *UE_li
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
nb_ssbri_cri
=
2
;
nb_ssb_resources
=
csi_MeasConfig
->
csi_SSB_ResourceSetToAddModList
->
list
.
array
[
csi_ssb_idx
]
->
csi_SSB_ResourceList
.
list
.
count
;
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
cri_ssbri_bitlen
=
nb_ssb_resources
>
1
?
log
(
nb_ssb_resources
)
/
log
(
2
)
:
1
;
if
(
nb_ssb_resources
)
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
cri_ssbri_bitlen
=
nb_ssb_resources
>
1
?
ceil
(
log2
(
nb_ssb_resources
))
:
1
;
else
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
cri_ssbri_bitlen
=
nb_ssb_resources
;
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
rsrp_bitlen
=
7
;
//From spec 38.212 Table 6.3.1.1.2-6: CRI, SSBRI, and RSRP
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
diff_rsrp_bitlen
=
4
;
//From spec 38.212 Table 6.3.1.1.2-6: CRI, SSBRI, and RSRP
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
diff_rsrp_bitlen
=
4
;
//From spec 38.212 Table 6.3.1.1.2-6: CRI, SSBRI, and RSRP
LOG_I
(
MAC
,
"UCI: CSI_bit len : ssbri %d, rsrp: %d, diff_rsrp: %d"
,
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
cri_ssbri_bitlen
,
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
rsrp_bitlen
,
UE_list
->
csi_report_template
[
UE_id
][
csi_report_id
].
CSI_report_bitlen
[
0
].
diff_rsrp_bitlen
);
break
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
22107302
...
...
@@ -688,6 +688,7 @@ void nr_schedule_pucch(int Mod_idP,
O_csi
=
get_csi_bitlen
(
Mod_idP
,
UE_id
,
UE_list
,
frameP
,
slotP
,
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
);
O_uci
=
O_ack
+
O_csi
;
// for now we are just sending acknacks in pucch
LOG_I
(
MAC
,
"Scheduling pucch reception for frame %d slot %d
\n
"
,
frameP
,
slotP
);
LOG_I
(
MAC
,
"UCI: Harq bitlen %d csi_report bitlen %d uci bitlen %d
\n
"
,
O_ack
,
O_csi
,
O_uci
);
nr_configure_pucch
(
pucch_pdu
,
scc
,
ubwp
,
...
...
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