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
Michael Black
OpenXG-RAN
Commits
d7453508
Commit
d7453508
authored
Aug 13, 2020
by
r.karey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added more debug logs
parent
3e1b27c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+1
-1
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+8
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
d7453508
...
@@ -1561,7 +1561,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
...
@@ -1561,7 +1561,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
if
(
curr_pucch
->
dai_c
<
MAX_ACK_BITS
)
{
if
(
curr_pucch
->
dai_c
<
MAX_ACK_BITS
)
{
curr_pucch
->
frame
=
frameP
;
curr_pucch
->
frame
=
frameP
;
curr_pucch
->
dai_c
++
;
curr_pucch
->
dai_c
++
;
curr_pucch
->
resource_indicator
=
0
;
// in phytest with only 1 UE we are using just the 1st resource
curr_pucch
->
resource_indicator
=
4
;
//
0; // in phytest with only 1 UE we are using just the 1st resource
// first pucch occasion in first UL or MIXED slot
// first pucch occasion in first UL or MIXED slot
first_ul_slot_tdd
=
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofDownlinkSlots
;
first_ul_slot_tdd
=
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofDownlinkSlots
;
i
=
0
;
i
=
0
;
...
...
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
View file @
d7453508
...
@@ -125,11 +125,14 @@ void extract_pucch_csi_report ( NR_CSI_MeasConfig_t *csi_MeasConfig,
...
@@ -125,11 +125,14 @@ void extract_pucch_csi_report ( NR_CSI_MeasConfig_t *csi_MeasConfig,
if
(
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportConfigType
.
present
==
NR_CSI_ReportConfig__reportConfigType_PR_periodic
)
{
if
(
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportConfigType
.
present
==
NR_CSI_ReportConfig__reportConfigType_PR_periodic
)
{
//considering 30khz scs and
//considering 30khz scs and
//Has to implement according to reportSlotConfig type
//Has to implement according to reportSlotConfig type
LOG_I
(
PHY
,
"SFN/SF:%d%d
\n
"
,
frame
,
slot
);
if
(((
NR_SubcarrierSpacing_kHz30
==
scs
)
&&
if
(((
NR_SubcarrierSpacing_kHz30
==
scs
)
&&
(
0
==
((
frame
*
20
)
+
slot
)
%
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportConfigType
.
choice
.
periodic
->
reportSlotConfig
.
choice
.
slots320
))
(
0
==
((
frame
*
20
)
+
(
slot
+
1
)
)
%
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportConfigType
.
choice
.
periodic
->
reportSlotConfig
.
choice
.
slots320
))
||
((
NR_SubcarrierSpacing_kHz120
==
scs
)
&&
||
((
NR_SubcarrierSpacing_kHz120
==
scs
)
&&
(
0
==
((
frame
*
80
)
+
slot
)
%
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportConfigType
.
choice
.
periodic
->
reportSlotConfig
.
choice
.
slots320
))){
(
0
==
((
frame
*
80
)
+
(
slot
+
1
)
)
%
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportConfigType
.
choice
.
periodic
->
reportSlotConfig
.
choice
.
slots320
))){
reportQuantity_type
=
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportQuantity
.
present
;
reportQuantity_type
=
csi_MeasConfig
->
csi_ReportConfigToAddModList
->
list
.
array
[
csi_report_id
]
->
reportQuantity
.
present
;
LOG_I
(
PHY
,
"SFN/SF:%d%d reportQuantity type = %d
\n
"
,
frame
,
slot
,
reportQuantity_type
);
}
}
}
}
}
}
...
@@ -374,6 +377,9 @@ void handle_nr_uci(NR_UL_IND_t *UL_info, NR_UE_sched_ctrl_t *sched_ctrl) {
...
@@ -374,6 +377,9 @@ void handle_nr_uci(NR_UL_IND_t *UL_info, NR_UE_sched_ctrl_t *sched_ctrl) {
int
bwp_id
=
1
;
int
bwp_id
=
1
;
NR_BWP_Uplink_t
*
ubwp
=
RC
.
nrmac
[
Mod_idP
]
->
UE_list
.
secondaryCellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_id
-
1
];
NR_BWP_Uplink_t
*
ubwp
=
RC
.
nrmac
[
Mod_idP
]
->
UE_list
.
secondaryCellGroup
[
UE_id
]
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
bwp_id
-
1
];
NR_SubcarrierSpacing_t
scs
=
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
NR_SubcarrierSpacing_t
scs
=
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
LOG_I
(
PHY
,
"SFN/SF:%d%d scs %d
\n
"
,
UL_info
->
frame
,
UL_info
->
slot
,
scs
);
//API to parse the csi report and store it into sched_ctrl
//API to parse the csi report and store it into sched_ctrl
extract_pucch_csi_report
(
csi_MeasConfig
,
uci_pdu
,
sched_ctrl
,
UL_info
->
frame
,
UL_info
->
slot
,
scs
);
extract_pucch_csi_report
(
csi_MeasConfig
,
uci_pdu
,
sched_ctrl
,
UL_info
->
frame
,
UL_info
->
slot
,
scs
);
}
}
...
...
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