X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-request.h;h=678922b39875a73361c60856fdd25fc5fc1773a2;hb=7a7268a5697b0b988bcabc00390878edee941b4e;hp=052cbab9a7d088cc7cf2afb039a6a0e8d2c27471;hpb=e0fa1cdd56ffb97fedc3ba8df482a14323d876c7;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-request.h b/include/afb/afb-request.h
index 052cbab9..678922b3 100644
--- a/include/afb/afb-request.h
+++ b/include/afb/afb-request.h
@@ -19,10 +19,6 @@
 
 #include "afb-request-itf.h"
 
-typedef struct afb_request afb_request;
-
-#include "afb-event.h"
-
 /*
  * Gets from the request 'request' the argument of 'name'.
  * Returns a PLAIN structure of type 'struct afb_arg'.
@@ -204,9 +200,9 @@ static inline void afb_request_context_clear(struct afb_request *request)
  * This function MUST be called by asynchronous implementations
  * of verbs if no reply was sent before returning.
  */
-static inline void afb_request_addref(struct afb_request *request)
+static inline struct afb_request *afb_request_addref(struct afb_request *request)
 {
-	request->itf->addref(request);
+	return request->itf->addref(request);
 }
 
 /*
@@ -244,9 +240,9 @@ static inline int afb_request_session_set_LOA(struct afb_request *request, unsig
  * to the 'event'.
  * Returns 0 in case of successful subscription or -1 in case of error.
  */
-static inline int afb_request_subscribe(struct afb_request *request, struct afb_event event)
+static inline int afb_request_subscribe(struct afb_request *request, struct afb_eventid *eventid)
 {
-	return request->itf->subscribe(request, event);
+	return request->itf->subscribe_eventid(request, eventid);
 }
 
 /*
@@ -254,9 +250,9 @@ static inline int afb_request_subscribe(struct afb_request *request, struct afb_
  * link identified by 'request'.
  * Returns 0 in case of successful subscription or -1 in case of error.
  */
-static inline int afb_request_unsubscribe(struct afb_request *request, struct afb_event event)
+static inline int afb_request_unsubscribe(struct afb_request *request, struct afb_eventid *eventid)
 {
-	return request->itf->unsubscribe(request, event);
+	return request->itf->unsubscribe_eventid(request, eventid);
 }
 
 /*
@@ -276,9 +272,9 @@ static inline int afb_request_unsubscribe(struct afb_request *request, struct af
  *  - 'afb_request_subcall_req' that is convenient to keep request alive automatically.
  *  - 'afb_request_subcall_sync' the synchronous version
  */
-static inline void afb_request_subcall(struct afb_request *request, const char *api, const char *verb, struct json_object *args, void (*callback)(void *closure, int iserror, struct json_object *result), void *closure)
+static inline void afb_request_subcall(struct afb_request *request, const char *api, const char *verb, struct json_object *args, void (*callback)(void *closure, int iserror, struct json_object *result, struct afb_request *request), void *closure)
 {
-	request->itf->subcall(request, api, verb, args, callback, closure);
+	request->itf->subcall_request(request, api, verb, args, callback, closure);
 }
 
 /*