Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "MAC Clean-up [Issue-ID: ODUHIGH-212]"
[o-du/l2.git]
/
src
/
cm
/
du_app_mac_inf.c
diff --git
a/src/cm/du_app_mac_inf.c
b/src/cm/du_app_mac_inf.c
index
dd2784b
..
3fe519d
100644
(file)
--- a/
src/cm/du_app_mac_inf.c
+++ b/
src/cm/du_app_mac_inf.c
@@
-17,10
+17,6
@@
*******************************************************************************/
#include "common_def.h"
*******************************************************************************/
#include "common_def.h"
-#include "ss_queue.h"
-#include "ss_task.h"
-#include "ss_msg.h"
-#include "du_cfg.h"
#include "du_app_mac_inf.h"
/**************************************************************************
#include "du_app_mac_inf.h"
/**************************************************************************
@@
-40,7
+36,7
@@
* RFAILED - failure
*
***************************************************************************/
* RFAILED - failure
*
***************************************************************************/
-
int
packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
+
uint8_t
packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
{
if(pst->selector == ODU_SELECTOR_LC)
{
{
if(pst->selector == ODU_SELECTOR_LC)
{
@@
-83,10
+79,7
@@
int packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg)
* RFAILED - failure
*
***************************************************************************/
* RFAILED - failure
*
***************************************************************************/
-int unpackDuMacCellCfg(
- DuMacCellCfgReq func,
- Pst *pst,
- Buffer *mBuf)
+uint8_t unpackDuMacCellCfg(DuMacCellCfgReq func, Pst *pst, Buffer *mBuf)
{
U16 ret = ROK;
MacCellCfg *macCellCfg;
{
U16 ret = ROK;
MacCellCfg *macCellCfg;
@@
-123,7
+116,7
@@
int unpackDuMacCellCfg(
* RFAILED - failure
*
***************************************************************************/
* RFAILED - failure
*
***************************************************************************/
-
in
t packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
+
uint8_
t packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
{
if(pst->selector == ODU_SELECTOR_LC)
{
{
if(pst->selector == ODU_SELECTOR_LC)
{
@@
-164,10
+157,7
@@
int packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
* RFAILED - failure
*
***************************************************************************/
* RFAILED - failure
*
***************************************************************************/
-int unpackMacCellCfgCfm(
- DuMacCellCfgCfm func,
- Pst *pst,
- Buffer *mBuf)
+uint8_t unpackMacCellCfgCfm(DuMacCellCfgCfm func, Pst *pst, Buffer *mBuf)
{
MacCellCfgCfm macCellCfgCfm;
{
MacCellCfgCfm macCellCfgCfm;
@@
-202,7
+192,7
@@
int unpackMacCellCfgCfm(
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t packMacCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo)
+uint
8
_t packMacCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo)
{
Buffer *mBuf = NULLP;
{
Buffer *mBuf = NULLP;
@@
-245,7
+235,7
@@
uint16_t packMacCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf)
+uint
8
_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf)
{
MacCellStartInfo *cellStartInfo;
{
MacCellStartInfo *cellStartInfo;
@@
-281,7
+271,7
@@
uint16_t unpackMacCellStartReq(DuMacCellStartReq func, Pst *pst, Buffer *mBuf)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t packMacCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo)
+uint
8
_t packMacCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo)
{
if(pst->selector == ODU_SELECTOR_LC)
{
{
if(pst->selector == ODU_SELECTOR_LC)
{
@@
-324,7
+314,7
@@
uint16_t packMacCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t unpackMacCellStopReq(DuMacCellStopReq func, Pst *pst, Buffer *mBuf)
+uint
8
_t unpackMacCellStopReq(DuMacCellStopReq func, Pst *pst, Buffer *mBuf)
{
MacCellStopInfo *cellStopInfo;
{
MacCellStopInfo *cellStopInfo;
@@
-360,7
+350,7
@@
uint16_t unpackMacCellStopReq(DuMacCellStopReq func, Pst *pst, Buffer *mBuf)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16_t packMacSlotInd(Pst *pst, Slot
Info *slotInfo )
+uint
8_t packMacSlotInd(Pst *pst, SlotInd
Info *slotInfo )
{
Buffer *mBuf = NULLP;
{
Buffer *mBuf = NULLP;
@@
-376,7
+366,7
@@
uint16_t packMacSlotInd(Pst *pst, SlotInfo *slotInfo )
CMCHKPK(SPkU16, slotInfo->sfn, mBuf);
CMCHKPK(SPkU16, slotInfo->slot, mBuf);
CMCHKPK(SPkU16, slotInfo->sfn, mBuf);
CMCHKPK(SPkU16, slotInfo->slot, mBuf);
- CM_FREE_SHRABL_BUF(pst->region, pst->pool, slotInfo, sizeof(SlotInfo));
+ CM_FREE_SHRABL_BUF(pst->region, pst->pool, slotInfo, sizeof(SlotIn
dIn
fo));
slotInfo = NULL;
}
else if(pst->selector == ODU_SELECTOR_LWLC)
slotInfo = NULL;
}
else if(pst->selector == ODU_SELECTOR_LWLC)
@@
-410,11
+400,11
@@
uint16_t packMacSlotInd(Pst *pst, SlotInfo *slotInfo )
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf)
+uint
8
_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf)
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
- SlotInfo *slotInfo;
+ SlotIn
dIn
fo *slotInfo;
/* unpack the address of the structure */
CMCHKUNPK(cmUnpkPtr, (PTR *)&slotInfo, mBuf);
/* unpack the address of the structure */
CMCHKUNPK(cmUnpkPtr, (PTR *)&slotInfo, mBuf);
@@
-423,7
+413,7
@@
uint16_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf)
}
else if(pst->selector == ODU_SELECTOR_LC)
{
}
else if(pst->selector == ODU_SELECTOR_LC)
{
- SlotInfo slotInfo;
+ SlotIn
dIn
fo slotInfo;
CMCHKUNPK(SUnpkU16, &(slotInfo.slot), mBuf);
CMCHKUNPK(SUnpkU16, &(slotInfo.sfn), mBuf);
CMCHKUNPK(SUnpkU16, &(slotInfo.slot), mBuf);
CMCHKUNPK(SUnpkU16, &(slotInfo.sfn), mBuf);
@@
-458,7
+448,7
@@
uint16_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId)
+uint
8
_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId)
{
Buffer *mBuf = NULLP;
{
Buffer *mBuf = NULLP;
@@
-507,7
+497,7
@@
uint16_t packMacStopInd(Pst *pst, MacCellStopInfo *cellStopId)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf)
+uint
8
_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf)
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
@@
-552,7
+542,7
@@
uint16_t unpackMacStopInd(DuMacStopInd func, Pst *pst, Buffer *mBuf)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
+uint
8
_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
{
Buffer *mBuf = NULLP;
{
Buffer *mBuf = NULLP;
@@
-593,7
+583,7
@@
uint16_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf)
+uint
8
_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf)
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
@@
-631,7
+621,7
@@
uint16_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
+uint
8
_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
{
Buffer *mBuf = NULLP;
{
Buffer *mBuf = NULLP;
@@
-672,7
+662,7
@@
uint16_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo)
* RFAILED - failure
*
* ****************************************************************/
* RFAILED - failure
*
* ****************************************************************/
-uint
16
_t unpackMacDlCcchInd(DuMacDlCcchInd func, Pst *pst, Buffer *mBuf)
+uint
8
_t unpackMacDlCcchInd(DuMacDlCcchInd func, Pst *pst, Buffer *mBuf)
{
if(pst->selector == ODU_SELECTOR_LWLC)
{
{
if(pst->selector == ODU_SELECTOR_LWLC)
{