X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fmac_sch_interface.h;h=63fc020a3b1096f44cd6e3377e0538d22d2b770c;hb=refs%2Fchanges%2F49%2F12949%2F3;hp=52591b69b69838f2b029cf9af2574da2d1bab21a;hpb=fcf583c575025651191abc59b4a4535a9d01eab1;p=o-du%2Fl2.git diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h index 52591b69b..63fc020a3 100644 --- a/src/cm/mac_sch_interface.h +++ b/src/cm/mac_sch_interface.h @@ -117,7 +117,7 @@ #define DEFAULT_K2_VALUE_FOR_SCS60 2 #define DEFAULT_K2_VALUE_FOR_SCS120 3 -#define MAX_PLMN 2 +#define MAX_PLMN 1 #define DL_DMRS_SYMBOL_POS 4 /* Bitmap value 00000000000100 i.e. using 3rd symbol for PDSCH DMRS */ #define MAX_PHR_REPORT 1 /*TODO: Range of PHR reports in multiple PHR.*/ @@ -789,8 +789,7 @@ typedef struct schBwpUlCfg typedef struct schPlmnInfoList { Plmn plmn; - uint8_t numSliceSupport; /* Total slice supporting */ - Snssai **snssai; /* List of supporting snssai*/ + SupportedSliceList suppSliceList; }SchPlmnInfoList; #ifdef NR_DRX @@ -1290,6 +1289,7 @@ typedef struct tbInfo typedef struct schPuschInfo { uint8_t harqProcId; /* HARQ Process ID */ + uint16_t crnti; FreqDomainAlloc fdAlloc; /* Freq domain allocation */ TimeDomainAlloc tdAlloc; /* Time domain allocation */ TbInfo tbInfo; /* TB info */ @@ -1334,6 +1334,7 @@ typedef struct schPucchFormatCfg typedef struct schPucchInfo { + uint16_t crnti; FreqDomainRsrc fdAlloc; TimeDomainAlloc tdAlloc; uint8_t srFlag; @@ -1354,6 +1355,7 @@ typedef struct schPucchInfo typedef struct schPuschUci { uint8_t harqProcId; /* HARQ Process ID */ + uint16_t crnti; FreqDomainAlloc fdAlloc; /* Freq domain allocation */ TimeDomainAlloc tdAlloc; /* Time domain allocation */ TbInfo tbInfo; /* TB information */ @@ -1365,13 +1367,12 @@ typedef struct schPuschUci typedef struct ulSchedInfo { uint16_t cellId; /* Cell Id */ - uint16_t crnti; /* CRNI */ SlotTimingInfo slotIndInfo; /* Slot Info: sfn, slot number */ uint8_t dataType; /* Type of info being scheduled */ SchPrachInfo prachSchInfo; /* Prach scheduling info */ - SchPuschInfo schPuschInfo; /* Pusch scheduling info */ - SchPuschUci schPuschUci; /* Pusch Uci */ - SchPucchInfo schPucchInfo; /* Pucch and Uci scheduling info */ + SchPuschInfo schPuschInfo[MAX_NUM_UE]; /* Pusch scheduling info */ + SchPuschUci schPuschUci[MAX_NUM_UE]; /* Pusch Uci */ + SchPucchInfo schPucchInfo[MAX_NUM_UE]; /* Pucch and Uci scheduling info */ }UlSchedInfo; /* Info of Scheduling Request to Add/Modify */