From abe141f1d4dd46fe2bda6cc56db0ceaa964d87b1 Mon Sep 17 00:00:00 2001 From: Tobias Jahnke Date: Fri, 11 Aug 2017 09:28:55 +0200 Subject: project name HAL_MOST_UNICENS is now uppercase --- HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt (limited to 'HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt') diff --git a/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt new file mode 100644 index 0000000..e532191 --- /dev/null +++ b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt @@ -0,0 +1,49 @@ +########################################################################### +# 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. +########################################################################### + +ADD_SUBDIRECTORY(ucs2-vol) + +# Add target to project dependency list +PROJECT_TARGET_ADD(hal-most-unicens) + + # Define project Targets + ADD_LIBRARY(hal-most-unicens MODULE hal_most_unicens.c wrap-json.c wrap_unicens.c wrap_volume.c) + + # Binder exposes a unique public entry point + SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES + PREFIX "afb-" + LABELS "BINDING" + LINK_FLAGS ${BINDINGS_LINK_FLAG} + OUTPUT_NAME ${TARGET_NAME} + ) + + # Library dependencies (include updates automatically) + TARGET_LINK_LIBRARIES(${TARGET_NAME} + hal-interface + audio-interface + ucs2-volume + ) + + # installation directory + INSTALL(TARGETS ${TARGET_NAME} + LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR}) + + # Define properties to expose when others use this target + TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc + ) -- cgit 1.2.3-korg From c01c0a73884fc39791862a0a3b5d1759a52c04bf Mon Sep 17 00:00:00 2001 From: Tobias Jahnke Date: Wed, 16 Aug 2017 15:54:22 +0200 Subject: merge changes for new audio interface --- HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt | 2 +- HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c | 10 +- nbproject/configurations.xml | 303 +++++++++------------------- 3 files changed, 104 insertions(+), 211 deletions(-) (limited to 'HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt') diff --git a/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt index e532191..b7740f0 100644 --- a/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt +++ b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt @@ -35,7 +35,7 @@ PROJECT_TARGET_ADD(hal-most-unicens) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} hal-interface - audio-interface + audio-common ucs2-volume ) diff --git a/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c index 7240fe0..4405e61 100644 --- a/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c +++ b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c @@ -16,10 +16,10 @@ * */ #define _GNU_SOURCE +#include #include "hal-interface.h" -#include "audio-interface.h" +#include "audio-common.h" #include "wrap-json.h" -#include "string.h" #include "wrap_unicens.h" #include "wrap_volume.h" @@ -34,7 +34,7 @@ static int master_volume; static json_bool master_switch; static int pcm_volume[PCM_MAX_CHANNELS]; -void unicens_master_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { +void unicens_master_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { const char *j_str = json_object_to_json_string(j_obj); @@ -47,7 +47,7 @@ void unicens_master_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* hand } } -void unicens_master_switch_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { +void unicens_master_switch_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { const char *j_str = json_object_to_json_string(j_obj); @@ -59,7 +59,7 @@ void unicens_master_switch_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* h } } -void unicens_pcm_vol_cb(halCtlsEnumT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { +void unicens_pcm_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle, json_object *j_obj) { const char *j_str = json_object_to_json_string(j_obj); diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index f7241d3..f045173 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -60,20 +60,6 @@ HalPlugPcm.c - - - - device_container.cpp - device_value.cpp - libmostvolume.cpp - setup.cpp - - - hal_most_unicens.c - wrap-json.c - wrap_unicens.c - wrap_volume.c - IntelHdaHAL.c @@ -92,8 +78,23 @@ HighLevelApiConf.c HighLevelBinding.c - - audio-interface.c + + + ConnectionInfo.cpp + Console.c + MacAddr.cpp + MostIpc.cpp + MostMsg.cpp + MostMsgTx.cpp + MsgAddr.cpp + MsgFilter.cpp + Shadow_NetworkMaster.cpp + Thread.cpp + + DeviceContainer.cpp + DeviceValue.cpp + Mediator.cpp + libmostvolume.cpp Shared-Interface - /usr/lib64/gcc/x86_64-suse-linux/5/include - build/HAL-afb/HAL-interface + HAL-afb/HAL-interface + build/HAL-afb/Unicens-USB - + - /usr/lib64/gcc/x86_64-suse-linux/5/include - build/HAL-afb/HAL-interface + HAL-afb/HAL-interface + build/HAL-afb/Unicens-USB - - - - HAL-afb/HAL-plugin - /usr/lib64/gcc/x86_64-suse-linux/5/include - build/HAL-afb/HAL-plugin - + + - - - - HAL-afb/HAL-plugin - /usr/lib64/gcc/x86_64-suse-linux/5/include - build/HAL-afb/HAL-plugin - + + - - - - ../../../opt/include/afb - HAL-afb/HAL-plugin - ../../../opt/include/alsa - build/HAL-afb/HAL-plugin - - - CONTROL_CDEV_RX="/dev/inic-usb-crx" - CONTROL_CDEV_TX="/dev/inic-usb-ctx" - MAX_SND_CARD=16 - - + - - - /opt/AGL/include/afb - HAL-afb/HAL_MOST_UNICENS - /usr/include/json-c - Shared-Interface - HAL-afb/HAL-interface - build/HAL-afb/Unicens-USB - - + - - - - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src - - + - - - - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc - - + flavor2="4"> - - - - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc - - + - - - - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src - - + - - - - HAL-afb/HAL-interface - build/HAL-afb/Unicens-USB - - + - - - /opt/AGL/include/afb - HAL-afb/HAL_MOST_UNICENS - /usr/lib64/gcc/x86_64-suse-linux/5/include - /usr/include/json-c - build/HAL-afb/HAL_MOST_UNICENS - - + - - - - /opt/AGL/include/afb - HAL-afb/HAL_MOST_UNICENS - /usr/lib64/gcc/x86_64-suse-linux/5/include - HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc - build/HAL-afb/HAL_MOST_UNICENS - - + - - - + - + + - - + tool="1" + flavor2="4"> - - - - Shared-Interface - HAL-afb/HAL-interface - /usr/lib64/gcc/x86_64-suse-linux/5/include - /opt/AGL/include - build/HAL-afb/Unicens-USB - - + - - + + + + - HAL-afb/HAL-interface - /usr/lib64/gcc/x86_64-suse-linux/5/include - build/HAL-afb/Unicens-USB + build/Alsa-Plugin/Alsa-Policy-Hook - - - - - - - - - - - - + + CONTROL_DOSCRIPT_PRE="doscript" + NATIVE_LINUX + PIC + policy_hook_cb_EXPORTS + @@ -977,27 +861,6 @@ - - - - - - - - - - - - @@ -1053,8 +916,50 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ../../../opt/include/afb + Alsa-Plugin/Alsa-Hook-Callback + ../../../opt/include/alsa + /usr/include/json-c + ../../../opt/include + build/Alsa-Plugin/Alsa-Hook-Callback + @@ -1121,18 +1026,6 @@ - - - - HAL-afb/Scarlett-Focusrite - /usr/include/json-c - Shared-Interface - HAL-afb/HAL-interface - ../../../opt/include - build/HAL-afb/Scarlett-Focusrite - - - -- cgit 1.2.3-korg