X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_ue_mgr.c;h=f901ce944c7959f9cb5f2100a66827dc8d787424;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=6def8e393e6e3bac7cfaff730a166b41c272678b;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c
index 6def8e393..f901ce944 100644
--- a/src/5gnrmac/mac_ue_mgr.c
+++ b/src/5gnrmac/mac_ue_mgr.c
@@ -32,14 +32,14 @@
 MacSchUeCreateReqFunc macSchUeCreateReqOpts[] =
 {
    packMacSchUeCreateReq,    /* packing for loosely coupled */
-   macSchUeCreateReq,        /* packing for tightly coupled */
+   MacSchUeCreateReq,        /* packing for tightly coupled */
    packMacSchUeCreateReq     /* packing for light weight loosely coupled */
 };
 
 DuMacUeCreateRspFunc DuMacUeCreateRspOpts[] =
 {
    packDuMacUeCreateRsp,     /* packing for loosely coupled */
-   duHandleMacUeCreateRsp,   /* packing for tightly coupled */
+   DuHandleMacUeCreateRsp,   /* packing for tightly coupled */
    packDuMacUeCreateRsp,     /* packing for light weight loosly coupled */
 };
 
@@ -664,10 +664,10 @@ uint8_t sendAddUeCreateReqToSch(MacUeCfg *ueCfg)
    }
 
    schUeCfg.numLc = ueCfg->numLcs;
-   if(schUeCfg.numLc > MAX_NUM_LOGICAL_CHANNELS)
+   if(schUeCfg.numLc > MAX_NUM_LC)
    {
       DU_LOG("\nMAC : Number of Logical channels %d exceeds max limit %d",\
-	    schUeCfg.numLc, MAX_NUM_LOGICAL_CHANNELS);
+	    schUeCfg.numLc, MAX_NUM_LC);
    }  
    for(idx = 0; idx < schUeCfg.numLc; idx++)
    {
@@ -720,7 +720,7 @@ uint8_t createUeCb(MacUeCfg *ueCfg)
    }
 
    /* Check if UE already configured */
-   ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx];
+   ueCb = &macCb.macCell[cellIdx]->ueCb[ueCfg->ueIdx -1];
    if(ueCb)
    {
       if((ueCb->ueIdx == ueCfg->ueIdx) && (ueCb->crnti == ueCfg->crnti) &&\
@@ -862,17 +862,17 @@ uint8_t createUeCb(MacUeCfg *ueCfg)
    }
 
    /* Fill SRB1 info */
-   if(ueCfg->numLcs > MAX_NUM_LOGICAL_CHANNELS)
+   if(ueCfg->numLcs > MAX_NUM_LC)
    {
       DU_LOG("\nMAC : Number of LC to configure[%d] exceeds limit[%d]",\
-	    ueCfg->numLcs, MAX_NUM_LOGICAL_CHANNELS);
+	    ueCfg->numLcs, MAX_NUM_LC);
       return RFAILED;
    }
 
    for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++)
    {
       ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcId = ueCfg->lcCfgList[lcIdx].lcId;
-      ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcState = LC_STATE_ACTIVE;
+      ueCb->dlInfo.lcCb[ueCb->dlInfo.numDlLc].lcState = MAC_LC_STATE_ACTIVE;
       ueCb->dlInfo.numDlLc++;
    }
 
@@ -1010,7 +1010,7 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
    if(schCfgRsp->rsp == RSP_NOK)
    {
       DU_LOG("\nMAC : SCH UE Create Response : FAILURE [CRNTI %d]", schCfgRsp->crnti);
-      memset(&macCb.macCell[cellIdx]->ueCb[schCfgRsp->ueIdx], 0, sizeof(MacUeCb));
+      memset(&macCb.macCell[cellIdx]->ueCb[schCfgRsp->ueIdx -1], 0, sizeof(MacUeCb));
       macCb.macCell[cellIdx]->numActvUe--;
       result = MAC_DU_APP_RSP_NOK;
    }