From 73f92fd9d1a954237c890cf2d6278cd40f0b8ad6 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Fri, 8 Apr 2016 11:25:53 +0200
Subject: [PATCH] update FAPI include files

---
 openair2/LAYER2/MAC/ff-mac-common.h     | 6 ++++--
 openair2/LAYER2/MAC/ff-mac-csched-sap.h | 1 +
 openair2/LAYER2/MAC/ff-mac-init.h       | 2 ++
 openair2/LAYER2/MAC/ff-mac-sched-sap.h  | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openair2/LAYER2/MAC/ff-mac-common.h b/openair2/LAYER2/MAC/ff-mac-common.h
index 2715b33915..a23c2c5a89 100644
--- a/openair2/LAYER2/MAC/ff-mac-common.h
+++ b/openair2/LAYER2/MAC/ff-mac-common.h
@@ -115,7 +115,9 @@ struct DlDciListElement_s
   uint16_t  rnti;
   uint32_t  rbBitmap;
   uint8_t   rbShift;
+  uint8_t   rbgSubset;      //resource allocation type1 field
   uint8_t   resAlloc;
+  uint8_t   nr_of_tbs;
   uint16_t  tbsSize[MAX_TB_LIST];
   uint8_t   mcs[MAX_TB_LIST];
   uint8_t   ndi[MAX_TB_LIST];
@@ -270,8 +272,8 @@ struct BuildDataListElement_s
   /* This is an array of CeBitmap_e enum flags. If one wants for example to signal TA in 1st TB and DRX and AD in 2nd one should:
    * ceBitmap[0] = ff_TA;  ceBitmap[1] = ff_DRX | ff_AD; */
   uint8_t ceBitmap[MAX_TB_LIST];
-  uint8_t   nr_rlcPDU_List;
-  struct RlcPduListElement_s (*rlcPduList)[MAX_TB_LIST];
+  uint8_t   nr_rlcPDU_List[MAX_TB_LIST];
+  struct RlcPduListElement_s* rlcPduList[MAX_TB_LIST];
   uint8_t   servCellIndex;	//definition according to 36.331 'ServCellIndex'
   /* Hex content of Activation/Deactivation MAC CE */
   uint8_t	activationDeactivationCE;
diff --git a/openair2/LAYER2/MAC/ff-mac-csched-sap.h b/openair2/LAYER2/MAC/ff-mac-csched-sap.h
index d0808fd93b..6e7a4f5711 100644
--- a/openair2/LAYER2/MAC/ff-mac-csched-sap.h
+++ b/openair2/LAYER2/MAC/ff-mac-csched-sap.h
@@ -374,6 +374,7 @@ struct CschedCellConfigUpdateIndParameters
 // CSCHED - MAC Scheduler Control SAP primitives
 // (See 4.1 for description of the primitives)
 //
+// Primitives defined as callbacks in separate file ff-mac-callback.h
 
 #if 0
 /* not used - the scheduler has callbacks for those */
diff --git a/openair2/LAYER2/MAC/ff-mac-init.h b/openair2/LAYER2/MAC/ff-mac-init.h
index ba7dd21108..5942615c43 100644
--- a/openair2/LAYER2/MAC/ff-mac-init.h
+++ b/openair2/LAYER2/MAC/ff-mac-init.h
@@ -20,6 +20,8 @@ void *SchedInit(
     CschedUeConfigUpdateInd_callback_t   *CschedUeConfigUpdateInd,
     CschedCellConfigUpdateInd_callback_t *CschedCellConfigUpdateInd);
 
+void SchedShutdown(void* scheduler);
+
 #if defined (__cplusplus)
 }
 #endif
diff --git a/openair2/LAYER2/MAC/ff-mac-sched-sap.h b/openair2/LAYER2/MAC/ff-mac-sched-sap.h
index 5b65ddcd72..f55450c2bb 100644
--- a/openair2/LAYER2/MAC/ff-mac-sched-sap.h
+++ b/openair2/LAYER2/MAC/ff-mac-sched-sap.h
@@ -261,6 +261,7 @@ struct SchedUlConfigIndParameters
 // SCHED - MAC Scheduler SAP primitives
 // (See 4.2 for description of the primitives)
 //
+// Primitives defined as callbacks in separate file ff-mac-callback.h
 
 #if 0
 /* not used - the scheduler has callbacks for those */
-- 
2.26.2