From 68138a3ec7a78ad7304d291ff92d8e5292847c4e Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Thu, 18 Apr 2019 12:40:25 +0200 Subject: Clarify internals hal functions and files names The purpose of this commit is to have of a more standard way to name files and functions used to generate/handle hal api (generated from hal json configuration file). It occurred to me that 'hal-controller' was not a good name because it is harder for people who don't know about the app-controller to understanded what is the purpose of these files/functions. It was renamed to 'internal-hal' because it's about hal that are all handle/load by hal-manager in opposition of external-hal that are independant binding/binder that can register themselves to hal-manager. BUG-AGL: SPEC-2329 Change-Id: I11b7efe64ec474b004a2a15ed8969b9db95d428f Signed-off-by: Jonathan Aillet --- plugins/lib/bluealsa/hal-bluealsa.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/lib') diff --git a/plugins/lib/bluealsa/hal-bluealsa.c b/plugins/lib/bluealsa/hal-bluealsa.c index 415b160..58c4b54 100644 --- a/plugins/lib/bluealsa/hal-bluealsa.c +++ b/plugins/lib/bluealsa/hal-bluealsa.c @@ -68,15 +68,16 @@ CTLP_INIT(plugin, callbacks) { json_object *actionsToAdd = NULL; CtlConfigT *ctrlConfig; - struct SpecificHalData *currentHalData; + struct HalData *currentHalData; if (!(ctrlConfig = (CtlConfigT *) afb_api_get_userdata(plugin->api))) { - AFB_API_ERROR(plugin->api, "Can't get current hal controller config"); + AFB_API_ERROR(plugin->api, "Can't get current internal hal controller config"); goto fail; } - if (!(currentHalData = (struct SpecificHalData *) ctrlConfig->external)) { - AFB_API_ERROR(plugin->api, "Can't get current hal controller data"); + currentHalData = (struct HalData *) getExternalData(ctrlConfig); + if (!currentHalData) { + AFB_API_ERROR(plugin->api, "Can't get current internal hal controller data"); goto fail; } -- cgit 1.2.3-korg