X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_demux.c;h=c0140951e2f41fe913988db5833a90e64c57edef;hb=refs%2Fchanges%2F77%2F4377%2F11;hp=e960c8b3aa881a9ac92918a0d96be82b80e8b752;hpb=ee769160fe5360f0d3ea043deaede2902ae13073;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c
index e960c8b3a..c0140951e 100644
--- a/src/5gnrmac/mac_demux.c
+++ b/src/5gnrmac/mac_demux.c
@@ -15,52 +15,29 @@
 #   limitations under the License.                                             #
 ################################################################################
 *******************************************************************************/ 
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
+#include "du_log.h"
+#include "du_app_mac_inf.h"
 #include "lrg.h"           /* Layer manager interface includes*/
 #include "crg.h"           /* CRG interface includes*/
-#include "rgu.h"           /* RGU interface includes*/
 #include "tfu.h"           /* TFU interface includes */
+#include "rgu.h"           /* RGU interface includes*/
 #include "rg_sch_inf.h"    /* SCH interface includes */
-#include "rg_prg.h"       /* PRG (MAC-MAC) interface includes*/
 #include "rg_env.h"       /* MAC environmental includes*/
 #include "rg.h"           /* MAC includes*/
 #include "rg_err.h"       /* MAC error includes*/
-#include "du_log.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
-#include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "crg.x"           /* CRG interface includes */
+#include "mac.h"
+#include "rgu.x"           /* RGU types */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #include "rg_prg.x"        /* PRG (MAC-MAC) Interface typedefs */
-#include "du_app_mac_inf.h"
-#include "mac.h"
 #include "rg.x"            /* typedefs for MAC */
-
 /*******************************************************************
  *
  * @brief De-mux of MAC-Sub PDUs from Rx Data Ind Pdu
@@ -78,7 +55,7 @@
  *         RFAILED
  *
  * ****************************************************************/
-int unpackRxData(SlotIndInfo timingInfo, RxDataIndPdu *rxDataIndPdu)
+int unpackRxData(RxDataIndPdu *rxDataIndPdu)
 {
    uint8_t   lcId;
    uint8_t   idx = 0;
@@ -116,9 +93,11 @@ int unpackRxData(SlotIndInfo timingInfo, RxDataIndPdu *rxDataIndPdu)
             pduLen -= length;
             idx = idx + length;
 
-            /* TODO:
-             * Fill and send UL-CCCH Indication to DU APP 
-             */
+            /* store msg3 pdu in macRaCb for CRI value */
+            memcpy(macCb.macCell->macRaCb[0].msg3Pdu, pdu, length);
+
+            /* Send UL-CCCH Indication to DU APP */
+				macSendUlCcchInd(pdu, macCb.macCell->cellId, rxDataIndPdu->rnti); 
             break;
          }