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
Fix for L2 compilation with WLS [Issue-ID: ODUHIGH-240]
[o-du/l2.git]
/
src
/
5gnrrlc
/
kw_ptli.c
diff --git
a/src/5gnrrlc/kw_ptli.c
b/src/5gnrrlc/kw_ptli.c
index
485117e
..
c41ca38
100755
(executable)
--- a/
src/5gnrrlc/kw_ptli.c
+++ b/
src/5gnrrlc/kw_ptli.c
@@
-81,14
+81,14
@@
EXTERN "C" {
#ifdef RLC_MAC_DAT_REQ_RBUF
#ifdef RLC_MAC_DAT_REQ_RBUF
-
PUBLIC S16 kw
LiRguDatReqRbuf(Pst *Post,SpId spId,Void *datReq);
+
S16 rlc
LiRguDatReqRbuf(Pst *Post,SpId spId,Void *datReq);
#endif
#ifdef RLC_MAC_STA_RSP_RBUF
#endif
#ifdef RLC_MAC_STA_RSP_RBUF
-
PUBLIC S16 kw
LiRguStaRspRbuf(Pst *Post,SpId spId,Void *staRsp);
+
S16 rlc
LiRguStaRspRbuf(Pst *Post,SpId spId,Void *staRsp);
#endif
#if defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)
#endif
#if defined(MAC_RLC_HARQ_STA_RBUF) && defined(LTE_L2_MEAS)
-EXTERN S16
Kw
DlHarqStaBatchProc (Void);
+EXTERN S16
Rlc
DlHarqStaBatchProc (Void);
#endif
\f
#endif
\f
@@
-98,7
+98,7
@@
EXTERN S16 KwDlHarqStaBatchProc (Void);
/* RGU Bind Request primitive */
/* RGU Bind Request primitive */
-
PUBLIC
RguBndReq kwLiRguBndReqMt[] =
+RguBndReq kwLiRguBndReqMt[] =
{
#ifdef LCKWLIRGU
cmPkRguBndReq, /* 0 - loosely coupled */
{
#ifdef LCKWLIRGU
cmPkRguBndReq, /* 0 - loosely coupled */
@@
-113,7
+113,7
@@
PUBLIC RguBndReq kwLiRguBndReqMt[] =
/* RGU Unbind Request primitive */
/* RGU Unbind Request primitive */
-
PUBLIC
RguBndReq kwLiRguUbndReqMt[] =
+RguBndReq kwLiRguUbndReqMt[] =
{
#ifdef LCKWLIRGU
cmPkRguUbndReq, /* 0 - loosely coupled */
{
#ifdef LCKWLIRGU
cmPkRguUbndReq, /* 0 - loosely coupled */
@@
-128,7
+128,7
@@
PUBLIC RguBndReq kwLiRguUbndReqMt[] =
/* RGU Dedicated Channel Data Request primitive */
/* RGU Dedicated Channel Data Request primitive */
-
PUBLIC
RlcMacDlData rlcMacSendDlDataOpts[] =
+RlcMacDlData rlcMacSendDlDataOpts[] =
{
#ifdef EGTP_TEST
macStubSendDlData,
{
#ifdef EGTP_TEST
macStubSendDlData,
@@
-150,7
+150,7
@@
PUBLIC RlcMacDlData rlcMacSendDlDataOpts[] =
/* RLC logical Channel Status primitive */
/* RLC logical Channel Status primitive */
-
PUBLIC
RlcMacBoStatus rlcMacSendBOStatusOpts[] =
+RlcMacBoStatus rlcMacSendBOStatusOpts[] =
{
#ifdef EGTP_TEST
macStubBOStatus,
{
#ifdef EGTP_TEST
macStubBOStatus,
@@
-174,7
+174,7
@@
PUBLIC RlcMacBoStatus rlcMacSendBOStatusOpts[] =
#ifdef LTE_RLC_R9
/* RGU L2 Measurement Ul Ip Throughput Measurement Request primitive */
#ifdef LTE_RLC_R9
/* RGU L2 Measurement Ul Ip Throughput Measurement Request primitive */
-
PUBLIC
RguL2MUlThrpMeasReq kwLiRguL2MUlThrpMeasReqMt[] =
+RguL2MUlThrpMeasReq kwLiRguL2MUlThrpMeasReqMt[] =
{
#ifdef LCKWLIRGU
cmPkRguL2MUlThrpMeasReq, /* 0 - loosely coupled */
{
#ifdef LCKWLIRGU
cmPkRguL2MUlThrpMeasReq, /* 0 - loosely coupled */
@@
-211,27
+211,27
@@
PUBLIC RguL2MUlThrpMeasReq kwLiRguL2MUlThrpMeasReqMt[] =
*/
#ifdef ANSI
*/
#ifdef ANSI
-
PUBLIC S16 Kw
LiRguBndReq
+
S16 Rlc
LiRguBndReq
(
Pst *post, /* post structure */
SuId suId, /* Service User Id */
SpId spId /* Service Provider Id */
)
#else
(
Pst *post, /* post structure */
SuId suId, /* Service User Id */
SpId spId /* Service Provider Id */
)
#else
-
PUBLIC S16 Kw
LiRguBndReq(post, suId, spId)
+
S16 Rlc
LiRguBndReq(post, suId, spId)
Pst *post; /* post structure */
SuId suId; /* Service User Id */
SpId spId; /* Service Provider Id */
#endif
{
Pst *post; /* post structure */
SuId suId; /* Service User Id */
SpId spId; /* Service Provider Id */
#endif
{
- TRC3(
Kw
LiRguBndReq)
+ TRC3(
Rlc
LiRguBndReq)
/* jump to specific primitive depending on configured selector */
(*kwLiRguBndReqMt[post->selector])(post, suId, spId);
/* jump to specific primitive depending on configured selector */
(*kwLiRguBndReqMt[post->selector])(post, suId, spId);
-
RETVALUE(ROK)
;
+
return ROK
;
-} /* end of
Kw
LiRguBndReq */
+} /* end of
Rlc
LiRguBndReq */
\f
/**
\f
/**
@@
-254,27
+254,27
@@
SpId spId; /* Service Provider Id */
*/
#ifdef ANSI
*/
#ifdef ANSI
-
PUBLIC S16 Kw
LiRguUbndReq
+
S16 Rlc
LiRguUbndReq
(
Pst *post,
SpId spId,
Reason reason
)
#else
(
Pst *post,
SpId spId,
Reason reason
)
#else
-
PUBLIC S16 Kw
LiRguUbndReq(post, spId, reason)
+
S16 Rlc
LiRguUbndReq(post, spId, reason)
Pst *post;
SpId spId;
Reason reason;
#endif
{
Pst *post;
SpId spId;
Reason reason;
#endif
{
- TRC3(
Kw
LiRguUbndReq)
+ TRC3(
Rlc
LiRguUbndReq)
/* jump to specific primitive depending on configured selector */
(*kwLiRguUbndReqMt[post->selector])(post, spId, reason);
/* jump to specific primitive depending on configured selector */
(*kwLiRguUbndReqMt[post->selector])(post, spId, reason);
-
RETVALUE(ROK)
;
+
return ROK
;
-} /* end of
Kw
LiRguUbndReq */
+} /* end of
Rlc
LiRguUbndReq */
\f
/**
\f
/**
@@
-299,14
+299,14
@@
Reason reason;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 RlcMacSendDlData
+S16 RlcMacSendDlData
(
Pst *post,
SpId spId,
RlcMacData *dlData
)
#else
(
Pst *post,
SpId spId,
RlcMacData *dlData
)
#else
-
PUBLIC
S16 RlcMacSendDlData(post, spId, dlData)
+S16 RlcMacSendDlData(post, spId, dlData)
Pst *post;
SpId spId;
RlcMacData *dlData;
Pst *post;
SpId spId;
RlcMacData *dlData;
@@
-315,20
+315,20
@@
RlcMacData *dlData;
TRC3(RlcMacSendDlData)
#ifdef RLC_MAC_DAT_REQ_RBUF
post->event=EVTRGUDDATREQ;
TRC3(RlcMacSendDlData)
#ifdef RLC_MAC_DAT_REQ_RBUF
post->event=EVTRGUDDATREQ;
- if((
kw
LiRguDatReqRbuf(post, spId, datReq)) != ROK)
+ if((
rlc
LiRguDatReqRbuf(post, spId, datReq)) != ROK)
{
SPutStaticBuffer(post->region, post->pool,
(Data *) datReq, sizeof(RguDDatReqInfo), 0);
{
SPutStaticBuffer(post->region, post->pool,
(Data *) datReq, sizeof(RguDDatReqInfo), 0);
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
#else
/* jump to specific primitive depending on configured selector */
(*rlcMacSendDlDataOpts[post->selector])(post, spId, dlData);
#endif
}
#else
/* jump to specific primitive depending on configured selector */
(*rlcMacSendDlDataOpts[post->selector])(post, spId, dlData);
#endif
-
RETVALUE(ROK)
;
+
return ROK
;
-} /* end of
Kw
LiRguDDatReq */
+} /* end of
Rlc
LiRguDDatReq */
\f
\f
@@
-354,14
+354,14
@@
RlcMacData *dlData;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC
S16 RlcMacSendBOStatus
+S16 RlcMacSendBOStatus
(
Pst *post,
SpId spId,
RlcMacBOStatus *boSta
)
#else
(
Pst *post,
SpId spId,
RlcMacBOStatus *boSta
)
#else
-
PUBLIC
S16 RlcMacSendBOStatus(post, spId, staRsp)
+S16 RlcMacSendBOStatus(post, spId, staRsp)
Pst *post;
SpId spId;
RlcMacBOStatus *boSta;
Pst *post;
SpId spId;
RlcMacBOStatus *boSta;
@@
-370,15
+370,15
@@
RlcMacBOStatus *boSta;
TRC3(RlcMacSendBOStatus)
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
post->event= EVTRGUDSTARSP;
TRC3(RlcMacSendBOStatus)
#if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF)
post->event= EVTRGUDSTARSP;
- if((
kw
LiRguStaRspRbuf(post, spId, staRsp)) != ROK)
+ if((
rlc
LiRguStaRspRbuf(post, spId, staRsp)) != ROK)
{
{
-
RETVALUE(RFAILED)
;
+
return RFAILED
;
}
#endif
/* jump to specific primitive depending on configured selector */
(*rlcMacSendBOStatusOpts[post->selector])(post, spId, boSta);
}
#endif
/* jump to specific primitive depending on configured selector */
(*rlcMacSendBOStatusOpts[post->selector])(post, spId, boSta);
-
RETVALUE(ROK)
;
+
return ROK
;
} /* end of RlcMacSendBOStatus */
} /* end of RlcMacSendBOStatus */
@@
-409,50
+409,50
@@
RlcMacBOStatus *boSta;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC S16 Kw
LiRguL2MUlThrpMeasReq
+
S16 Rlc
LiRguL2MUlThrpMeasReq
(
Pst *post,
SpId spId,
RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq
)
#else
(
Pst *post,
SpId spId,
RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq
)
#else
-
PUBLIC S16 Kw
LiRguL2MUlThrpMeasReq(post, spId, l2mUlThrpMeasReq)
+
S16 Rlc
LiRguL2MUlThrpMeasReq(post, spId, l2mUlThrpMeasReq)
Pst *post;
SpId spId;
RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq;
#endif
{
Pst *post;
SpId spId;
RguL2MUlThrpMeasReqInfo *l2mUlThrpMeasReq;
#endif
{
- TRC3(
Kw
LiRguL2MUlThrpMeasReq)
+ TRC3(
Rlc
LiRguL2MUlThrpMeasReq)
/* jump to specific primitive depending on configured selector */
(*kwLiRguL2MUlThrpMeasReqMt[post->selector])(post, spId, l2mUlThrpMeasReq);
/* jump to specific primitive depending on configured selector */
(*kwLiRguL2MUlThrpMeasReqMt[post->selector])(post, spId, l2mUlThrpMeasReq);
-
RETVALUE(ROK)
;
+
return ROK
;
-} /* end of
Kw
LiRguL2MUlThrpMeasReq */
+} /* end of
Rlc
LiRguL2MUlThrpMeasReq */
#endif /* LTE_RLC_R9 */
#endif /* LTE_L2_MEAS */
#ifdef MAC_RLC_UL_RBUF
#endif /* LTE_RLC_R9 */
#endif /* LTE_L2_MEAS */
#ifdef MAC_RLC_UL_RBUF
-
PUBLIC S16 kw
UlBatchProc ARGS ((Void));
-EXTERN Void
kw
UtlFreeUlRBuf ARGS((void));
+
S16 rlc
UlBatchProc ARGS ((Void));
+EXTERN Void
rlc
UtlFreeUlRBuf ARGS((void));
#ifdef ANSI
#ifdef ANSI
-
PUBLIC S16 kw
UlBatchProc
+
S16 rlc
UlBatchProc
(
Void
)
#else
(
Void
)
#else
-
PUBLIC S16 kw
UlBatchProc()
+
S16 rlc
UlBatchProc()
Void;
#endif
{
/* Read from Ring Buffer and process PDCP packets */
RguDDatIndInfo *datInd;
Void *elmIndx = NULLP;
Void;
#endif
{
/* Read from Ring Buffer and process PDCP packets */
RguDDatIndInfo *datInd;
Void *elmIndx = NULLP;
- PRIVATE Pst rlcUlRbfuPst={1,1,ENT
KW,0,ENTRG
,0,PRIOR0,RTESPEC,EVTRLCULDAT,0,0,0,0};
+ PRIVATE Pst rlcUlRbfuPst={1,1,ENT
RLC,0,ENTMAC
,0,PRIOR0,RTESPEC,EVTRLCULDAT,0,0,0,0};
/* Read from Ring Buffer and process PDCP packets */
#ifndef SS_RBUF
/* Read from Ring Buffer and process PDCP packets */
#ifndef SS_RBUF
@@
-467,7
+467,7
@@
Void;
SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].nPktProc++;;//Number of pkt processed in tti
if(datInd != NULLP)
{
SsRngInfoTbl[SS_RNG_BUF_ULMAC_TO_ULRLC].nPktProc++;;//Number of pkt processed in tti
if(datInd != NULLP)
{
-
Kw
LiRguDDatInd(&rlcUlRbfuPst, 0, datInd);
+
Rlc
LiRguDDatInd(&rlcUlRbfuPst, 0, datInd);
}
else
{
}
else
{
@@
-491,7
+491,7
@@
Void;
while(NULLP != elmIndx)
{
datInd = (RguDDatIndInfo *)elmIndx;
while(NULLP != elmIndx)
{
datInd = (RguDDatIndInfo *)elmIndx;
-
Kw
LiRguDDatInd(&rlcUlRbfuPst, 0, datInd);
+
Rlc
LiRguDDatInd(&rlcUlRbfuPst, 0, datInd);
elmIndx = NULLP;
datInd = NULLP;
elmIndx = NULLP;
datInd = NULLP;
@@
-501,7
+501,7
@@
Void;
break;
}
#endif
break;
}
#endif
-
RETVALUE(ROK)
;
+
return ROK
;
}
}
@@
-519,9
+519,9
@@
Void;
*
*/
#ifdef ANSI
*
*/
#ifdef ANSI
-
PUBLIC Void kw
UtlFreeUlRBuf(void)
+
Void rlc
UtlFreeUlRBuf(void)
#else
#else
-
PUBLIC Void kw
UtlFreeUlRBuf()
+
Void rlc
UtlFreeUlRBuf()
#endif
{
RguDDatIndInfo *datInd;
#endif
{
RguDDatIndInfo *datInd;
@@
-529,7
+529,7
@@
PUBLIC Void kwUtlFreeUlRBuf()
U8 numLch;
U8 numPdu;
U8 numLch;
U8 numPdu;
- TRC2(
kw
UtlFreeUlRBuf)
+ TRC2(
rlc
UtlFreeUlRBuf)
/* Free SS_RNG_BUF_ULMAC_TO_ULRLC */
while((SDeqSRngBuf (SS_RNG_BUF_ULMAC_TO_ULRLC, &elem) == ROK))
{
/* Free SS_RNG_BUF_ULMAC_TO_ULRLC */
while((SDeqSRngBuf (SS_RNG_BUF_ULMAC_TO_ULRLC, &elem) == ROK))
{
@@
-540,24
+540,24
@@
PUBLIC Void kwUtlFreeUlRBuf()
{
if(datInd->lchData[numLch].pdu.mBuf[numPdu])
{
{
if(datInd->lchData[numLch].pdu.mBuf[numPdu])
{
-
KW
_FREE_BUF_WC(datInd->lchData[numLch].pdu.mBuf[numPdu]);
+
RLC
_FREE_BUF_WC(datInd->lchData[numLch].pdu.mBuf[numPdu]);
}
}
}
}
}
}
-
KW
_PST_FREE(0, 0, datInd, sizeof(RguDDatIndInfo));
+
RLC
_PST_FREE(0, 0, datInd, sizeof(RguDDatIndInfo));
}
}
#endif
#ifdef RLC_MAC_STA_RSP_RBUF
#ifdef ANSI
}
}
#endif
#ifdef RLC_MAC_STA_RSP_RBUF
#ifdef ANSI
-
PUBLIC S16 kw
LiRguStaRspRbuf
+
S16 rlc
LiRguStaRspRbuf
(
Pst *post,
SpId spId,
Void *staRsp
)
#else
(
Pst *post,
SpId spId,
Void *staRsp
)
#else
-
PUBLIC S16 kw
LiRguStaRspRbuf(post, spId, staRsp)
+
S16 rlc
LiRguStaRspRbuf(post, spId, staRsp)
Pst *post;
SpId spId;
Void *staRsp;
Pst *post;
SpId spId;
Void *staRsp;
@@
-583,20
+583,20
@@
Void *staRsp;
SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].pktDrop++;
ret1 = RFAILED;
}
SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC].pktDrop++;
ret1 = RFAILED;
}
-
RETVALUE
(ret1);
+
return
(ret1);
} /* cmPkKwuDatReq */
#endif
#ifdef RLC_MAC_DAT_REQ_RBUF
#ifdef ANSI
} /* cmPkKwuDatReq */
#endif
#ifdef RLC_MAC_DAT_REQ_RBUF
#ifdef ANSI
-
PUBLIC S16 kw
LiRguDatReqRbuf
+
S16 rlc
LiRguDatReqRbuf
(
Pst *post,
SpId spId,
Void *datReq
)
#else
(
Pst *post,
SpId spId,
Void *datReq
)
#else
-
PUBLIC S16 kw
LiRguDatReqRbuf(post, spId, datReq)
+
S16 rlc
LiRguDatReqRbuf(post, spId, datReq)
Pst *post;
SpId spId;
Void *datReq;
Pst *post;
SpId spId;
Void *datReq;
@@
-622,7
+622,7
@@
Void *datReq;
SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].pktDrop++;
ret1 = RFAILED;
}
SsRngInfoTbl[SS_RNG_BUF_DLRLC_TO_DLMAC_DAT_REQ].pktDrop++;
ret1 = RFAILED;
}
-
RETVALUE
(ret1);
+
return
(ret1);
} /* cmPkKwuDatReq */
#endif
} /* cmPkKwuDatReq */
#endif