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 <jonathan.aillet@iot.bzh>

5 files changed, 10 insertions, 10 deletions

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 9205aaa..c35b3cc 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
@@ -439,7 +439,7 @@ void HalCtlsActionOnAlsaCtl(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;
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c
index 292bcd8..9ecf088 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c
@@ -86,7 +86,7 @@ static int HalCtlsInitOneApi(AFB_ApiT apiHandle)
 	if(! ctrlConfig)
 		return -2;
 
-	currentCtlHalData = (struct SpecificHalData *) ctrlConfig->external;
+	currentCtlHalData = (struct SpecificHalData *) getExternalData(ctrlConfig);
 	if(! currentCtlHalData)
 		return -3;
 
@@ -181,7 +181,7 @@ int HalCtlsCreateApi(AFB_ApiT apiHandle, char *path, struct HalMgrData *HalMgrGl
 	currentCtlHalData->apiName = (char *) ctrlConfig->api;
 
 	// Stores current hal controller data in controller config
-	ctrlConfig->external = (void *) currentCtlHalData;
+	setExternalData(ctrlConfig, (void *) currentCtlHalData);
 
 	// Allocation of the structure that will be used to store specific hal controller data
 	currentCtlHalData->ctlHalSpecificData = calloc(1, sizeof(struct CtlHalSpecificData));
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;
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c
index 2ffee91..6f160d7 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c
@@ -202,7 +202,7 @@ int HalCtlsAttachToMixer(AFB_ApiT apiHandle)
 		return -2;
 	}
 
-	currentCtlHalData = (struct SpecificHalData *) ctrlConfig->external;
+	currentCtlHalData = (struct SpecificHalData *) getExternalData(ctrlConfig);
 	if(! currentCtlHalData) {
 		AFB_ApiError(apiHandle, "Can't get current hal controller data");
 		return -3;
diff --git a/plugins/lib/bluetooth/hal-bt.c b/plugins/lib/bluetooth/hal-bt.c
index e5c73bc..7884dd6 100644
--- a/plugins/lib/bluetooth/hal-bt.c
+++ b/plugins/lib/bluetooth/hal-bt.c
@@ -69,7 +69,7 @@ CTLP_INIT(plugin, callbacks)
 		return -1;
 	}
 
-	if(! (currentHalData = (struct SpecificHalData *) ctrlConfig->external)) {
+	if(! (currentHalData = getExternalData(ctrlConfig))) {
 		AFB_ApiError(plugin->api, "Can't get current hal controller data");
 		return -2;
 	}