X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_f1ap_msg_hdl.c;h=9eda4f39aa61d0138982a0232e75363d036442b7;hb=3445f618e886af3b78ea14d71b776bfb843f1381;hp=fc537c2947e0c0094c383f9d23723a8ac357952a;hpb=3eceb3e5eb30b6df9f674f76b9e7b4e936e5be06;p=o-du%2Fl2.git

diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c
index fc537c294..9eda4f39a 100644
--- a/src/du_app/du_f1ap_msg_hdl.c
+++ b/src/du_app/du_f1ap_msg_hdl.c
@@ -163,6 +163,30 @@ uint8_t BuildDLNRInfo(NRFreqInfo_t *dlnrfreq)
    return ROK;
 }
 
+/*******************************************************************
+ *
+ * @brief Builds NRCell ID 
+ *
+ * @details
+ *
+ *    Function : BuildNrCellId
+ *
+ *    Functionality: Building the NR Cell ID
+ *
+ * @params[in] BIT_STRING_t *nrcell
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+
+S16 BuildNrCellId(BIT_STRING_t *nrcell)
+{
+   memset(nrcell->buf, 0, nrcell->size);
+   nrcell->buf[4]   = 16; 
+   nrcell->bits_unused = 4;
+   return ROK;
+}
+
 /*******************************************************************
  *
  * @brief Builds Nrcgi 
@@ -181,9 +205,7 @@ uint8_t BuildDLNRInfo(NRFreqInfo_t *dlnrfreq)
 uint8_t BuildNrcgi(NRCGI_t *nrcgi)
 {
    uint8_t ret;
-   uint8_t unused = 4;
    uint8_t byteSize = 5;
-   uint8_t val = 16;
    /* Allocate Buffer Memory */
    nrcgi->pLMN_Identity.size = PLMN_SIZE * sizeof(uint8_t);
    DU_ALLOC(nrcgi->pLMN_Identity.buf, nrcgi->pLMN_Identity.size);
@@ -198,18 +220,14 @@ uint8_t BuildNrcgi(NRCGI_t *nrcgi)
       return RFAILED;
    }
    /*nrCellIdentity*/
-   //ret = BuildNrCellId(&nrcgi->nRCellIdentity);
    nrcgi->nRCellIdentity.size = byteSize * sizeof(uint8_t);
    DU_ALLOC(nrcgi->nRCellIdentity.buf, nrcgi->nRCellIdentity.size); 
    if(nrcgi->nRCellIdentity.buf == NULLP)
    {
       return RFAILED;
    }
-   ret = fillBitString(&nrcgi->nRCellIdentity, unused, byteSize, val);
-   if(ret != ROK)
-   {
-      return RFAILED;
-   }
+   BuildNrCellId(&nrcgi->nRCellIdentity);
+
    return ROK;
 }
 /*******************************************************************
@@ -6453,9 +6471,6 @@ void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
             {
 	       macPdschCfg->timeDomRsrcAllociList[timeDomIdx].mappingType = \
 	          timeDomAlloc->choice.setup->list.array[timeDomIdx]->mappingType;
-	       //macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbol = \
-	          
-	       //macPdschCfg->timeDomRsrcAllociList[timeDomIdx].symbolLength;
 	       macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbolAndLength = \
 	          timeDomAlloc->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
 	    }
@@ -6669,13 +6684,9 @@ void extractPuschCfg(struct BWP_UplinkDedicated__pusch_Config *cuPuschCfg, Pusch
 		     macPuschCfg->timeDomRsrcAllocList[timeDomIdx].k2 = \
 		        *(timeDomAllocList->choice.setup->list.array[timeDomIdx]->k2);
                      macPuschCfg->timeDomRsrcAllocList[timeDomIdx].mappingType = \
-                     		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->mappingType;
+                        timeDomAllocList->choice.setup->list.array[timeDomIdx]->mappingType;
                      macPuschCfg->timeDomRsrcAllocList[timeDomIdx].startSymbolAndLength = \
 		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
-                    //macPuschCfg->timeDomRsrcAllocList[timeDomIdx].startSymbol = \
-		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->startSymbol;
-                    //macPuschCfg->timeDomRsrcAllocList[timeDomIdx].symbolLen = \
-		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->symbolLen;
                   }
 	       }
 	    }
@@ -8311,16 +8322,11 @@ uint8_t extractCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate)
       cell = cellsToActivate.list.array[idx]->value.choice.Cells_to_be_Activated_List_Item;
       bitStringToInt(&cell.nRCGI.nRCellIdentity, &nci);
 
-      if(nci <= 0 || nci > MAX_NUM_CELL)
-      {
-	 DU_LOG("\nDU APP : Invalid NCI %d", nci);
-	 return RFAILED;
-      }
       if(cell.nRPCI)
       {
 	 pci = *cell.nRPCI;
       }
-      ret = duProcCellsToBeActivated(nci, pci);
+      ret = duProcCellsToBeActivated(cell.nRCGI.pLMN_Identity.buf, nci, pci);
    }
    return ret;
 }