From 6e70aac6c9f02496978d3d02efb355d66fb36ceb Mon Sep 17 00:00:00 2001 From: fulup Date: Sun, 9 Apr 2017 14:35:00 +0200 Subject: Clean CMAKE structure and rename files/directories --- AlsaSound/HALayer/IntelHda/CMakeLists.txt | 36 ---------------- AlsaSound/HALayer/IntelHda/IntelHdaHAL.c | 68 ------------------------------- 2 files changed, 104 deletions(-) delete mode 100644 AlsaSound/HALayer/IntelHda/CMakeLists.txt delete mode 100644 AlsaSound/HALayer/IntelHda/IntelHdaHAL.c (limited to 'AlsaSound/HALayer/IntelHda') diff --git a/AlsaSound/HALayer/IntelHda/CMakeLists.txt b/AlsaSound/HALayer/IntelHda/CMakeLists.txt deleted file mode 100644 index 89665e4..0000000 --- a/AlsaSound/HALayer/IntelHda/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -########################################################################### -# Copyright 2015, 2016, 2017 IoT.bzh -# -# author: Fulup Ar Foll -# -# 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. -########################################################################### - - -INCLUDE_DIRECTORIES(${include_dirs}) - -################################################## -# Inte-HDA sound card Hardware Abstraction Layer -################################################## -ADD_LIBRARY(intel-hda-hal MODULE IntelHdaHAL.c ) - -SET_TARGET_PROPERTIES(intel-hda-hal PROPERTIES - PREFIX "" - LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/export.map" -) - -TARGET_LINK_LIBRARIES(intel-hda-hal ${link_libraries}) -INSTALL(TARGETS intel-hda-hal - LIBRARY DESTINATION ${binding_install_dir}) - - diff --git a/AlsaSound/HALayer/IntelHda/IntelHdaHAL.c b/AlsaSound/HALayer/IntelHda/IntelHdaHAL.c deleted file mode 100644 index 5d668ba..0000000 --- a/AlsaSound/HALayer/IntelHda/IntelHdaHAL.c +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author Fulup Ar Foll - * - * 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 "AudioCommonLib.h" -#include "SharedHalLib.h" // Include Share Interface to Alsa Sound Card HAL - -// Force a hard dependency to ShareHallLib -PUBLIC char* SharedHalLibVersion; - -// Init is call after all binding are loaded -STATIC int IntelHalInit (const struct afb_binding_interface *itf, struct afb_service service) { - DEBUG (itf, "IntelHalBinding Initialised"); - - return 0; // 0=OK -} - -/****************************************************************************************** - * alsaCtlsMap link hight level sound control with low level Alsa numid ctls. - * - * To find out which control your sound card uses - * aplay -l - * amixer -D hw:xx controls - * amixer -D hw:xx contents - * amixer -D "hw:3" cget numid=xx - * - * When automatic mapping to Alsa numid is not enough a custom callback might be used - * .cb={.handle=xxxx, .callback=(json_object)MyCtlFunction(struct afb_service service, int controle, int value, const struct alsaHalCtlMapS *map)}; - ********************************************************************************************/ -STATIC alsaHalMapT alsaHalMap[]= { - { .alsa={.control=Master_Playback_Volume,.numid=16,.group=OUTVOL,.values=1,.minval=0,.maxval= 87 ,.step=0,.acl=RW}, .info= "Master Playback Volume" }, - { .alsa={.control=PCM_Playback_Volume ,.numid=27,.group=PCMVOL,.values=2,.minval=0,.maxval= 255,.step=0,.acl=RW}, .info= "PCM Playback Volume" }, - { .alsa={.control=PCM_Playback_Switch ,.numid=17,.group=SWITCH,.values=1,.minval=0,.maxval= 1 ,.step=0,.acl=RW}, .info= "Master Playback Switch" }, - { .alsa={.control=Capture_Volume ,.numid=12,.group=INVOL ,.values=2,.minval=0,.maxval= 31 ,.step=0,.acl=RW}, .info= "Capture Volume" }, - { .alsa={.numid=0}, .cb={.callback=NULL, .handle=NULL}} /* marker for end of the array */ -} ; - -/*********************************************************************************** - * AlsaHalSndT provides - * - cardname used to map a given card to its HAL - * - ctls previously defined AlsaHalMapT control maps - * - info free text - * - * WARNING: name should fit with 'aplay -l' as it used to map from devid to HAL - * you may also retreive shortname when AudioBinder is running from a browser - * http://localhost:1234/api/alsacore/getcardid?devid=hw:xxx - * - ***********************************************************************************/ -PUBLIC alsaHalSndCardT alsaHalSndCard = { - .name = "HDA Intel PCH", - .info = "Hardware Abstraction Layer for IntelHDA sound card", - .ctls = alsaHalMap, - .prefix="intel-hda", - .initCB=IntelHalInit, // if NULL no initcallback -}; -- cgit 1.2.3-korg