diff options
author | fulup <fulup.arfoll@iot.bzh> | 2017-07-21 23:46:49 +0200 |
---|---|---|
committer | fulup <fulup.arfoll@iot.bzh> | 2017-07-21 23:46:49 +0200 |
commit | 044828c43097362973c82088a7afee760eab06ec (patch) | |
tree | 140522d19e9adea8286f377a53098566c0ee7b89 /HAL-afb/Unicens-USB | |
parent | db4d63597b22b63eb73b5c0558476652ed4988bb (diff) |
Added HAL selection in HTML page
Started SetCtl implementation
WIP Only
Diffstat (limited to 'HAL-afb/Unicens-USB')
-rw-r--r-- | HAL-afb/Unicens-USB/CMakeLists.txt | 42 | ||||
-rw-r--r-- | HAL-afb/Unicens-USB/UnicensHAL.c | 73 | ||||
-rw-r--r-- | HAL-afb/Unicens-USB/UnicensVol.c | 37 |
3 files changed, 152 insertions, 0 deletions
diff --git a/HAL-afb/Unicens-USB/CMakeLists.txt b/HAL-afb/Unicens-USB/CMakeLists.txt new file mode 100644 index 0000000..5ca563b --- /dev/null +++ b/HAL-afb/Unicens-USB/CMakeLists.txt @@ -0,0 +1,42 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll <fulup@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. +########################################################################### + + +# Add target to project dependency list +PROJECT_TARGET_ADD(hal-unicens-usb) + + # Define project Targets + ADD_LIBRARY(${TARGET_NAME} MODULE UnicensHAL.c UnicensVol.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 + ) + + # installation directory + INSTALL(TARGETS ${TARGET_NAME} + LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
\ No newline at end of file diff --git a/HAL-afb/Unicens-USB/UnicensHAL.c b/HAL-afb/Unicens-USB/UnicensHAL.c new file mode 100644 index 0000000..66f241f --- /dev/null +++ b/HAL-afb/Unicens-USB/UnicensHAL.c @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2016 "IoT.bzh" + * Author Fulup Ar Foll <fulup@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. + * + * + * To find out which control your sound card uses + * aplay -l # Check sndcard name name in between [] + * amixer -D hw:xx controls # get supported controls + * amixer -D "hw:3" cget numid=xx # get control settings + * + */ +#define _GNU_SOURCE +#include "hal-interface.h" +#include "audio-interface.h" + +STATIC struct json_object* MasterOnOff (alsaHalCtlMapT *control, void* handle, struct json_object *valJ) { + struct json_object *reponseJ; + + AFB_INFO ("Power Set value=%s", json_object_get_string(valJ)); + + reponseJ=json_object_new_object(); + json_object_object_add (reponseJ, "Callback", json_object_new_string("Hello From HAL")); + + return reponseJ; +} + +// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities. +STATIC alsaHalMapT alsaHalMap[]= { + { .tag=Master_Playback_Volume, .ctl={.numid=04 } }, + { .tag=PCM_Playback_Volume , .ctl={.numid=06 } }, + { .tag=PCM_Playback_Switch , .ctl={.numid=05 } }, + { .tag=Capture_Volume , .ctl={.numid=12 } }, + { .tag=Master_OnOff_Switch , .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_BOOLEAN, .count=1, .name="Power-Switch"}, .cb={.callback=MasterOnOff, .handle=NULL}}, + { .tag=Master_Playback_Ramp , .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .name="Volume-Switch"}, .cb={.callback=MasterOnOff, .handle=NULL}}, + + { .tag=EndHalCrlTag} /* marker for end of the array */ +} ; + +// HAL sound card mapping info +STATIC alsaHalSndCardT alsaHalSndCard = { + .name = "HDA Intel PCH", // WARNING: name MUST match with 'aplay -l' + .info = "Hardware Abstraction Layer for IntelHDA sound card", + .ctls = alsaHalMap, +}; + + +STATIC int sndServiceInit () { + int err; + AFB_DEBUG ("IntelHalBinding Init"); + + err = halServiceInit (afbBindingV2.api, &alsaHalSndCard); + return err; +} + +// API prefix should be unique for each snd card +PUBLIC const struct afb_binding_v2 afbBindingV2 = { + .api = "intel-hda", + .init = sndServiceInit, + .verbs = halServiceApi, + .onevent = halServiceEvent, +}; diff --git a/HAL-afb/Unicens-USB/UnicensVol.c b/HAL-afb/Unicens-USB/UnicensVol.c new file mode 100644 index 0000000..ab9787d --- /dev/null +++ b/HAL-afb/Unicens-USB/UnicensVol.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 "IoT.bzh" + * Author Fulup Ar Foll <fulup@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. + * + * + * To find out which control your sound card uses + * aplay -l # Check sndcard name name in between [] + * amixer -D hw:xx controls # get supported controls + * amixer -D "hw:3" cget numid=xx # get control settings + * + */ +#define _GNU_SOURCE +#include "hal-interface.h" +#include "audio-interface.h" + +STATIC struct json_object* MasterOnOff (alsaHalCtlMapT *control, void* handle, struct json_object *valJ) { + struct json_object *reponseJ; + + AFB_INFO ("Power Set value=%s", json_object_get_string(valJ)); + + reponseJ=json_object_new_object(); + json_object_object_add (reponseJ, "Callback", json_object_new_string("Hello From HAL")); + + return reponseJ; +} |