From 3df061b540dc2716fa026f97c7db8916106124a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Leroy?= <frederic.leroy@b-com.com>
Date: Fri, 1 Jul 2016 11:25:49 +0200
Subject: [PATCH] UE/EMM: move emm_indication_callback_t from openair2 to
emm_main.h
---
openair2/COMMON/commonDef.h | 9 ---------
openair3/NAS/UE/EMM/emm_main.h | 9 +++++++++
openair3/NAS/UE/nas_proc.h | 1 +
openair3/NAS/UE/nas_user.h | 1 +
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/openair2/COMMON/commonDef.h b/openair2/COMMON/commonDef.h
index b1ec47449a..37d05f3fda 100644
--- a/openair2/COMMON/commonDef.h
+++ b/openair2/COMMON/commonDef.h
@@ -316,15 +316,6 @@ typedef struct {
*/
#define TAI_LIST_T(SIZE) struct {Byte_t n_tais; tai_t tai[SIZE];}
-/*
- * User notification callback, executed whenever a change of data with
- * respect of network information (e.g. network registration and/or
- * location change, new PLMN becomes available) is notified by the
- * EPS Mobility Management sublayer
- */
-typedef int (*emm_indication_callback_t) (Stat_t, tac_t, ci_t, AcT_t,
- const char*, size_t);
-
typedef enum eps_protocol_discriminator_e {
/* Protocol discriminator identifier for EPS Mobility Management */
EPS_MOBILITY_MANAGEMENT_MESSAGE = 0x7,
diff --git a/openair3/NAS/UE/EMM/emm_main.h b/openair3/NAS/UE/EMM/emm_main.h
index 1ce584210e..c41dc0b664 100644
--- a/openair3/NAS/UE/EMM/emm_main.h
+++ b/openair3/NAS/UE/EMM/emm_main.h
@@ -50,6 +50,15 @@ Description Defines the EPS Mobility Management procedure call manager,
/************************ G L O B A L T Y P E S ************************/
/****************************************************************************/
+/*
+ * User notification callback, executed whenever a change of data with
+ * respect of network information (e.g. network registration and/or
+ * location change, new PLMN becomes available) is notified by the
+ * EPS Mobility Management sublayer
+ */
+typedef int (*emm_indication_callback_t) (Stat_t, tac_t, ci_t, AcT_t,
+ const char*, size_t);
+
/****************************************************************************/
/******************** G L O B A L V A R I A B L E S ********************/
/****************************************************************************/
diff --git a/openair3/NAS/UE/nas_proc.h b/openair3/NAS/UE/nas_proc.h
index 4514983df8..c66f2177fe 100644
--- a/openair3/NAS/UE/nas_proc.h
+++ b/openair3/NAS/UE/nas_proc.h
@@ -40,6 +40,7 @@ Description NAS procedure call manager
#include "commonDef.h"
#include "networkDef.h"
+#include "emm_main.h"
/****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/
diff --git a/openair3/NAS/UE/nas_user.h b/openair3/NAS/UE/nas_user.h
index 93b1cc8961..584c7532f0 100644
--- a/openair3/NAS/UE/nas_user.h
+++ b/openair3/NAS/UE/nas_user.h
@@ -40,6 +40,7 @@ Description NAS procedure functions triggered by the user
#include "commonDef.h"
#include "networkDef.h"
+#include "emm_main.h"
/****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/
--
GitLab