From 4f44ee8f17789ac27cd1e29a451ac450c7dbeb06 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Mon, 7 Jan 2019 11:30:12 +0100 Subject: Turn '4a-hal-utilities' into an internal library That way, includes will be cleaner and '4a-hal-utilities' functions will be usable in plugin. Change-Id: I8a2146bd4e5dd5ef449b9ba7f2b1eed4d59045d3 Signed-off-by: Jonathan Aillet --- .../4a-hal-controllers-alsacore-link.c | 34 +++------------- .../4a-hal-controllers-alsacore-link.h | 45 +--------------------- .../4a-hal-controllers-api-loader.c | 2 +- .../4a-hal-controllers-api-loader.h | 2 +- 4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c | 6 ++- .../4a-hal-controllers-mixer-link.c | 8 ++-- .../4a-hal-controllers-mixer-link.h | 2 +- .../4a-hal-controllers-value-handler.c | 2 + 8 files changed, 21 insertions(+), 80 deletions(-) (limited to '4a-hal/4a-hal-controllers') diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c index 4ae5a13..f1f99a6 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.c @@ -24,10 +24,13 @@ #include +#include + #include -#include "../4a-hal-utilities/4a-hal-utilities-data.h" -#include "../4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.h" +#include "4a-hal-utilities-alsa-data.h" +#include "4a-hal-utilities-data.h" +#include "4a-hal-utilities-appfw-responses-handler.h" #include "4a-hal-controllers-alsacore-link.h" #include "4a-hal-controllers-value-handler.h" @@ -63,33 +66,6 @@ snd_ctl_elem_type_t HalCtlsMapsAlsaTypeToEnum(const char *label) return SND_CTL_ELEM_TYPE_NONE; } -/******************************************************************************* - * Free contents of 'CtlHalAlsaMapT' data structure * - ******************************************************************************/ - -uint8_t HalCtlsFreeAlsaCtlsMap(struct CtlHalAlsaMapT *alsaCtlsMap) -{ - int idx; - - if(! alsaCtlsMap) - return -1; - - if(alsaCtlsMap->ctlsCount > 0 && ! alsaCtlsMap->ctls) - return -2; - - for(idx = 0; idx < alsaCtlsMap->ctlsCount; idx++) { - free(alsaCtlsMap->ctls[idx].action); - free(alsaCtlsMap->ctls[idx].ctl.alsaCtlProperties.enums); - free(alsaCtlsMap->ctls[idx].ctl.alsaCtlProperties.dbscale); - } - - free(alsaCtlsMap->ctls); - - free(alsaCtlsMap); - - return 0; -} - /******************************************************************************* * HAL controllers alsacore calls funtions * ******************************************************************************/ diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h index 5d687aa..351ad59 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-alsacore-link.h @@ -26,6 +26,8 @@ #include +#include "4a-hal-utilities-alsa-data.h" + #define ALSACORE_API "alsacore" #define ALSACORE_SUBSCRIBE_VERB "subscribe" #define ALSACORE_GETINFO_VERB "infoget" @@ -33,52 +35,9 @@ #define ALSACORE_CTLSET_VERB "ctlset" #define ALSACORE_ADDCTL_VERB "addcustomctl" -struct CtlHalAlsaDBScale { - int min; - int max; - int step; - int mute; -}; - -struct CtlHalAlsaCtlProperties { - snd_ctl_elem_type_t type; - int count; - int minval; - int maxval; - int step; - // TBD JAI : use them - const char **enums; - struct CtlHalAlsaDBScale *dbscale; -}; - -struct CtlHalAlsaCtl { - char *name; - int numid; - int value; - struct CtlHalAlsaCtlProperties alsaCtlProperties; - struct CtlHalAlsaCtlProperties *alsaCtlCreation; -}; - -struct CtlHalAlsaMap { - const char *uid; - char *info; - AFB_EventT alsaControlEvent; - struct CtlHalAlsaCtl ctl; - json_object *actionJ; - CtlActionT *action; -}; - -struct CtlHalAlsaMapT { - struct CtlHalAlsaMap *ctls; - unsigned int ctlsCount; -}; - // Alsa control types map from string function snd_ctl_elem_type_t HalCtlsMapsAlsaTypeToEnum(const char *label); -// Free contents of 'CtlHalAlsaMapT' data structure -uint8_t HalCtlsFreeAlsaCtlsMap(struct CtlHalAlsaMapT *alsaCtlsMap); - // HAL controllers alsacore calls funtions int HalCtlsGetCardIdByCardPath(AFB_ApiT apiHandle, char *devPath); int HalCtlsSubscribeToAlsaCardEvent(AFB_ApiT apiHandle, char *cardId); 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 4cac346..72515e7 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 @@ -27,7 +27,7 @@ #include -#include "../4a-hal-utilities/4a-hal-utilities-verbs-loader.h" +#include "4a-hal-utilities-verbs-loader.h" #include "4a-hal-controllers-api-loader.h" #include "4a-hal-controllers-alsacore-link.h" diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.h index 70e61cd..f1d3bfd 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.h +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.h @@ -22,7 +22,7 @@ #include -#include "../4a-hal-utilities/4a-hal-utilities-data.h" +#include "4a-hal-utilities-data.h" // Verbs that can be use to create api int HalCtlsCreateApi(AFB_ApiT apiHandle, char *path, struct HalMgrData *HalMgrGlobalData); 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 a8d0ee4..ba2454a 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c @@ -22,8 +22,10 @@ #include -#include "../4a-hal-utilities/4a-hal-utilities-data.h" -#include "../4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.h" +#include + +#include "4a-hal-utilities-data.h" +#include "4a-hal-utilities-appfw-responses-handler.h" #include "4a-hal-controllers-cb.h" #include "4a-hal-controllers-alsacore-link.h" diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c index 807dbb8..fd42899 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c @@ -22,9 +22,11 @@ #include -#include "../4a-hal-utilities/4a-hal-utilities-appfw-responses-handler.h" -#include "../4a-hal-utilities/4a-hal-utilities-data.h" -#include "../4a-hal-utilities/4a-hal-utilities-verbs-loader.h" +#include + +#include "4a-hal-utilities-appfw-responses-handler.h" +#include "4a-hal-utilities-data.h" +#include "4a-hal-utilities-verbs-loader.h" #include "../4a-hal-manager/4a-hal-manager.h" diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h index 165b70d..9189664 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h @@ -24,7 +24,7 @@ #include "afb-helpers-utils.h" -#include "../4a-hal-utilities/4a-hal-utilities-data.h" +#include "4a-hal-utilities-data.h" #define MIXER_ATTACH_VERB "attach" #define MIXER_INFO_VERB "info" diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c index 7a3dedd..4273def 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-value-handler.c @@ -25,6 +25,8 @@ #include +#include + #include "4a-hal-controllers-value-handler.h" #include "4a-hal-controllers-alsacore-link.h" -- cgit 1.2.3-korg