summaryrefslogtreecommitdiffstats
path: root/community-boards
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2019-06-26 17:40:30 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2019-06-26 17:41:45 +0200
commitd8a360eeb69c52dd811ab8d8f811cdc996744059 (patch)
tree5ff3bd0f112a0ce9256de5578971ba064edf52b0 /community-boards
parentb080c08d2ac82f7c38aace9587703b9182377c33 (diff)
Updates all hals to use 'haldependencies' resolution in 'halmap' section. That means that : - An halmap control is created for the corresponding audio device using 'target' key to map dependency. - 'uid' key in 'metadata' section is no longer used to find audio device. BUG-AGL: SPEC-2329 Change-Id: I2e6da5a3d6ca3f51bf1e6a3f87e930396fab57a6 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to 'community-boards')
-rw-r--r--community-boards/hal-4a-2ch-generic-usb.json76
-rw-r--r--community-boards/hal-4a-csl-cm106-8ch-usb.json78
-rw-r--r--community-boards/hal-4a-ensoniq.json74
-rw-r--r--community-boards/hal-4a-intel-upsquared-hdmi.json34
-rw-r--r--community-boards/hal-4a-intel.json74
-rw-r--r--community-boards/hal-4a-jabra.json74
-rw-r--r--community-boards/hal-4a-raspberry-pi-3.json76
7 files changed, 271 insertions, 215 deletions
diff --git a/community-boards/hal-4a-2ch-generic-usb.json b/community-boards/hal-4a-2ch-generic-usb.json
index d4e1c6a..298551c 100644
--- a/community-boards/hal-4a-2ch-generic-usb.json
+++ b/community-boards/hal-4a-2ch-generic-usb.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
- "version": "0.9",
+ "uid": "GENERIC-USB-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-2ch-generic-usb",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for 2ch generic USB device",
"author": "Jonathan Aillet",
- "date": "2018-06-13"
+ "date": "2019-06-25"
},
"resources": [
{
@@ -34,39 +34,47 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "generic-usb",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
- },
- "halmap": [
- {
- "uid": "agl-master-playback-volume",
- "alsa": {
- "name": "Speaker Playback Volume",
- "value": 80
- }
- },
+ "haldependencies" : [
{
- "uid": "agl-master-playback-switch",
- "alsa": {
- "name": "Speaker Playback Switch",
- "value": 1
- }
- },
- {
- "uid": "agl-master-capture-volume",
- "alsa": {
- "name": "Mic Capture Volume",
- "value": 80
- }
- },
+ "uid" : "generic-usb",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
+ }
+ ],
+ "halmap": [
{
- "uid": "agl-mic-capture-switch",
- "alsa": {
- "name": "Mic Capture Switch",
- "value": 1
- }
+ "uid" : "halmap-generic-usb",
+ "target" : "generic-usb",
+ "controls" : [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "Speaker Playback Volume",
+ "value": 80
+ }
+ },
+ {
+ "uid": "agl-master-playback-switch",
+ "alsa": {
+ "name": "Speaker Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-master-capture-volume",
+ "alsa": {
+ "name": "Mic Capture Volume",
+ "value": 80
+ }
+ },
+ {
+ "uid": "agl-mic-capture-switch",
+ "alsa": {
+ "name": "Mic Capture Switch",
+ "value": 1
+ }
+ }
+ ]
}
],
"halmixer": {
diff --git a/community-boards/hal-4a-csl-cm106-8ch-usb.json b/community-boards/hal-4a-csl-cm106-8ch-usb.json
index a0e32c5..38c932a 100644
--- a/community-boards/hal-4a-csl-cm106-8ch-usb.json
+++ b/community-boards/hal-4a-csl-cm106-8ch-usb.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
- "version": "0.9",
+ "uid": "CSL-CM106-USB-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-csl-cm106-8ch-usb",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for CSL CM106 8ch USB device",
"author": "Jonathan Aillet",
- "date": "2018-06-09"
+ "date": "2019-06-25"
},
"resources": [
{
@@ -34,42 +34,50 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "8ch-usb",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
- },
- "halmap": [
- {
- "uid": "agl-master-capture-volume",
- "alsa": {
- "name": "Mic Capture Volume",
- "value": 60
- }
- },
+ "haldependencies" : [
{
- "uid": "agl-master-playback-volume",
- "alsa": {
- "numid": 8,
- "value": 80
- }
- },
+ "uid" : "8ch-usb",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
+ }
+ ],
+ "halmap": [
{
- "uid": "hal-ping",
- "info": "ping this hal through alsa",
- "alsa": {
- "name": "Hal-Ping",
- "value": 20,
- "create":
+ "uid" : "halmap-8ch-usb",
+ "target" : "8ch-usb",
+ "controls" : [
{
- "type": "INTEGER",
- "count": 1,
- "minval": 0,
- "maxval": 100,
- "step": 1
+ "uid": "agl-master-capture-volume",
+ "alsa": {
+ "name": "Mic Capture Volume",
+ "value": 60
+ }
+ },
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "numid": 8,
+ "value": 80
+ }
+ },
+ {
+ "uid": "hal-ping",
+ "info": "ping this hal through alsa",
+ "alsa": {
+ "name": "Hal-Ping",
+ "value": 20,
+ "create":
+ {
+ "type": "INTEGER",
+ "count": 1,
+ "minval": 0,
+ "maxval": 100,
+ "step": 1
+ }
+ },
+ "action": "api://4a-hal-csl-cm106-8ch-usb#ping"
}
- },
- "action": "api://4a-hal-csl-cm106-8ch-usb#ping"
+ ]
}
],
"halmixer": {
diff --git a/community-boards/hal-4a-ensoniq.json b/community-boards/hal-4a-ensoniq.json
index 964ac2d..bca892f 100644
--- a/community-boards/hal-4a-ensoniq.json
+++ b/community-boards/hal-4a-ensoniq.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
- "version": "0.9",
+ "uid": "ENSONIQ-USB-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-ensoniq",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for Ensoniq",
"author": "Jonathan Aillet",
- "date": "2018-06-13"
+ "date": "2019-06-25"
},
"resources": [
{
@@ -34,38 +34,46 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "ensoniq-usb",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
- },
- "halmap": [
- {
- "uid": "agl-master-playback-volume",
- "alsa": {
- "name": "Master Playback Volume",
- "value": 100
- }
- },
+ "haldependencies" : [
{
- "uid": "agl-pcm-playback-volume",
- "alsa": {
- "name": "PCM Playback Volume",
- "value": 100
- }
- },
- {
- "uid": "agl-master-playback-switch",
- "alsa": {
- "name": "Master Playback Switch",
- "value": 1
- }
- },
+ "uid" : "ensoniq-usb",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
+ }
+ ],
+ "halmap": [
{
- "uid": "agl-master-capture-volume",
- "alsa": {
- "name": "Capture Volume"
- }
+ "uid" : "halmap-ensoniq-usb",
+ "target" : "ensoniq-usb",
+ "controls" : [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "Master Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-master-playback-switch",
+ "alsa": {
+ "name": "Master Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-master-capture-volume",
+ "alsa": {
+ "name": "Capture Volume"
+ }
+ }
+ ]
}
],
"halmixer": {
diff --git a/community-boards/hal-4a-intel-upsquared-hdmi.json b/community-boards/hal-4a-intel-upsquared-hdmi.json
index c293641..e6024b0 100644
--- a/community-boards/hal-4a-intel-upsquared-hdmi.json
+++ b/community-boards/hal-4a-intel-upsquared-hdmi.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-path/pci-0000:00:0e.0",
- "version": "0.9",
+ "uid": "INTEL-UPSQUARED-HDMI-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-intel-upsquared-hdmi",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for Intel UpSquared device via HDMI socket",
"author": "Dominig ar Foll (Intel OTC)",
- "date": "2018-10-01"
+ "date": "2019-06-25"
},
"resources": [
{
@@ -34,18 +34,26 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "intel-upsquared-hdmi",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-path/pci-0000:00:0e.0"
- },
+ "haldependencies" : [
+ {
+ "uid" : "intel-upsquared-hdmi",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/pci-0000:00:0e.0"
+ }
+ ],
"halmap": [
{
- "uid": "agl-pcm-playback-switch",
- "alsa": {
- "numid": 11,
- "value": 1
- }
+ "uid" : "halmap-intel-upsquared-hdmi",
+ "target" : "intel-upsquared-hdmi",
+ "controls" : [
+ {
+ "uid": "agl-pcm-playback-switch",
+ "alsa": {
+ "numid": 11,
+ "value": 1
+ }
+ }
+ ]
}
],
"halmixer": {
diff --git a/community-boards/hal-4a-intel.json b/community-boards/hal-4a-intel.json
index db2588c..1af66c8 100644
--- a/community-boards/hal-4a-intel.json
+++ b/community-boards/hal-4a-intel.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-path/pci-0000:00:1b.0",
- "version": "0.9",
+ "uid": "INTEL-HDMI-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-intel",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for Intel device",
"author": "Jonathan Aillet",
- "date": "2018-06-13"
+ "date": "2018-06-26"
},
"resources": [
{
@@ -34,38 +34,46 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "intel-hdmi",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-path/pci-0000:00:1b.0"
- },
- "halmap": [
- {
- "uid": "agl-master-playback-volume",
- "alsa": {
- "name": "Master Playback Volume",
- "value": 100
- }
- },
+ "haldependencies" : [
{
- "uid": "agl-pcm-playback-volume",
- "alsa": {
- "name": "PCM Playback Volume",
- "value": 100
- }
- },
- {
- "uid": "agl-master-playback-switch",
- "alsa": {
- "name": "Master Playback Switch",
- "value": 1
- }
- },
+ "uid" : "intel-hdmi",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/pci-0000:00:1b.0"
+ }
+ ],
+ "halmap": [
{
- "uid": "agl-capture-volume",
- "alsa": {
- "name": "Capture Volume"
- }
+ "uid" : "halmap-intel-hdmi",
+ "target" : "intel-hdmi",
+ "controls" : [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "Master Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-master-playback-switch",
+ "alsa": {
+ "name": "Master Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-capture-volume",
+ "alsa": {
+ "name": "Capture Volume"
+ }
+ }
+ ]
}
],
"halmixer": {
diff --git a/community-boards/hal-4a-jabra.json b/community-boards/hal-4a-jabra.json
index ab05ac9..7c1cffb 100644
--- a/community-boards/hal-4a-jabra.json
+++ b/community-boards/hal-4a-jabra.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
- "version": "0.9",
+ "uid": "JABRA-USB-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-jabra-solemate",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for Jabra Solemate",
"author": "Jonathan Aillet",
- "date": "2018-06-13"
+ "date": "2019-06-26"
},
"resources": [
{
@@ -34,38 +34,46 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "jabra-solemate-usb",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
- },
- "halmap": [
- {
- "uid": "agl-master-playback-volume",
- "alsa": {
- "name": "PCM Playback Volume",
- "value": 80
- }
- },
+ "haldependencies" : [
{
- "uid": "agl-pcm-playback-volume",
- "alsa": {
- "name": "PCM Playback Volume",
- "value": 80
- }
- },
- {
- "uid": "agl-pcm-playback-switch",
- "alsa": {
- "name": "PCM Playback Switch",
- "value": 1
- }
- },
+ "uid" : "jabra-solemate-usb",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00"
+ }
+ ],
+ "halmap": [
{
- "uid": "agl-master-capture-volume",
- "alsa": {
- "name": "Mic Capture Volume"
- }
+ "uid" : "halmap-jabra-solemate-usb",
+ "target" : "jabra-solemate-usb",
+ "controls" : [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 80
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 80
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-switch",
+ "alsa": {
+ "name": "PCM Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-master-capture-volume",
+ "alsa": {
+ "name": "Mic Capture Volume"
+ }
+ }
+ ]
}
],
"halmixer": {
diff --git a/community-boards/hal-4a-raspberry-pi-3.json b/community-boards/hal-4a-raspberry-pi-3.json
index b9202c9..bd640d0 100644
--- a/community-boards/hal-4a-raspberry-pi-3.json
+++ b/community-boards/hal-4a-raspberry-pi-3.json
@@ -1,13 +1,13 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-path/platform-soc:audio",
- "version": "0.9",
+ "uid": "RPI3-JACK-4A-HAL",
+ "version": "0.99",
"api": "4a-hal-raspberry-pi-3",
"require": [ "alsacore", "smixer" ],
"info": "4a hal for Raspberry Pi 3 device\nWARNING: in AGL FF.rc2, RPI3 suffers from a bug in the native sound card driver that prevents DMix component to work correctly. As a consequence, no sound can be heard on the internal sound card of the PI3. See https://jira.automotivelinux.org/browse/SPEC-1610 . [Signed-Off: sdx@iot.bzh - 20180724]",
"author": "Jonathan Aillet",
- "date": "2018-07-20"
+ "date": "2019-06-26"
},
"resources": [
{
@@ -35,39 +35,47 @@
"action": "api://4a-hal-manager#ping"
}
],
- "haldependencies" : {
- "uid" : "rpi3-jack",
- "class" : "mandatory",
- "cardPath" : "/dev/snd/by-path/platform-soc:audio"
- },
- "halmap": [
- {
- "uid": "agl-master-playback-volume",
- "alsa": {
- "name": "PCM Playback Volume",
- "value": 100
- }
- },
+ "haldependencies" : [
{
- "uid": "agl-pcm-playback-volume",
- "alsa": {
- "name": "PCM Playback Volume",
- "value": 100
- }
- },
- {
- "uid": "agl-master-playback-switch",
- "alsa": {
- "name": "PCM Playback Switch",
- "value": 1
- }
- },
+ "uid" : "rpi3-jack",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/platform-soc:audio"
+ }
+ ],
+ "halmap": [
{
- "uid": "agl-pcm-playback-switch",
- "alsa": {
- "name": "PCM Playback Switch",
- "value": 1
- }
+ "uid" : "halmap-rpi3-jack",
+ "target" : "rpi3-jack",
+ "controls" : [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-master-playback-switch",
+ "alsa": {
+ "name": "PCM Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-switch",
+ "alsa": {
+ "name": "PCM Playback Switch",
+ "value": 1
+ }
+ }
+ ]
}
],
"halmixer": {