osaf/services/saf/amf/amfd/Makefile.am | 8 +-
osaf/services/saf/amf/amfd/app.cc | 11 +--
osaf/services/saf/amf/amfd/apptype.cc | 10 +-
osaf/services/saf/amf/amfd/chkop.cc | 2 +-
osaf/services/saf/amf/amfd/mbcsv_dec.cc | 8 +-
osaf/services/saf/amf/amfd/mbcsv_edu.cc | 4 +-
osaf/services/saf/amf/amfd/mbcsv_enc.cc | 6 +-
osaf/services/saf/amf/amfd/mbcsv_updt.cc | 4 +-
osaf/services/saf/amf/amfd/clm.cc | 8 +-
osaf/services/saf/amf/amfd/cluster.cc | 10 +-
osaf/services/saf/amf/amfd/comp.cc | 14 ++--
osaf/services/saf/amf/amfd/compcstype.cc | 14 ++--
osaf/services/saf/amf/amfd/comptype.cc | 4 +-
osaf/services/saf/amf/amfd/csi.cc | 8 +-
osaf/services/saf/amf/amfd/csiattr.cc | 6 +-
osaf/services/saf/amf/amfd/cstype.cc | 6 +-
osaf/services/saf/amf/amfd/ctcstype.cc | 4 +-
osaf/services/saf/amf/amfd/dmsg.cc | 2 +-
osaf/services/saf/amf/amfd/hlt.cc | 6 +-
osaf/services/saf/amf/amfd/hlttype.cc | 2 +-
osaf/services/saf/amf/amfd/imm.cc | 26 ++++----
osaf/services/saf/amf/amfd/include/Makefile.am | 58 +++++++++++-----------
osaf/services/saf/amf/amfd/include/avd.h | 29 +++++-----
osaf/services/saf/amf/amfd/include/avd_app.h | 4 +-
osaf/services/saf/amf/amfd/include/avd_dl_api.h | 40 ---------------
osaf/services/saf/amf/amfd/include/avd_cb.h | 4 +-
osaf/services/saf/amf/amfd/include/avd_ckp.h | 5 +-
osaf/services/saf/amf/amfd/include/avd_ckpt_edu.h | 0
osaf/services/saf/amf/amfd/include/avd_ckpt_msg.h | 0
osaf/services/saf/amf/amfd/include/avd_ckpt_updt.h | 0
osaf/services/saf/amf/amfd/include/avd_clm.h | 0
osaf/services/saf/amf/amfd/include/avd_cluster.h | 2 +-
osaf/services/saf/amf/amfd/include/avd_comp.h | 2 +-
osaf/services/saf/amf/amfd/include/avd_csi.h | 6 +-
osaf/services/saf/amf/amfd/include/avd_def.h | 8 ---
osaf/services/saf/amf/amfd/include/avd_evt.h | 2 +-
osaf/services/saf/amf/amfd/include/avd_hlt.h | 0
osaf/services/saf/amf/amfd/include/avd_imm.h | 0
osaf/services/saf/amf/amfd/include/avd_mds.h | 0
osaf/services/saf/amf/amfd/include/avd_msg.h | 0
osaf/services/saf/amf/amfd/include/avd_node.h | 4 +-
osaf/services/saf/amf/amfd/include/avd_ntf.h | 4 +-
osaf/services/saf/amf/amfd/include/avd_pg.h | 6 +-
osaf/services/saf/amf/amfd/include/avd_proc.h | 6 +-
osaf/services/saf/amf/amfd/include/avd_sg.h | 4 +-
osaf/services/saf/amf/amfd/include/avd_si.h | 10 +-
osaf/services/saf/amf/amfd/include/avd_si_dep.h | 4 +-
osaf/services/saf/amf/amfd/include/avd_su.h | 12 ++--
osaf/services/saf/amf/amfd/include/avd_susi.h | 6 +-
osaf/services/saf/amf/amfd/include/avd_sutype.h | 2 +-
osaf/services/saf/amf/amfd/include/avd_tmr.h | 0
osaf/services/saf/amf/amfd/include/avd_util.h | 2 +-
osaf/services/saf/amf/amfd/main.cc | 16 +++---
osaf/services/saf/amf/amfd/mds.cc | 4 +-
osaf/services/saf/amf/amfd/ndfsm.cc | 4 +-
osaf/services/saf/amf/amfd/ndmsg.cc | 2 +-
osaf/services/saf/amf/amfd/ndproc.cc | 7 +-
osaf/services/saf/amf/amfd/node.cc | 6 +-
osaf/services/saf/amf/amfd/nodegroup.cc | 6 +-
osaf/services/saf/amf/amfd/nodeswbundle.cc | 6 +-
osaf/services/saf/amf/amfd/ntf.cc | 4 +-
osaf/services/saf/amf/amfd/pg.cc | 2 +-
osaf/services/saf/amf/amfd/role.cc | 14 ++--
osaf/services/saf/amf/amfd/sg.cc | 20 +++---
osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 8 +-
osaf/services/saf/amf/amfd/sg_nored_fsm.cc | 4 +-
osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 4 +-
osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 4 +-
osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 6 +-
osaf/services/saf/amf/amfd/sgproc.cc | 10 +-
osaf/services/saf/amf/amfd/sgtype.cc | 16 +++---
osaf/services/saf/amf/amfd/si.cc | 14 ++--
osaf/services/saf/amf/amfd/si_dep.cc | 8 +-
osaf/services/saf/amf/amfd/siass.cc | 12 ++--
osaf/services/saf/amf/amfd/sirankedsu.cc | 8 +-
osaf/services/saf/amf/amfd/su.cc | 12 ++--
osaf/services/saf/amf/amfd/sutcomptype.cc | 8 +-
osaf/services/saf/amf/amfd/sutype.cc | 12 ++--
osaf/services/saf/amf/amfd/svctype.cc | 14 ++--
osaf/services/saf/amf/amfd/svctypecstypes.cc | 4 +-
osaf/services/saf/amf/amfd/timer.cc | 2 +-
osaf/services/saf/amf/amfd/util.cc | 5 +-
82 files changed, 287 insertions(+), 338 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/Makefile.am
b/osaf/services/saf/amf/amfd/Makefile.am
--- a/osaf/services/saf/amf/amfd/Makefile.am
+++ b/osaf/services/saf/amf/amfd/Makefile.am
@@ -39,6 +39,10 @@ osafamfd_SOURCES = \
app.cc \
apptype.cc \
chkop.cc \
+ ckpt_dec.cc \
+ ckpt_edu.cc \
+ ckpt_enc.cc \
+ ckpt_updt.cc \
cluster.cc \
clm.cc \
comp.cc \
@@ -53,10 +57,6 @@ osafamfd_SOURCES = \
hlttype.cc \
imm.cc \
main.cc \
- mbcsv_dec.cc \
- mbcsv_edu.cc \
- mbcsv_enc.cc \
- mbcsv_updt.cc \
mds.cc \
ndfsm.cc \
ndmsg.cc \
diff --git a/osaf/services/saf/amf/amfd/app.cc
b/osaf/services/saf/amf/amfd/app.cc
--- a/osaf/services/saf/amf/amfd/app.cc
+++ b/osaf/services/saf/amf/amfd/app.cc
@@ -18,12 +18,11 @@
#include <logtrace.h>
-#include <avd_util.h>
-#include <avd_app.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
-#include <avd_si.h>
-#include <avd_util.h>
+#include <util.h>
+#include <app.h>
+#include <cluster.h>
+#include <imm.h>
+#include <si.h>
static NCS_PATRICIA_TREE app_db;
diff --git a/osaf/services/saf/amf/amfd/apptype.cc
b/osaf/services/saf/amf/amfd/apptype.cc
--- a/osaf/services/saf/amf/amfd/apptype.cc
+++ b/osaf/services/saf/amf/amfd/apptype.cc
@@ -17,11 +17,11 @@
*/
#include <logtrace.h>
-#include <avd_app.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
-#include <avd_si.h>
-#include <avd_util.h>
+#include <app.h>
+#include <cluster.h>
+#include <imm.h>
+#include <si.h>
+#include <util.h>
static NCS_PATRICIA_TREE apptype_db;
diff --git a/osaf/services/saf/amf/amfd/chkop.cc
b/osaf/services/saf/amf/amfd/chkop.cc
--- a/osaf/services/saf/amf/amfd/chkop.cc
+++ b/osaf/services/saf/amf/amfd/chkop.cc
@@ -38,7 +38,7 @@
* Module Inclusion Control...
*/
#include <logtrace.h>
-#include "avd.h"
+#include "amfd.h"
static uint32_t avsv_mbcsv_cb(NCS_MBCSV_CB_ARG *arg);
static uint32_t avsv_mbcsv_process_enc_cb(AVD_CL_CB *cb, NCS_MBCSV_CB_ARG
*arg);
diff --git a/osaf/services/saf/amf/amfd/mbcsv_dec.cc
b/osaf/services/saf/amf/amfd/ckpt_dec.cc
rename from osaf/services/saf/amf/amfd/mbcsv_dec.cc
rename to osaf/services/saf/amf/amfd/ckpt_dec.cc
--- a/osaf/services/saf/amf/amfd/mbcsv_dec.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_dec.cc
@@ -23,9 +23,9 @@
******************************************************************************/
#include <logtrace.h>
-#include <avd.h>
-#include <avd_cluster.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <cluster.h>
+#include <si_dep.h>
extern "C" const AVSV_DECODE_CKPT_DATA_FUNC_PTR
avd_dec_data_func_list[AVSV_CKPT_MSG_MAX];
@@ -103,7 +103,7 @@ static uint32_t dec_cs_comp_cs_type_conf
* We will jump into this function using the reo_type received
* in the decode argument.
*
- * This array _must_ correspond to avsv_ckpt_msg_reo_type in avd_ckpt_msg.h
+ * This array _must_ correspond to avsv_ckpt_msg_reo_type in ckpt_msg.h
*/
const AVSV_DECODE_CKPT_DATA_FUNC_PTR avd_dec_data_func_list[] = {
diff --git a/osaf/services/saf/amf/amfd/mbcsv_edu.cc
b/osaf/services/saf/amf/amfd/ckpt_edu.cc
rename from osaf/services/saf/amf/amfd/mbcsv_edu.cc
rename to osaf/services/saf/amf/amfd/ckpt_edu.cc
--- a/osaf/services/saf/amf/amfd/mbcsv_edu.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_edu.cc
@@ -32,9 +32,9 @@
******************************************************************************
*/
-#include <avd.h>
+#include <amfd.h>
#include <amf.h>
-#include <avd_cluster.h>
+#include <cluster.h>
/*****************************************************************************
diff --git a/osaf/services/saf/amf/amfd/mbcsv_enc.cc
b/osaf/services/saf/amf/amfd/ckpt_enc.cc
rename from osaf/services/saf/amf/amfd/mbcsv_enc.cc
rename to osaf/services/saf/amf/amfd/ckpt_enc.cc
--- a/osaf/services/saf/amf/amfd/mbcsv_enc.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_enc.cc
@@ -24,8 +24,8 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avd.h>
-#include <avd_cluster.h>
+#include <amfd.h>
+#include <cluster.h>
extern "C" const AVSV_ENCODE_CKPT_DATA_FUNC_PTR
avd_enc_ckpt_data_func_list[AVSV_CKPT_MSG_MAX];
@@ -104,7 +104,7 @@ static uint32_t enc_su_oper_list(AVD_CL_
* We will jump into this function using the reo_type received
* in the encode argument.
*
- * This array _must_ correspond to avsv_ckpt_msg_reo_type in avd_ckpt_msg.h
+ * This array _must_ correspond to avsv_ckpt_msg_reo_type in ckpt_msg.h
*/
const AVSV_ENCODE_CKPT_DATA_FUNC_PTR avd_enc_ckpt_data_func_list[] = {
enc_cb_config,
diff --git a/osaf/services/saf/amf/amfd/mbcsv_updt.cc
b/osaf/services/saf/amf/amfd/ckpt_updt.cc
rename from osaf/services/saf/amf/amfd/mbcsv_updt.cc
rename to osaf/services/saf/amf/amfd/ckpt_updt.cc
--- a/osaf/services/saf/amf/amfd/mbcsv_updt.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_updt.cc
@@ -16,8 +16,8 @@
*/
#include <logtrace.h>
-#include <avd.h>
-#include <avd_csi.h>
+#include <amfd.h>
+#include <csi.h>
static char *action_name[] = {
const_cast<char*>("invalid"),
diff --git a/osaf/services/saf/amf/amfd/clm.cc
b/osaf/services/saf/amf/amfd/clm.cc
--- a/osaf/services/saf/amf/amfd/clm.cc
+++ b/osaf/services/saf/amf/amfd/clm.cc
@@ -17,10 +17,10 @@
#include <saAis.h>
#include <logtrace.h>
-#include <avd_cb.h>
-#include <avd.h>
-#include <avd_clm.h>
-#include <avd_node.h>
+#include <cb.h>
+#include <amfd.h>
+#include <clm.h>
+#include <node.h>
static SaVersionT clmVersion = { 'B', 4, 1 };
diff --git a/osaf/services/saf/amf/amfd/cluster.cc
b/osaf/services/saf/amf/amfd/cluster.cc
--- a/osaf/services/saf/amf/amfd/cluster.cc
+++ b/osaf/services/saf/amf/amfd/cluster.cc
@@ -20,11 +20,11 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avd_util.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
-#include <avd_evt.h>
-#include <avd_proc.h>
+#include <util.h>
+#include <cluster.h>
+#include <imm.h>
+#include <evt.h>
+#include <proc.h>
/* Singleton cluster object */
static AVD_CLUSTER _avd_cluster;
diff --git a/osaf/services/saf/amf/amfd/comp.cc
b/osaf/services/saf/amf/amfd/comp.cc
--- a/osaf/services/saf/amf/amfd/comp.cc
+++ b/osaf/services/saf/amf/amfd/comp.cc
@@ -32,13 +32,13 @@
#include <immutil.h>
#include <logtrace.h>
#include <amf_util.h>
-#include <avd_util.h>
-#include <avd_comp.h>
-#include <avd_imm.h>
-#include <avd_node.h>
-#include <avd_csi.h>
-#include <avd_proc.h>
-#include <avd_ckpt_msg.h>
+#include <util.h>
+#include <comp.h>
+#include <imm.h>
+#include <node.h>
+#include <csi.h>
+#include <proc.h>
+#include <ckpt_msg.h>
static NCS_PATRICIA_TREE comp_db;
diff --git a/osaf/services/saf/amf/amfd/compcstype.cc
b/osaf/services/saf/amf/amfd/compcstype.cc
--- a/osaf/services/saf/amf/amfd/compcstype.cc
+++ b/osaf/services/saf/amf/amfd/compcstype.cc
@@ -21,13 +21,13 @@
#include <logtrace.h>
#include <amf_util.h>
-#include <avd_util.h>
-#include <avd_comp.h>
-#include <avd_imm.h>
-#include <avd_node.h>
-#include <avd_csi.h>
-#include <avd_proc.h>
-#include <avd_ckpt_msg.h>
+#include <util.h>
+#include <comp.h>
+#include <imm.h>
+#include <node.h>
+#include <csi.h>
+#include <proc.h>
+#include <ckpt_msg.h>
static NCS_PATRICIA_TREE compcstype_db;
diff --git a/osaf/services/saf/amf/amfd/comptype.cc
b/osaf/services/saf/amf/amfd/comptype.cc
--- a/osaf/services/saf/amf/amfd/comptype.cc
+++ b/osaf/services/saf/amf/amfd/comptype.cc
@@ -21,8 +21,8 @@
#include <logtrace.h>
#include <amf_util.h>
-#include <avd_comp.h>
-#include <avd_imm.h>
+#include <comp.h>
+#include <imm.h>
/* Global variable for the singleton object used by comp class */
AVD_COMP_GLOBALATTR avd_comp_global_attrs;
diff --git a/osaf/services/saf/amf/amfd/csi.cc
b/osaf/services/saf/amf/amfd/csi.cc
--- a/osaf/services/saf/amf/amfd/csi.cc
+++ b/osaf/services/saf/amf/amfd/csi.cc
@@ -18,11 +18,11 @@
#include <logtrace.h>
-#include <avd_util.h>
+#include <util.h>
#include <amf_util.h>
-#include <avd_csi.h>
-#include <avd_imm.h>
-#include <avd_proc.h>
+#include <csi.h>
+#include <imm.h>
+#include <proc.h>
static NCS_PATRICIA_TREE csi_db;
diff --git a/osaf/services/saf/amf/amfd/csiattr.cc
b/osaf/services/saf/amf/amfd/csiattr.cc
--- a/osaf/services/saf/amf/amfd/csiattr.cc
+++ b/osaf/services/saf/amf/amfd/csiattr.cc
@@ -18,10 +18,10 @@
#include <stdbool.h>
#include <logtrace.h>
-#include <avd_util.h>
+#include <util.h>
#include <amf_util.h>
-#include <avd_csi.h>
-#include <avd_imm.h>
+#include <csi.h>
+#include <imm.h>
/*****************************************************************************
* Function: csiattr_dn_to_csiattr_name
diff --git a/osaf/services/saf/amf/amfd/cstype.cc
b/osaf/services/saf/amf/amfd/cstype.cc
--- a/osaf/services/saf/amf/amfd/cstype.cc
+++ b/osaf/services/saf/amf/amfd/cstype.cc
@@ -18,9 +18,9 @@
#include <logtrace.h>
-#include <avd_util.h>
-#include <avd_csi.h>
-#include <avd_imm.h>
+#include <util.h>
+#include <csi.h>
+#include <imm.h>
static NCS_PATRICIA_TREE cstype_db;
diff --git a/osaf/services/saf/amf/amfd/ctcstype.cc
b/osaf/services/saf/amf/amfd/ctcstype.cc
--- a/osaf/services/saf/amf/amfd/ctcstype.cc
+++ b/osaf/services/saf/amf/amfd/ctcstype.cc
@@ -20,8 +20,8 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd_comp.h>
-#include <avd_imm.h>
+#include <comp.h>
+#include <imm.h>
static NCS_PATRICIA_TREE ctcstype_db;
diff --git a/osaf/services/saf/amf/amfd/dmsg.cc
b/osaf/services/saf/amf/amfd/dmsg.cc
--- a/osaf/services/saf/amf/amfd/dmsg.cc
+++ b/osaf/services/saf/amf/amfd/dmsg.cc
@@ -37,7 +37,7 @@
* Module Inclusion Control...
*/
-#include "avd.h"
+#include "amfd.h"
#include "logtrace.h"
/*****************************************************************************
diff --git a/osaf/services/saf/amf/amfd/hlt.cc
b/osaf/services/saf/amf/amfd/hlt.cc
--- a/osaf/services/saf/amf/amfd/hlt.cc
+++ b/osaf/services/saf/amf/amfd/hlt.cc
@@ -22,9 +22,9 @@
#include <immutil.h>
#include <amf_util.h>
-#include <avd_imm.h>
-#include <avd_hlt.h>
-#include <avd_comp.h>
+#include <imm.h>
+#include <hlt.h>
+#include <comp.h>
static SaAisErrorT ccb_completed_modify_hdlr(CcbUtilOperationData_t *opdata)
{
diff --git a/osaf/services/saf/amf/amfd/hlttype.cc
b/osaf/services/saf/amf/amfd/hlttype.cc
--- a/osaf/services/saf/amf/amfd/hlttype.cc
+++ b/osaf/services/saf/amf/amfd/hlttype.cc
@@ -20,7 +20,7 @@
#include <logtrace.h>
#include <immutil.h>
#include <ncsgl_defs.h>
-#include <avd_imm.h>
+#include <imm.h>
static SaAisErrorT hct_ccb_completed_cb(CcbUtilOperationData_t *opdata)
{
diff --git a/osaf/services/saf/amf/amfd/imm.cc
b/osaf/services/saf/amf/amfd/imm.cc
--- a/osaf/services/saf/amf/amfd/imm.cc
+++ b/osaf/services/saf/amf/amfd/imm.cc
@@ -32,20 +32,20 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avd_evt.h>
-#include <avd_util.h>
-#include <avd_cb.h>
+#include <evt.h>
+#include <util.h>
+#include <cb.h>
#include <amf_defs.h>
-#include <avd_imm.h>
-#include <avd_cluster.h>
-#include <avd_app.h>
-#include <avd_sg.h>
-#include <avd_su.h>
-#include <avd_sutype.h>
-#include <avd_comp.h>
-#include <avd_si.h>
-#include <avd_csi.h>
-#include <avd_si_dep.h>
+#include <imm.h>
+#include <cluster.h>
+#include <app.h>
+#include <sg.h>
+#include <su.h>
+#include <sutype.h>
+#include <comp.h>
+#include <si.h>
+#include <csi.h>
+#include <si_dep.h>
/* ========================================================================
* DEFINITIONS
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
@@ -19,32 +19,32 @@ include $(top_srcdir)/Makefile.common
MAINTAINERCLEANFILES = Makefile.in
noinst_HEADERS = \
- avd_app.h \
- avd_node.h \
- avd_cb.h \
- avd_ckp.h \
- avd_ckpt_edu.h \
- avd_ckpt_msg.h \
- avd_ckpt_updt.h \
- avd_cluster.h \
- avd_comp.h \
- avd_clm.h \
- avd_csi.h \
- avd_def.h \
- avd_evt.h \
- avd.h \
- avd_hlt.h \
- avd_imm.h \
- avd_mds.h \
- avd_msg.h \
- avd_pg.h \
- avd_proc.h \
- avd_sg.h \
- avd_si.h \
- avd_su.h \
- avd_sutype.h \
- avd_susi.h \
- avd_tmr.h \
- avd_util.h \
- avd_ntf.h \
- avd_si_dep.h
+ app.h \
+ node.h \
+ cb.h \
+ ckpt.h \
+ ckpt_edu.h \
+ ckpt_msg.h \
+ ckpt_updt.h \
+ cluster.h \
+ comp.h \
+ clm.h \
+ csi.h \
+ def.h \
+ evt.h \
+ amfd.h \
+ hlt.h \
+ imm.h \
+ mds.h \
+ msg.h \
+ pg.h \
+ proc.h \
+ sg.h \
+ si.h \
+ su.h \
+ sutype.h \
+ susi.h \
+ timer.h \
+ util.h \
+ ntf.h \
+ si_dep.h
diff --git a/osaf/services/saf/amf/amfd/include/avd.h
b/osaf/services/saf/amf/amfd/include/amfd.h
rename from osaf/services/saf/amf/amfd/include/avd.h
rename to osaf/services/saf/amf/amfd/include/amfd.h
--- a/osaf/services/saf/amf/amfd/include/avd.h
+++ b/osaf/services/saf/amf/amfd/include/amfd.h
@@ -41,30 +41,29 @@
#include "amf_d2nmsg.h"
/* Porting Include Files */
-#include "avd_def.h"
-#include "amf_ipc.h"
+#include "def.h"
-/* AVD-AVND common EDPs */
+/* AMFD-AMFND common EDPs */
#include "amf_d2nedu.h"
#include "mbcsv_papi.h"
-#include "avd_ckp.h"
+#include "ckpt.h"
-/* AvD specific include files */
-#include "avd_tmr.h"
-#include "avd_util.h"
-#include "avd_cb.h"
-#include "avd_pg.h"
+/* Director specific include files */
+#include "timer.h"
+#include "util.h"
+#include "cb.h"
+#include "pg.h"
-#include "avd_evt.h"
-#include "avd_proc.h"
+#include "evt.h"
+#include "proc.h"
-#include "avd_mds.h"
+#include "mds.h"
/* Checkpointing specific include files */
-#include "avd_ckpt_msg.h"
-#include "avd_ckpt_edu.h"
-#include "avd_ckpt_updt.h"
+#include "ckpt_msg.h"
+#include "ckpt_edu.h"
+#include "ckpt_updt.h"
#include <stdbool.h>
#endif
diff --git a/osaf/services/saf/amf/amfd/include/avd_app.h
b/osaf/services/saf/amf/amfd/include/app.h
rename from osaf/services/saf/amf/amfd/include/avd_app.h
rename to osaf/services/saf/amf/amfd/include/app.h
--- a/osaf/services/saf/amf/amfd/include/avd_app.h
+++ b/osaf/services/saf/amf/amfd/include/app.h
@@ -27,8 +27,8 @@
#include <saAmf.h>
#include <saImm.h>
#include <ncspatricia.h>
-#include <avd_sg.h>
-#include <avd_si.h>
+#include <sg.h>
+#include <si.h>
struct avd_sg_tag;
struct avd_si_tag;
diff --git a/osaf/services/saf/amf/amfd/include/avd_dl_api.h
b/osaf/services/saf/amf/amfd/include/avd_dl_api.h
deleted file mode 100644
--- a/osaf/services/saf/amf/amfd/include/avd_dl_api.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- 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:
-
- This module is the include file exposed to the managment enity
- that manages the Availability Director by initiating it.
-
-******************************************************************************
-*/
-
-/*
- * Module Inclusion Control...
- */
-#ifndef AVD_DL_API_H
-#define AVD_DL_API_H
-
-/* DL SE API for init and destroy of the AVD module */
-uint32_t avd_lib_req(NCS_LIB_REQ_INFO *req_info);
-
-#endif /* AVD_DL_API_H */
diff --git a/osaf/services/saf/amf/amfd/include/avd_cb.h
b/osaf/services/saf/amf/amfd/include/cb.h
rename from osaf/services/saf/amf/amfd/include/avd_cb.h
rename to osaf/services/saf/amf/amfd/include/cb.h
--- a/osaf/services/saf/amf/amfd/include/avd_cb.h
+++ b/osaf/services/saf/amf/amfd/include/cb.h
@@ -44,8 +44,8 @@
#include <mbcsv_papi.h>
#include <ncs_edu_pub.h>
-#include <avd_ckp.h>
-#include <avd_tmr.h>
+#include <ckpt.h>
+#include <timer.h>
struct avd_avnd_tag;
diff --git a/osaf/services/saf/amf/amfd/include/avd_ckp.h
b/osaf/services/saf/amf/amfd/include/ckpt.h
rename from osaf/services/saf/amf/amfd/include/avd_ckp.h
rename to osaf/services/saf/amf/amfd/include/ckpt.h
--- a/osaf/services/saf/amf/amfd/include/avd_ckp.h
+++ b/osaf/services/saf/amf/amfd/include/ckpt.h
@@ -126,8 +126,8 @@ typedef uint32_t (*AVSV_DECODE_COLD_SYNC
NCS_MBCSV_CB_DEC
*enc, uint32_t num_of_obj);
/* Function Definations of avd_chkop.c */
-extern uint32_t avd_active_role_initialization(struct cl_cb_tag *cb,
SaAmfHAStateT role);
-extern uint32_t avd_standby_role_initialization(struct cl_cb_tag *cb);
+uint32_t avd_active_role_initialization(struct cl_cb_tag *cb, SaAmfHAStateT
role);
+uint32_t avd_standby_role_initialization(struct cl_cb_tag *cb);
void avd_role_change_evh(struct cl_cb_tag *cb, struct avd_evt_tag *evt);
uint32_t avsv_mbcsv_register(struct cl_cb_tag *cb);
uint32_t avsv_mbcsv_deregister(struct cl_cb_tag *cb);
@@ -135,7 +135,6 @@ uint32_t avsv_set_ckpt_role(struct cl_cb
uint32_t avsv_mbcsv_dispatch(struct cl_cb_tag *cb, uint32_t flag);
uint32_t avsv_send_ckpt_data(struct cl_cb_tag *cb,
uint32_t action, MBCSV_REO_HDL reo_hdl,
uint32_t reo_type, uint32_t send_type);
-uint32_t avsv_send_hb_ntfy_msg(struct cl_cb_tag *cb);
uint32_t avsv_mbcsv_obj_set(struct cl_cb_tag *cb, uint32_t obj, uint32_t val);
uint32_t avsv_send_data_req(struct cl_cb_tag *cb);
uint32_t avsv_dequeue_async_update_msgs(struct cl_cb_tag *cb, bool pr_or_fr);
diff --git a/osaf/services/saf/amf/amfd/include/avd_ckpt_edu.h
b/osaf/services/saf/amf/amfd/include/ckpt_edu.h
rename from osaf/services/saf/amf/amfd/include/avd_ckpt_edu.h
rename to osaf/services/saf/amf/amfd/include/ckpt_edu.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_ckpt_msg.h
b/osaf/services/saf/amf/amfd/include/ckpt_msg.h
rename from osaf/services/saf/amf/amfd/include/avd_ckpt_msg.h
rename to osaf/services/saf/amf/amfd/include/ckpt_msg.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_ckpt_updt.h
b/osaf/services/saf/amf/amfd/include/ckpt_updt.h
rename from osaf/services/saf/amf/amfd/include/avd_ckpt_updt.h
rename to osaf/services/saf/amf/amfd/include/ckpt_updt.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_clm.h
b/osaf/services/saf/amf/amfd/include/clm.h
rename from osaf/services/saf/amf/amfd/include/avd_clm.h
rename to osaf/services/saf/amf/amfd/include/clm.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_cluster.h
b/osaf/services/saf/amf/amfd/include/cluster.h
rename from osaf/services/saf/amf/amfd/include/avd_cluster.h
rename to osaf/services/saf/amf/amfd/include/cluster.h
--- a/osaf/services/saf/amf/amfd/include/avd_cluster.h
+++ b/osaf/services/saf/amf/amfd/include/cluster.h
@@ -25,7 +25,7 @@
#define AVD_CLUSTER_H
#include <saAmf.h>
-#include <avd_node.h>
+#include <node.h>
typedef struct avd_cluster_tag {
SaNameT saAmfCluster;
diff --git a/osaf/services/saf/amf/amfd/include/avd_comp.h
b/osaf/services/saf/amf/amfd/include/comp.h
rename from osaf/services/saf/amf/amfd/include/avd_comp.h
rename to osaf/services/saf/amf/amfd/include/comp.h
--- a/osaf/services/saf/amf/amfd/include/avd_comp.h
+++ b/osaf/services/saf/amf/amfd/include/comp.h
@@ -38,7 +38,7 @@
#include <saImm.h>
#include <ncspatricia.h>
#include <amf_d2nmsg.h>
-#include <avd_su.h>
+#include <su.h>
/* AMF Class SaAmfCompGlobalAttributes */
typedef struct {
diff --git a/osaf/services/saf/amf/amfd/include/avd_csi.h
b/osaf/services/saf/amf/amfd/include/csi.h
rename from osaf/services/saf/amf/amfd/include/avd_csi.h
rename to osaf/services/saf/amf/amfd/include/csi.h
--- a/osaf/services/saf/amf/amfd/include/avd_csi.h
+++ b/osaf/services/saf/amf/amfd/include/csi.h
@@ -34,9 +34,9 @@
#ifndef AVD_CSI_H
#define AVD_CSI_H
-#include <avd_susi.h>
-#include <avd_comp.h>
-#include <avd_pg.h>
+#include <susi.h>
+#include <comp.h>
+#include <pg.h>
/* The attribute value structure for the CSIs. */
typedef struct avd_csi_attr_tag {
diff --git a/osaf/services/saf/amf/amfd/include/avd_def.h
b/osaf/services/saf/amf/amfd/include/def.h
rename from osaf/services/saf/amf/amfd/include/avd_def.h
rename to osaf/services/saf/amf/amfd/include/def.h
--- a/osaf/services/saf/amf/amfd/include/avd_def.h
+++ b/osaf/services/saf/amf/amfd/include/def.h
@@ -30,14 +30,6 @@
#ifndef AVD_DEF_H
#define AVD_DEF_H
-#define NCS_AVD_NAME_STR "AVD"
-#define NCS_AVD_PRIORITY 0
-#define NCS_AVD_STCK_SIZE NCS_STACKSIZE_HUGE
-
-#define NCS_AVD_HB_NAME_STR "AVD_HB"
-#define NCS_AVD_HB_PRIORITY 0
-#define NCS_AVD_HB_STCK_SIZE NCS_STACKSIZE_HUGE
-
/* The value to toggle a SI.*/
typedef enum {
AVSV_SI_TOGGLE_STABLE,
diff --git a/osaf/services/saf/amf/amfd/include/avd_evt.h
b/osaf/services/saf/amf/amfd/include/evt.h
rename from osaf/services/saf/amf/amfd/include/avd_evt.h
rename to osaf/services/saf/amf/amfd/include/evt.h
--- a/osaf/services/saf/amf/amfd/include/avd_evt.h
+++ b/osaf/services/saf/amf/amfd/include/evt.h
@@ -35,7 +35,7 @@
#define AVD_EVT_H
#include <amf_ipc.h>
-#include <avd_util.h>
+#include <util.h>
/* event type enums */
typedef enum avd_evt_type {
diff --git a/osaf/services/saf/amf/amfd/include/avd_hlt.h
b/osaf/services/saf/amf/amfd/include/hlt.h
rename from osaf/services/saf/amf/amfd/include/avd_hlt.h
rename to osaf/services/saf/amf/amfd/include/hlt.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_imm.h
b/osaf/services/saf/amf/amfd/include/imm.h
rename from osaf/services/saf/amf/amfd/include/avd_imm.h
rename to osaf/services/saf/amf/amfd/include/imm.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_mds.h
b/osaf/services/saf/amf/amfd/include/mds.h
rename from osaf/services/saf/amf/amfd/include/avd_mds.h
rename to osaf/services/saf/amf/amfd/include/mds.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_msg.h
b/osaf/services/saf/amf/amfd/include/msg.h
rename from osaf/services/saf/amf/amfd/include/avd_msg.h
rename to osaf/services/saf/amf/amfd/include/msg.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_node.h
b/osaf/services/saf/amf/amfd/include/node.h
rename from osaf/services/saf/amf/amfd/include/avd_node.h
rename to osaf/services/saf/amf/amfd/include/node.h
--- a/osaf/services/saf/amf/amfd/include/avd_node.h
+++ b/osaf/services/saf/amf/amfd/include/node.h
@@ -40,9 +40,9 @@
#include <ncspatricia.h>
#include <ncsdlib.h>
#include <mds_papi.h>
-#include <avd_su.h>
+#include <su.h>
#include <amf_d2nmsg.h>
-#include <avd_tmr.h>
+#include <timer.h>
struct avd_cluster_tag;
struct avd_node_sw_bundle_tag;
diff --git a/osaf/services/saf/amf/amfd/include/avd_ntf.h
b/osaf/services/saf/amf/amfd/include/ntf.h
rename from osaf/services/saf/amf/amfd/include/avd_ntf.h
rename to osaf/services/saf/amf/amfd/include/ntf.h
--- a/osaf/services/saf/amf/amfd/include/avd_ntf.h
+++ b/osaf/services/saf/amf/amfd/include/ntf.h
@@ -28,8 +28,8 @@
#ifndef AVD_NTF_H
#define AVD_NTF_H
-#include <avd_comp.h>
-#include <avd_susi.h>
+#include <comp.h>
+#include <susi.h>
#define ADDITION_TEXT_LENGTH 320
#define AMF_NTF_SENDER "safApp=safAmfService"
diff --git a/osaf/services/saf/amf/amfd/include/avd_pg.h
b/osaf/services/saf/amf/amfd/include/pg.h
rename from osaf/services/saf/amf/amfd/include/avd_pg.h
rename to osaf/services/saf/amf/amfd/include/pg.h
--- a/osaf/services/saf/amf/amfd/include/avd_pg.h
+++ b/osaf/services/saf/amf/amfd/include/pg.h
@@ -30,10 +30,10 @@
#ifndef AVD_PG_H
#define AVD_PG_H
-#include <avd_node.h>
-#include <avd_csi.h>
+#include <node.h>
+#include <csi.h>
#include <ncsdlib.h>
-#include <avd_susi.h>
+#include <susi.h>
/* csi pg node wrapper structure (maintained by csi) */
typedef struct avd_pg_csi_node {
diff --git a/osaf/services/saf/amf/amfd/include/avd_proc.h
b/osaf/services/saf/amf/amfd/include/proc.h
rename from osaf/services/saf/amf/amfd/include/avd_proc.h
rename to osaf/services/saf/amf/amfd/include/proc.h
--- a/osaf/services/saf/amf/amfd/include/avd_proc.h
+++ b/osaf/services/saf/amf/amfd/include/proc.h
@@ -33,9 +33,9 @@
#ifndef AVD_PROC_H
#define AVD_PROC_H
-#include <avd_cb.h>
-#include <avd_evt.h>
-#include <avd_susi.h>
+#include <cb.h>
+#include <evt.h>
+#include <susi.h>
typedef void (*AVD_EVT_HDLR) (AVD_CL_CB *, AVD_EVT *);
diff --git a/osaf/services/saf/amf/amfd/include/avd_sg.h
b/osaf/services/saf/amf/amfd/include/sg.h
rename from osaf/services/saf/amf/amfd/include/avd_sg.h
rename to osaf/services/saf/amf/amfd/include/sg.h
--- a/osaf/services/saf/amf/amfd/include/avd_sg.h
+++ b/osaf/services/saf/amf/amfd/include/sg.h
@@ -36,8 +36,8 @@
#include <saAmf.h>
#include <ncspatricia.h>
-#include <avd_su.h>
-#include <avd_si.h>
+#include <su.h>
+#include <si.h>
#include <amf_defs.h>
#include <amf_d2nmsg.h>
diff --git a/osaf/services/saf/amf/amfd/include/avd_si.h
b/osaf/services/saf/amf/amfd/include/si.h
rename from osaf/services/saf/amf/amfd/include/avd_si.h
rename to osaf/services/saf/amf/amfd/include/si.h
--- a/osaf/services/saf/amf/amfd/include/avd_si.h
+++ b/osaf/services/saf/amf/amfd/include/si.h
@@ -37,12 +37,12 @@
#include <saAmf.h>
#include <saImm.h>
#include <ncspatricia.h>
-#include <avd_app.h>
-#include <avd_sg.h>
-#include <avd_su.h>
-#include <avd_sg.h>
+#include <app.h>
+#include <sg.h>
+#include <su.h>
+#include <sg.h>
#include <amf_defs.h>
-#include <avd_ckpt_msg.h>
+#include <ckpt_msg.h>
/* Enum values defines different SI-SI dependency FSM states. */
typedef enum {
diff --git a/osaf/services/saf/amf/amfd/include/avd_si_dep.h
b/osaf/services/saf/amf/amfd/include/si_dep.h
rename from osaf/services/saf/amf/amfd/include/avd_si_dep.h
rename to osaf/services/saf/amf/amfd/include/si_dep.h
--- a/osaf/services/saf/amf/amfd/include/avd_si_dep.h
+++ b/osaf/services/saf/amf/amfd/include/si_dep.h
@@ -31,8 +31,8 @@
#ifndef AVD_SI_DEP_H
#define AVD_SI_DEP_H
-#include <avd_si.h>
-#include <avd_sg.h>
+#include <si.h>
+#include <sg.h>
/*
* Following struct is used to make a list which is used while checking the
diff --git a/osaf/services/saf/amf/amfd/include/avd_su.h
b/osaf/services/saf/amf/amfd/include/su.h
rename from osaf/services/saf/amf/amfd/include/avd_su.h
rename to osaf/services/saf/amf/amfd/include/su.h
--- a/osaf/services/saf/amf/amfd/include/avd_su.h
+++ b/osaf/services/saf/amf/amfd/include/su.h
@@ -36,13 +36,13 @@
#include <saAmf.h>
#include <ncspatricia.h>
-#include <avd_def.h>
-#include <avd_cb.h>
-#include <avd_node.h>
-#include <avd_sg.h>
+#include <def.h>
+#include <cb.h>
+#include <node.h>
+#include <sg.h>
#include <amf_defs.h>
-#include <avd_msg.h>
-#include <avd_comp.h>
+#include <msg.h>
+#include <comp.h>
/* The semantics the SU is undergoing. */
typedef enum {
diff --git a/osaf/services/saf/amf/amfd/include/avd_susi.h
b/osaf/services/saf/amf/amfd/include/susi.h
rename from osaf/services/saf/amf/amfd/include/avd_susi.h
rename to osaf/services/saf/amf/amfd/include/susi.h
--- a/osaf/services/saf/amf/amfd/include/avd_susi.h
+++ b/osaf/services/saf/amf/amfd/include/susi.h
@@ -34,9 +34,9 @@
#ifndef AVD_SUSI_H
#define AVD_SUSI_H
-#include <avd_su.h>
-#include <avd_si.h>
-#include <avd_ntf.h>
+#include <su.h>
+#include <si.h>
+#include <ntf.h>
typedef enum {
AVD_SU_SI_STATE_ABSENT = 1,
diff --git a/osaf/services/saf/amf/amfd/include/avd_sutype.h
b/osaf/services/saf/amf/amfd/include/sutype.h
rename from osaf/services/saf/amf/amfd/include/avd_sutype.h
rename to osaf/services/saf/amf/amfd/include/sutype.h
--- a/osaf/services/saf/amf/amfd/include/avd_sutype.h
+++ b/osaf/services/saf/amf/amfd/include/sutype.h
@@ -20,7 +20,7 @@
#include <saAis.h>
#include <ncspatricia.h>
-#include <avd_su.h>
+#include <su.h>
struct avd_sutype {
NCS_PATRICIA_NODE tree_node; /* key will be su type name */
diff --git a/osaf/services/saf/amf/amfd/include/avd_tmr.h
b/osaf/services/saf/amf/amfd/include/timer.h
rename from osaf/services/saf/amf/amfd/include/avd_tmr.h
rename to osaf/services/saf/amf/amfd/include/timer.h
diff --git a/osaf/services/saf/amf/amfd/include/avd_util.h
b/osaf/services/saf/amf/amfd/include/util.h
rename from osaf/services/saf/amf/amfd/include/avd_util.h
rename to osaf/services/saf/amf/amfd/include/util.h
--- a/osaf/services/saf/amf/amfd/include/avd_util.h
+++ b/osaf/services/saf/amf/amfd/include/util.h
@@ -36,7 +36,7 @@
#include <stdbool.h>
#include <amf_d2nmsg.h>
-#include <avd_cb.h>
+#include <cb.h>
#include <stdbool.h>
#include <amf_util.h>
diff --git a/osaf/services/saf/amf/amfd/main.cc
b/osaf/services/saf/amf/amfd/main.cc
--- a/osaf/services/saf/amf/amfd/main.cc
+++ b/osaf/services/saf/amf/amfd/main.cc
@@ -45,14 +45,14 @@
#include <nid_api.h>
#include <rda_papi.h>
-#include <avd.h>
-#include <avd_imm.h>
-#include <avd_cluster.h>
-#include <avd_si_dep.h>
-#include <avd_hlt.h>
-#include <avd_clm.h>
-#include <avd_su.h>
-#include <avd_sutype.h>
+#include <amfd.h>
+#include <imm.h>
+#include <cluster.h>
+#include <si_dep.h>
+#include <hlt.h>
+#include <clm.h>
+#include <su.h>
+#include <sutype.h>
enum {
FD_TERM = 0,
diff --git a/osaf/services/saf/amf/amfd/mds.cc
b/osaf/services/saf/amf/amfd/mds.cc
--- a/osaf/services/saf/amf/amfd/mds.cc
+++ b/osaf/services/saf/amf/amfd/mds.cc
@@ -39,8 +39,8 @@
/*
* Module Inclusion Control...
*/
-#include <avd_msg.h>
-#include "avd.h"
+#include <msg.h>
+#include "amfd.h"
const MDS_CLIENT_MSG_FORMAT_VER
avd_avnd_msg_fmt_map_table[AVD_AVND_SUBPART_VER_MAX] = {
AVSV_AVD_AVND_MSG_FMT_VER_1, AVSV_AVD_AVND_MSG_FMT_VER_2,
diff --git a/osaf/services/saf/amf/amfd/ndfsm.cc
b/osaf/services/saf/amf/amfd/ndfsm.cc
--- a/osaf/services/saf/amf/amfd/ndfsm.cc
+++ b/osaf/services/saf/amf/amfd/ndfsm.cc
@@ -25,8 +25,8 @@
#include <logtrace.h>
-#include <avd.h>
-#include <avd_cluster.h>
+#include <amfd.h>
+#include <cluster.h>
/*****************************************************************************
* Function: avd_node_up_func
diff --git a/osaf/services/saf/amf/amfd/ndmsg.cc
b/osaf/services/saf/amf/amfd/ndmsg.cc
--- a/osaf/services/saf/amf/amfd/ndmsg.cc
+++ b/osaf/services/saf/amf/amfd/ndmsg.cc
@@ -44,7 +44,7 @@
* Module Inclusion Control...
*/
-#include "avd.h"
+#include "amfd.h"
/****************************************************************************
Name : avd_mds_enc
diff --git a/osaf/services/saf/amf/amfd/ndproc.cc
b/osaf/services/saf/amf/amfd/ndproc.cc
--- a/osaf/services/saf/amf/amfd/ndproc.cc
+++ b/osaf/services/saf/amf/amfd/ndproc.cc
@@ -32,10 +32,9 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd.h>
-#include <avd_imm.h>
-#include <avd_cluster.h>
-#include <logtrace.h>
+#include <amfd.h>
+#include <imm.h>
+#include <cluster.h>
/**
* This function does a sanity check w.r.t the message received and returns
the node structure
diff --git a/osaf/services/saf/amf/amfd/node.cc
b/osaf/services/saf/amf/amfd/node.cc
--- a/osaf/services/saf/amf/amfd/node.cc
+++ b/osaf/services/saf/amf/amfd/node.cc
@@ -21,9 +21,9 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avd.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
+#include <amfd.h>
+#include <cluster.h>
+#include <imm.h>
static NCS_PATRICIA_TREE node_name_db; /* SaNameT index */
static NCS_PATRICIA_TREE node_id_db; /* SaClmNodeIdT index */
diff --git a/osaf/services/saf/amf/amfd/nodegroup.cc
b/osaf/services/saf/amf/amfd/nodegroup.cc
--- a/osaf/services/saf/amf/amfd/nodegroup.cc
+++ b/osaf/services/saf/amf/amfd/nodegroup.cc
@@ -19,9 +19,9 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
+#include <amfd.h>
+#include <cluster.h>
+#include <imm.h>
static NCS_PATRICIA_TREE nodegroup_db;
diff --git a/osaf/services/saf/amf/amfd/nodeswbundle.cc
b/osaf/services/saf/amf/amfd/nodeswbundle.cc
--- a/osaf/services/saf/amf/amfd/nodeswbundle.cc
+++ b/osaf/services/saf/amf/amfd/nodeswbundle.cc
@@ -19,9 +19,9 @@
#include <saImmOm.h>
#include <immutil.h>
#include <logtrace.h>
-#include <avd.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
+#include <amfd.h>
+#include <cluster.h>
+#include <imm.h>
/**
* Validate configuration attributes for an AMF node Sw bundle object.
diff --git a/osaf/services/saf/amf/amfd/ntf.cc
b/osaf/services/saf/amf/amfd/ntf.cc
--- a/osaf/services/saf/amf/amfd/ntf.cc
+++ b/osaf/services/saf/amf/amfd/ntf.cc
@@ -23,8 +23,8 @@
******************************************************************************/
#include <logtrace.h>
-#include <avd_util.h>
-#include <avd_ntf.h>
+#include <util.h>
+#include <ntf.h>
/*****************************************************************************
Name : avd_send_comp_inst_failed_alarm
diff --git a/osaf/services/saf/amf/amfd/pg.cc b/osaf/services/saf/amf/amfd/pg.cc
--- a/osaf/services/saf/amf/amfd/pg.cc
+++ b/osaf/services/saf/amf/amfd/pg.cc
@@ -38,7 +38,7 @@
******************************************************************************
*/
-#include "avd.h"
+#include "amfd.h"
/*****************************************************************************
* Function: avd_pg_trk_act_func
diff --git a/osaf/services/saf/amf/amfd/role.cc
b/osaf/services/saf/amf/amfd/role.cc
--- a/osaf/services/saf/amf/amfd/role.cc
+++ b/osaf/services/saf/amf/amfd/role.cc
@@ -36,14 +36,14 @@
#include <immutil.h>
#include <logtrace.h>
+#include <rda_papi.h>
-#include <avd.h>
-#include <avd_imm.h>
-#include <avd_app.h>
-#include <avd_cluster.h>
-#include <avd_clm.h>
-#include <rda_papi.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <imm.h>
+#include <app.h>
+#include <cluster.h>
+#include <clm.h>
+#include <si_dep.h>
static uint32_t avd_role_failover(AVD_CL_CB *cb, SaAmfHAStateT role);
static uint32_t avd_role_failover_qsd_actv(AVD_CL_CB *cb, SaAmfHAStateT role);
diff --git a/osaf/services/saf/amf/amfd/sg.cc b/osaf/services/saf/amf/amfd/sg.cc
--- a/osaf/services/saf/amf/amfd/sg.cc
+++ b/osaf/services/saf/amf/amfd/sg.cc
@@ -18,16 +18,16 @@
#include <logtrace.h>
-#include <avd_util.h>
-#include <avd_cluster.h>
-#include <avd_app.h>
-#include <avd_imm.h>
-#include <avd_sutype.h>
-#include <avd_ckpt_msg.h>
-#include <avd_ntf.h>
-#include <avd_sg.h>
-#include <avd_proc.h>
-#include <avd_si_dep.h>
+#include <util.h>
+#include <cluster.h>
+#include <app.h>
+#include <imm.h>
+#include <sutype.h>
+#include <ckpt_msg.h>
+#include <ntf.h>
+#include <sg.h>
+#include <proc.h>
+#include <si_dep.h>
static NCS_PATRICIA_TREE sg_db;
static void avd_verify_equal_ranked_su(AVD_SG *avd_sg);
diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
@@ -25,10 +25,10 @@
#include <logtrace.h>
#include <immutil.h>
-#include <avd.h>
-#include <avd_clm.h>
-#include <avd_si_dep.h>
-#include <avd_imm.h>
+#include <amfd.h>
+#include <clm.h>
+#include <si_dep.h>
+#include <imm.h>
/**
* @brief Determine fsm state of an SU.
diff --git a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
@@ -26,8 +26,8 @@
#include <logtrace.h>
-#include <avd.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <si_dep.h>
/*****************************************************************************
* Function: avd_sg_nored_su_chose_asgn
diff --git a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
@@ -26,8 +26,8 @@
#include <logtrace.h>
-#include <avd.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <si_dep.h>
static void avd_sg_npm_screening_for_si_redistr(AVD_SG *avd_sg);
static void avd_sg_npm_si_transfer_for_redistr(AVD_SG *avd_sg);
diff --git a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
@@ -26,8 +26,8 @@
#include <logtrace.h>
-#include <avd.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <si_dep.h>
/* static function declarations */
diff --git a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
@@ -26,9 +26,9 @@
#include <logtrace.h>
-#include <avd.h>
-#include <avd_imm.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <imm.h>
+#include <si_dep.h>
static AVD_SU *avd_get_qualified_su(AVD_SG *avd_sg, AVD_SI *avd_si,
bool *next_si_tobe_assigned);
diff --git a/osaf/services/saf/amf/amfd/sgproc.cc
b/osaf/services/saf/amf/amfd/sgproc.cc
--- a/osaf/services/saf/amf/amfd/sgproc.cc
+++ b/osaf/services/saf/amf/amfd/sgproc.cc
@@ -29,11 +29,11 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd.h>
-#include <avd_imm.h>
-#include <avd_su.h>
-#include <avd_clm.h>
-#include <avd_si_dep.h>
+#include <amfd.h>
+#include <imm.h>
+#include <su.h>
+#include <clm.h>
+#include <si_dep.h>
static SaAisErrorT avd_d2n_reboot_snd(AVD_AVND *node);
diff --git a/osaf/services/saf/amf/amfd/sgtype.cc
b/osaf/services/saf/amf/amfd/sgtype.cc
--- a/osaf/services/saf/amf/amfd/sgtype.cc
+++ b/osaf/services/saf/amf/amfd/sgtype.cc
@@ -18,14 +18,14 @@
#include <ncspatricia.h>
#include <logtrace.h>
-#include <avd_cluster.h>
-#include <avd_app.h>
-#include <avd_imm.h>
-#include <avd_sutype.h>
-#include <avd_ckpt_msg.h>
-#include <avd_ntf.h>
-#include <avd_sg.h>
-#include <avd_proc.h>
+#include <cluster.h>
+#include <app.h>
+#include <imm.h>
+#include <sutype.h>
+#include <ckpt_msg.h>
+#include <ntf.h>
+#include <sg.h>
+#include <proc.h>
static NCS_PATRICIA_TREE sgtype_db;
diff --git a/osaf/services/saf/amf/amfd/si.cc b/osaf/services/saf/amf/amfd/si.cc
--- a/osaf/services/saf/amf/amfd/si.cc
+++ b/osaf/services/saf/amf/amfd/si.cc
@@ -19,13 +19,13 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avd_util.h>
-#include <avd_si.h>
-#include <avd_app.h>
-#include <avd_imm.h>
-#include <avd_csi.h>
-#include <avd_proc.h>
-#include <avd_si_dep.h>
+#include <util.h>
+#include <si.h>
+#include <app.h>
+#include <imm.h>
+#include <csi.h>
+#include <proc.h>
+#include <si_dep.h>
static NCS_PATRICIA_TREE si_db;
static void avd_si_add_csi_db(struct avd_csi_tag* csi);
diff --git a/osaf/services/saf/amf/amfd/si_dep.cc
b/osaf/services/saf/amf/amfd/si_dep.cc
--- a/osaf/services/saf/amf/amfd/si_dep.cc
+++ b/osaf/services/saf/amf/amfd/si_dep.cc
@@ -152,10 +152,10 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd_imm.h>
-#include <avd_si_dep.h>
-#include <avd_susi.h>
-#include <avd_proc.h>
+#include <imm.h>
+#include <si_dep.h>
+#include <susi.h>
+#include <proc.h>
/* static function prototypes */
static bool avd_sidep_all_sponsors_active(AVD_SI *si);
diff --git a/osaf/services/saf/amf/amfd/siass.cc
b/osaf/services/saf/amf/amfd/siass.cc
--- a/osaf/services/saf/amf/amfd/siass.cc
+++ b/osaf/services/saf/amf/amfd/siass.cc
@@ -32,12 +32,12 @@
#include <saflog.h>
#include <amf_util.h>
-#include <avd_util.h>
-#include <avd_susi.h>
-#include <avd_imm.h>
-#include <avd_csi.h>
-#include <avd_proc.h>
-#include <avd_si_dep.h>
+#include <util.h>
+#include <susi.h>
+#include <imm.h>
+#include <csi.h>
+#include <proc.h>
+#include <si_dep.h>
/**
* Create an SaAmfSIAssignment runtime object in IMM.
diff --git a/osaf/services/saf/amf/amfd/sirankedsu.cc
b/osaf/services/saf/amf/amfd/sirankedsu.cc
--- a/osaf/services/saf/amf/amfd/sirankedsu.cc
+++ b/osaf/services/saf/amf/amfd/sirankedsu.cc
@@ -28,11 +28,11 @@
*/
#include <amf_util.h>
-#include <avd_util.h>
-#include <avd_susi.h>
+#include <util.h>
+#include <susi.h>
#include <immutil.h>
-#include <avd_imm.h>
-#include <avd_csi.h>
+#include <imm.h>
+#include <csi.h>
#include <logtrace.h>
static NCS_PATRICIA_TREE sirankedsu_db;
diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -21,12 +21,12 @@
#include <logtrace.h>
#include <saflog.h>
-#include <avd_util.h>
-#include <avd_su.h>
-#include <avd_sutype.h>
-#include <avd_imm.h>
-#include <avd_ntf.h>
-#include <avd_proc.h>
+#include <util.h>
+#include <su.h>
+#include <sutype.h>
+#include <imm.h>
+#include <ntf.h>
+#include <proc.h>
static NCS_PATRICIA_TREE su_db;
diff --git a/osaf/services/saf/amf/amfd/sutcomptype.cc
b/osaf/services/saf/amf/amfd/sutcomptype.cc
--- a/osaf/services/saf/amf/amfd/sutcomptype.cc
+++ b/osaf/services/saf/amf/amfd/sutcomptype.cc
@@ -20,10 +20,10 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd_util.h>
-#include <avd_su.h>
-#include <avd_sutype.h>
-#include <avd_imm.h>
+#include <util.h>
+#include <su.h>
+#include <sutype.h>
+#include <imm.h>
static NCS_PATRICIA_TREE sutcomptype_db;
diff --git a/osaf/services/saf/amf/amfd/sutype.cc
b/osaf/services/saf/amf/amfd/sutype.cc
--- a/osaf/services/saf/amf/amfd/sutype.cc
+++ b/osaf/services/saf/amf/amfd/sutype.cc
@@ -20,12 +20,12 @@
#include <immutil.h>
#include <logtrace.h>
-#include <avd_util.h>
-#include <avd_sutype.h>
-#include <avd_imm.h>
-#include <avd_cluster.h>
-#include <avd_ntf.h>
-#include <avd_proc.h>
+#include <util.h>
+#include <sutype.h>
+#include <imm.h>
+#include <cluster.h>
+#include <ntf.h>
+#include <proc.h>
static NCS_PATRICIA_TREE sutype_db;
diff --git a/osaf/services/saf/amf/amfd/svctype.cc
b/osaf/services/saf/amf/amfd/svctype.cc
--- a/osaf/services/saf/amf/amfd/svctype.cc
+++ b/osaf/services/saf/amf/amfd/svctype.cc
@@ -18,15 +18,15 @@
#include <logtrace.h>
-#include <avd_si.h>
+#include <si.h>
#include <saImmOm.h>
#include <immutil.h>
-#include <avd_app.h>
-#include <avd_cluster.h>
-#include <avd_imm.h>
-#include <avd_susi.h>
-#include <avd_csi.h>
-#include <avd_proc.h>
+#include <app.h>
+#include <cluster.h>
+#include <imm.h>
+#include <susi.h>
+#include <csi.h>
+#include <proc.h>
static NCS_PATRICIA_TREE svctype_db;
diff --git a/osaf/services/saf/amf/amfd/svctypecstypes.cc
b/osaf/services/saf/amf/amfd/svctypecstypes.cc
--- a/osaf/services/saf/amf/amfd/svctypecstypes.cc
+++ b/osaf/services/saf/amf/amfd/svctypecstypes.cc
@@ -17,8 +17,8 @@
*/
#include <logtrace.h>
-#include <avd_si.h>
-#include <avd_imm.h>
+#include <si.h>
+#include <imm.h>
static NCS_PATRICIA_TREE svctypecstypes_db;
diff --git a/osaf/services/saf/amf/amfd/timer.cc
b/osaf/services/saf/amf/amfd/timer.cc
--- a/osaf/services/saf/amf/amfd/timer.cc
+++ b/osaf/services/saf/amf/amfd/timer.cc
@@ -40,7 +40,7 @@
/*
* Module Inclusion Control...
*/
-#include "avd.h"
+#include "amfd.h"
/*****************************************************************************
PROCEDURE NAME : avd_start_tmr
diff --git a/osaf/services/saf/amf/amfd/util.cc
b/osaf/services/saf/amf/amfd/util.cc
--- a/osaf/services/saf/amf/amfd/util.cc
+++ b/osaf/services/saf/amf/amfd/util.cc
@@ -24,11 +24,12 @@
******************************************************************************
*/
+#include <string.h>
+
#include <saImmOm.h>
#include <immutil.h>
#include <logtrace.h>
-#include <string.h>
-#include <avd.h>
+#include <amfd.h>
static const SaNameT _amfSvcUsrName = {
sizeof("safApp=safAmfService"),
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
