Move from controller functions to afb functions

Move from controller 'afb-definitions.h' functions to
application framework 'afb/afb-binding.h' functions.

Change-Id: I4cd62af881ef8ac949b082ede9dfcc4736d1e12c
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

1 files changed, 64 insertions, 69 deletions

diff --git a/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c b/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c
index 4d42b01..9f23787 100644
--- a/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c
+++ b/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <json-c/json.h>
 
-#include <afb-definitions.h>
+#include <afb/afb-binding.h>
 
 #include <ctl-config.h>
 
@@ -32,13 +32,13 @@
  *		Actions to be call when a stream verb is called		       *
  ******************************************************************************/
 
-void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
+void HalUtlActionOnMixer(afb_req_t request, enum ActionOnMixerType actionType)
 {
 	int idx, count;
 
 	char *apiToCall;
 
-	AFB_ApiT apiHandle;
+	afb_api_t apiHandle;
 	CtlConfigT *ctrlConfig;
 
 	struct SpecificHalData *currentCtlHalData;
@@ -46,27 +46,23 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 
 	json_object *requestJson, *returnJ = NULL, *responseJ, *toReturnJ = NULL;
 
-	apiHandle = (AFB_ApiT) AFB_ReqGetApi(request);
-	if(! apiHandle) {
-		AFB_ReqFail(request, "api_handle", "Can't get current hal controller api handle");
+	if(! (apiHandle = afb_req_get_api(request))) {
+		afb_req_fail(request, "api_handle", "Can't get current hal controller api handle");
 		return;
 	}
 
-	ctrlConfig = (CtlConfigT *) AFB_ApiGetUserData(apiHandle);
-	if(! ctrlConfig) {
-		AFB_ReqFail(request, "hal_controller_config", "Can't get current hal controller config");
+	if(! (ctrlConfig = (CtlConfigT *) afb_api_get_userdata(apiHandle))) {
+		afb_req_fail(request, "hal_controller_config", "Can't get current hal controller config");
 		return;
 	}
 
-	currentCtlHalData = (struct SpecificHalData *) getExternalData(ctrlConfig);
-	if(! currentCtlHalData) {
-		AFB_ReqFail(request, "hal_controller_data", "Can't get current hal controller data");
+	if(! (currentCtlHalData = (struct SpecificHalData *) getExternalData(ctrlConfig))) {
+		afb_req_fail(request, "hal_controller_data", "Can't get current hal controller data");
 		return;
 	}
 
-	requestJson = AFB_ReqJson(request);
-	if(! requestJson) {
-		AFB_ReqFail(request, "request_json", "Can't get request json");
+	if(! (requestJson = afb_req_json(request))) {
+		afb_req_fail(request, "request_json", "Can't get request json");
 		return;
 	}
 
@@ -75,17 +71,17 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 
 	apiToCall = currentCtlHalData->ctlHalSpecificData->mixerApiName;
 	if(! apiToCall) {
-		AFB_ReqFail(request, "mixer_api", "Can't get mixer api");
+		afb_req_fail(request, "mixer_api", "Can't get mixer api");
 		return;
 	}
 
 	if(currentCtlHalData->status != HAL_STATUS_READY) {
-		AFB_ReqFail(request, "hal_not_ready", "Seems that hal is not ready");
+		afb_req_fail(request, "hal_not_ready", "Seems that hal is not ready");
 		return;
 	}
 
-	if(! (currentMixerData = (struct CtlHalMixerData *) AFB_ReqVCBData(request))) {
-		AFB_ReqFail(request, "hal_call_data", "Can't get current call data");
+	if(! (currentMixerData = (struct CtlHalMixerData *) afb_req_get_vcbdata(request))) {
+		afb_req_fail(request, "hal_call_data", "Can't get current call data");
 		return;
 	}
 
@@ -102,16 +98,16 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 			break;
 
 		default:
-			AFB_ReqFail(request, "hal_call_data", "Can't get current call data");
+			afb_req_fail(request, "hal_call_data", "Can't get current call data");
 			return;
 	}
 
 	for(idx = 0; idx < count; idx++) {
-		if(AFB_ServiceSync(apiHandle,
-				   apiToCall,
-				   currentMixerData->verbToCall,
-				   json_object_get(requestJson),
-				   &returnJ)) {
+		if(afb_api_call_sync_legacy(apiHandle,
+					    apiToCall,
+					    currentMixerData->verbToCall,
+					    json_object_get(requestJson),
+					    &returnJ)) {
 			HalUtlHandleAppFwCallErrorInRequest(request, apiToCall, currentMixerData->verbToCall, returnJ, "call_action");
 			json_object_put(returnJ);
 			if(toReturnJ)
@@ -120,11 +116,11 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 		}
 
 		if(wrap_json_unpack(returnJ, "{s:o}", "response", &responseJ)) {
-			AFB_ReqFailF(request,
-				     "Seems that %s call to api %s succeed, but no response was found in : '%s'",
-				     currentMixerData->verbToCall,
-				     apiToCall,
-				     json_object_get_string(returnJ));
+			afb_req_fail_f(request,
+				       "Seems that %s call to api %s succeed, but no response was found in : '%s'",
+				       currentMixerData->verbToCall,
+				       apiToCall,
+				       json_object_get_string(returnJ));
 			json_object_put(returnJ);
 			if(toReturnJ)
 				json_object_put(toReturnJ);
@@ -135,8 +131,8 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 		if((actionType == ACTION_ON_MIXER_STREAM ||
 		    actionType == ACTION_ON_MIXER_ALL_STREAM) &&
 		   ((! currentMixerData->event) ||
-		    (AFB_EventPush(currentMixerData->event, json_object_get(responseJ)) < 0))) {
-			AFB_ApiError(apiHandle, "Couldn't generate an event for stream %s", currentMixerData->verb);
+		    (afb_event_push(currentMixerData->event, json_object_get(responseJ)) < 0))) {
+			AFB_API_ERROR(apiHandle, "Could not generate an event for stream %s", currentMixerData->verb);
 		}
 
 		switch(actionType) {
@@ -173,29 +169,29 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 
 	switch(actionType) {
 		case ACTION_ON_MIXER_STREAM:
-			AFB_ReqSuccessF(request,
-					toReturnJ,
-					"Action %s correctly transferred to %s without any error raised",
-					currentMixerData->verbToCall,
-					apiToCall);
+			afb_req_success_f(request,
+					  toReturnJ,
+					  "Action %s correctly transferred to %s without any error raised",
+					  currentMixerData->verbToCall,
+					  apiToCall);
 			break;
 
 		case ACTION_ON_MIXER_PLAYBACK:
-			AFB_ReqSuccess(request,
-				       toReturnJ,
-				       "Actions correctly transferred to all playbacks without any error raised");
+			afb_req_success(request,
+					toReturnJ,
+					"Actions correctly transferred to all playbacks without any error raised");
 			break;
 
 		case ACTION_ON_MIXER_CAPTURE:
-			AFB_ReqSuccess(request,
-				       toReturnJ,
-				       "Actions correctly transferred to all captures without any error raised");
+			afb_req_success(request,
+					toReturnJ,
+					"Actions correctly transferred to all captures without any error raised");
 			break;
 
 		case ACTION_ON_MIXER_ALL_STREAM:
-			AFB_ReqSuccess(request,
-				       toReturnJ,
-				       "Actions correctly transferred to all streams without any error raised");
+			afb_req_success(request,
+					toReturnJ,
+					"Actions correctly transferred to all streams without any error raised");
 			break;
 
 		default:
@@ -203,22 +199,22 @@ void HalUtlActionOnMixer(AFB_ReqT request, enum ActionOnMixerType actionType)
 	}
 }
 
-void HalUtlActionOnStream(AFB_ReqT request)
+void HalUtlActionOnStream(afb_req_t request)
 {
 	HalUtlActionOnMixer(request, ACTION_ON_MIXER_STREAM);
 }
 
-void HalUtlActionOnPlayback(AFB_ReqT request)
+void HalUtlActionOnPlayback(afb_req_t request)
 {
 	HalUtlActionOnMixer(request, ACTION_ON_MIXER_PLAYBACK);
 }
 
-void HalUtlActionOnCapture(AFB_ReqT request)
+void HalUtlActionOnCapture(afb_req_t request)
 {
 	HalUtlActionOnMixer(request, ACTION_ON_MIXER_CAPTURE);
 }
 
-void HalUtlActionOnAllStream(AFB_ReqT request)
+void HalUtlActionOnAllStream(afb_req_t request)
 {
 	HalUtlActionOnMixer(request, ACTION_ON_MIXER_ALL_STREAM);
 }
@@ -227,7 +223,7 @@ void HalUtlActionOnAllStream(AFB_ReqT request)
  *		Add stream data and verb function			       *
  ******************************************************************************/
 
-struct CtlHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(AFB_ApiT apiHandle,
+struct CtlHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(afb_api_t apiHandle,
 							       char *verb,
 							       char *verbToCall,
 							       char *streamCardId)
@@ -242,7 +238,7 @@ struct CtlHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(AFB_ApiT apiHandl
 	if(! apiHandle || ! verb || ! verbToCall || ! streamCardId)
 		return NULL;
 
-	if((! (ctrlConfig = (CtlConfigT *) AFB_ApiGetUserData(apiHandle))) ||
+	if((! (ctrlConfig = (CtlConfigT *) afb_api_get_userdata(apiHandle))) ||
 	   (! (currentSpecificHalData = (struct SpecificHalData *) getExternalData(ctrlConfig))) ||
 	   (! currentSpecificHalData->ctlHalSpecificData))
 		return NULL;
@@ -261,21 +257,20 @@ struct CtlHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(AFB_ApiT apiHandl
 		return NULL;
 	}
 
-	createdStreamData->event = AFB_EventMake(apiHandle, createdStreamData->verb);
-	if(! AFB_EventIsValid(createdStreamData->event)) {
+	if(! (createdStreamData->event = afb_api_make_event(apiHandle, createdStreamData->verb))) {
 		HalUtlRemoveSelectedMixerData(&currentSpecificHalData->ctlHalSpecificData->ctlHalStreamsData, createdStreamData);
 		return NULL;
 	}
 
-	if(AFB_ApiAddVerb(apiHandle,
-			  createdStreamData->verb,
-			  "Stream action transferred to mixer",
-			  HalUtlActionOnStream,
-			  (void *) createdStreamData,
-			  NULL,
-			  0,
-			  0)) {
-		AFB_ApiError(apiHandle,"Error while creating verb for stream : '%s'", createdStreamData->verb);
+	if(afb_api_add_verb(apiHandle,
+			    createdStreamData->verb,
+			    "Stream action transferred to mixer",
+			    HalUtlActionOnStream,
+			    (void *) createdStreamData,
+			    NULL,
+			    0,
+			    0)) {
+		AFB_API_ERROR(apiHandle,"Error while creating verb for stream : '%s'", createdStreamData->verb);
 		HalUtlRemoveSelectedMixerData(&currentSpecificHalData->ctlHalSpecificData->ctlHalStreamsData, createdStreamData);
 		return NULL;
 	}
@@ -286,12 +281,12 @@ struct CtlHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(AFB_ApiT apiHandl
 		       "name", createdStreamData->verb,
 		       "cardId", createdStreamData->streamCardId);
 
-	AFB_EventPush(currentSpecificHalData->ctlHalSpecificData->streamUpdates, streamAddedEventJ);
+	afb_event_push(currentSpecificHalData->ctlHalSpecificData->streamUpdates, streamAddedEventJ);
 
 	return createdStreamData;
 }
 
-int8_t HalUtlRemoveStreamDataAndDeleteStreamVerb(AFB_ApiT apiHandle,
+int8_t HalUtlRemoveStreamDataAndDeleteStreamVerb(afb_api_t apiHandle,
 						 char *verb,
 						 char *verbToCall,
 						 char *streamCardId)
@@ -308,7 +303,7 @@ int8_t HalUtlRemoveStreamDataAndDeleteStreamVerb(AFB_ApiT apiHandle,
 	if(! apiHandle || ! verb || ! verbToCall || ! streamCardId)
 		return -1;
 
-	if((! (ctrlConfig = (CtlConfigT *) AFB_ApiGetUserData(apiHandle))) ||
+	if((! (ctrlConfig = (CtlConfigT *) afb_api_get_userdata(apiHandle))) ||
 	   (! (currentSpecificHalData = (struct SpecificHalData *) getExternalData(ctrlConfig))) ||
 	   (! currentSpecificHalData->ctlHalSpecificData))
 		return -2;
@@ -326,18 +321,18 @@ int8_t HalUtlRemoveStreamDataAndDeleteStreamVerb(AFB_ApiT apiHandle,
 		       "cardId", toRemoveStreamData->streamCardId);
 
 	if(afb_api_del_verb(apiHandle, verb, NULL)) {
-		AFB_ApiError(apiHandle,"Error while deleting verb for stream : '%s'", verb);
+		AFB_API_ERROR(apiHandle,"Error while deleting verb for stream : '%s'", verb);
 		json_object_put(streamRemovedEventJ);
 		return -4;
 	}
 
 	if((returnedErr = HalUtlRemoveSelectedMixerData(&currentSpecificHalData->ctlHalSpecificData->ctlHalStreamsData, toRemoveStreamData))) {
-		AFB_ApiError(apiHandle,"Error %i while removing data for stream : '%s'", returnedErr, verb);
+		AFB_API_ERROR(apiHandle,"Error %i while removing data for stream : '%s'", returnedErr, verb);
 		json_object_put(streamRemovedEventJ);
 		return -5;
 	}
 
-	AFB_EventPush(currentSpecificHalData->ctlHalSpecificData->streamUpdates, streamRemovedEventJ);
+	afb_event_push(currentSpecificHalData->ctlHalSpecificData->streamUpdates, streamRemovedEventJ);
 
 	return 0;
 }
\ No newline at end of file