From b62ab4c3fa9595715538dda7dfa330dcb77b0778 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Fri, 1 Jun 2018 21:56:45 +0200 Subject: Include afb-definitions when using application framework Include from 'app-controller' instead of and use its definitions. It allows to migrate from an application framework version to another with less impact on the code. Change-Id: I22359cd3fe22145b3d6c551f227be2ba7e1b65d5 Signed-off-by: Jonathan Aillet --- 4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c index 37d6447..366de0f 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c @@ -30,7 +30,7 @@ * HAL controllers alsacore calls funtions * ******************************************************************************/ -bool HalCtlsGetCardIdByCardPath(afb_dynapi *apiHandle, struct SpecificHalData *currentCtlHalData) +bool HalCtlsGetCardIdByCardPath(AFB_ApiT apiHandle, struct SpecificHalData *currentCtlHalData) { int *cardId; @@ -46,12 +46,12 @@ bool HalCtlsGetCardIdByCardPath(afb_dynapi *apiHandle, struct SpecificHalData *c wrap_json_pack(&toSendJ, "{s:s}", "devpath", currentCtlHalData->sndCard); - if(afb_dynapi_call_sync(apiHandle, ALSACORE_API, ALSACORE_GETINFO_VERB, toSendJ, &returnJ)) { + if(AFB_ServiceSync(apiHandle, ALSACORE_API, ALSACORE_GETINFO_VERB, toSendJ, &returnJ)) { returnedStatus = alloca(sizeof(char *)); returnedInfo = alloca(sizeof(char *)); returnedError = HalUtlHandleAppFwCallError(apiHandle, ALSACORE_API, ALSACORE_GETINFO_VERB, returnJ, returnedStatus, returnedInfo); - AFB_DYNAPI_WARNING(apiHandle, + AFB_ApiWarning(apiHandle, "Error %i during call to verb %s of %s api", (int) returnedError, ALSACORE_GETINFO_VERB, @@ -61,10 +61,10 @@ bool HalCtlsGetCardIdByCardPath(afb_dynapi *apiHandle, struct SpecificHalData *c if(json_object_object_get_ex(responsJ, "devid", &devidJ) && json_object_is_type(devidJ, json_type_string)) { cardIdString = (char *) json_object_get_string(devidJ); if(sscanf(cardIdString, "hw:%i", cardId) <= 0) - AFB_DYNAPI_WARNING(apiHandle, "Couldn't get valid devid from string: '%s'", cardIdString); + AFB_ApiWarning(apiHandle, "Couldn't get valid devid from string: '%s'", cardIdString); } else { - AFB_DYNAPI_WARNING(apiHandle, "Response devid is not present/valid"); + AFB_ApiWarning(apiHandle, "Response devid is not present/valid"); } currentCtlHalData->sndCardId = *cardId; -- cgit 1.2.3-korg