make build test work after the removal of RAL, MIH (802.21), minor coding guidelines corrections in RLCs

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7753 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/COMMON/gtpv1_u_messages_types.h

@@ -30,6 +30,9 @@
 #ifndef GTPV1_U_MESSAGES_TYPES_H_
 #define GTPV1_U_MESSAGES_TYPES_H_
 
+#include "asn1_constants.h"
+
+
 #define GTPV1U_MAX_BEARERS_PER_UE max_val_DRB_Identity
 
 #define GTPV1U_ENB_CREATE_TUNNEL_REQ(mSGpTR)  (mSGpTR)->ittiMsg.Gtpv1uCreateTunnelReq

openair2/COMMON/messages_def.h

@@ -38,7 +38,9 @@
 #include "pdcp_messages_def.h"
 #include "rrc_messages_def.h"
 #include "nas_messages_def.h"
+#if ENABLE_RAL
 #include "ral_messages_def.h"
+#endif
 #include "s1ap_messages_def.h"
 #include "x2ap_messages_def.h"
 #include "sctp_messages_def.h"

openair2/COMMON/messages_types.h

@@ -46,7 +46,9 @@
 #include "pdcp_messages_types.h"
 #include "rrc_messages_types.h"
 #include "nas_messages_types.h"
+#if ENABLE_RAL
 #include "ral_messages_types.h"
+#endif
 #include "s1ap_messages_types.h"
 #include "x2ap_messages_types.h"
 #include "sctp_messages_types.h"

openair2/COMMON/phy_messages_types.h

@@ -38,7 +38,9 @@
 #define PHY_MESSAGES_TYPES_H_
 
 #include "PHY/impl_defs_lte.h"
-#include "ral_messages_types.h"
+#if ENABLE_RAL
+#include "ral_messages_types.h" //LG: MIH moved from repository/trunk to repository/extras
+#endif
 //-------------------------------------------------------------------------------------------//
 // Defines to access message fields.
 #define PHY_CONFIGURATION_REQ(mSGpTR)       (mSGpTR)->ittiMsg.phy_configuration_req
@@ -93,9 +95,9 @@ typedef struct PhyDeactivateReq_s {
 } PhyDeactivateReq;
 
 typedef struct PhyFindCellReq_s {
-  //#   if defined(ENABLE_RAL)
+#   if ENABLE_RAL
   ral_transaction_id_t    transaction_id;
-  //#   endif
+#   endif
   Earfcn                  earfcn_start;
   Earfcn                  earfcn_end;
 } PhyFindCellReq;
@@ -104,28 +106,34 @@ typedef struct PhyFindNextCellReq_s {
 } PhyFindNextCellReq;
 
 typedef struct PhyMeasThresholdReq_s {
+#   if ENABLE_RAL
   ral_transaction_id_t    transaction_id;
   ral_link_cfg_param_t    cfg_param;
+#endif
 } PhyMeasThresholdReq;
 
 typedef struct PhyMeasReportInd_s {
+#   if ENABLE_RAL
   ral_threshold_t         threshold;
   ral_link_param_t        link_param;
+#endif
 } PhyMeasReportInd;
 
 // UE: PHY -> RRC messages
 typedef struct PhyFindCellInd_s {
-  //#   if defined(ENABLE_RAL)
+#   if ENABLE_RAL
   ral_transaction_id_t    transaction_id;
-  //#   endif
+#   endif
   uint8_t                  cell_nb;
   CellInfo                 cells[MAX_REPORTED_CELL];
 } PhyFindCellInd;
 
 typedef struct PhyMeasThresholdConf_s {
+#   if ENABLE_RAL
   ral_transaction_id_t    transaction_id;
   ral_status_t            status;
   uint8_t                 num_link_cfg_params;
   ral_link_cfg_status_t   cfg_status[RAL_MAX_LINK_CFG_PARAMS];
+#endif
 } PhyMeasThresholdConf;
 #endif /* PHY_MESSAGES_TYPES_H_ */