From 328a2ecefc5ffd6a15016500912877fd57f14441 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Fri, 15 Dec 2017 11:03:43 +0100
Subject: libusbgx: update libusbgx configuration to upstream format

Since the OS Descriptor feature has been reviewed and upstreamed
the USB Gadget library configuration format changed slightly.
Update the configuration files to make sure they work with the
current upstream library version.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 6eb3dc989c3172dfb34ac5d8c40f6db40a3abf99)
---
 recipes-support/libusbgx/files/apalis-imx6/g1.schema  | 11 ++++-------
 recipes-support/libusbgx/files/colibri-imx6/g1.schema | 11 ++++-------
 recipes-support/libusbgx/files/colibri-vf/g1.schema   | 11 ++++-------
 recipes-support/libusbgx/files/mx6ull/g1.schema       | 11 ++++-------
 recipes-support/libusbgx/files/mx7/g1.schema          | 11 ++++-------
 5 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/recipes-support/libusbgx/files/apalis-imx6/g1.schema b/recipes-support/libusbgx/files/apalis-imx6/g1.schema
index 01d6e0d..5d6dab2 100644
--- a/recipes-support/libusbgx/files/apalis-imx6/g1.schema
+++ b/recipes-support/libusbgx/files/apalis-imx6/g1.schema
@@ -10,10 +10,10 @@ attrs :
 };
 os_descs : 
 {
-    config = "c_1";
+    config_id = 1;
     use = 1;
     qw_sign = "MSFT100";
-    b_vendor_code = 0xCD;
+    b_vendor_code = 0xcd;
 };
 strings = ( 
     {
@@ -42,9 +42,7 @@ functions :
             } );
     };
 };
-configs : 
-{
-    c_1 : 
+configs = (
     {
         id = 1;
         name = "c";
@@ -63,5 +61,4 @@ configs :
                 name = "rndis.usb0";
                 function = "rndis_usb0";
             } );
-    };
-};
+    } );
diff --git a/recipes-support/libusbgx/files/colibri-imx6/g1.schema b/recipes-support/libusbgx/files/colibri-imx6/g1.schema
index 60ed38f..300dcd2 100644
--- a/recipes-support/libusbgx/files/colibri-imx6/g1.schema
+++ b/recipes-support/libusbgx/files/colibri-imx6/g1.schema
@@ -10,10 +10,10 @@ attrs :
 };
 os_descs : 
 {
-    config = "c_1";
+    config_id = 1;
     use = 1;
     qw_sign = "MSFT100";
-    b_vendor_code = 0xCD;
+    b_vendor_code = 0xcd;
 };
 strings = ( 
     {
@@ -42,9 +42,7 @@ functions :
             } );
     };
 };
-configs : 
-{
-    c_1 : 
+configs = (
     {
         id = 1;
         name = "c";
@@ -63,5 +61,4 @@ configs :
                 name = "rndis.usb0";
                 function = "rndis_usb0";
             } );
-    };
-};
+    } );
diff --git a/recipes-support/libusbgx/files/colibri-vf/g1.schema b/recipes-support/libusbgx/files/colibri-vf/g1.schema
index 2592e3b..4f3a1d8 100644
--- a/recipes-support/libusbgx/files/colibri-vf/g1.schema
+++ b/recipes-support/libusbgx/files/colibri-vf/g1.schema
@@ -10,10 +10,10 @@ attrs :
 };
 os_descs : 
 {
-    config = "c_1";
+    config_id = 1;
     use = 1;
     qw_sign = "MSFT100";
-    b_vendor_code = 0xCD;
+    b_vendor_code = 0xcd;
 };
 strings = ( 
     {
@@ -42,9 +42,7 @@ functions :
             } );
     };
 };
-configs : 
-{
-    c_1 : 
+configs = (
     {
         id = 1;
         name = "c";
@@ -63,5 +61,4 @@ configs :
                 name = "rndis.usb0";
                 function = "rndis_usb0";
             } );
-    };
-};
+    } );
diff --git a/recipes-support/libusbgx/files/mx6ull/g1.schema b/recipes-support/libusbgx/files/mx6ull/g1.schema
index 1d352c5..1050225 100644
--- a/recipes-support/libusbgx/files/mx6ull/g1.schema
+++ b/recipes-support/libusbgx/files/mx6ull/g1.schema
@@ -10,10 +10,10 @@ attrs :
 };
 os_descs : 
 {
-    config = "c_1";
+    config_id = 1;
     use = 1;
     qw_sign = "MSFT100";
-    b_vendor_code = 0xCD;
+    b_vendor_code = 0xcd;
 };
 strings = ( 
     {
@@ -42,9 +42,7 @@ functions :
             } );
     };
 };
-configs : 
-{
-    c_1 : 
+configs = (
     {
         id = 1;
         name = "c";
@@ -63,5 +61,4 @@ configs :
                 name = "rndis.usb0";
                 function = "rndis_usb0";
             } );
-    };
-};
+    } );
diff --git a/recipes-support/libusbgx/files/mx7/g1.schema b/recipes-support/libusbgx/files/mx7/g1.schema
index 484fd54..79b8882 100644
--- a/recipes-support/libusbgx/files/mx7/g1.schema
+++ b/recipes-support/libusbgx/files/mx7/g1.schema
@@ -10,10 +10,10 @@ attrs :
 };
 os_descs : 
 {
-    config = "c_1";
+    config_id = 1;
     use = 1;
     qw_sign = "MSFT100";
-    b_vendor_code = 0xCD;
+    b_vendor_code = 0xcd;
 };
 strings = ( 
     {
@@ -42,9 +42,7 @@ functions :
             } );
     };
 };
-configs : 
-{
-    c_1 : 
+configs = (
     {
         id = 1;
         name = "c";
@@ -63,5 +61,4 @@ configs :
                 name = "rndis.usb0";
                 function = "rndis_usb0";
             } );
-    };
-};
+    } );
-- 
cgit v1.2.3