[devel] [PATCH 2 of 7] amf: update saAmf.h for new intialize API, callback and callback structure [#1553]

[praveen . malviya]

 osaf/libs/saf/include/saAmf.h |  24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)


Added in saAmf.h:
-OsafCsiAttributeChangeCallbackT
-SaAmfCallbacksT_5()
-saAmfInitialize_5( SaAmfHandleT *amfHandle, const SaAmfCallbacksT_5
                *amfCallbacks, SaVersionT *version);
TODO: Move all this new resources in saAmf_B_04_01.
Details are in published README.

diff --git a/osaf/libs/saf/include/saAmf.h b/osaf/libs/saf/include/saAmf.h
--- a/osaf/libs/saf/include/saAmf.h
+++ b/osaf/libs/saf/include/saAmf.h
@@ -383,6 +383,12 @@ typedef void
     SaInvocationT invocation,
     const SaNameT *containedCompName);
 
+typedef void
+(*OsafCsiAttributeChangeCallbackT)(
+    SaInvocationT invocation,
+    const SaNameT *csiName,
+    SaAmfCSIAttributeListT   csiAttr);
+
 #if defined(SA_AMF_B01) || defined(SA_AMF_B02)
 typedef struct {
    SaAmfHealthcheckCallbackT                 saAmfHealthcheckCallback;
@@ -482,12 +488,30 @@ typedef struct {
     SaAmfContainedComponentCleanupCallbackT     
saAmfContainedComponentCleanupCallback;
 } SaAmfCallbacksT_4;
 
+typedef struct {
+    SaAmfHealthcheckCallbackT                   saAmfHealthcheckCallback;
+    SaAmfComponentTerminateCallbackT            
saAmfComponentTerminateCallback;
+    SaAmfCSISetCallbackT                        saAmfCSISetCallback;
+    SaAmfCSIRemoveCallbackT                     saAmfCSIRemoveCallback;
+    SaAmfProtectionGroupTrackCallbackT_4        
saAmfProtectionGroupTrackCallback;
+    SaAmfProxiedComponentInstantiateCallbackT   
saAmfProxiedComponentInstantiateCallback;
+    SaAmfProxiedComponentCleanupCallbackT       
saAmfProxiedComponentCleanupCallback;
+    SaAmfContainedComponentInstantiateCallbackT 
saAmfContainedComponentInstantiateCallback;
+    SaAmfContainedComponentCleanupCallbackT     
saAmfContainedComponentCleanupCallback;
+    OsafCsiAttributeChangeCallbackT             osafCsiAttributeChangeCallback;
+} SaAmfCallbacksT_5;
+
 extern SaAisErrorT 
 saAmfInitialize_4(
     SaAmfHandleT *amfHandle, 
     const SaAmfCallbacksT_4 *amfCallbacks,
     SaVersionT *version);
 
+extern SaAisErrorT 
+saAmfInitialize_5(
+    SaAmfHandleT *amfHandle, 
+    const SaAmfCallbacksT_5 *amfCallbacks,
+    SaVersionT *version);
 
 extern SaAisErrorT 
 saAmfSelectionObjectGet(

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel