Rename a filed of 'CtlHalStreamData' structure

Rename 'cardId' filed to 'streamCardId' in 'CtlHalStreamData' structure.

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

4 files changed, 4 insertions, 4 deletions

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 39f625b..fb70962 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
@@ -203,7 +203,7 @@ void HalCtlsListVerbs(afb_request *request)
 		wrap_json_pack(&currentStream,
 			       "{s:s s:s}",
 			       "name", currentCtlHalData->ctlHalSpecificData->ctlHalStreamsData.data[idx].name,
-			       "cardId", currentCtlHalData->ctlHalSpecificData->ctlHalStreamsData.data[idx].cardId);
+			       "cardId", currentCtlHalData->ctlHalSpecificData->ctlHalStreamsData.data[idx].streamCardId);
 		json_object_array_add(streamsArray, currentStream);
 	}
 
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
index 66de4bb..64910b5 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
@@ -150,7 +150,7 @@ int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT
 		}
 		else {
 			currentHalStreamsData->data[idx].name = strdup(currentStreamName);
-			currentHalStreamsData->data[idx].cardId = strdup(currentStreamCardId);
+			currentHalStreamsData->data[idx].streamCardId = strdup(currentStreamCardId);
 
 			CtlHalDynApiStreamVerbs[idx].verb = currentStreamName;
 			CtlHalDynApiStreamVerbs[idx].callback = HalCtlsActionOnStream;
diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
index f03393f..62bdb8f 100644
--- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
+++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
@@ -41,7 +41,7 @@ uint8_t HalUtlRemoveAllCtlHalStreamsData(struct CtlHalStreamsDataT *ctlHalStream
 
 	for(cpt = 0; cpt < ctlHalStreamsData->count; cpt++) {
 		free(ctlHalStreamsData->data[cpt].name);
-		free(ctlHalStreamsData->data[cpt].cardId);
+		free(ctlHalStreamsData->data[cpt].streamCardId);
 	}
 
 	free(ctlHalStreamsData->data);
diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
index 9fd98eb..e357256 100644
--- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
+++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
@@ -37,7 +37,7 @@ enum HalStatus {
 
 struct CtlHalStreamData {
 	char *name;
-	char *cardId;
+	char *streamCardId;
 };
 
 struct CtlHalStreamsDataT {