X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.h;h=fabeaaf2949319fc112b133617ba97011106df37;hb=62605166db94fd7d52f32de84dea8c7006e0f4c5;hp=ffe59785cf78ea6b3dd00ab6596838a66d54ad3b;hpb=cbb4a6f503471e0f923b080a3add21f933b76e95;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index ffe59785c..fabeaaf29 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -148,7 +148,8 @@ #define SIB1_VALUE_TAG 10 /* MACRO Ddefine for PDSCH Configuration */ -#define PDSCH_K0 0 +#define PDSCH_K0_CFG1 0 +#define PDSCH_K0_CFG2 1 #define PDSCH_START_SYMBOL 3 #define PDSCH_LENGTH_SYMBOL 11 #define PDSCH_RES_ALLOC_TYPE 1 /* Resource allocation type */ @@ -157,7 +158,9 @@ #define PDSCH_NUM_HARQ_PROC 5 /* MACRO Define for PUSCH Configuration */ -#define PUSCH_K2 3 +#define MAX_UL_ALLOC 16 +#define PUSCH_K2_CFG1 3 +#define PUSCH_K2_CFG2 4 #define PUSCH_START_SYMBOL 3 #define PUSCH_LENGTH_SYMBOL 11 @@ -1086,12 +1089,18 @@ typedef struct pdcchCfgCommon long raSearchSpc; /* Id of search space for Random Access proc */ }PdcchCfgCommon; -typedef struct pdschCfgCommon +typedef struct pdschTimeDomainRsrcAlloc { - uint8_t present; long k0; long mapType; /* Mapping Type */ uint16_t sliv; +}PdschTimeDomainRsrcAlloc; + +typedef struct pdschCfgCommon +{ + uint8_t present; + uint8_t numTimeDomRsrcAlloc; + PdschTimeDomainRsrcAlloc timeDomAlloc[MAX_NUM_DL_ALLOC]; }PdschCfgCommon; typedef struct bcchCfg @@ -1149,12 +1158,18 @@ typedef struct rachCfgCommon long restrictedSetCfg; /* Restricted set configuration */ }RachCfgCommon; -typedef struct puschCfgCommon +typedef struct puschCfgCmnTimeDomAlloc { - uint8_t present; long k2; long mapType; uint16_t sliv; +}PuschCfgCmnTimeDomAlloc; + +typedef struct puschCfgCommon +{ + uint8_t puschCfgPresent; + uint8_t numTimeDomRsrcAlloc; + PuschCfgCmnTimeDomAlloc timeDomAllocList[MAX_UL_ALLOC]; long msg3DeltaPreamble; long p0NominalWithGrant; }PuschCfgCommon;