Git submodule migration to separated libraries

- Replace controller binder functions definition with the binder ones.
and remove the last used submodules to use the separated libraries.

- Add liburcu as a project dependency in addition to the others ones.

Bug-AGL: SPEC-2139

Change-Id: If46eed24018e28e58d1e62397f4355d2aa46a58e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/alsa/alsa-transaction.c b/plugins/alsa/alsa-transaction.c
index 1958c87..1677582 100644
--- a/plugins/alsa/alsa-transaction.c
+++ b/plugins/alsa/alsa-transaction.c
@@ -70,7 +70,7 @@ fail:
 void AlsaMixerTransactionDoCleanup(AlsaMixerTransaction* transaction) {
 	AlsaMixerTransactionDataItem * item, *sav;
 
-    AFB_ApiInfo(transaction->mixer->api, "%s for transaction %s", __func__, transaction->uid);
+    AFB_API_INFO(transaction->mixer->api, "%s for transaction %s", __func__, transaction->uid);
 
 	cds_list_for_each_entry_safe(item, sav, &transaction->item_list, list_entry) {
 		if (item->destructor)
@@ -80,10 +80,10 @@ void AlsaMixerTransactionDoCleanup(AlsaMixerTransaction* transaction) {
 		free(item);
 	}
 
-    AFB_ApiInfo(transaction->mixer->api, "%s for transaction %s .. DONE !", __func__, transaction->uid);
+    AFB_API_INFO(transaction->mixer->api, "%s for transaction %s .. DONE !", __func__, transaction->uid);
 }
 
-void AlsaMixerTransactionVerbCB(AFB_ReqT request) {
+void AlsaMixerTransactionVerbCB(afb_req_t request) {
 	json_object *responseJ = NULL;
 	AlsaMixerTransaction *transaction = (AlsaMixerTransaction*) afb_req_get_vcbdata(request);
 	json_object *argsJ = afb_req_json(request);
@@ -95,7 +95,7 @@ void AlsaMixerTransactionVerbCB(AFB_ReqT request) {
 			"action", &action);
 
 	if (error) {
-		AFB_ReqFailF(request, "missing action", "%s: missing 'action' field: %s", transaction->uid, json_object_get_string(argsJ));
+		afb_req_fail_f(request, "missing action", "%s: missing 'action' field: %s", transaction->uid, json_object_get_string(argsJ));
 		goto fail;
 	}
 
@@ -113,20 +113,20 @@ void AlsaMixerTransactionVerbCB(AFB_ReqT request) {
 
 		error = afb_api_del_verb(transaction->mixer->api, transaction->uid, (void**)NULL);
 		if (error) {
-			AFB_ReqFail(request, "verb deletion" , "verb was not removed");
+			afb_req_fail(request, "verb deletion" , "verb was not removed");
 			goto fail;
 		}
 
 		AlsaMixerTransactionDelete(transaction);
 
 	} else {
-		AFB_ReqFailF(request, "unsupported action", "%s: unsupported action %s (supported ones are ['remove']", transaction->uid, action);
+		afb_req_fail_f(request, "unsupported action", "%s: unsupported action %s (supported ones are ['remove']", transaction->uid, action);
 		goto fail;
 	}
 
 	responseJ=json_object_new_object();
 	json_object_object_add(responseJ, "result", json_object_new_string("OK"));
-	AFB_ReqSuccess(request, responseJ, uid);
+	afb_req_success(request, responseJ, uid);
 
 fail:
 	free((char*)uid);