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
5bae6dd6
Commit
5bae6dd6
authored
Feb 23, 2022
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing fiels in fapi_nr_dl_config_csirs_pdu_rel15_t
parent
3ae8f393
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+2
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+5
-0
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+1
-1
No files found.
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @
5bae6dd6
...
@@ -489,6 +489,8 @@ typedef struct {
...
@@ -489,6 +489,8 @@ typedef struct {
uint8_t
cdm_type
;
uint8_t
cdm_type
;
uint8_t
freq_density
;
//The density field, p and comb offset (for dot5).0: dot5 (even RB), 1: dot5 (odd RB), 2: one, 3: three
uint8_t
freq_density
;
//The density field, p and comb offset (for dot5).0: dot5 (even RB), 1: dot5 (odd RB), 2: one, 3: three
uint16_t
scramb_id
;
//ScramblingID of the CSI-RS [TS38.214, sec 5.2.2.3.1] Value: 0->1023
uint16_t
scramb_id
;
//ScramblingID of the CSI-RS [TS38.214, sec 5.2.2.3.1] Value: 0->1023
uint8_t
power_control_offset
;
//Ratio of PDSCH EPRE to NZP CSI-RSEPRE Value :0->23 representing -8 to 15 dB in 1dB steps
uint8_t
power_control_offset_ss
;
//Ratio of SSB/PBCH block EPRE to NZP CSI-RS EPRES 0: -3dB, 1: 0dB, 2: 3dB, 3: 6dB
}
fapi_nr_dl_config_csirs_pdu_rel15_t
;
}
fapi_nr_dl_config_csirs_pdu_rel15_t
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
5bae6dd6
...
@@ -2457,6 +2457,11 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) {
...
@@ -2457,6 +2457,11 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) {
&&
(
resourceMapping
.
density
.
choice
.
dot5
==
NR_CSI_RS_ResourceMapping__density__dot5_evenPRBs
))
&&
(
resourceMapping
.
density
.
choice
.
dot5
==
NR_CSI_RS_ResourceMapping__density__dot5_evenPRBs
))
csirs_config_pdu
->
freq_density
--
;
csirs_config_pdu
->
freq_density
--
;
csirs_config_pdu
->
scramb_id
=
nzpcsi
->
scramblingID
;
csirs_config_pdu
->
scramb_id
=
nzpcsi
->
scramblingID
;
csirs_config_pdu
->
power_control_offset
=
nzpcsi
->
powerControlOffset
+
8
;
if
(
nzpcsi
->
powerControlOffsetSS
)
csirs_config_pdu
->
power_control_offset_ss
=
*
nzpcsi
->
powerControlOffsetSS
;
else
csirs_config_pdu
->
power_control_offset_ss
=
1
;
// 0 dB
switch
(
resourceMapping
.
frequencyDomainAllocation
.
present
){
switch
(
resourceMapping
.
frequencyDomainAllocation
.
present
){
case
NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1
:
case
NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1
:
csirs_config_pdu
->
row
=
1
;
csirs_config_pdu
->
row
=
1
;
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
5bae6dd6
...
@@ -1510,7 +1510,7 @@ void fill_initial_SpCellConfig(int uid,
...
@@ -1510,7 +1510,7 @@ void fill_initial_SpCellConfig(int uid,
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
=
calloc
(
1
,
sizeof
(
*
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
));
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
=
calloc
(
1
,
sizeof
(
*
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
));
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
->
csi_SSB_ResourceSetList
=
calloc
(
1
,
sizeof
(
*
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
->
csi_SSB_ResourceSetList
));
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
->
csi_SSB_ResourceSetList
=
calloc
(
1
,
sizeof
(
*
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
->
csi_SSB_ResourceSetList
));
NR_CSI_SSB_ResourceSetId_t
*
ssbres00
=
calloc
(
1
,
sizeof
(
*
ssbres00
));
NR_CSI_SSB_ResourceSetId_t
*
ssbres00
=
calloc
(
1
,
sizeof
(
*
ssbres00
));
*
ssbres00
=
0
;
*
ssbres00
=
0
;
ASN_SEQUENCE_ADD
(
&
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
->
csi_SSB_ResourceSetList
->
list
,
ssbres00
);
ASN_SEQUENCE_ADD
(
&
csires1
->
csi_RS_ResourceSetList
.
choice
.
nzp_CSI_RS_SSB
->
csi_SSB_ResourceSetList
->
list
,
ssbres00
);
csires1
->
bwp_Id
=
0
;
csires1
->
bwp_Id
=
0
;
csires1
->
resourceType
=
NR_CSI_ResourceConfig__resourceType_periodic
;
csires1
->
resourceType
=
NR_CSI_ResourceConfig__resourceType_periodic
;
...
...
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