osaf/services/saf/amf/amfd/include/Makefile.am | 1 +
osaf/services/saf/amf/amfd/include/app.h | 14 +-------
osaf/services/saf/amf/amfd/include/apptype.h | 48 ++++++++++++++++++++++++++
3 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/include/Makefile.am
b/osaf/services/saf/amf/amfd/include/Makefile.am
--- a/osaf/services/saf/amf/amfd/include/Makefile.am
+++ b/osaf/services/saf/amf/amfd/include/Makefile.am
@@ -20,6 +20,7 @@ MAINTAINERCLEANFILES = Makefile.in
noinst_HEADERS = \
app.h \
+ apptype.h \
node.h \
cb.h \
ckpt.h \
diff --git a/osaf/services/saf/amf/amfd/include/app.h
b/osaf/services/saf/amf/amfd/include/app.h
--- a/osaf/services/saf/amf/amfd/include/app.h
+++ b/osaf/services/saf/amf/amfd/include/app.h
@@ -27,17 +27,11 @@
#include <saAmf.h>
#include <saImm.h>
+#include <include/apptype.h>
#include <sg.h>
#include <si.h>
#include "db_template.h"
-typedef struct avd_app_type_tag {
- SaNameT name;
- SaNameT *sgAmfApptSGTypes;
- uint32_t no_sg_types;
- struct avd_app_tag *list_of_app;
-} AVD_APP_TYPE;
-
// TODO (hafe) change to class AmfApp
typedef struct avd_app_tag {
SaNameT name;
@@ -59,10 +53,4 @@ extern void avd_app_remove_sg(AVD_APP *a
extern SaAisErrorT avd_app_config_get(void);
extern void avd_app_constructor(void);
-extern AVD_APP_TYPE *avd_apptype_get(const SaNameT *dn);
-extern void avd_apptype_add_app(AVD_APP *app);
-extern void avd_apptype_remove_app(AVD_APP *app);
-extern SaAisErrorT avd_apptype_config_get(void);
-extern void avd_apptype_constructor(void);
-
#endif
diff --git a/osaf/services/saf/amf/amfd/include/apptype.h
b/osaf/services/saf/amf/amfd/include/apptype.h
new file mode 100644
--- /dev/null
+++ b/osaf/services/saf/amf/amfd/include/apptype.h
@@ -0,0 +1,48 @@
+/* -*- OpenSAF -*-
+ *
+ * (C) Copyright 2008 The OpenSAF Foundation
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
+ * under the GNU Lesser General Public License Version 2.1, February 1999.
+ * The complete license can be accessed from the following location:
+ * http://opensource.org/licenses/lgpl-license.php
+ * See the Copying file included with the OpenSAF distribution for full
+ * licensing terms.
+ *
+ * Author(s): Emerson Network Power
+ *
+ */
+
+/****************************************************************************
+
+ DESCRIPTION: Application type class
+
+****************************************************************************/
+#ifndef AVD_APPTYPE_H
+#define AVD_APPTYPE_H
+
+#include <saAmf.h>
+#include <saImm.h>
+
+#include <sg.h>
+#include <si.h>
+#include "db_template.h"
+
+struct avd_app_tag;
+
+typedef struct avd_app_type_tag {
+ SaNameT name;
+ SaNameT *sgAmfApptSGTypes;
+ uint32_t no_sg_types;
+ struct avd_app_tag *list_of_app;
+} AVD_APP_TYPE;
+
+extern AVD_APP_TYPE *avd_apptype_get(const SaNameT *dn);
+extern void avd_apptype_add_app(struct avd_app_tag *app);
+extern void avd_apptype_remove_app(struct avd_app_tag *app);
+extern SaAisErrorT avd_apptype_config_get(void);
+extern void avd_apptype_constructor(void);
+
+#endif
------------------------------------------------------------------------------
The best possible search technologies are now affordable for all companies.
Download your FREE open source Enterprise Search Engine today!
Our experts will assist you in its installation for $59/mo, no commitment.
Test it for FREE on our Cloud platform anytime!
http://pubads.g.doubleclick.net/gampad/clk?id=145328191&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
