From 226aa0fb14a036f44e9931ea7b7c45aa569be2d9 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Wed, 31 Oct 2018 15:55:32 +0100 Subject: Use new ctl functions to set/get ctl external data Use new controller functions to set/get controller configuration structure external data field. Change-Id: I0e1ce259fccbbd8b4054efbed07cef5c5b9243b5 Signed-off-by: Jonathan Aillet --- 4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c index 9f074df..41404fa 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c @@ -54,7 +54,7 @@ void HalCtlsDispatchApiEvent(AFB_ApiT apiHandle, const char *evtLabel, json_obje return; } - currentHalData = (struct SpecificHalData *) ctrlConfig->external; + currentHalData = (struct SpecificHalData *) getExternalData(ctrlConfig); if(! currentHalData) { AFB_ApiWarning(apiHandle, "Can't get current hal controller data"); return; @@ -128,7 +128,7 @@ int HalCtlsHalMixerConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object if(! ctrlConfig) return -2; - currentHalData = (struct SpecificHalData *) ctrlConfig->external; + currentHalData = (struct SpecificHalData *) getExternalData(ctrlConfig); if(! currentHalData) return -3; @@ -345,7 +345,7 @@ int HalCtlsHalMapConfig(AFB_ApiT apiHandle, CtlSectionT *section, json_object *A if(! ctrlConfig) return -1; - currentHalData = (struct SpecificHalData *) ctrlConfig->external; + currentHalData = (struct SpecificHalData *) getExternalData(ctrlConfig); if(! currentHalData) return -2; @@ -415,7 +415,7 @@ void HalCtlsActionOnCall(AFB_ReqT request) return; } - currentCtlHalData = (struct SpecificHalData *) ctrlConfig->external; + currentCtlHalData = (struct SpecificHalData *) getExternalData(ctrlConfig); if(! currentCtlHalData) { AFB_ReqFail(request, "hal_controller_data", "Can't get current hal controller data"); return; @@ -531,7 +531,7 @@ void HalCtlsInfo(AFB_ReqT request) return; } - currentCtlHalData = (struct SpecificHalData *) ctrlConfig->external; + currentCtlHalData = (struct SpecificHalData *) getExternalData(ctrlConfig); if(! currentCtlHalData) { AFB_ReqFail(request, "hal_controller_data", "Can't get current hal controller data"); return; -- cgit 1.2.3-korg