X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-binding.h;h=f70475968d4d1c1601def3285c75a5409a05f6a0;hb=f30be1ca9ce04cfab55b9e6ce25cec6952f7e21d;hp=706ca8137556245f0f9a6aa5e1a8d7d917bfbd2d;hpb=c6380108964e71f533d8c672bb9c217020a95e8d;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-binding.h b/include/afb/afb-binding.h
index 706ca813..f7047596 100644
--- a/include/afb/afb-binding.h
+++ b/include/afb/afb-binding.h
@@ -67,6 +67,7 @@
 
 #include "afb-binding-v1.h"
 #include "afb-binding-v2.h"
+#include "afb-binding-vdyn.h"
 
 typedef struct afb_verb_desc_v1         afb_verb_desc_v1;
 typedef struct afb_binding_desc_v1      afb_binding_desc_v1;
@@ -82,8 +83,13 @@ typedef struct afb_daemon               afb_daemon;
 typedef struct afb_event                afb_event;
 typedef struct afb_arg                  afb_arg;
 typedef struct afb_req                  afb_req;
+typedef struct afb_stored_req           afb_stored_req;
 typedef struct afb_service              afb_service;
 
+typedef struct afb_dynapi               afb_dynapi;
+typedef struct afb_request              afb_request;
+typedef struct afb_eventid              afb_eventid;
+
 #if 0
 /* these typedef's shouldn't be needed */
 typedef enum   afb_binding_type_v1      afb_binding_type_v1;
@@ -138,21 +144,17 @@ typedef struct afb_service_itf          afb_service_itf;
 # define AFB_SESSION_LOA_GE_2	AFB_SESSION_LOA_GE_2_V1
 # define AFB_SESSION_LOA_GE_3	AFB_SESSION_LOA_GE_3_V1
 
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
-
-#  define ERROR			AFB_ERROR_V1
-#  define WARNING		AFB_WARNING_V1
-#  define NOTICE		AFB_NOTICE_V1
-#  define INFO			AFB_INFO_V1
-#  define DEBUG			AFB_DEBUG_V1
+# define AFB_ERROR		AFB_ERROR_V1
+# define AFB_WARNING		AFB_WARNING_V1
+# define AFB_NOTICE		AFB_NOTICE_V1
+# define AFB_INFO		AFB_INFO_V1
+# define AFB_DEBUG		AFB_DEBUG_V1
 
-#  define REQ_ERROR		AFB_REQ_ERROR_V1
-#  define REQ_WARNING		AFB_REQ_WARNING_V1
-#  define REQ_NOTICE		AFB_REQ_NOTICE_V1
-#  define REQ_INFO		AFB_REQ_INFO_V1
-#  define REQ_DEBUG		AFB_REQ_DEBUG_V1
-
-# endif
+# define AFB_REQ_ERROR		AFB_REQ_ERROR_V1
+# define AFB_REQ_WARNING	AFB_REQ_WARNING_V1
+# define AFB_REQ_NOTICE		AFB_REQ_NOTICE_V1
+# define AFB_REQ_INFO		AFB_REQ_INFO_V1
+# define AFB_REQ_DEBUG		AFB_REQ_DEBUG_V1
 
 #define afb_daemon_get_event_loop	afb_daemon_get_event_loop_v1
 #define afb_daemon_get_user_bus		afb_daemon_get_user_bus_v1
@@ -163,6 +165,8 @@ typedef struct afb_service_itf          afb_service_itf;
 #define afb_daemon_rootdir_get_fd	afb_daemon_rootdir_get_fd_v1
 #define afb_daemon_rootdir_open_locale	afb_daemon_rootdir_open_locale_v1
 #define afb_daemon_queue_job		afb_daemon_queue_job_v1
+#define afb_daemon_require_api		afb_daemon_require_api_v1
+#define afb_daemon_rename_api		afb_daemon_rename_api_v1
 
 #define afb_service_call		afb_service_call_v1
 #define afb_service_call_sync		afb_service_call_sync_v1
@@ -177,6 +181,10 @@ typedef struct afb_service_itf          afb_service_itf;
 #if AFB_BINDING_VERSION == 2
 
 # define afb_binding		afb_binding_v2
