X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fdu_app_mac_inf.h;h=5b770d1ddbda8b79fa36004f14b5f3c339404133;hb=ef723e2e773fc6a6dcff43005569e509201df198;hp=45db1b85ef082819b0e110ece9b3ebaca827505f;hpb=15c1e4f846f9935150615a5e9e7f94500bd62790;p=o-du%2Fl2.git diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h index 45db1b85e..5b770d1dd 100644 --- a/src/cm/du_app_mac_inf.h +++ b/src/cm/du_app_mac_inf.h @@ -21,12 +21,9 @@ #define __MACINT_H__ #define NUM_NUMEROLOGY 5 /* Number of numerology */ -#define MAXIMUM_TDD_PERIODICITY 5 -#define MAX_SYMB_PER_SLOT 14 #define NUM_SSB 1 /* max value is 64 */ #define SSB_MASK_SIZE 1 /* SSB mask size is 32bit for sub6 */ -#define SIB1_NEW_TX_PERIOD 160 #define SIB1_REPETITION_PERIOD 20 #define CORESET_0_INDEX 0 #define CORESET_1_INDEX 1 @@ -53,16 +50,23 @@ #define MAX_NUM_UL_ALLOC 16 /* Max number of pusch time domain uplink allocation */ #define SD_SIZE 3 /* Max size of Slice Differentiator in S-NSSAI */ -#define MAX_NUM_SRB 8 -#define MAX_NUM_DRB 64 #define MAX_NUM_SCELL 32 +/* PUCCH Configuration Macro */ +#define MAX_NUM_PUCCH_RESRC 128 +#define MAX_NUM_PUCCH_RESRC_SET 4 +#define MAX_NUM_PUCCH_PER_RESRC_SET 32 +#define MAX_NUM_SPATIAL_RELATIONS 8 +#define MAX_NUM_PUCCH_P0_PER_SET 8 +#define MAX_NUM_PATH_LOSS_REF_RS 4 +#define MAX_NUM_DL_DATA_TO_UL_ACK 15 + /* Event IDs */ #define EVENT_MAC_CELL_CONFIG_REQ 200 #define EVENT_MAC_CELL_CONFIG_CFM 201 -#define EVENT_MAC_CELL_START_REQ 202 -#define EVENT_MAC_CELL_STOP_REQ 203 -#define EVENT_MAC_SLOT_IND 204 +#define EVENT_MAC_CELL_START 202 +#define EVENT_MAC_CELL_STOP 203 +#define EVENT_MAC_CELL_UP_IND 204 #define EVENT_MAC_STOP_IND 205 #define EVENT_MAC_UL_CCCH_IND 206 #define EVENT_MAC_DL_CCCH_IND 207 @@ -70,6 +74,10 @@ #define EVENT_MAC_UE_CREATE_RSP 209 #define EVENT_MAC_UE_RECONFIG_REQ 210 #define EVENT_MAC_UE_RECONFIG_RSP 211 +#define EVENT_MAC_UE_DELETE_REQ 212 +#define EVENT_MAC_UE_DELETE_RSP 213 +#define EVENT_MAC_CELL_DELETE_REQ 214 +#define EVENT_MAC_CELL_DELETE_RSP 215 #define BSR_PERIODIC_TIMER_SF_10 10 #define BSR_RETX_TIMER_SF_320 320 @@ -81,6 +89,19 @@ typedef enum MAC_DU_APP_RSP_OK }MacRsp; +typedef enum +{ + SUCCESS, + CELLID_INVALID, + UEIDX_INVALID +}UeDeleteStatus; + +typedef enum +{ + SUCCESSFUL_RSP, + CELL_ID_INVALID +}CellDeleteStatus; + typedef enum { DUP_MODE_FDD, @@ -114,25 +135,6 @@ typedef enum RSSI_UNIT_DBFS }RSSIMeasUnit; -typedef enum -{ - DL_SLOT, - UL_SLOT, - GUARD_SLOT -}SlotConfig; - -typedef enum -{ - TX_PRDCTY_MS_0P5, - TX_PRDCTY_MS_0P625, - TX_PRDCTY_MS_1, - TX_PRDCTY_MS_1P25, - TX_PRDCTY_MS_2, - TX_PRDCTY_MS_2P5, - TX_PRDCTY_MS_5, - TX_PRDCTY_MS_10 -}DlUlTxPeriodicity; - typedef enum { BETA_PSS_0DB, @@ -554,18 +556,10 @@ typedef struct prachCfg uint8_t raRspWindow; /* RA Response Window */ }PrachCfg; -typedef struct tddCfg -{ - bool pres; - DlUlTxPeriodicity tddPeriod; /* DL UL Transmission periodicity */ - SlotConfig slotCfg[MAXIMUM_TDD_PERIODICITY][MAX_SYMB_PER_SLOT]; -}TDDCfg; - typedef struct sib1CellCfg { uint8_t *sib1Pdu; uint16_t sib1PduLen; - uint16_t sib1NewTxPeriod; uint16_t sib1RepetitionPeriod; uint8_t coresetZeroIndex; /* derived from 4 LSB of pdcchSib1 present in MIB */ uint8_t searchSpaceZeroIndex; /* derived from 4 MSB of pdcchSib1 present in MIB */ @@ -646,16 +640,19 @@ typedef struct bwpUlConfig typedef struct macCellCfg { - uint16_t cellId; /* Cell Id */ - uint8_t carrierId; /* Carrired Index */ - uint16_t phyCellId; /* Physical cell id */ + uint16_t cellId; /* Cell Id */ + uint8_t carrierId; /* Carrired Index */ + uint16_t phyCellId; /* Physical cell id */ + uint8_t numerology; /* Supported numerology */ DuplexMode dupType; /* Duplex type: TDD/FDD */ CarrierCfg dlCarrCfg; /* DL Carrier configuration */ CarrierCfg ulCarrCfg; /* UL Carrier configuration */ bool freqShft; /* Indicates presence of 7.5kHz frequency shift */ SsbCfg ssbCfg; /* SSB configuration */ PrachCfg prachCfg; /* PRACH Configuration */ +#ifdef NR_TDD TDDCfg tddCfg; /* TDD periodicity and slot configuration */ +#endif RSSIMeasUnit rssiUnit; /* RSSI measurement unit */ Sib1CellCfg sib1Cfg; /* SIB1 config */ BwpDlConfig initialDlBwp; /* Initial DL BWP */ @@ -665,20 +662,10 @@ typedef struct macCellCfg typedef struct macCellCfgCfm { - uint16_t cellId; + uint16_t cellId; uint8_t rsp; }MacCellCfgCfm; -typedef struct macCellStartInfo -{ - uint16_t cellId; -}MacCellStartInfo; - -typedef struct macCellStopInfo -{ - uint16_t cellId; -}MacCellStopInfo; - typedef struct ulCcchInd { uint16_t cellId; @@ -874,9 +861,171 @@ typedef struct pdschServCellCfg }PdschServCellCfg; /* PUCCH Configuration */ + +typedef struct pucchResrcSetInfo +{ + uint8_t resrcSetId; + uint8_t resrcListCount; + uint8_t resrcList[MAX_NUM_PUCCH_PER_RESRC_SET]; + uint8_t maxPayLoadSize; +}PucchResrcSetInfo; + +typedef struct pucchResrcSetCfg +{ + uint8_t resrcSetToAddModListCount; + PucchResrcSetInfo resrcSetToAddModList[MAX_NUM_PUCCH_RESRC_SET]; + uint8_t resrcSetToRelListCount; + uint8_t resrcSetToRelList[MAX_NUM_PUCCH_RESRC]; +}PucchResrcSetCfg; + +typedef struct pucchFormat0 +{ + uint8_t initialCyclicShift; + uint8_t numSymbols; + uint8_t startSymbolIdx; +}PucchFormat0; + +typedef struct pucchFormat1 +{ + uint8_t initialCyclicShift; + uint8_t numSymbols; + uint8_t startSymbolIdx; + uint8_t timeDomOCC; +}PucchFormat1; + +typedef struct pucchFormat2_3 +{ + uint8_t numPrbs; + uint8_t numSymbols; + uint8_t startSymbolIdx; +}PucchFormat2_3; + +typedef struct pucchFormat4 +{ + uint8_t numSymbols; + uint8_t occLen; + uint8_t occIdx; + uint8_t startSymbolIdx; +}PucchFormat4; + +typedef struct pucchResrcInfo +{ + uint8_t resrcId; + uint16_t startPrb; + uint8_t intraFreqHop; + uint16_t secondPrbHop; + uint8_t pucchFormat; + union + { + PucchFormat0 *format0; + PucchFormat1 *format1; + PucchFormat2_3 *format2; + PucchFormat2_3 *format3; + PucchFormat4 *format4; + }PucchFormat; +}PucchResrcInfo; + +typedef struct pucchResrcCfg +{ + uint8_t resrcToAddModListCount; + PucchResrcInfo resrcToAddModList[MAX_NUM_PUCCH_RESRC]; + uint8_t resrcToRelListCount; + uint8_t resrcToRelList[MAX_NUM_PUCCH_RESRC]; +}PucchResrcCfg; + +typedef struct pucchFormatCfg +{ + uint8_t interSlotFreqHop; + uint8_t addDmrs; + uint8_t maxCodeRate; + uint8_t numSlots; + bool pi2BPSK; + bool harqAckCSI; +}PucchFormatCfg; + +typedef struct schedReqResrcInfo +{ + uint8_t resrcId; + uint8_t requestId; + uint8_t periodicity; + uint16_t offset; + uint8_t resrc; +}SchedReqResrcInfo; + +typedef struct pucchSchedReqCfg +{ + uint8_t schedAddModListCount; + SchedReqResrcInfo schedAddModList[MAX_NUM_SR_CFG_PER_CELL_GRP]; + uint8_t schedRelListCount; + uint8_t schedRelList[MAX_NUM_SR_CFG_PER_CELL_GRP]; +}PucchSchedReqCfg; + +typedef struct spatialRelationInfo +{ + uint8_t spatialRelationId; + uint8_t servCellIdx; + uint8_t pathLossRefRSId; + uint8_t p0PucchId; + uint8_t closeLoopIdx; +}SpatialRelationInfo; + +typedef struct pucchSpatialCfg +{ + uint8_t spatialAddModListCount; + SpatialRelationInfo spatialAddModList[MAX_NUM_SPATIAL_RELATIONS]; + uint8_t spatialRelListCount; + uint8_t spatialRelList[MAX_NUM_SPATIAL_RELATIONS]; +}PucchSpatialCfg; + +typedef struct p0PucchCfg +{ + uint8_t p0PucchId; + int p0PucchVal; +}P0PucchCfg; + +typedef struct pathLossRefRSCfg +{ + uint8_t pathLossRefRSId; +}PathLossRefRSCfg; + +typedef struct pucchMultiCsiCfg +{ + uint8_t multiCsiResrcListCount; + uint8_t multiCsiResrcList[MAX_NUM_PUCCH_RESRC-1]; +}PucchMultiCsiCfg; + +typedef struct pucchDlDataToUlAck +{ + uint8_t dlDataToUlAckListCount; + uint8_t dlDataToUlAckList[MAX_NUM_DL_DATA_TO_UL_ACK]; +}PucchDlDataToUlAck; + +typedef struct pucchPowerControl +{ + int deltaF_Format0; + int deltaF_Format1; + int deltaF_Format2; + int deltaF_Format3; + int deltaF_Format4; + uint8_t p0SetCount; + P0PucchCfg p0Set[MAX_NUM_PUCCH_P0_PER_SET]; + uint8_t pathLossRefRSListCount; + PathLossRefRSCfg pathLossRefRSList[MAX_NUM_PATH_LOSS_REF_RS]; +}PucchPowerControl; + typedef struct pucchCfg { - /* TODO : Not used currently */ + PucchResrcSetCfg *resrcSet; + PucchResrcCfg *resrc; + PucchFormatCfg *format1; + PucchFormatCfg *format2; + PucchFormatCfg *format3; + PucchFormatCfg *format4; + PucchSchedReqCfg *schedReq; + PucchMultiCsiCfg *multiCsiCfg; + PucchSpatialCfg *spatialInfo; + PucchDlDataToUlAck *dlDataToUlAck; + PucchPowerControl *powerControl; }PucchCfg; /* Transform precoding disabled */ @@ -954,7 +1103,6 @@ typedef struct spCellCfg typedef struct ambrCfg { uint32_t ulBr; /* UL Bit rate */ - uint32_t dlBr; /* DL Bit rate */ }AmbrCfg; /* Single Network Slice Selection assistance Info */ @@ -1050,8 +1198,11 @@ typedef struct macUeCfg uint16_t cellId; uint8_t ueIdx; uint16_t crnti; + bool macCellGrpCfgPres; MacCellGrpCfg macCellGrpCfg; + bool phyCellGrpCfgPres; PhyCellGrpCfg phyCellGrpCfg; + bool spCellCfgPres; SpCellCfg spCellCfg; AmbrCfg *ambrCfg; ModulationInfo dlModInfo; /* DL modulation info */ @@ -1098,25 +1249,51 @@ typedef struct ueCfgRsp SCellFailInfo *failedSCellList; }MacUeCfgRsp; +typedef struct ueDelete +{ + uint16_t cellId; + uint8_t ueIdx; + uint16_t crnti; +}MacUeDelete; + +typedef struct ueDeleteRsp +{ + uint16_t cellId; + uint8_t ueIdx; + UeDeleteStatus result; +}MacUeDeleteRsp; + +typedef struct macCellDelete +{ + uint16_t cellId; +}MacCellDelete; + +typedef struct macCellDeleteRsp +{ + uint16_t cellId; + CellDeleteStatus result; +} +MacCellDeleteRsp; + /* Functions for slot Ind from MAC to DU APP*/ -typedef uint8_t (*DuMacSlotInd) ARGS(( +typedef uint8_t (*DuMacCellUpInd) ARGS(( Pst *pst, - SlotIndInfo *slotInfo )); + OduCellId *cellId )); /* Functions for stop Ind from MAC to DU APP*/ typedef uint8_t (*DuMacStopInd) ARGS(( - Pst *pst, - MacCellStopInfo *cellId )); + Pst *pst, + OduCellId *cellId )); /* Functions for mac cell start req */ -typedef uint8_t (*DuMacCellStartReq) ARGS(( - Pst *pst, - MacCellStartInfo *cellStartInfo )); +typedef uint8_t (*DuMacCellStart) ARGS(( + Pst *pst, + OduCellId *cellId)); /* Functions for mac cell stop request */ -typedef uint8_t (*DuMacCellStopReq) ARGS(( - Pst *pst, - MacCellStopInfo *cellStopInfo )); +typedef uint8_t (*DuMacCellStop) ARGS(( + Pst *pst, + OduCellId *cellId )); /* Function pointers for packing macCellCfg Request and Confirm */ typedef uint8_t (*packMacCellCfgReq) ARGS(( @@ -1160,24 +1337,44 @@ typedef uint8_t (*DuMacUeReconfigReq) ARGS(( Pst *pst, MacUeCfg *ueCfg )); -uint8_t packMacSlotInd(Pst *pst, SlotIndInfo *slotInfo ); -uint8_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf); -uint8_t duHandleSlotInd(Pst *pst, SlotIndInfo *slotInfo); -uint8_t packMacCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo); -uint8_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf); -uint8_t MacProcCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo); -uint8_t packMacCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo); -uint8_t unpackMacCellStopReq(DuMacCellStopReq func, Pst *pst, Buffer *mBuf); -uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo); +/* UE Delete Request from DU APP to MAC*/ +typedef uint8_t (*DuMacUeDeleteReq) ARGS(( + Pst *pst, + MacUeDelete *ueDel )); + +/* UE Delete Response from MAC to DU APP*/ +typedef uint8_t (*MacDuUeDeleteRspFunc) ARGS(( + Pst *pst, + MacUeDeleteRsp *deleteRsp)); + +/* Cell Delete Request from DU APP to MAC*/ +typedef uint8_t (*DuMacCellDeleteReq) ARGS(( + Pst *pst, + MacCellDelete *cellDelete )); + +/* Cell Delete Response from MAC to DU APP*/ +typedef uint8_t (*MacDuCellDeleteRspFunc) ARGS(( + Pst *pst, + MacCellDeleteRsp *cellDeleteRsp)); + +uint8_t packMacCellUpInd(Pst *pst, OduCellId *cellId); +uint8_t unpackMacCellUpInd(DuMacCellUpInd func, Pst *pst, Buffer *mBuf); +uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId); +uint8_t packMacCellStart(Pst *pst, OduCellId *cellId); +uint8_t unpackMacCellStart(DuMacCellStart func, Pst *pst, Buffer *mBuf); +uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId); +uint8_t packMacCellStop(Pst *pst, OduCellId *cellId); +uint8_t unpackMacCellStop(DuMacCellStop func, Pst *pst, Buffer *mBuf); +uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId); uint8_t packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg); uint8_t unpackDuMacCellCfg(DuMacCellCfgReq func, Pst *pst, Buffer *mBuf); uint8_t MacProcCellCfgReq(Pst *pst, MacCellCfg *macCellCfg); uint8_t packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); uint8_t unpackMacCellCfgCfm(DuMacCellCfgCfm func, Pst *pst, Buffer *mBuf); uint8_t duHandleMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); -uint8_t packMacStopInd(Pst *pst, MacCellStopInfo *cellId); +uint8_t packMacStopInd(Pst *pst, OduCellId *cellId); uint8_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf); -uint8_t duHandleStopInd(Pst *pst, MacCellStopInfo *cellId); +uint8_t duHandleStopInd(Pst *pst, OduCellId *cellId); uint8_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo); uint8_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf); uint8_t duHandleUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo); @@ -1194,9 +1391,22 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp); uint8_t packDuMacUeReconfigReq(Pst *pst, MacUeCfg *ueCfg); uint8_t unpackMacUeReconfigReq(DuMacUeReconfigReq func, Pst *pst, Buffer *mBuf); uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg); +uint8_t packDuMacUeDeleteReq(Pst *pst, MacUeDelete *ueDelete); +uint8_t MacProcUeDeleteReq(Pst *pst, MacUeDelete *ueDelete); +uint8_t unpackMacUeDeleteReq(DuMacUeDeleteReq func, Pst *pst, Buffer *mBuf); +uint8_t packDuMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp); +uint8_t DuProcMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp); +uint8_t unpackDuMacUeDeleteRsp(MacDuUeDeleteRspFunc func, Pst *pst, Buffer *mBuf); +uint8_t packDuMacCellDeleteReq(Pst *pst, MacCellDelete *cellDelete); +uint8_t MacProcCellDeleteReq(Pst *pst, MacCellDelete *cellDelete); +uint8_t unpackMacCellDeleteReq(DuMacCellDeleteReq func, Pst *pst, Buffer *mBuf); +uint8_t packDuMacCellDeleteRsp(Pst *pst, MacCellDeleteRsp *cellDeleteRsp); +uint8_t DuProcMacCellDeleteRsp(Pst *pst, MacCellDeleteRsp *cellDeleteRsp); +uint8_t unpackDuMacCellDeleteRsp(MacDuCellDeleteRspFunc func, Pst *pst, Buffer *mBuf); #endif + /********************************************************************** End of file **********************************************************************/