#include "ssi.x"
#include "cm_hash.x"
#include "cm_lib.x"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
typedef enum
{
#include "cm_hash.x"
#include "cm_lib.x"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "lwr_mac.h"
EXTERN S16 rgClBldAndSndFAPICfgReq ARGS((ClCellCb *cellCb));
#include "crg.x" /* CRG interface includes */
#include "rg_sch_inf.x" /* SCH interface typedefs */
#include "rg_prg.x" /* PRG (MAC-MAC) Interface typedefs */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#ifdef LTE_ADV
#include "rg_pom_scell.x"
#include "ssi.x"
#include "cm_hash.x"
#include "cm_lib.x"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
typedef enum
{
#include "ssi.x"
#include "cm_hash.x"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "lwr_mac.h"
#include "rg_cl_phy.h"
#include "fapi.h"
#include "tfu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x"
#ifdef LTE_ADV
#include "rg_pom_scell.x"
#include "tfu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x"
#include "tfu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x"
#ifdef L2_OPTMZ
#include "rgu.x" /* RGU Interface includes */
#include "lrg.x" /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
#include "crg.x" /* CRG interface typedes */
#include "rg_sch_inf.x" /* SCH interface typedefs */
#include "rg_prg.x" /*PRG interface includes*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#endif /* LCRGMILRG */
case EVENT_MAC_CELL_CONFIG_REQ:
/* Process MAC cell config */
- unpackDuMacCellCfg(handleMacCellCfgReq, pst, mBuf);
+ unpackDuMacCellCfg(MacHdlCellCfgReq, pst, mBuf);
break;
default:
RG_FREE_MSG(mBuf);
#include "crg.x" /* layer management typedefs for MAC */
#include "rg_sch_inf.x" /* typedefs for Scheduler */
#include "rg_prg.x" /* typedefs for PRG interface */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC types */
#ifdef LTE_L2_MEAS
#include "crg.x" /* layer management typedefs for MAC */
#include "rg_sch_inf.x" /* SCH interface typedefs */
#include "rg_prg.x" /* PRG interface typedefs */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
/* local defines */
#include "rg_prg.x" /* PRG Interface includes */
#include "lrg.x" /* LRG Interface includes */
#include "rgr.x" /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
#ifdef SS_DIAG
#include "ss_diag.h" /* Common log file */
extern U16 cmPackLcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm);
extern U16 cmPackLwlcMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm);
-packMacCellCfgCfm packMacCellCfmMt[] =
+packMacCellCfgCfm packMacCellCfmOpts[] =
{
cmPackLcMacCellCfgCfm, /* packing for loosely coupled */
duHandleMacCellCfgCfm, /* packing for tightly coupled */
*
* @details
*
- * Function : handleMacCellCfgReq
+ * Function : MacHdlCellCfgReq
*
* This function handles the gNB and cell configuration
* request received from DU APP.
* @return S16
* -# ROK
**/
-S16 handleMacCellCfgReq
+S16 MacHdlCellCfgReq
(
Pst *pst,
MacCellCfg *macCellCfg
macCellCfgCfm.transId = macCellCfg->transId;
//ret = cmPackLcMacCellCfgCfm(&cnfPst,&macCellCfgCfm);
- ret = (*packMacCellCfmMt[cnfPst.selector])(&cnfPst,&macCellCfgCfm);
+ ret = (*packMacCellCfmOpts[cnfPst.selector])(&cnfPst,&macCellCfgCfm);
return ret;
-} /* end of handleMacCellCfgReq */
+} /* end of MacHdlCellCfgReq */
\f
/**********************************************************************
#include "rgu.x" /* RGU Interface includes */
#include "lrg.x" /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
#include "ss_queue.h"
#include "ss_queue.x"
#include "tfu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x"
#ifdef LTE_ADV
#include "rg_pom_scell.x"
#include "crg.x" /* layer management typedefs for MAC */
#include "rg_sch_inf.x" /* layer management typedefs for MAC */
#include "rg_prg.x" /* Prg(MAC-MAC)interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#ifdef LTE_ADV
#include "crg.x" /* layer management typedefs for MAC */
#include "rg_sch_inf.x" /* layer management typedefs for MAC */
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#ifdef LTE_ADV
#include "rg_prg.x" /* PRG Interface includes */
#include "lrg.x" /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
#include "rg_prg.x" /* PRG Interface includes */
#include "lrg.x" /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
#include "rg_prg.x" /* PRG interface typedefs */
#include "rgm.x" /* layer management typedefs for MAC */
#include "rgm.h" /* layer management typedefs for MAC */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#ifdef MAC_RLC_UL_RBUF
#include "rg_prg.x" /* PRG Interface defines */
#include "lrg.x" /* LRG Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
#include "rgu.x"
#include "rg_sch_inf.x"
#include "rg_prg.x" /* PRG interface typedefs*/
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* typedefs for MAC */
#include "ss_rbuf.h"
#include "lrg.x" /* LRG Interface includes */
#include "rg_prg.x" /* PRG(MAC-MAC) Interface includes */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
#include "cm_hash.x" /* Common Hash List Definitions */
#include "cm_lte.x" /* Common LTE Defines */
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
/**************************************************************************
* @brief Function to pack Loose Coupled
*
* @details
*
- * Function : packLcMacCellCfg
+ * Function : packMacCellCfg
*
* Functionality:
* packs the macCellCfg parameters
* RFAILED - failure
*
***************************************************************************/
-S16 packLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
+S16 packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
{
- /* we are now implemented only light wieght lossely coupled interface */
- return ROK;
-}
-
-/**************************************************************************
- * @brief Function to pack light weight Loose Coupled
- * MAC cell config parameters required by MAC
- *
- * @details
- *
- * Function : packLwLcMacCellCfg
- *
- * Functionality:
- * packs the macCellCfg parameters
- *
- * @param[in] Pst *pst, Post structure of the primitive.
- * @param[in] MacCellCfg *macCellCfg, mac cell config parameters.
- * @return ROK - success
- * RFAILED - failure
- *
- ***************************************************************************/
-S16 packLwLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
-{
- Buffer *mBuf = NULLP;
-
- if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
+ if(pst->selector == DU_SELECTOR_LC)
{
- RETVALUE(RFAILED);
+ /* we are now implemented only light wieght lossely coupled interface */
+ return ROK;
}
+ else if(pst->selector == DU_SELECTOR_LWLC)
+ {
+ Buffer *mBuf = NULLP;
- /* pack the address of the structure */
- CMCHKPK(cmPkPtr,(PTR)macCellCfg, mBuf);
+ if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK)
+ {
+ RETVALUE(RFAILED);
+ }
- RETVALUE(SPstTsk(pst,mBuf));
+ /* pack the address of the structure */
+ CMCHKPK(cmPkPtr,(PTR)macCellCfg, mBuf);
+
+ RETVALUE(SPstTsk(pst,mBuf));
+
+ }
}
/**************************************************************************
/* only loose coupling is suported */
}
}
+
+/**********************************************************************
+ End of file
+**********************************************************************/
MacCellCfgCfm *macCellCfgCfm /* Config Structure */
));
-S16 packLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg);
-S16 packLwLcMacCellCfg(Pst *pst, MacCellCfg *macCellCfg);
+S16 packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg);
-
-EXTERN S16 handleMacCellCfgReq
+EXTERN S16 MacHdlCellCfgReq
(
Pst *pst,
MacCellCfg *macCellCfg
#define __DU_CONFIG_H__
#include "du_mgr.h"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "du_log.h"
#include "BIT_STRING.h"
#include "lkw.h"
#include "lrg.h"
#include "legtp.h"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
#include "gen.x" /* General */
#include "ssi.x" /* System services */
CmHashListCp cellLst; /* List of cells at DU APP of type DuCellCb */
CmHashListCp actvCellLst; /* List of cells activated/to be activated of type DuCellCb */
/* pointer to store the address of macCellCfg params used to send du-app to MAC */
- MacCellCfg *ptrMacCellCfg; /* pointer to store params while sending DU-APP to MAC */
+ MacCellCfg *duMacCellCfg; /* pointer to store params while sending DU-APP to MAC */
}DuCb;
#include "du_f1ap_msg_hdl.h"
#include "lsctp.h"
#include "legtp.h"
-#include "mac_interface.h"
+#include "du_mgr_mac_inf.h"
extern S16 cmUnpkLkwCfgCfm(LkwCfgCfm func,Pst *pst, Buffer *mBuf);
extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf);
extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
-packMacCellCfgReq packMacCellCfgMt[] =
+packMacCellCfgReq packMacCellCfgOpts[] =
{
- packLcMacCellCfg, /* packing for loosely coupled */
- handleMacCellCfgReq, /* packing for tightly coupled */
- packLwLcMacCellCfg, /* packing for light weight loosly coupled */
+ packMacCellCfg, /* packing for loosely coupled */
+ MacHdlCellCfgReq, /* packing for tightly coupled */
+ packMacCellCfg, /* packing for light weight loosly coupled */
};
/**************************************************************************
{
Pst pst;
DU_SET_ZERO(&pst, sizeof(Pst));
- MacCellCfg *pMacCellCfg = NULLP;
+ MacCellCfg *duMacCellCfg = NULLP;
- DU_ALLOC(pMacCellCfg, sizeof(MacCellCfg));
- if(pMacCellCfg == NULLP)
+ DU_ALLOC(duMacCellCfg, sizeof(MacCellCfg));
+ if(duMacCellCfg == NULLP)
{
return RFAILED;
}
/* store the address in the duCb so that we can free on confirm msg */
- duCb.ptrMacCellCfg = pMacCellCfg;
+ duCb.duMacCellCfg = duMacCellCfg;
/* copy the mac config structure from duCfgParams */
- memcpy(pMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
+ memcpy(duMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
- pMacCellCfg->transId = getTransId(); /* transaction ID */
+ duMacCellCfg->transId = getTransId(); /* transaction ID */
/* Fill Pst */
pst.selector = DU_SELECTOR_LWLC;
pst.event = EVENT_MAC_CELL_CONFIG_REQ;
/* Send MAC cell config to MAC */
- return (*packMacCellCfgMt[pst.selector])(&pst, pMacCellCfg);
+ return (*packMacCellCfgOpts[pst.selector])(&pst, duMacCellCfg);
}
/**************************************************************************
{
S16 ret = ROK;
- if(macCellCfgCfm->transId == duCb.ptrMacCellCfg->transId)
+ if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
{
/* free the memory allocated during sending macCellCfg request */
- DU_FREE(duCb.ptrMacCellCfg,sizeof(MacCellCfg));
- duCb.ptrMacCellCfg = NULLP;
+ DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
+ duCb.duMacCellCfg = NULLP;
/* Build and send GNB-DU config update */
ret = BuildAndSendDUConfigUpdate();