From 68138a3ec7a78ad7304d291ff92d8e5292847c4e Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Thu, 18 Apr 2019 12:40:25 +0200 Subject: Clarify internals hal functions and files names The purpose of this commit is to have of a more standard way to name files and functions used to generate/handle hal api (generated from hal json configuration file). It occurred to me that 'hal-controller' was not a good name because it is harder for people who don't know about the app-controller to understanded what is the purpose of these files/functions. It was renamed to 'internal-hal' because it's about hal that are all handle/load by hal-manager in opposition of external-hal that are independant binding/binder that can register themselves to hal-manager. BUG-AGL: SPEC-2329 Change-Id: I11b7efe64ec474b004a2a15ed8969b9db95d428f Signed-off-by: Jonathan Aillet --- .../4a-hal-controllers-mixer-link.h | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.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 deleted file mode 100644 index 744830c..0000000 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2018 "IoT.bzh" - * Author Jonathan Aillet - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _HAL_CTLS_SOFTMIXER_LINK_INCLUDE_ -#define _HAL_CTLS_SOFTMIXER_LINK_INCLUDE_ - -#include - -#include - -#include - -#include - -#include "4a-hal-utilities-data.h" - -#define MIXER_ATTACH_VERB "attach" -#define MIXER_INFO_VERB "info" - -#define HAL_PLAYBACK_ID "playback" -#define HAL_CAPTURE_ID "capture" - -#define HAL_ALL_STREAMS_VERB "all-streams" - -// Enum for the type of object sent back by the mixer -enum MixerDataType { - MIXER_DATA_STREAMS = 1, - MIXER_DATA_PLAYBACKS = 2, - MIXER_DATA_CAPTURES = 3 -}; - -// Enum for the type of error detected -enum MixerStatus { - MIXER_NO_ERROR=0, - MIXER_ERROR_API_UNAVAILABLE=-1, - MIXER_ERROR_DATA_UNAVAILABLE=-2, - MIXER_ERROR_DATA_EMPTY =-3, - MIXER_ERROR_PLAYBACK_VERB_NOT_CREATED =-4, - MIXER_ERROR_CAPTURE_VERB_NOT_CREATED =-5, - MIXER_ERROR_ALL_STREAMS_VERB_NOT_CREATED =-6, - MIXER_ERROR_DATA_NAME_UNAVAILABLE=-10, - MIXER_ERROR_DATA_CARDID_UNAVAILABLE=-100, - MIXER_ERROR_STREAM_NOT_ADDED =-1000, - MIXER_ERROR_STREAM_ALLOCATION_FAILED =-10000 -}; - -// HAL controllers handle mixer calls functions -int HalCtlsAttachToMixer(afb_api_t apiHandle); -int HalCtlsGetInfoFromMixer(afb_api_t apiHandle, - char *apiToCall, - json_object *requestJson, - json_object **toReturnJ, - char **returnedError, - char **returnedInfo); - -#endif /* _HAL_CTLS_SOFTMIXER_LINK_INCLUDE_ */ \ No newline at end of file -- cgit 1.2.3-korg