Updates all hals to use 'haldependencies'halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.28.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.2halibut

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>

4 files changed, 137 insertions, 105 deletions

diff --git a/reference-boards/hal-4a-intel-minnow.json b/reference-boards/hal-4a-intel-minnow.json
index 0b9e72f..5db34d1 100644
--- a/reference-boards/hal-4a-intel-minnow.json
+++ b/reference-boards/hal-4a-intel-minnow.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-MINNOW-HDMI-4A-HAL",
+        "version": "0.99",
         "api": "4a-hal-intel-minnow",
         "require": [ "alsacore", "smixer" ],
         "info": "4a hal for Intel Minnow device",
         "author": "Jonathan Aillet",
-        "date": "2018-06-13"
+        "date": "2019-06-26"
     },
     "resources": [
         {
@@ -34,18 +34,26 @@
             "action": "api://4a-hal-manager#ping"
         }
     ],
-    "haldependencies" : {
-        "uid" : "intel-minnow-hdmi",
-        "class" : "mandatory",
-        "cardPath" : "/dev/snd/by-path/pci-0000:00:1b.0"
-    },
+    "haldependencies" : [
+        {
+            "uid" : "intel-minnow-hdmi",
+            "class" : "mandatory",
+            "cardPath" : "/dev/snd/by-path/pci-0000:00:1b.0"
+        }
+    ],
     "halmap": [
         {
-            "uid": "agl-pcm-playback-switch",
-            "alsa": {
-                "name": "IEC958 Playback Switch",
-                "value": 1
-            }
+            "uid" : "halmap-intel-minnow-hdmi",
+            "target" : "intel-minnow-hdmi",
+            "controls" : [
+                {
+                    "uid": "agl-pcm-playback-switch",
+                    "alsa": {
+                        "name": "IEC958 Playback Switch",
+                        "value": 1
+                    }
+                }
+            ]
         }
     ],
     "halmixer": {
diff --git a/reference-boards/hal-4a-intel-qemu.json b/reference-boards/hal-4a-intel-qemu.json
index 3e819b7..e4d27bb 100644
--- a/reference-boards/hal-4a-intel-qemu.json
+++ b/reference-boards/hal-4a-intel-qemu.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:03.0",
-        "version": "0.9",
+        "uid": "INTEL-QEMU-HDMI-4A-HAL",
+        "version": "0.99",
         "api": "4a-hal-intel-qemu",
         "require": [ "alsacore", "smixer" ],
         "info": "4a hal for QEMU Intel device",
         "author": "Jonathan Aillet",
-        "date": "2018-07-10"
+        "date": "2019-06-26"
     },
     "resources": [
         {
@@ -34,31 +34,39 @@
             "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",
-            "alsa": {
-                "name": "Master Playback Volume",
-                "value": 100
-            }
-        },
+    "haldependencies" : [
         {
-            "uid": "agl-master-playback-switch",
-            "alsa": {
-                "name": "Master Playback Switch",
-                "value": 1
-            }
-        },
+            "uid" : "intel-qemu-hdmi",
+            "class" : "mandatory",
+            "cardPath" : "/dev/snd/by-path/pci-0000:00:03.0"
+        }
+    ],
+    "halmap": [
         {
-            "uid": "agl-capture-volume",
-            "alsa": {
-                "name": "Capture Volume"
-            }
+            "uid" : "halmap-intel-qemu-hdmi",
+            "target" : "intel-qemu-hdmi",
+            "controls" : [
+                {
+                    "uid": "agl-master-playback-volume",
+                    "alsa": {
+                        "name": "Master 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/reference-boards/hal-4a-rcar-m3.json b/reference-boards/hal-4a-rcar-m3.json
index 9a243aa..85cfc98 100644
--- a/reference-boards/hal-4a-rcar-m3.json
+++ b/reference-boards/hal-4a-rcar-m3.json
@@ -1,13 +1,13 @@
 {
     "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
     "metadata": {
-        "uid": "/dev/snd/by-path/platform-sound",
-        "version": "0.9",
+        "uid": "RENESAS-M3-JACK-4A-HAL",
+        "version": "0.99",
         "api": "4a-hal-rcar-m3",
         "require": [ "alsacore", "smixer" ],
         "info": "4a hal for Rcar M3 device",
         "author": "Jonathan Aillet",
-        "date": "2018-06-13"
+        "date": "2019-06-26"
     },
     "resources": [
         {
@@ -34,38 +34,46 @@
             "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",
-            "alsa": {
-                "name": "DVC Out Playback Volume",
-                "value": 80
-            }
-        },
+    "haldependencies" : [
         {
-            "uid": "agl-pcm-playback-volume",
-            "alsa": {
-                "name": "DVC Out Playback Volume",
-                "value": 80
-            }
-        },
-        {
-            "uid": "agl-pcm-playback-switch",
-            "alsa": {
-                "name": "SRC Out Rate Switch",
-                "value": 1
-            }
-        },
+            "uid" : "renesas-m3-jack",
+            "class" : "mandatory",
+            "cardPath" : "/dev/snd/by-path/platform-sound"
+        }
+    ],
+    "halmap": [
         {
-            "uid": "agl-capture-volume",
-            "alsa": {
-                "name": "DVC In Capture Volume"
-            }
+            "uid" : "halmap-renesas-m3-jack",
+            "target" : "renesas-m3-jack",
+            "controls" : [
+                {
+                    "uid": "agl-master-playback-volume",
+                    "alsa": {
+                        "name": "DVC Out Playback Volume",
+                        "value": 80
+                    }
+                },
+                {
+                    "uid": "agl-pcm-playback-volume",
+                    "alsa": {
+                        "name": "DVC Out Playback Volume",
+                        "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": {
diff --git a/reference-boards/hal-4a-rcar-m3kf.json b/reference-boards/hal-4a-rcar-m3kf.json
index 8581d2b..e1206db 100644
--- a/reference-boards/hal-4a-rcar-m3kf.json
+++ b/reference-boards/hal-4a-rcar-m3kf.json
@@ -1,13 +1,13 @@
 {
     "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
     "metadata": {
-        "uid": "/dev/snd/by-path/platform-sound@1",
-        "version": "0.9",
+        "uid": "RENESAS-M3KF-JACK-4A-HAL",
+        "version": "0.99",
         "api": "4a-hal-rcar-m3kf",
         "require": [ "alsacore", "smixer" ],
         "info": "4a hal for Rcar M3 device when plugged on Kingfisher board",
         "author": "Jonathan Aillet, Stephane Desneux",
-        "date": "2018-06-15"
+        "date": "2019-06-26"
     },
     "resources": [
         {
@@ -34,38 +34,46 @@
             "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",
-            "alsa": {
-                "name": "DVC Out Playback Volume",
-                "value": 80
-            }
-        },
-        {
-            "uid": "agl-pcm-playback-volume",
-            "alsa": {
-                "name": "DVC Out Playback Volume",
-                "value": 80
-            }
-        },
+    "haldependencies" : [
         {
-            "uid": "agl-pcm-playback-switch",
-            "alsa": {
-                "name": "SRC Out Rate Switch",
-                "value": 1
-            }
-        },
+            "uid" : "renesas-m3-jack-kf",
+            "class" : "mandatory",
+            "cardPath" : "/dev/snd/by-path/platform-sound@1"
+        }
+    ],
+    "halmap":  [
         {
-            "uid": "agl-capture-volume",
-            "alsa": {
-                "name": "DVC In Capture Volume"
-            }
+            "uid" : "halmap-renesas-m3-jack-kf",
+            "target" : "renesas-m3-jack-kf",
+            "controls" : [
+                {
+                    "uid": "agl-master-playback-volume",
+                    "alsa": {
+                        "name": "DVC Out Playback Volume",
+                        "value": 80
+                    }
+                },
+                {
+                    "uid": "agl-pcm-playback-volume",
+                    "alsa": {
+                        "name": "DVC Out Playback Volume",
+                        "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": {