Move functions used to generate json

Move functions used to generate hal information json into
there corresponding files in hal-utilities.

BUG-AGL: SPEC-2329

Change-Id: Id518e7f732ef393bbf98f3b3a32edf01ec81f70c
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

1 files changed, 4 insertions, 84 deletions

diff --git a/src/4a-internals-hal/4a-internals-hal-cb.c b/src/4a-internals-hal/4a-internals-hal-cb.c
index 451572e..d9123c9 100644
--- a/src/4a-internals-hal/4a-internals-hal-cb.c
+++ b/src/4a-internals-hal/4a-internals-hal-cb.c
@@ -1012,86 +1012,6 @@ int InternalHalHalDependenciesConfig(afb_api_t apiHandle, CtlSectionT *section,
  *		Internals HAL verbs functions				       *
  ******************************************************************************/
 
-json_object *InternalHalGetJsonArrayForMixerDataTable(afb_api_t apiHandle,
-						      struct InternalHalMixerData **mixerDataList)
-{
-	int wrapRet;
-
-	json_object *mixerDataArrayJ, *currentMixerDataJ;
-
-	struct InternalHalMixerData *currentMixerData;
-
-	if(! apiHandle) {
-		AFB_API_ERROR(apiHandle, "Api handle is not valid");
-		return NULL;
-	}
-
-	mixerDataArrayJ = json_object_new_array();
-	if(! mixerDataArrayJ) {
-		AFB_API_ERROR(apiHandle, "Didn't succeed to allocate requested mixer data json array");
-		return NULL;
-	}
-
-	currentMixerData = *mixerDataList;
-	while(currentMixerData) {
-		wrapRet = wrap_json_pack(&currentMixerDataJ,
-					 "{s:s s:s}",
-					 "name", currentMixerData->verb,
-					 "cardId", currentMixerData->streamCardId);
-		if(wrapRet) {
-			AFB_API_ERROR(apiHandle, "Didn't succeed to allocate current mixer json object");
-			json_object_put(mixerDataArrayJ);
-			return NULL;
-		}
-
-		json_object_array_add(mixerDataArrayJ, currentMixerDataJ);
-
-		currentMixerData = currentMixerData->next;
-	}
-
-	return mixerDataArrayJ;
-}
-
-json_object *InternalHalGetJsonArrayForControls(afb_api_t apiHandle, struct InternalHalAlsaMapT *currentAlsaMapDataT)
-{
-	int wrapRet;
-	unsigned int idx;
-
-	json_object *alsaMapDataArray, *currentAlsaMapData;
-
-	if(! apiHandle) {
-		AFB_API_ERROR(apiHandle, "Can't get current internal hal api handle");
-		return NULL;
-	}
-
-	if(! currentAlsaMapDataT) {
-		AFB_API_ERROR(apiHandle, "Can't get Alsa map data table to handle");
-		return NULL;
-	}
-
-	alsaMapDataArray = json_object_new_array();
-	if(! alsaMapDataArray) {
-		AFB_API_ERROR(apiHandle, "Didn't succeed to allocate ALSA controls data json array");
-		return NULL;
-	}
-
-	for(idx = 0; idx < currentAlsaMapDataT->ctlsCount; idx++) {
-		wrapRet = wrap_json_pack(&currentAlsaMapData,
-					 "{s:s s:s}",
-					 "name", currentAlsaMapDataT->ctls[idx].uid,
-					 "info", currentAlsaMapDataT->ctls[idx].info ? currentAlsaMapDataT->ctls[idx].info : "none");
-		if(wrapRet) {
-			AFB_API_ERROR(apiHandle, "Didn't succeed to allocate current streams json object");
-			json_object_put(alsaMapDataArray);
-			return NULL;
-		}
-
-		json_object_array_add(alsaMapDataArray, currentAlsaMapData);
-	}
-
-	return alsaMapDataArray;
-}
-
 void InternalHalInfo(afb_req_t request)
 {
 	int wrapRet;
@@ -1151,15 +1071,15 @@ void InternalHalInfo(afb_req_t request)
 		return;
 	}
 
-	streamsArray = InternalHalGetJsonArrayForMixerDataTable(apiHandle,
-								&currentHalData->internalHalData->streamsData);
+	streamsArray = HalUtlGetJsonArrayForAllMixersData(apiHandle,
+							  &currentHalData->internalHalData->streamsData);
 	if(! streamsArray) {
 		afb_req_fail(request, "streams_data", "Didn't succeed to generate streams data array");
 		return;
 	}
 
-	controlsArray = InternalHalGetJsonArrayForControls(apiHandle,
-							   currentHalData->internalHalData->alsaMapT);
+	controlsArray = HalUtGetJsonArrayForAllControls(apiHandle,
+							currentHalData->internalHalData->alsaMapT);
 	if(! controlsArray) {
 		afb_req_fail(request, "controls_data", "Didn't succeed to generate controls data array");
 		return;