Moving all common header file into common_def.h file

[o-du/l2.git] / src / cm / tfu.c

diff --git a/src/cm/tfu.c b/src/cm/tfu.c
index d24f3fd..b32443c 100755 (executable)
--- a/src/cm/tfu.c
+++ b/src/cm/tfu.c
@@ -35,29 +35,15 @@
 */
 
 /* header include files (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_lte.h"        /* Common LTE Defines */
-#include "cm_mblk.h"        /* Common LTE Defines */
+#include "common_def.h" 
 #include "tfu.h"           /* RGU Interface defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_lte.x"        /* Common LTE Defines */
-#include "cm_mblk.x"        /* Common LTE Defines */
 #include "tfu.x"           /* RGU Interface includes */
 
+#include "du_app_mac_inf.h"
+//#include "mac_sch_interface.h"
+
 #if (defined(LCTFU))
 
 \f
@@ -878,7 +864,7 @@ TfuRaReqIndInfo * raReqInd;
       TFU_FREE_MEM(raReqInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -890,7 +876,7 @@ TfuRaReqIndInfo * raReqInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)raReqInd, mBuf) != ROK)
       {
@@ -915,7 +901,7 @@ TfuRaReqIndInfo * raReqInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(raReqInd);
    }
 
@@ -975,7 +961,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -991,7 +977,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuRaReqIndInfo(raReqInd, mBuf) != ROK) {
          TFU_FREE_MEM(raReqInd);
@@ -1004,7 +990,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&raReqInd, mBuf) != ROK)
       {
@@ -1082,7 +1068,7 @@ TfuRecpReqInfo * recpReq;
       TFU_FREE_MEM(recpReq);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuRecpReqInfo(recpReq, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1094,7 +1080,7 @@ TfuRecpReqInfo * recpReq;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)recpReq, mBuf) != ROK)
       {
@@ -1120,7 +1106,7 @@ TfuRecpReqInfo * recpReq;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(recpReq);
    }
 
@@ -1190,7 +1176,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1204,7 +1190,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&recpReq, mBuf) != ROK)
       {
@@ -1219,7 +1205,7 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuRecpReqInfo(recpReq, (Ptr)&recpReq->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(recpReq);
@@ -1232,7 +1218,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR*)&recpReq, mBuf) != ROK)
       {
@@ -1302,7 +1288,7 @@ TfuUlCqiIndInfo * ulCqiInd;
       TFU_FREE_MEM(ulCqiInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuUlCqiIndInfo(ulCqiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1314,7 +1300,7 @@ TfuUlCqiIndInfo * ulCqiInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)ulCqiInd, mBuf) != ROK)
       {
@@ -1339,7 +1325,7 @@ TfuUlCqiIndInfo * ulCqiInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(ulCqiInd);
    }
 
@@ -1400,7 +1386,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1416,7 +1402,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuUlCqiIndInfo(ulCqiInd, (Ptr)&ulCqiInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(ulCqiInd);
@@ -1429,7 +1415,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&ulCqiInd, mBuf) != ROK)
       {
@@ -1497,7 +1483,7 @@ TfuHqIndInfo * hqInd;
       TFU_FREE_MEM(hqInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuHqIndInfo(hqInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1509,7 +1495,7 @@ TfuHqIndInfo * hqInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)hqInd, mBuf) != ROK)
       {
@@ -1534,7 +1520,7 @@ TfuHqIndInfo * hqInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(hqInd);
    }
 
@@ -1594,7 +1580,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1610,7 +1596,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuHqIndInfo(hqInd, (Ptr)&hqInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(hqInd);
@@ -1623,7 +1609,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&hqInd, mBuf) != ROK)
       {
@@ -1690,7 +1676,7 @@ TfuSrIndInfo * srInd;
       TFU_FREE_MEM(srInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuSrIndInfo(srInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1702,7 +1688,7 @@ TfuSrIndInfo * srInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)srInd, mBuf) != ROK)
       {
@@ -1727,7 +1713,7 @@ TfuSrIndInfo * srInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(srInd);
    }
 
