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
49c7dbf2
Commit
49c7dbf2
authored
Dec 11, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use three fields
parent
171f7842
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+4
-4
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
49c7dbf2
...
@@ -219,7 +219,7 @@ void nr_csi_meas_reporting(int Mod_idP,
...
@@ -219,7 +219,7 @@ void nr_csi_meas_reporting(int Mod_idP,
// we are scheduling pucch for csi in the first pucch occasion (this comes before ack/nack)
// we are scheduling pucch for csi in the first pucch occasion (this comes before ack/nack)
// FIXME: for the moment, we statically put it into the second sched_pucch!
// FIXME: for the moment, we statically put it into the second sched_pucch!
curr_pucch
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
[
1
];
curr_pucch
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
[
2
];
NR_PUCCH_CSI_Resource_t
*
pucchcsires
=
csirep
->
reportConfigType
.
choice
.
periodic
->
pucch_CSI_ResourceList
.
list
.
array
[
0
];
NR_PUCCH_CSI_Resource_t
*
pucchcsires
=
csirep
->
reportConfigType
.
choice
.
periodic
->
pucch_CSI_ResourceList
.
list
.
array
[
0
];
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
49c7dbf2
...
@@ -387,11 +387,11 @@ typedef struct {
...
@@ -387,11 +387,11 @@ typedef struct {
/// the currently active BWP in UL
/// the currently active BWP in UL
NR_BWP_Uplink_t
*
active_ubwp
;
NR_BWP_Uplink_t
*
active_ubwp
;
/// PUCCH scheduling information. Array of t
wo
, we assume for the moment:
/// PUCCH scheduling information. Array of t
hree
, we assume for the moment:
/// HARQ
(and SR) in the first field, CSI in second (as fixed by RRC conf.,
/// HARQ
in the first field, SR in second, CSI in third (as fixed by RRC
/// i.e. if actually present). The order is important for
///
conf.,
i.e. if actually present). The order is important for
/// nr_acknack_scheduling()!
/// nr_acknack_scheduling()!
NR_sched_pucch_t
sched_pucch
[
2
];
NR_sched_pucch_t
sched_pucch
[
3
];
NR_sched_pusch_save_t
pusch_save
;
NR_sched_pusch_save_t
pusch_save
;
NR_sched_pusch_t
sched_pusch
;
NR_sched_pusch_t
sched_pusch
;
...
...
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