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

10 files changed, 191 insertions, 152 deletions

diff --git a/Ensoniq/EnsoniqHAL.c b/Ensoniq/EnsoniqHAL.c
index c91fc75..e5a79a4 100644
--- a/Ensoniq/EnsoniqHAL.c
+++ b/Ensoniq/EnsoniqHAL.c
@@ -138,15 +138,30 @@ STATIC alsaHalMapT  alsaHalMap[]= {
   },
 
   // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
-  { .tag=Guidance_Playback_Volume      , .ctl={.name="Guidance_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Entertainment_Playback_Volume , .ctl={.name="Entertainment_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Notification_Playback_Volume  , .ctl={.name="Notification_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Communication_Playback_Volume , .ctl={.name="Communications_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Warning_Playback_Volume       , .ctl={.name="Warning_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=System_Playback_Volume        , .ctl={.name="System_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Startup_Playback_Volume       , .ctl={.name="Startup_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Shutdown_Playback_Volume      , .ctl={.name="Shutdown_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  // Could have similar controls for input  side
+  { .tag=Guidance_Playback_Volume      , 
+     .ctl={.name="Guidance_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Entertainment_Playback_Volume ,
+    .ctl={.name="Entertainment_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Notification_Playback_Volume  , 
+    .ctl={.name="Notification_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Communication_Playback_Volume , 
+    .ctl={.name="Communications_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Warning_Playback_Volume       , 
+    .ctl={.name="Warning_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204}
+  },
+  { .tag=System_Playback_Volume        , 
+    .ctl={.name="System_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Startup_Playback_Volume       ,
+   .ctl={.name="Startup_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204} 
+  },
+  { .tag=Shutdown_Playback_Volume      , 
+    .ctl={.name="Shutdown_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
+  },
 
   { .tag=EndHalCrlTag}  /* marker for end of the array */
 } ;
diff --git a/HDA-intel/IntelHdaHAL.c b/HDA-intel/IntelHdaHAL.c
index affc020..25b267c 100644
--- a/HDA-intel/IntelHdaHAL.c
+++ b/HDA-intel/IntelHdaHAL.c
@@ -136,17 +136,32 @@ STATIC alsaHalMapT  alsaHalMap[]= {
   { .tag=Shutdown_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampShutdown}, .info="Ramp-up Shutdown Volume",
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Shutdown_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },
-
+  
   // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
-  { .tag=Guidance_Playback_Volume      , .ctl={.name="Guidance_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Entertainment_Playback_Volume , .ctl={.name="Entertainment_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Notification_Playback_Volume  , .ctl={.name="Notification_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Communication_Playback_Volume , .ctl={.name="Communications_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Warning_Playback_Volume       , .ctl={.name="Warning_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=System_Playback_Volume        , .ctl={.name="System_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Startup_Playback_Volume       , .ctl={.name="Startup_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Shutdown_Playback_Volume      , .ctl={.name="Shutdown_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  // Could have similar controls for input  side
+  { .tag=Guidance_Playback_Volume      , 
+     .ctl={.name="Guidance_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Entertainment_Playback_Volume ,
+    .ctl={.name="Entertainment_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Notification_Playback_Volume  , 
+    .ctl={.name="Notification_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Communication_Playback_Volume , 
+    .ctl={.name="Communications_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Warning_Playback_Volume       , 
+    .ctl={.name="Warning_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204}
+  },
+  { .tag=System_Playback_Volume        , 
+    .ctl={.name="System_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Startup_Playback_Volume       ,
+   .ctl={.name="Startup_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204} 
+  },
+  { .tag=Shutdown_Playback_Volume      , 
+    .ctl={.name="Shutdown_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
+  },
 
   { .tag=EndHalCrlTag}  /* marker for end of the array */
 } ;
diff --git a/Jabra-Solemate/JabraUsbHAL.c b/Jabra-Solemate/JabraUsbHAL.c
index 2ad3fb0..6a4ffd0 100644
--- a/Jabra-Solemate/JabraUsbHAL.c
+++ b/Jabra-Solemate/JabraUsbHAL.c
@@ -106,45 +106,61 @@ STATIC alsaHalMapT  alsaHalMap[]= {
 
   // Sound card does not have hardware volume ramping
   { .tag=Master_Playback_Ramp   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="ramp volume linearly according to current ramp setting",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Rampup Master"}
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Rampup Master", .value=100}
   },
 
   // Implement Rampup Volume for Virtual Channels (0-100)
   { .tag=Guidance_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampGuidance}, .info="RampUp Guidance Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Guidance_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Guidance_Ramp", .value=80 }
   },
   { .tag=Entertainment_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampEntertainment}, .info="Rampup Entertainment Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Entertainment_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Entertainment_Ramp", .value=80 }
   },
   { .tag=Notification_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampNotification}, .info="Ramp-up Notification Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Notification_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Notification_Ramp", .value=80 }
   },
   { .tag=Communication_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampCommunication}, .info="RampUp Communication Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Communication_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Communication_Ramp", .value=80 }
   },
   { .tag=Warning_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampWarning}, .info="Ramp-up Warning Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Warning_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Warning_Ramp", .value=80 }
   },
 
   { .tag=System_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampSystem}, .info="Ramp-up System Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="System_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="System_Ramp", .value=80 }
   },
   { .tag=Startup_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampStartup}, .info="Ramp-up Startup Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Startup_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Startup_Ramp", .value=80 }
   },
   { .tag=Shutdown_Playback_Ramp, .cb={.callback=volumeRamp, .handle=&volRampShutdown}, .info="Ramp-up Shutdown Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Shutdown_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
+    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Shutdown_Ramp", .value=80 }
   },
 
   // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
-  { .tag=Guidance_Playback_Volume      , .ctl={.name="Guidance_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Entertainment_Playback_Volume , .ctl={.name="Entertainment_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Notification_Playback_Volume  , .ctl={.name="Notification_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Communication_Playback_Volume , .ctl={.name="Communications_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Warning_Playback_Volume       , .ctl={.name="Warning_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=System_Playback_Volume        , .ctl={.name="System_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Startup_Playback_Volume       , .ctl={.name="Startup_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Shutdown_Playback_Volume      , .ctl={.name="Shutdown_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
+  { .tag=Guidance_Playback_Volume      , 
+     .ctl={.name="Guidance_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Entertainment_Playback_Volume ,
+    .ctl={.name="Entertainment_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Notification_Playback_Volume  , 
+    .ctl={.name="Notification_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Communication_Playback_Volume , 
+    .ctl={.name="Communications_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Warning_Playback_Volume       , 
+    .ctl={.name="Warning_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204}
+  },
+  { .tag=System_Playback_Volume        , 
+    .ctl={.name="System_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Startup_Playback_Volume       ,
+   .ctl={.name="Startup_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204} 
+  },
+  { .tag=Shutdown_Playback_Volume      , 
+    .ctl={.name="Shutdown_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
   // Could have similar controls for input  side
 
   { .tag=EndHalCrlTag}  /* marker for end of the array */
@@ -168,7 +184,7 @@ STATIC int sndServiceInit () {
 
 // API prefix should be unique for each snd card
 PUBLIC const struct afb_binding_v2 afbBindingV2 = {
-    .api     = "jabra-usb",
+    .api     = "usb-jabra",
     .init    = sndServiceInit,
     .verbs   = halServiceApi,
     .onevent = halServiceEvent,
diff --git a/USB-Device/UsbDeviceHAL.c b/USB-Device/UsbDeviceHAL.c
index c0315f9..78550f0 100644
--- a/USB-Device/UsbDeviceHAL.c
+++ b/USB-Device/UsbDeviceHAL.c
@@ -133,24 +133,39 @@ STATIC alsaHalMapT  alsaHalMap[]= {
     .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Shutdown_Ramp", .minval=0, .maxval=100, .step=1, .value=80 }
   },
 
-  // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
-  { .tag=Guidance_Playback_Volume      , .ctl={.name="Guidance_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Entertainment_Playback_Volume , .ctl={.name="Entertainment_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Notification_Playback_Volume  , .ctl={.name="Notification_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Communication_Playback_Volume , .ctl={.name="Communications_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Warning_Playback_Volume       , .ctl={.name="Warning_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=System_Playback_Volume        , .ctl={.name="System_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Startup_Playback_Volume       , .ctl={.name="Startup_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  { .tag=Shutdown_Playback_Volume      , .ctl={.name="Shutdown_Volume", .minval=0, .maxval=255, .step=1, .value=204 } },
-  // Could have similar controls for input  side
+   // Bind with existing ones created by ALSA configuration (and linked to softvol) [0-255]
+  { .tag=Guidance_Playback_Volume      , 
+     .ctl={.name="Guidance_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Entertainment_Playback_Volume ,
+    .ctl={.name="Entertainment_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Notification_Playback_Volume  , 
+    .ctl={.name="Notification_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Communication_Playback_Volume , 
+    .ctl={.name="Communications_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Warning_Playback_Volume       , 
+    .ctl={.name="Warning_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204}
+  },
+  { .tag=System_Playback_Volume        , 
+    .ctl={.name="System_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 } 
+  },
+  { .tag=Startup_Playback_Volume       ,
+   .ctl={.name="Startup_Volume", .numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204} 
+  },
+  { .tag=Shutdown_Playback_Volume      , 
+    .ctl={.name="Shutdown_Volume",.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.count=2, .maxval=255, .value=204 }
+  },
 
   { .tag=EndHalCrlTag}  /* marker for end of the array */
 } ;
 
 // HAL sound card mapping info
 STATIC alsaHalSndCardT alsaHalSndCard = {
-    .name = "USB Audio Device", //  WARNING: name MUST match with 'aplay -l'
-    .info = "Hardware Abstraction Layer for IntelHDA sound card",
+    .name = "USB-Audio", //  Match any USB audio sound card
+    .info = "Hardware Abstraction Layer for Generic USB Audio sound card",
     .ctls = alsaHalMap,
 };
 
@@ -163,7 +178,7 @@ STATIC int sndServiceInit() {
 
 // API prefix should be unique for each snd card
 PUBLIC const struct afb_binding_v2 afbBindingV2 = {
-    .api = "usbaudio",
+    .api = "usb-audio",
     .init = sndServiceInit,
     .verbs = halServiceApi,
     .onevent = halServiceEvent,
diff --git a/afb-utilities b/afb-utilities
-Subproject be1205fd4ab6bd20dd9bc44ed63c35d999ece76
+Subproject 77c12fc3a44ce4fd1f4a83019547190d0f44549
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject b5fb4364e02d4d3db339e966c69cbe1177f4f52
+Subproject c881d86fc8852a2b2215856d3503aba192c0f4e
diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
index 4811441..3a1ba5f 100755
--- a/conf.d/autobuild/agl/autobuild
+++ b/conf.d/autobuild/agl/autobuild
@@ -29,8 +29,9 @@ help:
 	@echo "- clean"
 	@echo "- distclean"
 	@echo "- configure"
-	@echo "- build"
-	@echo "- package"
+	@echo "- build: compilation, link and prepare files for package into a widget"
+	@echo "- package: output a widget file '*.wgt'"
+	@echo "- install: install in your ${CMAKE_INSTALL_DIR} directory"
 	@echo ""
 	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
 	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
@@ -58,6 +59,9 @@ package: build
 	@cmake --build ${BUILD_DIR} --target widget
 	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
+install: build
+	@cmake --build ${BUILD_DIR} --target install
+
 ${BUILD_DIR}/Makefile:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
 	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild
index 4811441..3a1ba5f 100755
--- a/conf.d/autobuild/linux/autobuild
+++ b/conf.d/autobuild/linux/autobuild
@@ -29,8 +29,9 @@ help:
 	@echo "- clean"
 	@echo "- distclean"
 	@echo "- configure"
-	@echo "- build"
-	@echo "- package"
+	@echo "- build: compilation, link and prepare files for package into a widget"
+	@echo "- package: output a widget file '*.wgt'"
+	@echo "- install: install in your ${CMAKE_INSTALL_DIR} directory"
 	@echo ""
 	@echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
 	@echo "Don't use your build dir as DEST as wgt file is generated at this location"
@@ -58,6 +59,9 @@ package: build
 	@cmake --build ${BUILD_DIR} --target widget
 	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
+install: build
+	@cmake --build ${BUILD_DIR} --target install
+
 ${BUILD_DIR}/Makefile:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
 	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
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>