@@ -1786,7 +1772,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1802,7 +1788,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuSrIndInfo(srInd, (Ptr)&srInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(srInd);
@@ -1815,7 +1801,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&srInd, mBuf) != ROK)
       {
@@ -1880,7 +1866,7 @@ TfuDlCqiIndInfo * dlCqiInd;
       TFU_FREE_MEM(dlCqiInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuDlCqiIndInfo(dlCqiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -1892,7 +1878,7 @@ TfuDlCqiIndInfo * dlCqiInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)dlCqiInd, mBuf) != ROK)
       {
@@ -1917,7 +1903,7 @@ TfuDlCqiIndInfo * dlCqiInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(dlCqiInd);
    }
    pst->event = (Event) EVTTFUDLCQIIND;
@@ -1973,7 +1959,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -1989,7 +1975,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuDlCqiIndInfo(dlCqiInd, (Ptr)&dlCqiInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(dlCqiInd);
@@ -2002,7 +1988,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&dlCqiInd, mBuf) != ROK)
       {
@@ -2350,7 +2336,7 @@ TfuDatIndInfo * datInd;
       TFU_FREE_MEM(datInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuDatIndInfo(datInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2362,7 +2348,7 @@ TfuDatIndInfo * datInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmPkPtr((PTR)datInd, mBuf) != ROK)
       {
@@ -2387,7 +2373,7 @@ TfuDatIndInfo * datInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(datInd);
    }
 
@@ -2446,7 +2432,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -2462,7 +2448,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuDatIndInfo(datInd, (Ptr)&datInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(datInd);
@@ -2475,7 +2461,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmUnpkPtr((PTR *)&datInd, mBuf) != ROK)
       {
@@ -2546,7 +2532,7 @@ TfuCrcIndInfo * crcIndInfo;
       TFU_FREE_MEM(crcIndInfo);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuCrcIndInfo(crcIndInfo, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2558,7 +2544,7 @@ TfuCrcIndInfo * crcIndInfo;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)crcIndInfo, mBuf) != ROK)
       {
@@ -2584,7 +2570,7 @@ TfuCrcIndInfo * crcIndInfo;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(crcIndInfo);
    }
 
@@ -2647,7 +2633,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -2663,7 +2649,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuCrcIndInfo(crcIndInfo, (Ptr)&crcIndInfo->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(crcIndInfo);
@@ -2676,7 +2662,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&crcIndInfo, mBuf) != ROK)
       {
@@ -2744,7 +2730,7 @@ TfuTimingAdvIndInfo * timingAdvInd;
       TFU_FREE_MEM(timingAdvInd);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuTimingAdvIndInfo(timingAdvInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2756,7 +2742,7 @@ TfuTimingAdvIndInfo * timingAdvInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)timingAdvInd, mBuf) != ROK)
       {
@@ -2781,7 +2767,7 @@ TfuTimingAdvIndInfo * timingAdvInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(timingAdvInd);
    }
 
@@ -2841,7 +2827,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -2857,7 +2843,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuTimingAdvIndInfo(timingAdvInd, (Ptr)&timingAdvInd->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(timingAdvInd);
@@ -2870,7 +2856,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&timingAdvInd, mBuf) != ROK)
       {
@@ -2940,7 +2926,7 @@ TfuDatReqInfo * datReq;
       TFU_FREE_MEM(datReq);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuDatReqInfo(datReq, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -2952,7 +2938,7 @@ TfuDatReqInfo * datReq;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmPkPtr((PTR)datReq, mBuf) != ROK)
       {
@@ -2977,7 +2963,7 @@ TfuDatReqInfo * datReq;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(datReq);
    }
 
@@ -3039,7 +3025,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -3055,7 +3041,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuDatReqInfo(datReq, (Ptr)&datReq->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(datReq);
@@ -3068,7 +3054,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if (pst->selector == TFU_SEL_LWLC)
+   else if (pst->selector == ODU_SELECTOR_LWLC)
    {
       if(cmUnpkPtr((PTR *)&datReq, mBuf) != ROK)
       {
@@ -3139,7 +3125,7 @@ TfuCntrlReqInfo * cntrlReq;
       TFU_FREE_MEM(cntrlReq);
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuCntrlReqInfo(cntrlReq, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3151,7 +3137,7 @@ TfuCntrlReqInfo * cntrlReq;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)cntrlReq, mBuf) != ROK)
       {
@@ -3177,7 +3163,7 @@ TfuCntrlReqInfo * cntrlReq;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(cntrlReq);
    }
 
@@ -3240,7 +3226,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -3256,7 +3242,7 @@ Buffer *mBuf;
    }
 
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuCntrlReqInfo(cntrlReq, (Ptr)&cntrlReq->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(cntrlReq);
@@ -3269,7 +3255,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&cntrlReq, mBuf) != ROK)
       {
@@ -3336,7 +3322,7 @@ TfuTtiIndInfo * ttiInd;
       SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuTtiIndInfo(ttiInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3348,7 +3334,7 @@ TfuTtiIndInfo * ttiInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)ttiInd, mBuf) != ROK)
       {
@@ -3375,7 +3361,7 @@ TfuTtiIndInfo * ttiInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3387,14 +3373,14 @@ TfuTtiIndInfo * ttiInd;
       }
    }
 
