Merge branch 'master' of github.com:fulup-bzh/hal-sample-4a

2 files changed, 68 insertions, 98 deletions

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 9790959..feb6197 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -454,6 +454,19 @@
           </preprocessorList>
         </cTool>
       </item>
+      <item path="Ensoniq/EnsoniqHAL.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>Ensoniq</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>hal-utilities-4a</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>build/Ensoniq</pElem>
+          </incDir>
+        </cTool>
+      </item>
       <item path="HAL-afb/HAL-interface/hal-interface.c"
             ex="false"
             tool="0"
@@ -511,8 +524,8 @@
           </incDir>
         </cTool>
       </item>
-      <item path="HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="0">
-        <cTool flags="0">
+      <item path="HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
@@ -523,8 +536,8 @@
         <cTool flags="3">
         </cTool>
       </item>
-      <item path="Jabra-Solemate/JabraUsbHAL.c" ex="false" tool="0" flavor2="0">
-        <cTool flags="0">
+      <item path="Jabra-Solemate/JabraUsbHAL.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4">
@@ -561,12 +574,36 @@
       </item>
       <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
       </item>
+      <item path="USB-Device/UsbDeviceHAL.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>USB-Device</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>hal-utilities-4a</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>build/USB-Device</pElem>
+          </incDir>
+        </cTool>
+      </item>
       <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
+        <cTool flags="2">
+          <incDir>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>afb-utilities</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>build/afb-utilities</pElem>
+          </incDir>
         </cTool>
       </item>
       <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
+        <cTool flags="2">
+          <incDir>
+            <pElem>afb-utilities</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>build/afb-utilities</pElem>
+          </incDir>
         </cTool>
       </item>
       <folder path="0/Alsa-Plugin">
@@ -715,21 +752,14 @@
       <folder path="0/HDA-intel">
         <cTool>
           <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>HDA-intel</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>hal-utilities-4a</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
             <pElem>build/HDA-intel</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-            <Elem>hal_intel_hda_EXPORTS</Elem>
-          </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/HighLevel-afb">
@@ -769,21 +799,14 @@
       <folder path="0/Jabra-Solemate">
         <cTool>
           <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>Jabra-Solemate</pElem>
+            <pElem>../../../opt/include/afb</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>hal-utilities-4a</pElem>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
             <pElem>build/Jabra-Solemate</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-            <Elem>hal_jabra_usb_EXPORTS</Elem>
-          </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/MostVolume">
@@ -816,99 +839,46 @@
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/afb-utilities">
-        <cTool>
+      <item path="hal-utilities-4a/hal-interface.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
           <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
+            <pElem>../../../opt/include/afb</pElem>
+            <pElem>hal-utilities-4a</pElem>
             <pElem>../../../opt/include/alsa</pElem>
-            <pElem>afb-utilities</pElem>
-            <pElem>build/afb-utilities</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <item path="hal-utilities-4a/hal-interface.c" ex="false" tool="0" flavor2="0">
-        <cTool flags="0">
-          <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>hal-utilities-4a</pElem>
             <pElem>build/hal-utilities-4a</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="hal-utilities-4a/hal-statics.c" ex="false" tool="0" flavor2="0">
-        <cTool flags="0">
+      <item path="hal-utilities-4a/hal-statics.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
           <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
             <pElem>hal-utilities-4a</pElem>
             <pElem>build/hal-utilities-4a</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="hal-utilities-4a/hal-volramp.c" ex="false" tool="0" flavor2="0">
-        <cTool flags="0">
+      <item path="hal-utilities-4a/hal-volramp.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
           <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>../../../opt/include/afb</pElem>
             <pElem>hal-utilities-4a</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>build/hal-utilities-4a</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="hal-utilities-4a/hal-volume.c" ex="false" tool="0" flavor2="0">
-        <cTool flags="0">
+      <item path="hal-utilities-4a/hal-volume.c" ex="false" tool="0" flavor2="3">
+        <cTool flags="2">
           <incDir>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>/usr/include/p11-kit-1</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>../../../opt/include/afb</pElem>
             <pElem>hal-utilities-4a</pElem>
+            <pElem>../../../opt/include/alsa</pElem>
+            <pElem>/usr/include/json-c</pElem>
             <pElem>build/hal-utilities-4a</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_MAXPATH_LEN=255</Elem>
-            <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
-            <Elem>MAX_SND_CARD=16</Elem>
-            <Elem>NATIVE_LINUX</Elem>
-            <Elem>TLV_BYTE_SIZE=256</Elem>
-          </preprocessorList>
         </cTool>
       </item>
       <item path="hal-utilities/hal-interface.c" ex="false" tool="0" flavor2="3">
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 2f75c2f..cb32b54 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,7 +6,7 @@
             <name>hal-samples-4a</name>
             <c-extensions>c</c-extensions>
             <cpp-extensions>cpp,cxx</cpp-extensions>
-            <header-extensions>h</header-extensions>
+            <header-extensions>h,hpp</header-extensions>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects/>
             <sourceRootList>