+# define afb_get_verbosity	afb_get_verbosity_v2
+# define afb_get_daemon		afb_get_daemon_v2
+# define afb_get_service	afb_get_service_v2
+
 
 # define AFB_SESSION_NONE	AFB_SESSION_NONE_V2
 # define AFB_SESSION_CLOSE	AFB_SESSION_CLOSE_V2
@@ -191,21 +199,17 @@ typedef struct afb_service_itf          afb_service_itf;
 # define AFB_SESSION_LOA_2	AFB_SESSION_LOA_2_V2
 # define AFB_SESSION_LOA_3	AFB_SESSION_LOA_3_V2
 
-# if !defined(AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO)
+# define AFB_ERROR		AFB_ERROR_V2
+# define AFB_WARNING		AFB_WARNING_V2
+# define AFB_NOTICE		AFB_NOTICE_V2
+# define AFB_INFO		AFB_INFO_V2
+# define AFB_DEBUG		AFB_DEBUG_V2
 
-#  define ERROR			AFB_ERROR_V2
-#  define WARNING		AFB_WARNING_V2
-#  define NOTICE		AFB_NOTICE_V2
-#  define INFO			AFB_INFO_V2
-#  define DEBUG			AFB_DEBUG_V2
-
-#  define REQ_ERROR		AFB_REQ_ERROR_V2
-#  define REQ_WARNING		AFB_REQ_WARNING_V2
-#  define REQ_NOTICE		AFB_REQ_NOTICE_V2
-#  define REQ_INFO		AFB_REQ_INFO_V2
-#  define REQ_DEBUG		AFB_REQ_DEBUG_V2
-
-# endif
+# define AFB_REQ_ERROR		AFB_REQ_ERROR_V2
+# define AFB_REQ_WARNING	AFB_REQ_WARNING_V2
+# define AFB_REQ_NOTICE		AFB_REQ_NOTICE_V2
+# define AFB_REQ_INFO		AFB_REQ_INFO_V2
+# define AFB_REQ_DEBUG		AFB_REQ_DEBUG_V2
 
 #define afb_daemon_get_event_loop	afb_daemon_get_event_loop_v2
 #define afb_daemon_get_user_bus		afb_daemon_get_user_bus_v2
@@ -217,6 +221,8 @@ typedef struct afb_service_itf          afb_service_itf;
 #define afb_daemon_rootdir_open_locale	afb_daemon_rootdir_open_locale_v2
 #define afb_daemon_queue_job		afb_daemon_queue_job_v2
 #define afb_daemon_unstore_req		afb_daemon_unstore_req_v2
+#define afb_daemon_require_api		afb_daemon_require_api_v2
+#define afb_daemon_rename_api		afb_daemon_rename_api_v2
 
 #define afb_service_call		afb_service_call_v2
 #define afb_service_call_sync		afb_service_call_sync_v2
@@ -226,3 +232,31 @@ typedef struct afb_service_itf          afb_service_itf;
 
 #endif
 
+/***************************************************************************************************/
+
+#if AFB_BINDING_VERSION >= 2
+
+# define afb_verbose_error()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_ERROR)
+# define afb_verbose_warning()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_WARNING)
+# define afb_verbose_notice()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_NOTICE)
+# define afb_verbose_info()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_INFO)
+# define afb_verbose_debug()	(afb_get_verbosity() >= AFB_VERBOSITY_LEVEL_DEBUG)
+
+#endif
+
+/***************************************************************************************************/
+
+#if defined(AFB_BINDING_PRAGMA_KEEP_VERBOSE_UNPREFIX)
+# define ERROR			AFB_ERROR
+# define WARNING		AFB_WARNING
+# define NOTICE			AFB_NOTICE
+# define INFO			AFB_INFO
+# define DEBUG			AFB_DEBUG
+
+# define REQ_ERROR		AFB_REQ_ERROR
+# define REQ_WARNING		AFB_REQ_WARNING
+# define REQ_NOTICE		AFB_REQ_NOTICE
+# define REQ_INFO		AFB_REQ_INFO
+# define REQ_DEBUG		AFB_REQ_DEBUG
+#endif
+