-   pst->event = (Event) EVTTFUTTIIND;
+   pst->event = (Event) EVENT_SLOT_IND_TO_MAC;
    RETVALUE(SPstTsk(pst,mBuf));
 }
 
 \f
 /***********************************************************
 *
-*     Func : cmUnpkTfuTtiInd
+*     Func : cmUnpackSlotInd
 *
 *
 *     Desc : This API is the TTI indication from PHY to MAC . 
@@ -3413,24 +3399,17 @@ TfuTtiIndInfo * ttiInd;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkTfuTtiInd
+PUBLIC S16 cmUnpackSlotInd
 (
 TfuTtiInd func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkTfuTtiInd(func, pst, mBuf)
-TfuTtiInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
    SuId suId;
-   TfuTtiIndInfo *ttiInd;
+   SlotIndInfo *slotInd;
    
-   TRC3(cmUnpkTfuTtiInd)
+   TRC3(cmUnpackSlotInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       TFU_FREE_MSG(mBuf);
@@ -3441,8 +3420,8 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd,             sizeof(TfuTtiIndInfo))) != ROK) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
+      if ((SGetSBuf(pst->region, pst->pool, (Data **)&slotInd, sizeof(SlotIndInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -3453,10 +3432,10 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
-      if (cmUnpkTfuTtiIndInfo(ttiInd, mBuf) != ROK) {
-         SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
+      if (cmUnpackSlotIndInfo(slotInd, mBuf) != ROK) {
+         SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
          TFU_FREE_MSG(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3466,26 +3445,23 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
-      if (cmUnpkPtr((PTR *)&ttiInd, mBuf) != ROK)
+      if (cmUnpkPtr((PTR *)&slotInd, mBuf) != ROK)
       {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ETFUXXX, (ErrVal)0, "LWLC un-Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
+         SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
          TFU_FREE_MSG(mBuf);
          RETVALUE(RFAILED);
       }
    }
    TFU_FREE_MSG(mBuf);
-   /* [ccpu00141698]-MOD- MAC/SCH does not free the TTI ind anymore */
-   (*func)(pst, suId, ttiInd);
-   SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
 
-   RETVALUE((*func)(pst, suId, ttiInd));
+   RETVALUE((*func)(pst, slotInd));
 }
 
 #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
@@ -3595,7 +3571,7 @@ Buffer *mBuf;
 
 /***********************************************************
 *
-*     Func : cmPkTfuSchTtiInd
+*     Func : cmUnpackMacSchSlotInd
 *
 *
 *     Desc : This API is the TTI indication from PHY to scheduler. 
@@ -3614,124 +3590,18 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmPkTfuSchTtiInd
+PUBLIC S16 cmUnpackMacSchSlotInd
 (
-Pst * pst,
-SuId suId,
-TfuTtiIndInfo * ttiInd
-)
-#else
-PUBLIC S16 cmPkTfuSchTtiInd(pst, suId, ttiInd)
-Pst * pst;
-SuId suId;
-TfuTtiIndInfo * ttiInd;
-#endif
-{
-   Buffer *mBuf = NULLP;
-   TRC3(cmPkTfuSchTtiInd)
-
-   if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ETFU112, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
-      RETVALUE(RFAILED);
-   }
-   if (pst->selector == TFU_SEL_LC) {
-      if (cmPkTfuTtiIndInfo(ttiInd, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ETFU113, (ErrVal)0, "Packing failed");
-#endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
-         TFU_FREE_MSG(mBuf);
-         RETVALUE(RFAILED);
-      }
-   }
-   else if(pst->selector == TFU_SEL_LWLC)
-   {
-      if (cmPkPtr((PTR)ttiInd, mBuf) != ROK)
-      {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-         SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-            __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-            (ErrVal)ETFUXXX, (ErrVal)0, "LWLC Packing failed");
-#endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
-         TFU_FREE_MSG(mBuf);
-         RETVALUE(RFAILED);
-      }
-   }
-
-   if (SPkS16(suId, mBuf) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ETFU114, (ErrVal)0, "Packing failed");
-#endif
-      SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
-      TFU_FREE_MSG(mBuf);
-      RETVALUE(RFAILED);
-   }
-   if (pst->selector != TFU_SEL_LWLC) {
-      if (SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo)) != ROK) {
-#if (ERRCLASS & ERRCLS_ADD_RES)
-      SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
-         __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
-         (ErrVal)ETFU115, (ErrVal)0, "Packing failed");
-#endif
-         TFU_FREE_MSG(mBuf);
-         RETVALUE(RFAILED);
-      }
-   }
-   pst->event = (Event) EVTTFUSCHTTIIND;
-   RETVALUE(SPstTsk(pst,mBuf));
-}
-
-\f
-/***********************************************************
-*
-*     Func : cmUnpkTfuSchTtiInd
-*
-*
-*     Desc : This API is the TTI indication from PHY to scheduler. 
- * @details This primitive provides the timing information (SFN and subframe)
- * which is currently running on the physical layer. 
- * @param pst Pointer to the post structure.
- * @param suId SAP ID of the service user.
- * @param ttiInd Pointer to the TfuTtiIndInfo.
- * @return ROK/RFAILED
-*
-*
-*     Ret  : S16
-*
-*     Notes:
-*
-*     File  : 
-*
-**********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkTfuSchTtiInd
-(
-TfuSchTtiInd func,
+MacSchSlotIndFunc func,
 Pst *pst,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkTfuSchTtiInd(func, pst, mBuf)
-TfuSchTtiInd func;
-Pst *pst;
-Buffer *mBuf;
-#endif
 {
+#if 0
    SuId suId;
-   TfuTtiIndInfo *ttiInd;
+   SlotIndInfo *slotInd;
    
-   TRC3(cmUnpkTfuSchTtiInd)
+   TRC3(cmUnpackMacSchSlotInd)
 
    if (SUnpkS16(&suId, mBuf) != ROK) {
       TFU_FREE_MSG(mBuf);
@@ -3742,8 +3612,8 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
-      if ((SGetSBuf(pst->region, pst->pool, (Data **)&ttiInd,             sizeof(TfuTtiIndInfo))) != ROK) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
+      if ((SGetSBuf(pst->region, pst->pool, (Data **)&slotInd, sizeof(SlotIndInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
@@ -3754,10 +3624,10 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
-      if (cmUnpkTfuTtiIndInfo(ttiInd, mBuf) != ROK) {
-         SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
+      if (cmUnpackSlotIndInfo(slotInd, mBuf) != ROK) {
+         SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
          TFU_FREE_MSG(mBuf);
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3767,26 +3637,27 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
-      if (cmUnpkPtr((PTR *)&ttiInd, mBuf) != ROK)
+      if (cmUnpkPtr((PTR *)&slotInd, mBuf) != ROK)
       {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
             __FILE__, __LINE__, (ErrCls)ERRCLS_ADD_RES,
             (ErrVal)ETFUXXX, (ErrVal)0, "LWLC un-Packing failed");
 #endif
-         SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
+         SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
          TFU_FREE_MSG(mBuf);
          RETVALUE(RFAILED);
       }
    }
    TFU_FREE_MSG(mBuf);
    /* [ccpu00141698]-MOD- MAC/SCH does not free the TTI ind anymore */
-   (*func)(pst, suId, ttiInd);
-   SPutSBuf(pst->region, pst->pool, (Data *)ttiInd, sizeof(TfuTtiIndInfo));
- 
-   RETVALUE(ROK);
+//   (*func)(pst, suId, slotInd);
+   (*func)(pst, slotInd);
+   SPutSBuf(pst->region, pst->pool, (Data *)slotInd, sizeof(SlotIndInfo));
+#endif
+   return ROK;
 }
 
 \f
@@ -3837,7 +3708,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr;
       SPutSBuf(pst->region, pst->pool, (Data *)pucchDeltaPwr, sizeof(TfuPucchDeltaPwrIndInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -3849,7 +3720,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)pucchDeltaPwr, mBuf) != ROK)
       {
@@ -3874,7 +3745,7 @@ TfuPucchDeltaPwrIndInfo * pucchDeltaPwr;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       TFU_FREE_MEM(pucchDeltaPwr);
    }
    pst->event = (Event) EVTTFUPUCCHDELPWR;
