Remove eference HAL

Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>

7 files changed, 204 insertions, 683 deletions

diff --git a/Apache-2.0 b/Apache-2.0
new file mode 100644
index 0000000..b3201ab
--- /dev/null
+++ b/Apache-2.0
@@ -0,0 +1,204 @@
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don`t include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/HDA-intel/CMakeLists.txt b/HDA-intel/CMakeLists.txt
deleted file mode 100644
index 68314b4..0000000
--- a/HDA-intel/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-if(HAL_INTEL_HDA)
-	# Add target to project dependency list
-	PROJECT_TARGET_ADD(hal-intel-hda)
-
-		# Define project Targets
-		ADD_LIBRARY(${TARGET_NAME} MODULE IntelHdaHAL.c)
-
-		# Binder exposes a unique public entry point
-		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-		PREFIX "afb-"
-			LABELS "BINDING"
-		LINK_FLAGS  ${BINDINGS_LINK_FLAG}
-			OUTPUT_NAME ${TARGET_NAME}
-		)
-
-		# Library dependencies (include updates automatically)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME}
-			hal-utilities-4a
-			${link_libraries}
-		)
-endif()
diff --git a/HDA-intel/IntelHdaHAL.c b/HDA-intel/IntelHdaHAL.c
deleted file mode 100644
index 25b267c..0000000
--- a/HDA-intel/IntelHdaHAL.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * To find out which control your sound card uses
- *  aplay -l  # Check sndcard name name in between []
- *  amixer -D hw:xx controls # get supported controls
- *  amixer -D "hw:3" cget numid=xx  # get control settings
- *
- */
-#define _GNU_SOURCE
-#include "hal-interface.h"
-
-// Define few private tag for not standard functions
-#define PCM_Volume_Multimedia 1000
-#define PCM_Volume_Navigation 1001
-#define PCM_Volume_Emergency      1002
-
-// Default Values for MasterVolume Ramping
-STATIC halVolRampT volRampMaster= {
-    .mode    = RAMP_VOL_NORMAL,
-    .slave   = Master_Playback_Volume,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown=1,
-    .stepUp  =1,
-};
-
-//Solvol Ramping Value can be customize by Audio Role and Hardwar card
-STATIC halVolRampT volRampGuidance= {
-    .slave   = Guidance_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 2,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampCommunication= {
-    .slave   = Communication_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampEntertainment= {
-    .slave   = Entertainment_Playback_Volume,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 4,
-    .stepUp  = 2,
-};
-
-STATIC halVolRampT volRampNotification= {
-    .slave   = Notification_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampWarning= {
-    .slave   = Warning_Playback_Volume,
-    .delay   = 10*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampSystem= {
-    .slave   = System_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-
-STATIC halVolRampT volRampStartup= {
-    .slave   = Startup_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampShutdown= {
-    .slave   = Shutdown_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-
-
-// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities.
-STATIC alsaHalMapT  alsaHalMap[]= {
-  { .tag=Master_Playback_Volume, .ctl={.name="Master Playback Volume", .value=100 } },
-  { .tag=PCM_Playback_Volume     , .ctl={.name="PCM Playback Volume", .value=100 } },
-  { .tag=PCM_Playback_Switch     , .ctl={.name="Master Playback Switch" } },
-  { .tag=Capture_Volume          , .ctl={.name="Capture Volume"  } },
-
-  // Sound card does not have hardware volume ramping
-  { .tag=Master_Playback_Ramp   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="Master Playback Volume Ramp",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Master_Ramp"}
-  },
-
-  // 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 }
-  },
-  { .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 }
-  },
-  { .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 }
-  },
-  { .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 }
-  },
-  { .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 }
-  },
-
-  { .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 }
-  },
-  { .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="Statup_Ramp", .minval=0, .maxval=100, .step=1, .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 }
-  },
-  
-  // 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 = "HDA Intel PCH", //  WARNING: name MUST match with 'aplay -l'
-    .info = "Hardware Abstraction Layer for IntelHDA sound card",
-    .ctls = alsaHalMap,
-};
-
-STATIC int sndServiceInit() {
-    int err;
-    AFB_DEBUG("IntelHal Binding Init");
-    err = halServiceInit(afbBindingV2.api, &alsaHalSndCard);
-    return err;
-}
-
-// API prefix should be unique for each snd card
-PUBLIC const struct afb_binding_v2 afbBindingV2 = {
-    .api = "intel-hda",
-    .init = sndServiceInit,
-    .verbs = halServiceApi,
-    .onevent = halServiceEvent,
-};
diff --git a/Rcar-M3/CMakeLists.txt b/Rcar-M3/CMakeLists.txt
deleted file mode 100644
index ab91683..0000000
--- a/Rcar-M3/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Ronan Le Martret <ronan@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-
-if(HAL_RCAR-M3)
-	# Add target to project dependency list
-	PROJECT_TARGET_ADD(hal-rcar-m3)
-
-		# Define project Targets
-		ADD_LIBRARY(${TARGET_NAME} MODULE Rcar-M3-HAL.c)
-
-		# Binder exposes a unique public entry point
-		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-		PREFIX "afb-"
-			LABELS "BINDING"
-		LINK_FLAGS  ${BINDINGS_LINK_FLAG}
-			OUTPUT_NAME ${TARGET_NAME}
-		)
-
-		# Library dependencies (include updates automatically)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME}
-			hal-utilities-4a
-			${link_libraries}
-		)
-endif()
diff --git a/Rcar-M3/Rcar-M3-HAL.c b/Rcar-M3/Rcar-M3-HAL.c
deleted file mode 100644
index 5f1ec5c..0000000
--- a/Rcar-M3/Rcar-M3-HAL.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2017 "IoT.bzh"
- * Author Ronan Le Martret <ronan@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * To find out which control your sound card uses
- *  aplay -l  # Check sndcard name name in between []
- *  amixer -D hw:v1340 controls # get supported controls
- *  amixer -Dhw:v1340 cget name=Power-Switch	
- *  amixer -Dhw:v1340 cset name=Power-Switch true
- *
- */
-#define _GNU_SOURCE
-#include "hal-interface.h"
-
-// Define few private tag for not standard functions
-#define PCM_Volume_Multimedia 1000
-#define PCM_Volume_Navigation 1001
-#define PCM_Volume_Emergency      1002
-
-// Default Values for MasterVolume Ramping
-STATIC halVolRampT volRampMaster= {
-    .mode    = RAMP_VOL_NORMAL,
-    .slave   = Master_Playback_Volume,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown=1,
-    .stepUp  =1,
-};
-
-//Solvol Ramping Value can be customize by Audio Role and Hardwar card
-STATIC halVolRampT volRampGuidance= {
-    .slave   = Guidance_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 2,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampCommunication= {
-    .slave   = Communication_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampEntertainment= {
-    .slave   = Entertainment_Playback_Volume,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 4,
-    .stepUp  = 2,
-};
-
-STATIC halVolRampT volRampNotification= {
-    .slave   = Notification_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampWarning= {
-    .slave   = Warning_Playback_Volume,
-    .delay   = 10*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampSystem= {
-    .slave   = System_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampStartup= {
-    .slave   = Startup_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampShutdown= {
-    .slave   = Shutdown_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-
-// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities.
-STATIC alsaHalMapT  alsaHalMap[]= {
-  { .tag=Master_Playback_Volume, .  ctl={.name="Digital Playback Volume1", .value=12 }},
-  { .tag=PCM_Playback_Volume     , .ctl={.name="Digital Playback Volume1", .value=12 }},
-  { .tag=PCM_Playback_Switch     , .ctl={.name="SRC Out Rate Switch", .value=01 }},
-  { .tag=Capture_Volume          , .ctl={.name="DVC In Capture Volume"  }},
-
-  // 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, .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", .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", .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", .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", .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", .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", .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", .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", .value=80 }
-  },
-
-  // 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 } 
-  },
-  // Could have similar controls for input  side
-
-  { .tag=EndHalCrlTag}  /* marker for end of the array */
-} ;
-
-
-// HAL sound card mapping info
-STATIC alsaHalSndCardT alsaHalSndCard  = {
-    .name  = "rsnd-dai.0-ak4613-hifi", //  WARNING: name MUST match with 'aplay -l'
-    .info  = "Hardware Abstraction Layer for R-CAR M3 speakers",
-    .ctls  = alsaHalMap,
-    .volumeCB = NULL, // use default volume normalisation function
-};
-
-
-STATIC int sndServiceInit () {
-    int err;
-    err = halServiceInit (afbBindingV2.api, &alsaHalSndCard);
-    return err;
-}
-
-// API prefix should be unique for each snd card
-PUBLIC const struct afb_binding_v2 afbBindingV2 = {
-    .api     = "rsnddai0ak4613h",
-    .init    = sndServiceInit,
-    .verbs   = halServiceApi,
-    .onevent = halServiceEvent,
-};
diff --git a/USB-Device/CMakeLists.txt b/USB-Device/CMakeLists.txt
deleted file mode 100644
index d71cc2c..0000000
--- a/USB-Device/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-if(HAL_UBS_DEVICE)
-	# Add target to project dependency list
-	PROJECT_TARGET_ADD(hal-usb-device)
-
-		# Define project Targets
-		ADD_LIBRARY(${TARGET_NAME} MODULE UsbDeviceHAL.c)
-
-		# Binder exposes a unique public entry point
-		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-		PREFIX "afb-"
-			LABELS "BINDING"
-		LINK_FLAGS  ${BINDINGS_LINK_FLAG}
-			OUTPUT_NAME ${TARGET_NAME}
-		)
-
-		# Library dependencies (include updates automatically)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME}
-			hal-utilities-4a
-			${link_libraries}
-		)
-endif()
diff --git a/USB-Device/UsbDeviceHAL.c b/USB-Device/UsbDeviceHAL.c
deleted file mode 100644
index 78550f0..0000000
--- a/USB-Device/UsbDeviceHAL.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * To find out which control your sound card uses
- *  aplay -l  # Check sndcard name name in between []
- *  amixer -D hw:xx controls # get supported controls
- *  amixer -D "hw:3" cget numid=xx  # get control settings
- *
- */
-#define _GNU_SOURCE
-#include "hal-interface.h"
-
-// Define few private tag for not standard functions
-#define PCM_Volume_Multimedia 1000
-#define PCM_Volume_Navigation 1001
-#define PCM_Volume_Emergency      1002
-
-// Default Values for MasterVolume Ramping
-STATIC halVolRampT volRampMaster= {
-    .mode    = RAMP_VOL_NORMAL,
-    .slave   = Master_Playback_Volume,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown=1,
-    .stepUp  =1,
-};
-
-//Solvol Ramping Value can be customize by Audio Role and Hardwar card
-STATIC halVolRampT volRampGuidance= {
-    .slave   = Guidance_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 2,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampCommunication= {
-    .slave   = Communication_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampEntertainment= {
-    .slave   = Entertainment_Playback_Volume,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 4,
-    .stepUp  = 2,
-};
-
-STATIC halVolRampT volRampNotification= {
-    .slave   = Notification_Playback_Volume,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 4,
-};
-
-STATIC halVolRampT volRampWarning= {
-    .slave   = Warning_Playback_Volume,
-    .delay   = 10*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampSystem= {
-    .slave   = System_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-
-STATIC halVolRampT volRampStartup= {
-    .slave   = Startup_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-STATIC halVolRampT volRampShutdown= {
-    .slave   = Shutdown_Playback_Volume,
-    .delay   = 20*100, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 10,
-};
-
-
-
-// Map HAL hight sndctl with Alsa numid and optionally with a custom callback for non Alsa supported functionalities.
-STATIC alsaHalMapT  alsaHalMap[]= {
-
-  // Sound card does not have hardware volume ramping
-  { .tag=Master_Playback_Ramp   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="Master Playback Volume Ramp",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Master_Ramp"}
-  },
-
-  // 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 }
-  },
-  { .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 }
-  },
-  { .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 }
-  },
-  { .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 }
-  },
-  { .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 }
-  },
-
-  { .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 }
-  },
-  { .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="Statup_Ramp", .minval=0, .maxval=100, .step=1, .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 }
-  },
-
-   // 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", //  Match any USB audio sound card
-    .info = "Hardware Abstraction Layer for Generic USB Audio sound card",
-    .ctls = alsaHalMap,
-};
-
-STATIC int sndServiceInit() {
-    int err;
-    AFB_DEBUG("USB-Audio HAL Binding Init");
-    err = halServiceInit(afbBindingV2.api, &alsaHalSndCard);
-    return err;
-}
-
-// API prefix should be unique for each snd card
-PUBLIC const struct afb_binding_v2 afbBindingV2 = {
-    .api = "usb-audio",
-    .init = sndServiceInit,
-    .verbs = halServiceApi,
-    .onevent = halServiceEvent,
-};