Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04

Conflicts:
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/defs.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/RRC/LITE/rrc_eNB.c

openair3/COMMON/nas_messages_def.h

@@ -61,9 +61,3 @@ MESSAGE_DEF(NAS_PDN_CONNECTIVITY_FAIL,          MESSAGE_PRIORITY_MED,   nas_pdn_
 MESSAGE_DEF(NAS_AUTHENTICATION_PARAM_RSP,       MESSAGE_PRIORITY_MED,   nas_auth_param_rsp_t,        nas_auth_param_rsp)
 MESSAGE_DEF(NAS_AUTHENTICATION_PARAM_FAIL,      MESSAGE_PRIORITY_MED,   nas_auth_param_fail_t,       nas_auth_param_fail)
 
-#if defined(DISABLE_USE_NAS)
-MESSAGE_DEF(NAS_ATTACH_REQ,                     MESSAGE_PRIORITY_MED,   nas_attach_req_t,           nas_attach_req)
-MESSAGE_DEF(NAS_ATTACH_ACCEPT,                  MESSAGE_PRIORITY_MED,   nas_attach_accept_t,        nas_attach_accept)
-MESSAGE_DEF(NAS_AUTHENTICATION_RESP,            MESSAGE_PRIORITY_MED,   nas_auth_resp_t,            nas_auth_resp)
-MESSAGE_DEF(NAS_AUTHENTICATION_REQ,             MESSAGE_PRIORITY_MED,   nas_auth_req_t,             nas_auth_req)
-#endif

openair3/COMMON/nas_messages_types.h

@@ -233,17 +233,7 @@ typedef struct nas_conn_est_ind_s {
 typedef nas_establish_rsp_t nas_conn_est_rej_t;
 
 
-#if defined(DISABLE_USE_NAS)
-typedef struct nas_conn_est_cnf_s {
-  uint32_t ue_id;
-
-  nas_establish_cnf_t nas_establish_cnf;
-  /* Transparent message from MME_APP to S1AP */
-  s1ap_initial_ctxt_setup_req_t transparent;
-} nas_conn_est_cnf_t;
-#else
 typedef nas_establish_cnf_t nas_conn_est_cnf_t;
-#endif
 
 
 typedef struct nas_conn_rel_ind_s {
@@ -336,10 +326,4 @@ typedef struct nas_auth_param_fail_s {
 } nas_auth_param_fail_t;
 
 
-#if defined(DISABLE_USE_NAS)
-typedef struct nas_attach_accept_s {
-  s1ap_initial_ctxt_setup_req_t transparent;
-} nas_attach_accept_t;
-#endif
-
 #endif /* NAS_MESSAGES_TYPES_H_ */

openair3/S1AP/s1ap_eNB.c

@@ -65,10 +65,7 @@
 #include "oaisim_mme_test_s1c.h"
 #endif
 
-
-#if !defined(OAI_EMU)
 s1ap_eNB_config_t s1ap_config;
-#endif
 
 static int s1ap_eNB_generate_s1_setup_request(
   s1ap_eNB_instance_t *instance_p, s1ap_eNB_mme_data_t *s1ap_mme_data_p);

openair3/S1AP/s1ap_eNB.h

@@ -35,13 +35,9 @@ typedef struct s1ap_eNB_config_s {
   unsigned char mme_enabled;          ///< MME enabled ?
 } s1ap_eNB_config_t;
 
-#if defined(OAI_EMU)
-# define EPC_MODE_ENABLED       oai_emulation.info.s1ap_config.mme_enabled
-#else
 extern s1ap_eNB_config_t s1ap_config;
 
-# define EPC_MODE_ENABLED       s1ap_config.mme_enabled
-#endif
+#define EPC_MODE_ENABLED       s1ap_config.mme_enabled
 
 void *s1ap_eNB_task(void *arg);