X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_prg.x;h=b190734d5407a4bde20a01f356e4aa1c825f318c;hb=531da47c7bfb6ce138a454f66eb184729860beef;hp=d45c35c0cddb64fbf41c9da0c818498cb358c6ab;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git
diff --git a/src/5gnrmac/rg_prg.x b/src/5gnrmac/rg_prg.x
index d45c35c0c..b190734d5 100755
--- a/src/5gnrmac/rg_prg.x
+++ b/src/5gnrmac/rg_prg.x
@@ -47,7 +47,7 @@ typedef TfuDatReqTbInfo RgPrgDatReqTbInfo;
/**
* @brief Typedef for uplink Dedicated Logical channel group Id.
*/
-typedef U8 RgPrgLteLcgId;
+typedef uint8_t RgPrgLteLcgId;
/**
* @brief Structure to hold uplink Dedicated Logical channel info.
@@ -62,9 +62,9 @@ typedef U8 RgPrgLteLcgId;
typedef struct rgPrgUlLcInfo
{
CmLteLcId lcId; /*!< Logical channel ID */
- RgPrgLteLcgId lcgId; /*!< Logical channel group */
+ RgPrgLteLcgId lcgId; /*!< Logical channel group */
#ifdef LTE_L2_MEAS
- U8 qci; /*!< QCI for this logical channel control block */
+ uint8_t qci; /*!< QCI for this logical channel control block */
Bool measOn; /*!< TRUE if Timing Info needs to be fetched for
Scheduled UL IP throughput else FALSE */
@@ -85,7 +85,7 @@ typedef struct rgPrgLcgInfo
/* Right now not keeping associated logical channels, searching for
* associated channels needed only during config */
RgPrgLteLcgId lcgId; /*!< Group ID */
- U8 lcCount; /*!< Lc count */
+ uint8_t lcCount; /*!< Lc count */
Bool isGbr; /*!< Indicate if LCG is GBR LCG */
}RgPrgLcgInfo;
@@ -120,7 +120,7 @@ typedef struct rgPrgUeSCellCfgInfo
CmLteRnti ueId; /*!< UE identifier */
CmLteCellId cellId; /*!< Cell ID */
- U8 maxUlHqRetx; /*!< Maximum number of harq
+ uint8_t maxUlHqRetx; /*!< Maximum number of harq
* re-transmissions */
RgPrgUlLcInfo ulLcInfo[RG_MAX_LC_PER_UE]; /*!< Dedicated Uplink
logical channel information */
@@ -149,8 +149,8 @@ typedef struct rgPrgCfgCfmInfo
{
CmLteRnti ueId; /*!< UE identifier */
CmLteCellId sCellId; /*!< SCell ID */
- U8 status; /*!< Status: OK/NOK */
- U8 event; /*!< type of event */
+ uint8_t status; /*!< Status: OK/NOK */
+ uint8_t event; /*!< type of event */
}RgPrgCfgCfmInfo;
/**
@@ -185,7 +185,7 @@ typedef struct rgPrgUeSCellLchModInfo
struct ulLchRecfgS
{
- U8 lcgId; /*!< Logical channel group ID */
+ uint8_t lcgId; /*!< Logical channel group ID */
} ulLchRecfg; /*!< Uplink logical channel reconfiguration
information */
}RgPrgUeSCellLchModInfo;
@@ -204,7 +204,7 @@ typedef struct rgPrgUeSCellLchDelInfo
CmLteCellId cellId; /*!< Cell ID */
CmLteRnti crnti; /*!< CRNTI for DTCH and DCCH */
CmLteLcId lcId; /*!< Logical channel ID */
- U8 dir; /*!< Indicates Direction. Direction can take following
+ uint8_t dir; /*!< Indicates Direction. Direction can take following
values:
PRG_DIR_TX
PRG_DIR_RX
@@ -225,12 +225,12 @@ typedef struct rgPrgUeSCellLchDelInfo
*/
typedef struct rgPrgUlLchCfg
{
- U8 ulTrchType; /*!< Indicates type of UL transport channel:
+ uint8_t ulTrchType; /*!< Indicates type of UL transport channel:
Validated only for BCCH at MAC.
UL Transport channel type can take following values:
CM_LTE_TRCH_RACH
CM_LTE_TRCH_UL_SCH */
- U8 lcgId; /*!< Logical channel group ID */
+ uint8_t lcgId; /*!< Logical channel group ID */
} RgPrgUlLchCfg;
@@ -247,7 +247,7 @@ typedef struct rgPrgUlLchCfg
*/
typedef struct rgPrgDlLchCfg
{
- U8 dlTrchType; /*!< Indicates type of DL transport channel:
+ uint8_t dlTrchType; /*!< Indicates type of DL transport channel:
Validated only for BCCH at MAC. DL Transport
channel type can take following values:
CM_LTE_TRCH_BCH
@@ -291,7 +291,7 @@ typedef struct rgPrgUeSCellLchAddInfo
CM_LTE_LCH_DCCH
CM_LTE_LCH_DTCH */
- U8 dir; /*!< Indicates Direction. Direction can take following
+ uint8_t dir; /*!< Indicates Direction. Direction can take following
values:
PRG_DIR_TX
PRG_DIR_RX
@@ -300,7 +300,7 @@ typedef struct rgPrgUeSCellLchAddInfo
RgPrgDlLchCfg dlInfo; /*!< Downlink logical channel configuration info */
RgPrgUlLchCfg ulInfo; /*!< Uplink logical channel configuration info */
#ifdef LTE_L2_MEAS
- U8 qci; /*!< QCI for the logical channel.
+ uint8_t qci; /*!< QCI for the logical channel.
Valid Range:[0-255] (Actual QCI - 1). */
#endif /* LTE_L2_MEAS */
@@ -311,14 +311,14 @@ typedef struct rgPrgUeSCellLchAddInfo
Function Prototypes
*/
/** @brief Request from PMAC to SMAC to add Ue Scell config. */
-EXTERN S16 RgPrgPMacSMacUeSCellCfg ARGS
+S16 RgPrgPMacSMacUeSCellCfg ARGS
((
Pst *pst,
RgPrgUeSCellCfgInfo *ueSCellCb
));
/** @brief Request from PMAC to SMAC to add Ue Scell config. */
-EXTERN S16 RgPrgPMacSMacUeSCellCfgReq ARGS
+S16 RgPrgPMacSMacUeSCellCfgReq ARGS
((
Pst *pst,
RgPrgUeSCellCfgInfo *ueSCellCb
@@ -331,13 +331,13 @@ typedef S16 (*RgPrgUeSCellCfgReq) ARGS ((
));
/** @brief Config confirm of Ue SCell config Req from SMAC to PMAC */
-EXTERN S16 RgPrgSMacPMacCfg ARGS ((
+S16 RgPrgSMacPMacCfg ARGS ((
Pst *pst,
RgPrgCfgCfmInfo *cfgCfm
));
/** @brief Config confirm from SMAC to PMAC */
-EXTERN S16 RgPrgSMacPMacCfgCfm ARGS ((
+S16 RgPrgSMacPMacCfgCfm ARGS ((
Pst *pst,
RgPrgCfgCfmInfo *cfgCfm
));
@@ -350,14 +350,14 @@ typedef S16 (*RgSMacPMacCfgCfm) ARGS((
/**
* @brief Ue SCell cfg delete Req from PMac to SMac*/
-EXTERN S16 RgPrgPMacSMacUeSCellDel ARGS ((
+S16 RgPrgPMacSMacUeSCellDel ARGS ((
Pst *pst,
RgPrgUeSCellDelInfo *sCellUedelReq
));
/**
* @brief Ue SCell cfg delete Req from PMac to SMac*/
-EXTERN S16 RgPrgPMacSMacUeSCellDelReq ARGS ((
+S16 RgPrgPMacSMacUeSCellDelReq ARGS ((
Pst *pst,
RgPrgUeSCellDelInfo *sCellUedelReq
));
@@ -374,12 +374,12 @@ typedef S16 (*RgUeSCellDelReq) ARGS((
* @brief Ue SCell Cfg Req from PMac to SMac.
* @details This primitive is used for light-weight loose coupling.
*/
-EXTERN S16 cmPkPrgPMacSMacUeSCellCfgReq ARGS ((
+S16 cmPkPrgPMacSMacUeSCellCfgReq ARGS ((
Pst *pst,
RgPrgUeSCellCfgInfo *ueSCellCb
));
-EXTERN S16 cmUnpkPrgPMacSMacUeSCellCfgReq ARGS ((
+S16 cmUnpkPrgPMacSMacUeSCellCfgReq ARGS ((
RgPrgUeSCellCfgReq func,
Pst *pst,
Buffer *mBuf
@@ -389,13 +389,13 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellCfgReq ARGS ((
* @brief Ue SCell Add Cfg cfm from SMac to PMac.
* @details This primitive is used for light-weight loose coupling.
*/
-EXTERN S16 cmPkPrgSMacPMacCfgCfm ARGS((
+S16 cmPkPrgSMacPMacCfgCfm ARGS((
Pst *pst,
RgPrgCfgCfmInfo *cfgCfm
));
-EXTERN S16 cmUnpkPrgSMacPMacCfgCfm ARGS((
+S16 cmUnpkPrgSMacPMacCfgCfm ARGS((
RgSMacPMacCfgCfm func,
Pst *pst,
Buffer *mBuf
@@ -404,13 +404,13 @@ EXTERN S16 cmUnpkPrgSMacPMacCfgCfm ARGS((
* @brief SCell Ue Delete Req from PMac to SMac.
* @details This primitive is used for light-weight loose coupling.
*/
-EXTERN S16 cmPkPrgPMacSMacUeSCellDelReq ARGS((
+S16 cmPkPrgPMacSMacUeSCellDelReq ARGS((
Pst *pst,
RgPrgUeSCellDelInfo *sCellUeDelInfo
));
-EXTERN S16 cmUnpkPrgPMacSMacUeSCellDelReq ARGS((
+S16 cmUnpkPrgPMacSMacUeSCellDelReq ARGS((
RgUeSCellDelReq func,
Pst *pst,
Buffer *mBuf
@@ -421,12 +421,12 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellDelReq ARGS((
* @brief Ue Lch recfg Req from PMac to SMac.
* @details This primitive is used for light-weight loose coupling.
*/
-EXTERN S16 cmPkPrgPMacSMacUeSCellLchModReq ARGS((
+S16 cmPkPrgPMacSMacUeSCellLchModReq ARGS((
Pst *pst,
RgPrgUeSCellLchModInfo *lchCfgCb
));
-EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchModReq ARGS((
+S16 cmUnpkPrgPMacSMacUeSCellLchModReq ARGS((
RgPrgUeScellModLchReq func,
Pst *pst,
Buffer *mBuf
@@ -436,13 +436,13 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchModReq ARGS((
* @brief SCell Ue Delete Req from PMac to SMac.
* @details This primitive is used for light-weight loose coupling.
*/
-EXTERN S16 cmPkPrgPMacSMacUeSCellLchDelReq ARGS((
+S16 cmPkPrgPMacSMacUeSCellLchDelReq ARGS((
Pst *pst,
RgPrgUeSCellLchDelInfo *delLcCb
));
-EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchDelReq ARGS((
+S16 cmUnpkPrgPMacSMacUeSCellLchDelReq ARGS((
RgPrgUeScellDelLchReq func,
Pst *pst,
Buffer *mBuf
@@ -452,12 +452,12 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchDelReq ARGS((
* @brief Ue Lch cfg Req from PMac to SMac.
* @details This primitive is used for light-weight loose coupling.
*/
-EXTERN S16 cmPkPrgPMacSMacUeSCellLchAddReq ARGS ((
+S16 cmPkPrgPMacSMacUeSCellLchAddReq ARGS ((
Pst *pst,
RgPrgUeSCellLchAddInfo *lchCfgCb
));
-EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchAddReq ARGS ((
+S16 cmUnpkPrgPMacSMacUeSCellLchAddReq ARGS ((
RgPrgUeScellAddLchReq func,
Pst *pst,
Buffer *mBuf
@@ -467,7 +467,7 @@ EXTERN S16 cmUnpkPrgPMacSMacUeSCellLchAddReq ARGS ((
#endif /* LCPRG */
/** @brief Request from PMAC to SMAC to add Lch Reconfig. */
-EXTERN S16 RgPrgPMacSMacUeScellLchMod ARGS
+S16 RgPrgPMacSMacUeScellLchMod ARGS
((
Pst *pst,
RgPrgUeSCellLchModInfo *lchCfgCb
@@ -482,7 +482,7 @@ typedef S16 (*RgPrgUeScellModLchReq) ARGS((
));
/** @brief Request from PMAC to SMAC to delete Lch . */
-EXTERN S16 RgPrgPMacSMacUeScellLchDel ARGS
+S16 RgPrgPMacSMacUeScellLchDel ARGS
((
Pst *pst,
RgPrgUeSCellLchDelInfo *delLcCb
@@ -498,7 +498,7 @@ typedef S16 (*RgPrgUeScellDelLchReq) ARGS((
/** @brief Request from PMAC to SMAC to add Lch config. */
-EXTERN S16 RgPrgPMacSMacUeScellLchAdd ARGS
+S16 RgPrgPMacSMacUeScellLchAdd ARGS
((
Pst *pst,
RgPrgUeSCellLchAddInfo *lchCfgCb