aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-08 10:42:03 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:52:51 +0200
commit19e10aecc2c79da8a738d6071a74409d6627018c (patch)
treeda5a037103132f3c3d0791f3f38511b1be9f5fbd
parent18cc036b38bb207c7298ca3d4fc78be55fe87e39 (diff)
Change the field name use to store card path
Change the field name use to store card path into controller hal data structure. Change-Id: I4413a4e5550f3122055db4c6184907d8be407ceb Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c4
-rw-r--r--4a-hal/4a-hal-manager/4a-hal-manager-cb.c8
-rw-r--r--4a-hal/4a-hal-utilities/4a-hal-utilities-data.c2
-rw-r--r--4a-hal/4a-hal-utilities/4a-hal-utilities-data.h2
4 files changed, 8 insertions, 8 deletions
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 403b934..8de028d 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
@@ -93,7 +93,7 @@ static int HalCtlsInitOneApi(AFB_ApiT apiHandle)
currentCtlHalData->internal = true;
currentCtlHalData->apiName = (char *) ctrlConfig->api;
- currentCtlHalData->sndCard = (char *) ctrlConfig->uid;
+ currentCtlHalData->sndCardPath = (char *) ctrlConfig->uid;
currentCtlHalData->info = (char *) ctrlConfig->info;
currentCtlHalData->author = (char *) ctrlConfig->author;
@@ -105,7 +105,7 @@ static int HalCtlsInitOneApi(AFB_ApiT apiHandle)
currentCtlHalData->ctlHalSpecificData->ctlHalStreamsData.count = 0;
- currentCtlHalData->sndCardId = HalCtlsGetCardIdByCardPath(apiHandle, currentCtlHalData->sndCard);
+ currentCtlHalData->sndCardId = HalCtlsGetCardIdByCardPath(apiHandle, currentCtlHalData->sndCardPath);
if(currentCtlHalData->sndCardId < 0)
currentCtlHalData->status = HAL_STATUS_UNAVAILABLE;
diff --git a/4a-hal/4a-hal-manager/4a-hal-manager-cb.c b/4a-hal/4a-hal-manager/4a-hal-manager-cb.c
index e4dc56c..10fae1c 100644
--- a/4a-hal/4a-hal-manager/4a-hal-manager-cb.c
+++ b/4a-hal/4a-hal-manager/4a-hal-manager-cb.c
@@ -116,7 +116,7 @@ void HalMgrLoaded(AFB_ReqT request)
"{s:s s:i s:s s:i s:s s:s s:s s:s}",
"api", currentHalData->apiName,
"status", (int) currentHalData->status,
- "sndcard", currentHalData->sndCard,
+ "sndcard", currentHalData->sndCardPath,
"internal", (int) currentHalData->internal,
"info", currentHalData->info ? currentHalData->info : "",
"author", currentHalData->author ? currentHalData->author : "",
@@ -141,7 +141,7 @@ void HalMgrLoaded(AFB_ReqT request)
void HalMgrLoad(AFB_ReqT request)
{
- char *apiName, *sndCard, *info = NULL, *author = NULL, *version = NULL, *date = NULL;
+ char *apiName, *sndCardPath, *info = NULL, *author = NULL, *version = NULL, *date = NULL;
AFB_ApiT apiHandle;
struct HalMgrData *HalMgrGlobalData;
@@ -175,7 +175,7 @@ void HalMgrLoad(AFB_ReqT request)
if(wrap_json_unpack(apiReceviedMetadata,
"{s:s s:s s?:s s?:s s?:s s?:s}",
"api", &apiName,
- "uid", &sndCard,
+ "uid", &sndCardPath,
"info", &info,
"author", &author,
"version", &version,
@@ -192,7 +192,7 @@ void HalMgrLoad(AFB_ReqT request)
addedHal->status = HAL_STATUS_UNAVAILABLE;
addedHal->apiName = strdup(apiName);
- addedHal->sndCard = strdup(sndCard);
+ addedHal->sndCardPath = strdup(sndCardPath);
if(info)
addedHal->info = strdup(info);
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 48e6f9e..d2b9104 100644
--- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
+++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c
@@ -113,7 +113,7 @@ uint8_t HalUtlRemoveSelectedHalFromList(struct HalMgrData *HalMgrGlobalData, str
if(! matchingApi->internal) {
free(matchingApi->apiName);
- free(matchingApi->sndCard);
+ free(matchingApi->sndCardPath);
free(matchingApi->info);
free(matchingApi->author);
free(matchingApi->version);
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 53a8f69..71cda63 100644
--- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
+++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h
@@ -65,7 +65,7 @@ struct CtlHalSpecificData {
struct SpecificHalData {
char *apiName;
enum HalStatus status;
- char *sndCard;
+ char *sndCardPath;
int sndCardId;
char *info;
bool internal;