summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2019-04-23 10:45:31 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2019-04-23 10:46:11 +0200
commitb85e660519d9ee6bf6000bf12a771da9282f9515 (patch)
treebdc0135d5f45dd6cd14ffadc97139cd2c2afcca4
parentfdf0e3c4c67ceb5ddc77c9c1f27d85c1be2055a6 (diff)
Add 'haldependencies' section to all halshalibut_7.99.1halibut/7.99.17.99.1
Add 'haldependencies' section to all hals for incoming dependencies functionality. Added in a way to make the hals compatible with current implementation and incoming implementation. Alsa, clean some minor issues in json format. BUG-AGL: SPEC-2329 Change-Id: I786d3180f1bfbb73f1e4597aa0e6f025bbc355f5 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--community-boards/hal-4a-2ch-generic-usb.json5
-rw-r--r--community-boards/hal-4a-csl-cm106-8ch-usb.json5
-rw-r--r--community-boards/hal-4a-ensoniq.json5
-rw-r--r--community-boards/hal-4a-intel-upsquared-hdmi.json5
-rw-r--r--community-boards/hal-4a-intel.json5
-rw-r--r--community-boards/hal-4a-jabra.json5
-rw-r--r--community-boards/hal-4a-raspberry-pi-3.json5
-rw-r--r--devices/hal-4a-greenbox.json7
-rw-r--r--devices/hal-4a-unicens-coax.json5
-rw-r--r--devices/hal-4a-unicens-utp.json5
-rw-r--r--reference-boards/hal-4a-intel-minnow.json5
-rw-r--r--reference-boards/hal-4a-intel-qemu.json5
-rw-r--r--reference-boards/hal-4a-rcar-m3.json5
-rw-r--r--reference-boards/hal-4a-rcar-m3kf.json7
14 files changed, 72 insertions, 2 deletions
diff --git a/community-boards/hal-4a-2ch-generic-usb.json b/community-boards/hal-4a-2ch-generic-usb.json
index b5cf1d9..6a19f9a 100644
--- a/community-boards/hal-4a-2ch-generic-usb.json
+++ b/community-boards/hal-4a-2ch-generic-usb.json
@@ -34,6 +34,11 @@
"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",
diff --git a/community-boards/hal-4a-csl-cm106-8ch-usb.json b/community-boards/hal-4a-csl-cm106-8ch-usb.json
index f249b5b..9646a22 100644
--- a/community-boards/hal-4a-csl-cm106-8ch-usb.json
+++ b/community-boards/hal-4a-csl-cm106-8ch-usb.json
@@ -34,6 +34,11 @@
"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",
diff --git a/community-boards/hal-4a-ensoniq.json b/community-boards/hal-4a-ensoniq.json
index 09db8f8..b1ff56a 100644
--- a/community-boards/hal-4a-ensoniq.json
+++ b/community-boards/hal-4a-ensoniq.json
@@ -34,6 +34,11 @@
"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",
diff --git a/community-boards/hal-4a-intel-upsquared-hdmi.json b/community-boards/hal-4a-intel-upsquared-hdmi.json
index 1a61723..c293641 100644
--- a/community-boards/hal-4a-intel-upsquared-hdmi.json
+++ b/community-boards/hal-4a-intel-upsquared-hdmi.json
@@ -34,6 +34,11 @@
"action": "api://4a-hal-manager#ping"
}
],
+ "haldependencies" : {
+ "uid" : "intel-upsquared-hdmi",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/pci-0000:00:0e.0"
+ },
"halmap": [
{
"uid": "agl-pcm-playback-switch",
diff --git a/community-boards/hal-4a-intel.json b/community-boards/hal-4a-intel.json
index 0752915..0e32df0 100644
--- a/community-boards/hal-4a-intel.json
+++ b/community-boards/hal-4a-intel.json
@@ -34,6 +34,11 @@
"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",
diff --git a/community-boards/hal-4a-jabra.json b/community-boards/hal-4a-jabra.json
index 1c63be4..fcdb4c1 100644
--- a/community-boards/hal-4a-jabra.json
+++ b/community-boards/hal-4a-jabra.json
@@ -34,6 +34,11 @@
"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",
diff --git a/community-boards/hal-4a-raspberry-pi-3.json b/community-boards/hal-4a-raspberry-pi-3.json
index 99eb2d0..e33c38f 100644
--- a/community-boards/hal-4a-raspberry-pi-3.json
+++ b/community-boards/hal-4a-raspberry-pi-3.json
@@ -35,6 +35,11 @@
"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",
diff --git a/devices/hal-4a-greenbox.json b/devices/hal-4a-greenbox.json
index 2d1aa5a..03cd78b 100644
--- a/devices/hal-4a-greenbox.json
+++ b/devices/hal-4a-greenbox.json
@@ -26,7 +26,7 @@
},
"libs": ["hal-bluealsa.ctlso"]
},
- {
+ {
"uid": "hal-unicens-output",
"info": "UNICENS HAL plugin for output audio",
"spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
@@ -52,6 +52,11 @@
"action": "plugin://hal-unicens-output#Events"
}
],
+ "haldependencies" : {
+ "uid" : "microship-unicens-output-utp",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02"
+ },
"halmap": [
{
"uid": "agl-master-playback-volume",
diff --git a/devices/hal-4a-unicens-coax.json b/devices/hal-4a-unicens-coax.json
index 84f851e..01918d9 100644
--- a/devices/hal-4a-unicens-coax.json
+++ b/devices/hal-4a-unicens-coax.json
@@ -36,6 +36,11 @@
"action": "plugin://hal-unicens-output#Events"
}
],
+ "haldependencies" : {
+ "uid" : "microship-unicens-output-coax",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-Microchip-SMSC_OS81118_0000-0000004C-02"
+ },
"halmap": [
{
"uid": "agl-master-playback-volume",
diff --git a/devices/hal-4a-unicens-utp.json b/devices/hal-4a-unicens-utp.json
index 8d9b522..cfc154f 100644
--- a/devices/hal-4a-unicens-utp.json
+++ b/devices/hal-4a-unicens-utp.json
@@ -36,6 +36,11 @@
"action": "plugin://hal-unicens-output#Events"
}
],
+ "haldependencies" : {
+ "uid" : "microship-unicens-output-utp",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02"
+ },
"halmap": [
{
"uid": "agl-master-playback-volume",
diff --git a/reference-boards/hal-4a-intel-minnow.json b/reference-boards/hal-4a-intel-minnow.json
index dc8ce89..4305aef 100644
--- a/reference-boards/hal-4a-intel-minnow.json
+++ b/reference-boards/hal-4a-intel-minnow.json
@@ -34,6 +34,11 @@
"action": "api://4a-hal-manager#ping"
}
],
+ "haldependencies" : {
+ "uid" : "intel-minnow-hdmi",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/pci-0000:00:1b.0"
+ },
"halmap": [
{
"uid": "agl-pcm-playback-switch",
diff --git a/reference-boards/hal-4a-intel-qemu.json b/reference-boards/hal-4a-intel-qemu.json
index 8b34231..05edaac 100644
--- a/reference-boards/hal-4a-intel-qemu.json
+++ b/reference-boards/hal-4a-intel-qemu.json
@@ -34,6 +34,11 @@
"action": "api://4a-hal-manager#ping"
}
],
+ "haldependencies" : {
+ "uid" : "intel-qemu-hdmi",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/pci-0000:00:03.0"
+ },
"halmap": [
{
"uid": "agl-master-playback-volume",
diff --git a/reference-boards/hal-4a-rcar-m3.json b/reference-boards/hal-4a-rcar-m3.json
index 5df9bd6..5438376 100644
--- a/reference-boards/hal-4a-rcar-m3.json
+++ b/reference-boards/hal-4a-rcar-m3.json
@@ -34,6 +34,11 @@
"action": "api://4a-hal-manager#ping"
}
],
+ "haldependencies" : {
+ "uid" : "renesas-m3-jack",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/platform-sound"
+ },
"halmap": [
{
"uid": "agl-master-playback-volume",
diff --git a/reference-boards/hal-4a-rcar-m3kf.json b/reference-boards/hal-4a-rcar-m3kf.json
index ca9ac77..2e7b341 100644
--- a/reference-boards/hal-4a-rcar-m3kf.json
+++ b/reference-boards/hal-4a-rcar-m3kf.json
@@ -34,6 +34,11 @@
"action": "api://4a-hal-manager#ping"
}
],
+ "haldependencies" : {
+ "uid" : "renesas-m3-jack-kf",
+ "class" : "mandatory",
+ "cardPath" : "/dev/snd/by-path/platform-sound@1"
+ },
"halmap": [
{
"uid": "agl-master-playback-volume",
@@ -248,7 +253,7 @@
"mute": true,
"params": {
"rate" : 48000,
- "format": "S16_LE",
+ "format": "S16_LE"
}
}
]