summaryrefslogtreecommitdiffstats
path: root/lib/4a-hal-utilities
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2019-04-18 11:21:04 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2019-05-24 16:29:12 +0200
commit701bea793ed1d2e20d036957268a71973c975cda (patch)
treee11453562495478d0b98462e9f5c7746c611aa33 /lib/4a-hal-utilities
parent9f9650031fcbea8401d64609778cef1b7c252990 (diff)
Correct mistakes due to use of unsigned returns
Correct mistakes due to use of unsigned returns. Also, simplify use of int by replacing 'int8_t' and 'int64_t' types by plain 'int' type. BUG-AGL: SPEC-2329 Change-Id: I24fe273c5a233762c072f7bc9e79eab32a1c824c Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to 'lib/4a-hal-utilities')
-rw-r--r--lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c2
-rw-r--r--lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h2
-rw-r--r--lib/4a-hal-utilities/4a-hal-utilities-data.c22
-rw-r--r--lib/4a-hal-utilities/4a-hal-utilities-data.h14
-rw-r--r--lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c10
-rw-r--r--lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h8
6 files changed, 29 insertions, 29 deletions
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c
index 6409253..90fb612 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c
+++ b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c
@@ -27,7 +27,7 @@
* Free contents of 'InternalHalAlsaMapT' data structure *
******************************************************************************/
-uint8_t HalUtlFreeAlsaCtlsMap(struct InternalHalAlsaMapT *alsaCtlsMap)
+int HalUtlFreeAlsaCtlsMap(struct InternalHalAlsaMapT *alsaCtlsMap)
{
int idx;
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h
index fe70210..50171e7 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h
+++ b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h
@@ -69,6 +69,6 @@ struct InternalHalAlsaMapT {
};
// Free contents of 'CtlHalAlsaMapT' data structure
-uint8_t HalUtlFreeAlsaCtlsMap(struct InternalHalAlsaMapT *alsaCtlsMap);
+int HalUtlFreeAlsaCtlsMap(struct InternalHalAlsaMapT *alsaCtlsMap);
#endif /* _HAL_UTILITIES_ALSA_DATA_INCLUDE_ */ \ No newline at end of file
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-data.c b/lib/4a-hal-utilities/4a-hal-utilities-data.c
index 215adb2..1e20c59 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-data.c
+++ b/lib/4a-hal-utilities/4a-hal-utilities-data.c
@@ -60,7 +60,7 @@ struct InternalHalMixerData *HalUtlAddMixerDataToMixerDataList(struct InternalHa
return currentMixerData;
}
-int8_t HalUtlRemoveSelectedMixerData(struct InternalHalMixerData **mixerDataList, struct InternalHalMixerData *mixerDataToRemove)
+int HalUtlRemoveSelectedMixerData(struct InternalHalMixerData **mixerDataList, struct InternalHalMixerData *mixerDataToRemove)
{
struct InternalHalMixerData *currentMixerData, *matchingMixerData;
@@ -94,9 +94,9 @@ int8_t HalUtlRemoveSelectedMixerData(struct InternalHalMixerData **mixerDataList
return 0;
}
-int64_t HalUtlRemoveAllMixerData(struct InternalHalMixerData **mixerDataList)
+int HalUtlRemoveAllMixerData(struct InternalHalMixerData **mixerDataList)
{
- int64_t mixerDataRemoved = 0;
+ int mixerDataRemoved = 0;
if(! mixerDataList)
return -1;
@@ -111,9 +111,9 @@ int64_t HalUtlRemoveAllMixerData(struct InternalHalMixerData **mixerDataList)
return mixerDataRemoved;
}
-int64_t HalUtlGetNumberOfMixerDataInList(struct InternalHalMixerData **mixerDataList)
+int HalUtlGetNumberOfMixerDataInList(struct InternalHalMixerData **mixerDataList)
{
- int64_t numberOfMixerData = 0;
+ int numberOfMixerData = 0;
struct InternalHalMixerData *currentMixerData;
if(! mixerDataList)
@@ -181,7 +181,7 @@ struct HalData *HalUtlAddHalToHalList(struct HalData **halDataList)
return currentHalData;
}
-int8_t HalUtlRemoveSelectedHalFromList(struct HalData **halDataList, struct HalData *halToRemove)
+int HalUtlRemoveSelectedHalFromList(struct HalData **halDataList, struct HalData *halToRemove)
{
struct HalData *currentHalData, *matchingHal;
@@ -231,9 +231,9 @@ int8_t HalUtlRemoveSelectedHalFromList(struct HalData **halDataList, struct HalD
return 0;
}
-int64_t HalUtlRemoveAllHalFromList(struct HalData **halDataList)
+int HalUtlRemoveAllHalFromList(struct HalData **halDataList)
{
- int64_t halRemoved = 0;
+ int halRemoved = 0;
if(! halDataList)
return -1;
@@ -248,9 +248,9 @@ int64_t HalUtlRemoveAllHalFromList(struct HalData **halDataList)
return halRemoved;
}
-int64_t HalUtlGetNumberOfHalInList(struct HalData **halDataList)
+int HalUtlGetNumberOfHalInList(struct HalData **halDataList)
{
- int64_t numberOfHal = 0;
+ int numberOfHal = 0;
struct HalData *currentHalData;
if(! halDataList)
@@ -305,7 +305,7 @@ struct HalData *HalUtlSearchReadyHalDataByCardId(struct HalData **halDataList, i
* Hal Manager data handling functions *
******************************************************************************/
-uint8_t HalUtlInitializeHalMgrData(afb_api_t apiHandle, struct HalMgrData *halMgrData, char *apiName, char *info)
+int HalUtlInitializeHalMgrData(afb_api_t apiHandle, struct HalMgrData *halMgrData, char *apiName, char *info)
{
if(! apiHandle || ! halMgrData || ! apiName || ! info)
return -1;
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-data.h b/lib/4a-hal-utilities/4a-hal-utilities-data.h
index f3de1a6..a782417 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-data.h
+++ b/lib/4a-hal-utilities/4a-hal-utilities-data.h
@@ -96,21 +96,21 @@ struct HalMgrData {
// Internal Hal - Streams data handling functions
struct InternalHalMixerData *HalUtlAddMixerDataToMixerDataList(struct InternalHalMixerData **mixerDataList);
-int8_t HalUtlRemoveSelectedMixerData(struct InternalHalMixerData **mixerDataList, struct InternalHalMixerData *mixerDataToRemove);
-int64_t HalUtlRemoveAllMixerData(struct InternalHalMixerData **mixerDataList);
-int64_t HalUtlGetNumberOfMixerDataInList(struct InternalHalMixerData **mixerDataList);
+int HalUtlRemoveSelectedMixerData(struct InternalHalMixerData **mixerDataList, struct InternalHalMixerData *mixerDataToRemove);
+int HalUtlRemoveAllMixerData(struct InternalHalMixerData **mixerDataList);
+int HalUtlGetNumberOfMixerDataInList(struct InternalHalMixerData **mixerDataList);
struct InternalHalMixerData *HalUtlSearchMixerDataByProperties(struct InternalHalMixerData **mixerDataList, char *verb, char *verbToCall, char *streamCardId);
// Hal data handling functions
struct HalData *HalUtlAddHalToHalList(struct HalData **halDataList);
-int8_t HalUtlRemoveSelectedHalFromList(struct HalData **halDataList, struct HalData *halToRemove);
-int64_t HalUtlRemoveAllHalFromList(struct HalData **halDataList);
-int64_t HalUtlGetNumberOfHalInList(struct HalData **halDataList);
+int HalUtlRemoveSelectedHalFromList(struct HalData **halDataList, struct HalData *halToRemove);
+int HalUtlRemoveAllHalFromList(struct HalData **halDataList);
+int HalUtlGetNumberOfHalInList(struct HalData **halDataList);
struct HalData *HalUtlSearchHalDataByApiName(struct HalData **halDataList, char *apiName);
struct HalData *HalUtlSearchReadyHalDataByCardId(struct HalData **halDataList, int cardId);
// Hal Manager data handling functions
-uint8_t HalUtlInitializeHalMgrData(afb_api_t apiHandle, struct HalMgrData *halMgrData, char *apiName, char *info);
+int HalUtlInitializeHalMgrData(afb_api_t apiHandle, struct HalMgrData *halMgrData, char *apiName, char *info);
void HalUtlRemoveHalMgrData(struct HalMgrData *halMgrData);
#endif /* _HAL_UTILITIES_DATA_INCLUDE_ */ \ No newline at end of file
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c
index 2960537..550faaa 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c
+++ b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c
@@ -301,12 +301,12 @@ struct InternalHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(afb_api_t ap
return createdStreamData;
}
-int8_t HalUtlRemoveStreamDataAndDeleteStreamVerb(afb_api_t apiHandle,
- char *verb,
- char *verbToCall,
- char *streamCardId)
+int HalUtlRemoveStreamDataAndDeleteStreamVerb(afb_api_t apiHandle,
+ char *verb,
+ char *verbToCall,
+ char *streamCardId)
{
- int8_t returnedErr = 0;
+ int returnedErr = 0;
json_object *streamRemovedEventJ;
diff --git a/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h
index 028dd1f..204fe18 100644
--- a/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h
+++ b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h
@@ -43,9 +43,9 @@ struct InternalHalMixerData *HalUtlAddStreamDataAndCreateStreamVerb(afb_api_t ap
char *verb,
char *verbToCall,
char *streamCardId);
-int8_t HalUtlRemoveStreamDataAndDeleteStreamVerb(afb_api_t apiHandle,
- char *verb,
- char *verbToCall,
- char *streamCardId);
+int HalUtlRemoveStreamDataAndDeleteStreamVerb(afb_api_t apiHandle,
+ char *verb,
+ char *verbToCall,
+ char *streamCardId);
#endif /* _HAL_UTILITIES_HAL_STREAMS_CREATION_INCLUDE_ */ \ No newline at end of file