From 6ad908ff865b41aa645749a31d8f459668f139a8 Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Mon, 17 Sep 2018 16:35:58 +0200 Subject: kingfisher: merged the radio HAL into the main HAL There was no point to have 2 separate HALs, the radio stream and capture is now merged into the main HAL Change-Id: I0ba974fdcfc17fc9a3964677361dd7509c7e74b3 Signed-off-by: Thierry Bultel --- .../hal-4a-m3ulcbkf-radio-to-2ch.json | 166 --------------------- 4a-hal-cfg-reference/hal-4a-rcar-m3kf.json | 38 ++++- 2 files changed, 36 insertions(+), 168 deletions(-) delete mode 100644 4a-hal-cfg-reference/hal-4a-m3ulcbkf-radio-to-2ch.json diff --git a/4a-hal-cfg-reference/hal-4a-m3ulcbkf-radio-to-2ch.json b/4a-hal-cfg-reference/hal-4a-m3ulcbkf-radio-to-2ch.json deleted file mode 100644 index 1f76e3b..0000000 --- a/4a-hal-cfg-reference/hal-4a-m3ulcbkf-radio-to-2ch.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-path/platform-sound@1", - "version": "0.9", - "api": "4a-hal-m3ulcb-radio-to-2ch", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for Rcar M3 device", - "author": "Thierry Bultel", - "date": "2018-07-11" - }, - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" - } - ], - "halmap": [ - { - "uid": "agl-master-playback-volume", - "alsa": { - "name": "Digital Playback Volume1", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-volume", - "alsa": { - "name": "Digital Playback Volume1", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-switch", - "alsa": { - "name": "SRC Out Rate Switch", - "value": 1 - } - }, - { - "uid": "agl-capture-volume", - "alsa": { - "name": "DVC In Capture Volume" - } - } - ], - "halmixer": { - "uid": "rcar-m3", - "mixerapi": "smixer", - "ramps": [ - { - "uid": "ramp-very-fast", - "delay": 50, - "up": 6, - "down": 10 - }, - { - "uid": "ramp-fast", - "delay": 50, - "up": 2, - "down": 10 - }, - { - "uid": "ramp-normal", - "delay": 50, - "up": 2, - "down": 4 - }, - { - "uid": "ramp-slow", - "delay": 50, - "up": 2, - "down": 2 - }, - { - "uid": "ramp-very-slow", - "delay": 100, - "up": 1, - "down": 1 - } - ], - "playbacks" : [ - { - "uid": "AK4613", - "path": "/dev/snd/by-path/platform-sound@1", - "params": { - "rate": 48000, - "format": "S24_LE" - }, - "sink": { - "controls": { - "volume": { - "name": "DVC Out Playback Volume", - "value": 81 - }, - "mute": { - "name": "SRC Out Rate Switch" - } - }, - "channels": [ - { - "uid": "front-right-m3", - "port": 0 - }, - { - "uid": "front-left-m3", - "port": 1 - } - ] - } - } - ], - "captures": [ - { - "uid": "radio", - "path": "/dev/snd/by-path/platform-sound@2", - "params": { - "channels": 2 - }, - "source": { - "channels": [ - { - "uid": "radio-right", - "port": 0 - }, - { - "uid": "radio-left", - "port": 1 - } - ] - } - } - ], - "zones": [ - { - "uid": "stereo-2", - "sink": [ - { - "target": "front-right-m3", - "channel": 0 - }, - { - "target": "front-left-m3", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "radio_stream", - "verb": "radio_stream", - "zone": "stereo-2", - "source" : "radio", - "volume": 40, - "mute": true, - "params": { - "rate" : 48000, - "format": "S16_LE", - "channels": 2 - } - } - ] - } -} diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json b/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json index 5f9820a..e8200ce 100644 --- a/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json +++ b/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json @@ -110,7 +110,8 @@ ] } }, - "captures": { + "captures": [ + { "uid": "RCAR-M3", "path": "/dev/snd/by-path/platform-sound@1", "params": { @@ -136,7 +137,27 @@ } ] } - }, + } , + { + "uid": "radio", + "path": "/dev/snd/by-path/platform-sound@2", + "params": { + "channels": 2 + }, + "source": { + "channels": [ + { + "uid": "radio-right", + "port": 0 + }, + { + "uid": "radio-left", + "port": 1 + } + ] + } + } + ], "zones": [ { "uid": "full-stereo", @@ -198,6 +219,19 @@ "rate": 48000, "format": "S16_LE" } + }, + { + "uid": "radio_stream", + "verb": "radio_stream", + "zone": "full-stereo", + "source" : "radio", + "volume": 80, + "mute": true, + "params": { + "rate" : 48000, + "format": "S16_LE", + "channels": 2 + } } ] } -- cgit 1.2.3-korg