@@ -3931,7 +3802,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       Mem   sMem;
       sMem.region = pst->region;
       sMem.pool = pst->pool;
@@ -3946,7 +3817,7 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuPucchDeltaPwrIndInfo(pucchDeltaPwr, (Ptr)&pucchDeltaPwr->memCp, mBuf) != ROK) {
          TFU_FREE_MEM(pucchDeltaPwr);
@@ -3959,7 +3830,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&pucchDeltaPwr, mBuf) != ROK)
       {
@@ -12103,10 +11974,10 @@ Buffer *mBuf;
 \f
 /***********************************************************
 *
-*     Func : cmUnpkTfuTtiIndInfo
+*     Func : cmUnpackSlotIndInfo
 *
 *
-*     Desc : This structure contains information that is passed as a part of the TTI
+*     Desc : This structure contains information that is passed as a part of the Slot
  * indication sent from PHY to MAC.
 *
 *
@@ -12117,28 +11988,15 @@ Buffer *mBuf;
 *     File  : 
 *
 **********************************************************/
-#ifdef ANSI
-PUBLIC S16 cmUnpkTfuTtiIndInfo
+PUBLIC S16 cmUnpackSlotIndInfo
 (
-TfuTtiIndInfo *param,
+SlotIndInfo *param,
 Buffer *mBuf
 )
-#else
-PUBLIC S16 cmUnpkTfuTtiIndInfo(param, mBuf)
-TfuTtiIndInfo *param;
-Buffer *mBuf;
-#endif
 {
+   CMCHKUNPK(SUnpkU16, &param->sfn, mBuf);
+   CMCHKUNPK(SUnpkU16, &param->slot, mBuf);
 
-   S32 i;
-   TRC3(cmUnpkTfuTtiIndInfo)
-
-   /* CA dev Start */
-   CMCHKUNPK(SUnpkU8, &param->numCells, mBuf);
-   for (i=0; i<(param->numCells); i++) {
-      CMCHKUNPK(cmUnpkTfuTtiCellInfo, &param->cells[i], mBuf);
-   }
-   /* CA dev End */
    RETVALUE(ROK);
 }
 
@@ -15467,7 +15325,7 @@ TfuErrIndInfo * errInd;
       SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo));
       RETVALUE(RFAILED);
    }
-   if (pst->selector == TFU_SEL_LC) {
+   if (pst->selector == ODU_SELECTOR_LC) {
       if (cmPkTfuErrIndInfo(errInd, mBuf) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -15479,7 +15337,7 @@ TfuErrIndInfo * errInd;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmPkPtr((PTR)errInd, mBuf) != ROK)
       {
@@ -15506,7 +15364,7 @@ TfuErrIndInfo * errInd;
       TFU_FREE_MSG(mBuf);
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if (SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo)) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
       SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -15574,7 +15432,7 @@ Buffer *mBuf;
 #endif
       RETVALUE(RFAILED);
    }
-   if (pst->selector != TFU_SEL_LWLC) {
+   if (pst->selector != ODU_SELECTOR_LWLC) {
       if ((SGetSBuf(pst->region, pst->pool, (Data **)&errInd, sizeof(TfuErrIndInfo))) != ROK) {
 #if (ERRCLASS & ERRCLS_ADD_RES)
          SLogError(pst->srcEnt, pst->srcInst, pst->srcProcId,
@@ -15586,7 +15444,7 @@ Buffer *mBuf;
       }
    }
 
-   if (pst->selector == TFU_SEL_LC) 
+   if (pst->selector == ODU_SELECTOR_LC) 
    {
       if (cmUnpkTfuErrIndInfo(errInd, mBuf) != ROK) {
          SPutSBuf(pst->region, pst->pool, (Data *)errInd, sizeof(TfuErrIndInfo));
@@ -15599,7 +15457,7 @@ Buffer *mBuf;
          RETVALUE(RFAILED);
       }
    }
-   else if(pst->selector == TFU_SEL_LWLC)
+   else if(pst->selector == ODU_SELECTOR_LWLC)
    {
       if (cmUnpkPtr((PTR *)&errInd, mBuf) != ROK)
       {