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>
---
 devices/hal-4a-greenbox.json | 61 +++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 21 deletions(-)

(limited to 'devices/hal-4a-greenbox.json')

diff --git a/devices/hal-4a-greenbox.json b/devices/hal-4a-greenbox.json
index 333fd0e..6092ee8 100644
--- a/devices/hal-4a-greenbox.json
+++ b/devices/hal-4a-greenbox.json
@@ -1,13 +1,13 @@
 {
     "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
     "metadata": {
-        "uid": "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02",
-        "version": "0.9",
+        "uid": "AGL-GREENBOX-4A-HAL",
+        "version": "0.99",
         "api": "4a-hal-rcar-m3kf-unicens",
         "require": [ "alsacore", "UNICENS", "smixer" ],
         "info": "4a hal for Rcar M3 device when plugged on Kingfisher board, with Unicens sound card",
         "author": "Jonathan Aillet, Stephane Desneux, Thierry Bultel",
-        "date": "2018-06-15"
+        "date": "2019-06-26"
     },
     "resources": [
         {
@@ -52,28 +52,47 @@
             "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"
-    },
+    "haldependencies" : [
+        {
+            "uid" : "microchip-unicens-output-utp",
+            "class" : "mandatory",
+            "cardShortName" : "ep016ch",
+            "cardPath" : "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02"
+        },
+        {
+            "uid" : "microchip-unicens-simple-micro-input",
+            "class" : "mandatory",
+            "cardShortName" : "ep822ch"
+        },
+        {
+            "uid" : "renesas-kf-radio",
+            "class" : "mandatory",
+            "cardShortName" : "radio"
+        }
+    ],
     "halmap": [
         {
-            "uid": "agl-master-playback-volume",
-            "info": "Sets master playback volume",
-            "alsa": {
-                "name": "Master Playback Volume",
-                "value": 90,
-                "create":
+            "uid" : "halmap-microchip-unicens-output-utp",
+            "target" : "microchip-unicens-output-utp",
+            "controls" : [
                 {
-                    "type": "INTEGER",
-                    "count": 1,
-                    "minval": 0,
-                    "maxval": 100,
-                    "step": 1
+                    "uid": "agl-master-playback-volume",
+                    "info": "Sets master playback volume",
+                    "alsa": {
+                        "name": "Master Playback Volume",
+                        "value": 90,
+                        "create":
+                        {
+                            "type": "INTEGER",
+                            "count": 1,
+                            "minval": 0,
+                            "maxval": 100,
+                            "step": 1
+                        }
+                    },
+                    "action": "plugin://hal-unicens-output#MasterVol"
                 }
-            },
-            "action": "plugin://hal-unicens-output#MasterVol"
+            ]
         }
     ],
     "halmixer": {
-- 
cgit 1.2.3-korg