Mux Code Changes

[o-du/l2.git] / src / 5gnrmac / mac_slot_ind.c

diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c
index 8f686b3..c30b946 100644 (file)
--- a/src/5gnrmac/mac_slot_ind.c
+++ b/src/5gnrmac/mac_slot_ind.c
@@ -16,17 +16,7 @@
 ################################################################################
  *******************************************************************************/
 /* header include files (.h) */
-#include "stdbool.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 "common_def.h"
 #include "rgu.h"
 #include "tfu.h"           /* RGU Interface includes */
 #include "lrg.h"
@@ -35,15 +25,6 @@
 #include "rg_env.h"   
 #include "rg.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 "rgu.x"
 #include "tfu.x"           /* RGU Interface includes */
 #include "lrg.x"
@@ -104,50 +85,69 @@ int MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo)
                if(dlSchedInfo->msg4Alloc != NULLP)
       {
          Msg4Alloc *msg4Alloc = NULLP;
-         MacDlData msg4DlData;
-         MacCeInfo  macCeData;
-
                   currDlSlot = &macCb.macCell->dlSlot[dlSchedInfo->schSlotValue.msg4Time.slot];
                        currDlSlot->dlInfo.msg4Alloc = dlSchedInfo->msg4Alloc; /* copy msg4 alloc pointer in MAC slot info */
                        msg4Alloc = dlSchedInfo->msg4Alloc;
+         macCb.macCell->macRaCb[0].msg4TbSize = msg4Alloc->msg4PdschCfg.codeword[0].tbSize;
+      }
+   }
+   return ROK;
+}
 
-         memset(&msg4DlData, 0, sizeof(MacDlData));
-         memset(&macCeData, 0, sizeof(MacCeInfo));
+void BuildAndSendMsg4MuxPdu(Msg4Alloc *msg4Alloc)
+{ 
+   MacDlData msg4DlData;
+   MacCeInfo  macCeData;
 
-         macCb.macCell->macRaCb[0].msg4TbSize = msg4Alloc->msg4PdschCfg.codeword[0].tbSize;
+   memset(&msg4DlData, 0, sizeof(MacDlData));
+   memset(&macCeData, 0, sizeof(MacCeInfo));
  
-         if(macCb.macCell->macRaCb[0].msg4Pdu != NULLP)
+   if(macCb.macCell->macRaCb[0].msg4Pdu != NULLP)
+   {
+      MAC_ALLOC(msg4DlData.pduInfo[0].dlPdu, \
+        macCb.macCell->macRaCb[0].msg4PduLen);
+      if(msg4DlData.pduInfo[0].dlPdu != NULLP)
+      {
+         fillMsg4DlData(&msg4DlData, macCb.macCell->macRaCb[0].msg4Pdu);
+         fillMacCe(&macCeData, &macCb.macCell->macRaCb[0].msg3Pdu);
+         /* Forming Mux Pdu */
+                       macCb.macCell->macRaCb[0].msg4TxPdu = NULLP;
+                       MAC_ALLOC(macCb.macCell->macRaCb[0].msg4TxPdu, macCb.macCell->macRaCb[0].msg4TbSize);
+         if(macCb.macCell->macRaCb[0].msg4TxPdu != NULLP)
          {
-            MAC_ALLOC(msg4DlData.pduInfo[0].dlPdu, \
-              macCb.macCell->macRaCb[0].msg4PduLen);
-            if(msg4DlData.pduInfo[0].dlPdu != NULLP)
-            {
-               fillMsg4DlData(&msg4DlData);
-            }
-         }
-
-         /* MUXing for msg4 */
-         fillMacCe(&macCeData);
-         macMuxPdu(&msg4DlData, &macCeData, macCb.macCell->macRaCb[0].msg4TbSize);
-      
-         /* storing msg4 Pdu in macDlSlot */
-         MAC_ALLOC(msg4Alloc->msg4Info.msg4Pdu, macCb.macCell->macRaCb[0].msg4PduLen);
-         if(msg4Alloc->msg4Info.msg4Pdu != NULLP)
-         {  
-            msg4Alloc->msg4Info.msg4Pdu = macCb.macCell->macRaCb[0].msg4Pdu;
-            msg4Alloc->msg4Info.msg4PduLen = macCb.macCell->macRaCb[0].msg4PduLen;
-         }
-
-         /* TODO: Free all allocated memory, after the usage */
-         /* MAC_FREE(macCb.macCell->macRaCb[0].msg4TxPdu, \
-              macCb.macCell->macRaCb[0].msg4TbSize); // TODO: To be freed after re-transmission is successful.
-            MAC_FREE(dlSchedInfo->msg4Alloc->msg4Info.msg4Pdu,\
-              macCb.macCell->macRaCb[0].msg4PduLen); //TODO: To be freed after lower-mac is succesfull
-            MAC_FREE(msg4DlData.pduInfo[0].dlPdu, macCb.macCell->macRaCb[0].msg4PduLen);
-            MAC_FREE(macCb.macCell->macRaCb[0].msg4Pdu, macCb.macCell->macRaCb[0].msg4PduLen); */
+                          memset(macCb.macCell->macRaCb[0].msg4TxPdu, 0, macCb.macCell->macRaCb[0].msg4TbSize);
+                          macMuxPdu(&msg4DlData, &macCeData, macCb.macCell->macRaCb[0].msg4TxPdu,\
+                                 macCb.macCell->macRaCb[0].msg4TbSize);
+            
+                       }
+                       else
+                       {
+            DU_LOG("\nMAC: Failed allocating memory for msg4TxPdu");
+                       }
+                       /* Free memory allocated */
+         MAC_FREE(msg4DlData.pduInfo[0].dlPdu, macCb.macCell->macRaCb[0].msg4PduLen);
       }
    }
-   return ROK;
+      
+   /* storing msg4 Pdu in macDlSlot */
+   if(macCb.macCell->macRaCb[0].msg4TxPdu)
+   {
+      msg4Alloc->msg4Info.msg4PduLen = macCb.macCell->macRaCb[0].msg4TbSize;
+      MAC_ALLOC(msg4Alloc->msg4Info.msg4Pdu, msg4Alloc->msg4Info.msg4PduLen);
+     if(msg4Alloc->msg4Info.msg4Pdu != NULLP)
+     {
+            memcpy(msg4Alloc->msg4Info.msg4Pdu, macCb.macCell->macRaCb[0].msg4TxPdu, \
+                 msg4Alloc->msg4Info.msg4PduLen);
+     }
+       }
+       else
+       {
+      DU_LOG("\nMAC: Failed at macMuxPdu()");
+       }
+   /* TODO: Free all allocated memory, after the usage */
+   /* MAC_FREE(macCb.macCell->macRaCb[0].msg4TxPdu, \
+     macCb.macCell->macRaCb[0].msg4TbSize); // TODO: To be freed after re-transmission is successful.
+      MAC_FREE(macCb.macCell->macRaCb[0].msg4Pdu, macCb.macCell->macRaCb[0].msg4PduLen); */
 }
 
 /**
@@ -210,7 +210,7 @@ int sendSlotIndMacToDuApp(SlotIndInfo *slotInd)
   slotInfo->slot = slotInd->slot;
  
   /* Fill Pst */
-  pst.selector  = DU_MAC_LWLC;
+  pst.selector  = ODU_SELECTOR_LWLC;
   pst.srcEnt    = ENTRG;
   pst.dstEnt    = ENTDUAPP;
   pst.dstInst   = 0;