X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-export.c;h=304395aedd7f5efa8724b5c76c24943142b592f7;hb=8cbdf0a5cb4d9abf0684344a28746a21dfc36ac3;hp=ce48dbe0577e7f3556cc061613d026652b17d620;hpb=4a6490b96d8ac2da6a19b4f251c005ff1b1e7d61;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-export.c b/src/afb-export.c
index ce48dbe0..304395ae 100644
--- a/src/afb-export.c
+++ b/src/afb-export.c
@@ -173,13 +173,13 @@ static struct afb_eventid *eventid_make_cb(void *closure, const char *name)
 	memcpy(event + plen + 1, name, nlen + 1);
 
 	/* create the event */
-	return afb_evt_create_event(event);
+	return afb_evt_eventid_create(event);
 }
 
 static struct afb_event event_make_cb(void *closure, const char *name)
 {
 	struct afb_eventid *eventid = eventid_make_cb(closure, name);
-	return (struct afb_event){ .itf = eventid ? eventid->itf : NULL, .closure = eventid };
+	return afb_evt_event_from_evtid(afb_evt_eventid_to_evtid(eventid));
 }
 
 static int event_broadcast_cb(void *closure, const char *name, struct json_object *object)
@@ -255,11 +255,12 @@ static int api_new_api_cb(
 		void *closure,
 		const char *api,
 		const char *info,
+		int noconcurrency,
 		int (*preinit)(void*, struct afb_dynapi *),
 		void *preinit_closure)
 {
 	struct afb_export *export = closure;
-	return afb_api_dyn_add(export->apiset, api, info, preinit, preinit_closure);
+	return afb_api_dyn_add(export->apiset, api, info, noconcurrency, preinit, preinit_closure);
 }
 
 /**********************************************
@@ -376,11 +377,12 @@ static int hooked_api_new_api_cb(
 		void *closure,
 		const char *api,
 		const char *info,
+		int noconcurrency,
 		int (*preinit)(void*, struct afb_dynapi *),
 		void *preinit_closure)
 {
 	/* TODO */
-	return api_new_api_cb(closure, api, info, preinit, preinit_closure);
+	return api_new_api_cb(closure, api, info, noconcurrency, preinit, preinit_closure);
 }
 /**********************************************
 * vectors
@@ -568,10 +570,10 @@ static struct call_req *callreq_create(
 		callreq->xreq.context.validated = 1;
 		copy = (char*)&callreq[1];
 		memcpy(copy, api, lenapi);
-		callreq->xreq.api = copy;
+		callreq->xreq.request.api = copy;
 		copy = &copy[lenapi];
 		memcpy(copy, verb, lenverb);
-		callreq->xreq.verb = copy;
+		callreq->xreq.request.verb = copy;
 		callreq->xreq.listener = export->listener;
 		callreq->xreq.json = args;
 		callreq->export = export;
@@ -1070,7 +1072,7 @@ static struct afb_export *create(struct afb_apiset *apiset, const char *apiname,
 
 	/* session shared with other exports */
 	if (common_session == NULL) {
-		common_session = afb_session_create (NULL, 0);
+		common_session = afb_session_create (0);
 		if (common_session == NULL)
 			return NULL;
 	}
@@ -1179,7 +1181,7 @@ struct afb_binding_interface_v1 *afb_export_get_interface_v1(struct afb_export *
 int afb_export_unshare_session(struct afb_export *export)
 {
 	if (export->session == common_session) {
-		export->session = afb_session_create (NULL, 0);
+		export->session = afb_session_create (0);
 		if (export->session)
 			afb_session_unref(common_session);
 		else {