From d8a360eeb69c52dd811ab8d8f811cdc996744059 Mon Sep 17 00:00:00 2001
From: Jonathan Aillet <jonathan.aillet@iot.bzh>
Date: Wed, 26 Jun 2019 17:40:30 +0200
Subject: Updates all hals to use 'haldependencies'

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>
---
 community-boards/hal-4a-raspberry-pi-3.json | 76 ++++++++++++++++-------------
 1 file changed, 42 insertions(+), 34 deletions(-)

(limited to 'community-boards/hal-4a-raspberry-pi-3.json')

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": {
-- 
cgit 1.2.3-korg