X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=2d939fbcb17d7c1018427499b1dba766261172be;hb=01534912a8e32468b62d848ec1fe23004df1dd19;hp=7df83dd8fc05a37f81959fc2dd086da848bff5b0;hpb=e62227977bbc161d2d0ae49951f9a4fbf02a354e;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 7df83dd8..2d939fbc 100644
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -24,7 +24,8 @@
 
 #include <afb/afb-binding.h>
 
-#include "afb-apis.h"
+#include "afb-api.h"
+#include "afb-apiset.h"
 #include "afb-svc.h"
 #include "afb-ditf.h"
 #include "afb-evt.h"
@@ -68,10 +69,10 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 	if (!verb)
 		afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->api);
 	else
-		afb_xreq_call(xreq, verb->session, verb->callback);
+		afb_xreq_so_call(xreq, verb->session, verb->callback);
 }
 
-static int service_start_cb(void *closure, int share_session, int onneed)
+static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
 {
 	int (*start)(const struct afb_binding_interface *interface, struct afb_service service);
 	void (*onevent)(const char *event, struct json_object *object);
@@ -103,7 +104,7 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 
 	/* get the event handler if any */
 	onevent = desc->binding->onevent;
-	desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->ditf.interface);
+	desc->service = afb_svc_create_v2(apiset, share_session, onevent, start, &desc->ditf.interface);
 	if (desc->service == NULL) {
 		/* starting error */
 		ERROR("Starting service %s failed", desc->binding->api);
@@ -113,11 +114,38 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 	return 0;
 }
 
-int afb_api_so_v2_add(const char *path, void *handle)
+static void update_hooks_cb(void *closure)
+{
+	struct api_so_v2 *desc = closure;
+	afb_ditf_update_hook(&desc->ditf);
+}
+
+static int get_verbosity_cb(void *closure)
+{
+	struct api_so_v2 *desc = closure;
+	return desc->ditf.interface.verbosity;
+}
+
+static void set_verbosity_cb(void *closure, int level)
+{
+	struct api_so_v2 *desc = closure;
+	desc->ditf.interface.verbosity = level;
+}
+
+static struct afb_api_itf so_v2_api_itf = {
+	.call = call_cb,
+	.service_start = service_start_cb,
+	.update_hooks = update_hooks_cb,
+	.get_verbosity = get_verbosity_cb,
+	.set_verbosity = set_verbosity_cb
+};
+
+int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
 {
 	int rc;
 	struct api_so_v2 *desc;
 	struct afb_binding_v2 *binding;
+	struct afb_api afb_api;
 
 	/* retrieves the register function */
 	binding = dlsym(handle, afb_api_so_v2_descriptor);
@@ -131,7 +159,7 @@ int afb_api_so_v2_add(const char *path, void *handle)
 		ERROR("binding [%s] bad api name...", path);
 		goto error;
 	}
-	if (!afb_apis_is_valid_api_name(binding->api)) {
+	if (!afb_api_is_valid_name(binding->api)) {
 		ERROR("binding [%s] invalid api name...", path);
 		goto error;
 	}
@@ -169,10 +197,9 @@ int afb_api_so_v2_add(const char *path, void *handle)
 	}
 
 	/* records the binding */
-	if (afb_apis_add(binding->api, (struct afb_api){
-			.closure = desc,
-			.call = call_cb,
-			.service_start = service_start_cb }) < 0) {
+	afb_api.closure = desc;
+	afb_api.itf = &so_v2_api_itf;
+	if (afb_apiset_add(apiset, binding->api, afb_api) < 0) {
 		ERROR("binding [%s] can't be registered...", path);
 		goto error2;
 	}