X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-binding-v3.h;h=79d36da53ac560b4350c88d08a861e3bffa6df86;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=52a3a8d2cc07b3fc5f8e224229b0e5f8d9b73764;hpb=525e9eaa644ca92fad23adfbb7c3119ae8b57a30;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-binding-v3.h b/include/afb/afb-binding-v3.h
index 52a3a8d2..79d36da5 100644
--- a/include/afb/afb-binding-v3.h
+++ b/include/afb/afb-binding-v3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -192,8 +192,8 @@ extern const struct afb_binding_v3 afbBindingV3;
 
 # define AFB_API_VERBOSE_V3(api,level,...) \
 		do { if(level <= AFB_VERBOSITY_LEVEL_ERROR) \
-			afb_api_v3_verbose(api,level,__FILE__,__LINE__,NULL,__VA_ARGS__); \
-		else afb_api_v3_verbose(api,level,__FILE__,__LINE__,NULL); } while(0)
+			afb_api_x3_verbose(api,level,__FILE__,__LINE__,NULL,__VA_ARGS__); \
+		else afb_api_x3_verbose(api,level,__FILE__,__LINE__,NULL); } while(0)
 
 # define AFB_REQ_VERBOSE_V3(req,level,...) \
 		do { if(level <= AFB_VERBOSITY_LEVEL_ERROR) \
@@ -203,7 +203,7 @@ extern const struct afb_binding_v3 afbBindingV3;
 #elif defined(AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS)
 
 # define AFB_API_VERBOSE_V3(api,level,...) \
-	afb_api_v3_verbose(api,level,NULL,0,NULL,__VA_ARGS__)
+	afb_api_x3_verbose(api,level,NULL,0,NULL,__VA_ARGS__)
 
 # define AFB_REQ_VERBOSE_V3(req,level,...) \
 	afb_req_x2_verbose(req,level,NULL,0,NULL,__VA_ARGS__)
@@ -219,9 +219,9 @@ extern const struct afb_binding_v3 afbBindingV3;
 #endif
 
 #define _AFB_API_LOGGING_V3_(api,llevel,...) \
-        do{ if(AFB_SYSLOG_MASK_WANT((api)->logmask,(llevel))) AFB_API_VERBOSE_V3((api),(llevel),__VA_ARGS__); }while(0)
+        do{ if(afb_api_wants_log_level((api),(llevel))) AFB_API_VERBOSE_V3((api),(llevel),__VA_ARGS__); }while(0)
 #define _AFB_REQ_LOGGING_V3_(req,llevel,...) \
-        do{ if(AFB_SYSLOG_MASK_WANT((req)->api->logmask,(llevel))) AFB_REQ_VERBOSE_V3((req),(llevel),__VA_ARGS__); }while(0)
+        do{ if(afb_req_wants_log_level((req),(llevel))) AFB_REQ_VERBOSE_V3((req),(llevel),__VA_ARGS__); }while(0)
 
 #define AFB_API_ERROR_V3(api,...)		_AFB_API_LOGGING_V3_(api,AFB_SYSLOG_LEVEL_ERROR,__VA_ARGS__)
 #define AFB_API_WARNING_V3(api,...)		_AFB_API_LOGGING_V3_(api,AFB_SYSLOG_LEVEL_WARNING,__VA_ARGS__)
@@ -245,9 +245,9 @@ extern const struct afb_binding_v3 afbBindingV3;
 #define afb_get_logmask_v3()			(afbBindingV3root->logmask)
 #define afb_get_verbosity_v3()			AFB_SYSLOG_LEVEL_TO_VERBOSITY(_afb_verbomask_to_upper_level_(afbBindingV3root->logmask))
 
-#define afb_daemon_get_event_loop_v3(...)	afb_api_get_event_loop(afbBindingV3root,__VA_ARGS__)
-#define afb_daemon_get_user_bus_v3(...)		afb_api_get_user_bus(afbBindingV3root,__VA_ARGS__)
-#define afb_daemon_get_system_bus_v3(...)	afb_api_get_system_bus(afbBindingV3root,__VA_ARGS__)
+#define afb_daemon_get_event_loop_v3()		afb_api_get_event_loop(afbBindingV3root)
+#define afb_daemon_get_user_bus_v3()		afb_api_get_user_bus(afbBindingV3root)
+#define afb_daemon_get_system_bus_v3()		afb_api_get_system_bus(afbBindingV3root)
 #define afb_daemon_broadcast_event_v3(...)	afb_api_broadcast_event(afbBindingV3root,__VA_ARGS__)
 #define afb_daemon_make_event_v3(...)		afb_api_make_event(afbBindingV3root,__VA_ARGS__)
 #define afb_daemon_verbose_v3(...)		afb_api_verbose(afbBindingV3root,__VA_ARGS__)
@@ -259,4 +259,6 @@ extern const struct afb_binding_v3 afbBindingV3;
 
 #define afb_service_call_v3(...)		afb_api_call(afbBindingV3root,__VA_ARGS__)
 #define afb_service_call_sync_v3(...)		afb_api_call_sync(afbBindingV3root,__VA_ARGS__)
+#define afb_service_call_legacy_v3(...)		afb_api_call_legacy(afbBindingV3root,__VA_ARGS__)
+#define afb_service_call_sync_legacy_v3(...)	afb_api_call_sync_legacy(afbBindingV3root,__VA_ARGS__)