summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-28 19:22:15 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:55:26 +0200
commit85fd2f13f9daf96b18aa4bd72d36d838172eaca9 (patch)
tree902fac9cba3d8b2713f42f7cfd48cc14defa4e7e
parentaf048eb67d8ecc0e9c8f0a9bc4543e3d101ce230 (diff)
Disable community hals by default
Disable community hals by default. Also move some hals from reference configurations directory to community configurations directory. Add prefixes to all hal for mixer attach. Change-Id: Ib1f74c313dbc4596457f9535d3e593a7019b55fa Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--4a-hal-cfg-community/CMakeLists.txt2
-rw-r--r--4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled (renamed from 4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json)7
-rw-r--r--4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled (renamed from 4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json)1
-rw-r--r--4a-hal-cfg-community/hal-4a-ensoniq.json.disabled (renamed from 4a-hal-cfg-community/hal-4a-ensoniq.json)13
-rw-r--r--4a-hal-cfg-community/hal-4a-intel.json.disabled (renamed from 4a-hal-cfg-reference/hal-4a-intel.json)7
-rw-r--r--4a-hal-cfg-community/hal-4a-jabra.json.disabled (renamed from 4a-hal-cfg-community/hal-4a-jabra.json)7
-rw-r--r--4a-hal-cfg-reference/CMakeLists.txt2
-rw-r--r--4a-hal-cfg-reference/hal-4a-intel-minnow.json1
8 files changed, 23 insertions, 17 deletions
diff --git a/4a-hal-cfg-community/CMakeLists.txt b/4a-hal-cfg-community/CMakeLists.txt
index 46b866e..7679315 100644
--- a/4a-hal-cfg-community/CMakeLists.txt
+++ b/4a-hal-cfg-community/CMakeLists.txt
@@ -21,7 +21,7 @@
##################################################
PROJECT_TARGET_ADD(4a-hal-cfg-community)
- file(GLOB CONF_FILES "*.json")
+ file(GLOB CONF_FILES "*.json*")
add_input_files("${CONF_FILES}")
diff --git a/4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json b/4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled
index fdc3b19..84f8a96 100644
--- a/4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json
+++ b/4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled
@@ -1,7 +1,7 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-01",
+ "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"version": "0.9",
"api": "4a-hal-2ch-generic-usb",
"require": [ "alsacore", "smixer" ],
@@ -49,6 +49,7 @@
"halmixer": {
"uid": "2ch-generic-usb",
"mixerapi": "smixer",
+ "prefix": "2ch-usb",
"ramps": [
{
"uid": "ramp-very-fast",
@@ -83,7 +84,7 @@
],
"playbacks" : {
"uid": "2CH-GENERIC-USB",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-01",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
@@ -111,7 +112,7 @@
},
"captures": {
"uid": "2CH-GENERIC-USB",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-01",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
diff --git a/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json b/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled
index 18dd1cb..0b5d954 100644
--- a/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json
+++ b/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled
@@ -65,6 +65,7 @@
"halmixer": {
"uid": "csl-cm106-8ch-usb",
"mixerapi": "smixer",
+ "prefix": "cm106-usb",
"ramps": [
{
"uid": "ramp-fast",
diff --git a/4a-hal-cfg-community/hal-4a-ensoniq.json b/4a-hal-cfg-community/hal-4a-ensoniq.json.disabled
index 809acf8..f884247 100644
--- a/4a-hal-cfg-community/hal-4a-ensoniq.json
+++ b/4a-hal-cfg-community/hal-4a-ensoniq.json.disabled
@@ -1,7 +1,7 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03",
+ "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"version": "0.9",
"api": "4a-hal-ensoniq",
"require": [ "alsacore", "smixer" ],
@@ -46,8 +46,9 @@
}
],
"halmixer": {
- "uid": "jabra-solemate",
+ "uid": "ensoniq",
"mixerapi": "smixer",
+ "prefix": "ensoniq",
"ramps": [
{
"uid": "ramp-very-fast",
@@ -81,8 +82,8 @@
}
],
"playbacks" : {
- "uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03",
+ "uid": "ENSONIQ",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
@@ -109,8 +110,8 @@
}
},
"captures": {
- "uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03",
+ "uid": "ENSONIQ",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
diff --git a/4a-hal-cfg-reference/hal-4a-intel.json b/4a-hal-cfg-community/hal-4a-intel.json.disabled
index d489c85..bab8364 100644
--- a/4a-hal-cfg-reference/hal-4a-intel.json
+++ b/4a-hal-cfg-community/hal-4a-intel.json.disabled
@@ -1,7 +1,7 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-path/pci-0000:00:1b.1",
+ "uid": "/dev/snd/by-path/pci-0000:00:1b.0",
"version": "0.9",
"api": "4a-hal-intel",
"require": [ "alsacore", "smixer" ],
@@ -48,6 +48,7 @@
"halmixer": {
"uid": "intel",
"mixerapi": "smixer",
+ "prefix": "intel-generic",
"ramps": [
{
"uid": "ramp-very-fast",
@@ -82,7 +83,7 @@
],
"playbacks" : {
"uid": "INTEL",
- "path": "/dev/snd/by-path/pci-0000:00:1b.1",
+ "path": "/dev/snd/by-path/pci-0000:00:1b.0",
"params": {
"rate": 48000
},
@@ -110,7 +111,7 @@
},
"captures": {
"uid": "INTEL",
- "path": "/dev/snd/by-path/pci-0000:00:1b.1",
+ "path": "/dev/snd/by-path/pci-0000:00:1b.0",
"params": {
"rate": 48000
},
diff --git a/4a-hal-cfg-community/hal-4a-jabra.json b/4a-hal-cfg-community/hal-4a-jabra.json.disabled
index e2d60d2..8a95020 100644
--- a/4a-hal-cfg-community/hal-4a-jabra.json
+++ b/4a-hal-cfg-community/hal-4a-jabra.json.disabled
@@ -1,7 +1,7 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02",
+ "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"version": "0.9",
"api": "4a-hal-jabra-solemate",
"require": [ "alsacore", "smixer" ],
@@ -48,6 +48,7 @@
"halmixer": {
"uid": "jabra-solemate",
"mixerapi": "smixer",
+ "prefix": "jabra-solemate",
"ramps": [
{
"uid": "ramp-very-fast",
@@ -82,7 +83,7 @@
],
"playbacks" : {
"uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
@@ -110,7 +111,7 @@
},
"captures": {
"uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
diff --git a/4a-hal-cfg-reference/CMakeLists.txt b/4a-hal-cfg-reference/CMakeLists.txt
index e8267f9..df54ef5 100644
--- a/4a-hal-cfg-reference/CMakeLists.txt
+++ b/4a-hal-cfg-reference/CMakeLists.txt
@@ -21,7 +21,7 @@
##################################################
PROJECT_TARGET_ADD(4a-hal-cfg-reference)
- file(GLOB CONF_FILES "*.json")
+ file(GLOB CONF_FILES "*.json*")
add_input_files("${CONF_FILES}")
diff --git a/4a-hal-cfg-reference/hal-4a-intel-minnow.json b/4a-hal-cfg-reference/hal-4a-intel-minnow.json
index 0e78148..67c5467 100644
--- a/4a-hal-cfg-reference/hal-4a-intel-minnow.json
+++ b/4a-hal-cfg-reference/hal-4a-intel-minnow.json
@@ -35,6 +35,7 @@
"halmixer": {
"uid": "intel-minnow",
"mixerapi": "smixer",
+ "prefix": "intel-minnow",
"ramps": [
{
"uid": "ramp-very-fast",