diff options
author | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-06-03 19:16:32 +0200 |
---|---|---|
committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-08 15:51:00 +0200 |
commit | 67fc2c25d727888cb45a847971771f34674b68ff (patch) | |
tree | 4fab47f096de6a897f8f33028ad8072d7bd07815 /4a-hal/4a-hal-utilities | |
parent | 70108117e5f392eff2710d5d6a0cd04e400e4cde (diff) |
Handle hal status using card presence and mixer init
Test audio card presence at hal startup using alsacore call.
Handling a new state of hal.
Move alsacore link files into 4a-hal-controllers.
Check state of hal before mixer initialization call.
Actualize hal state if mixer initlialization ends well.
Add a sndCardId filed to 'SpecificHalData' structure which will contain
audio card if (from alsa).
Change-Id: I2e82a14ee6ba6e63f06fe2b498587783941b7b98
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal/4a-hal-utilities')
-rw-r--r-- | 4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.c | 27 | ||||
-rw-r--r-- | 4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.h | 25 | ||||
-rw-r--r-- | 4a-hal/4a-hal-utilities/4a-hal-utilities-data.h | 2 |
3 files changed, 2 insertions, 52 deletions
diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.c b/4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.c deleted file mode 100644 index 8ff6c06..0000000 --- a/4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author Jonathan Aillet <jonathan.aillet@iot.bzh> - * - * 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. - */ - -#define _GNU_SOURCE - -#include <stdio.h> -#include <string.h> -#include <stdbool.h> - -#include "4a-hal-utilities-data.h" -#include "4a-hal-utilities-alsa-link.h" - -// TODO JAI: implement alsa link functions
\ No newline at end of file diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.h b/4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.h deleted file mode 100644 index 5c15109..0000000 --- a/4a-hal/4a-hal-utilities/4a-hal-utilities-alsa-link.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author Jonathan Aillet <jonathan.aillet@iot.bzh> - * - * 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_UTILITIES_ALSA_LINK_INCLUDE_ -#define _HAL_UTILITIES_ALSA_LINK_INCLUDE_ - -#include <stdio.h> - -// TODO JAI: implement alsa link functions - -#endif /* _HAL_UTILITIES_DATA_INCLUDE_ */
\ No newline at end of file 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 e357256..34ca3e8 100644 --- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h +++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h @@ -33,6 +33,7 @@ enum HalStatus { HAL_STATUS_UNAVAILABLE=0, HAL_STATUS_AVAILABLE=1, + HAL_STATUS_READY=2, }; struct CtlHalStreamData { @@ -62,6 +63,7 @@ struct SpecificHalData { char *apiName; enum HalStatus status; char *sndCard; + int sndCardId; char *info; unsigned int internal; |