1 files changed, 7 insertions, 15 deletions

diff --git a/src/4a-hal-manager/4a-hal-manager.c b/src/4a-hal-manager/4a-hal-manager.c
index 567e9eb..ce1aed5 100644
--- a/src/4a-hal-manager/4a-hal-manager.c
+++ b/src/4a-hal-manager/4a-hal-manager.c
@@ -32,9 +32,6 @@
 // Default api to print log when apihandle not available
 afb_api_t AFB_default;
 
-// Local (static) Hal manager data structure
-static struct HalMgrData localHalMgrGlobalData;
-
 /*******************************************************************************
  *		HAL Manager verbs table					       *
  ******************************************************************************/
@@ -53,16 +50,6 @@ afb_verb_t HalManagerApiStaticVerbs[] =
 };
 
 /*******************************************************************************
- *		HAL Manager get 'HalData' linked list			       *
-		from HAL list function					       *
- ******************************************************************************/
-
-struct HalData **HalMngGetHalDataList(void)
-{
-	return &localHalMgrGlobalData.halDataList;
-}
-
-/*******************************************************************************
  *		Dynamic API functions for hal manager			       *
  ******************************************************************************/
 
@@ -142,6 +129,7 @@ int HalMgrCreateApi(afb_api_t apiHandle, struct HalMgrData *halMgrData)
 
 int afbBindingEntry(afb_api_t apiHandle)
 {
+	struct HalMgrData *halMgrData;
 
 	if(! apiHandle)
 		return -1;
@@ -151,12 +139,16 @@ int afbBindingEntry(afb_api_t apiHandle)
 
 	AFB_API_NOTICE(apiHandle, "Binding start");
 
+	halMgrData = (struct HalMgrData *) calloc(1, sizeof(struct HalMgrData));
+	if(! halMgrData)
+		return -2;
+
 	// Load Hal-Manager using Api v3
-	if(HalMgrCreateApi(apiHandle, &localHalMgrGlobalData))
+	if(HalMgrCreateApi(apiHandle, halMgrData))
 		return -3;
 
 	// Load internals Hal using Api v3
-	if(InternalHalCreateAllApi(apiHandle, &localHalMgrGlobalData))
+	if(InternalHalCreateAllApi(apiHandle, halMgrData))
 		return -4;
 
 	return 0;