Commit 03988632 authored by Robert Schmidt's avatar Robert Schmidt

Use three fields

parent 6f4aa16c
...@@ -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];
......
...@@ -385,11 +385,11 @@ typedef struct { ...@@ -385,11 +385,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 two, we assume for the moment: /// PUCCH scheduling information. Array of three, 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment