X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_rach.c;h=a0feae5b93cc18a128347b236b0cce5ca3611ee4;hb=45d134510deb6902b870b4a0fb574b6075fba601;hp=37893503ea0c52c1434376ab06c2ea753727c1a3;hpb=cb47d1fdfaa5c7229e57282b39edd1603cbdb5c7;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_rach.c b/src/5gnrmac/mac_rach.c
index 37893503e..a0feae5b9 100644
--- a/src/5gnrmac/mac_rach.c
+++ b/src/5gnrmac/mac_rach.c
@@ -16,44 +16,124 @@
 ################################################################################
  *******************************************************************************/
 /* 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_mblk.h"       /* common memory link list library */
-#include "cm_lte.h"        /* Common LTE Defines */
-#include "tfu.h"           /* RGU Interface includes */
+#include "common_def.h"
 #include "lrg.h"
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.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_mblk.x"       /* common memory link list library */
-#include "cm_lte.x"        /* Common LTE Defines */
-#include "tfu.x"           /* RGU Interface includes */
 #include "lrg.x"
 #include "du_app_mac_inf.h"
+#include "mac_sch_interface.h"
+#include "lwr_mac_upr_inf.h"
 #include "mac.h"
+#include "mac_utils.h"
 
+/* Function pointer for sending rach ind from MAC to SCH */
+MacSchRachIndFunc macSchRachIndOpts[]=
+{
+   packMacSchRachInd,
+   macSchRachInd,
+   packMacSchRachInd
+};
+
+/*******************************************************************
+ *
+ * @brief Sends RACH indication to SCH
+ *
+ * @details
+ *
+ *    Function : sendRachIndMacToSch
+ *
+ *    Functionality:
+ *     Sends RACH indication to SCH
+ *
+ * @params[in] RACH indication info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t sendRachIndMacToSch(RachIndInfo *rachInd)
+{
+   Pst pst;
+
+   FILL_PST_MAC_TO_SCH(pst, EVENT_RACH_IND_TO_SCH);
+   return(*macSchRachIndOpts[pst.selector])(&pst, rachInd); 
+}
+
+/*******************************************************************
+ *
+ * @brief Processes RACH indication from PHY
+ *
+ * @details
+ *
+ *    Function : fapiMacRachInd
+ *
+ *    Functionality:
+ *      Processes RACH indication from PHY
+ *
+ * @params[in] Post structure
+ *             Rach indication message
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/ 
+uint8_t fapiMacRachInd(Pst *pst, RachInd *rachInd)
+{
+   uint8_t      pduIdx;
+   uint8_t      preambleIdx;
+   RachIndInfo  rachIndInfo;
+
+   DU_LOG("\nMAC : Received RACH indication");
+   /* Considering one pdu and one preamble */
+   pduIdx = 0;
+   preambleIdx = 0;
+
+   rachIndInfo.cellId = rachInd->rachPdu[pduIdx].pci;
+   /* TODO : A.ocate unique crnti for each ue */
+   rachIndInfo.crnti = 100;
+   rachIndInfo.timingInfo.sfn = rachInd->timingInfo.sfn;
+   rachIndInfo.timingInfo.slot = rachInd->timingInfo.slot;
+   rachIndInfo.slotIdx = rachInd->rachPdu[pduIdx].slotIdx;
+   rachIndInfo.symbolIdx = rachInd->rachPdu[pduIdx].symbolIdx;
+   rachIndInfo.freqIdx = rachInd->rachPdu[pduIdx].freqIdx;
+   rachIndInfo.preambleIdx = \
+			     rachInd->rachPdu[pduIdx].preamInfo[preambleIdx].preamIdx;
+   rachIndInfo.timingAdv = \
+			   rachInd->rachPdu[pduIdx].preamInfo[preambleIdx].timingAdv;
+
+   /* storing the value in macRaCb */
+   createMacRaCb(rachIndInfo.cellId, rachIndInfo.crnti);
+
+   return(sendRachIndMacToSch(&rachIndInfo));
+}
 
 /* spec-38.211 Table 6.3.3.1-7 */
 uint8_t UnrestrictedSetNcsTable[MAX_ZERO_CORR_CFG_IDX] = 
 {0, 2, 4, 6, 8, 10, 12, 13, 15, 17, 19, 23, 27, 34, 46, 69};
 
-int MacProcUlSchInfo(Pst *pst, UlSchInfo *ulSchInfo)
+/*******************************************************************
+ *
+ * @brief Processes UL scheduling info from SCH
+ *
+ * @details
+ *
+ *    Function : MacProcUlSchInfo
+ *
+ *    Functionality: Processes UL scheduling info from SCH
+ *
+ * @params[in] Post structure
+ *             UL scheduling info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t MacProcUlSchInfo(Pst *pst, UlSchedInfo *ulSchedInfo)
 {
-   if(ulSchInfo != NULLP)
-	{
+   uint16_t  cellIdx;
+
+   GET_CELL_IDX(ulSchedInfo->cellId, cellIdx);
+   if(ulSchedInfo != NULLP)
+   {
       MacUlSlot *currUlSlot = 
-	   &macCb.macCell->ulSlot[ulSchInfo->slotIndInfo.slot % MAX_SLOT_SUPPORTED];
-      memcpy(&currUlSlot->ulCellInfo, ulSchInfo, sizeof(UlSchInfo)); 
+	 &macCb.macCell[cellIdx]->ulSlot[ulSchedInfo->slotIndInfo.slot % MAX_SLOT_SUPPORTED];
+      memcpy(&currUlSlot->ulInfo, ulSchedInfo, sizeof(UlSchedInfo)); 
    }
    return ROK;
 }