Initial working version as independent repo

91 files changed, 299 insertions, 10169 deletions

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index cb8ad34..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "conf.d/app-templates"]
-	path = conf.d/app-templates
-	url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates
-[submodule "afb-utilities"]
-	path = afb-utilities
-	url = https://github.com/iotbzh/afb-utilities.git
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
deleted file mode 100644
index 5512cb3..0000000
--- a/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "null",
-            "includePath": [],
-            "defines": [],
-            "browse": {
-                "path": [
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "intelliSenseMode": "clang-x64"
-        }
-    ],
-    "version": 2
-}
\ No newline at end of file
diff --git a/Alsa-Plugin/Alsa-Policy-Hook/CMakeLists.txt b/Alsa-Plugin/Alsa-Policy-Hook/CMakeLists.txt
deleted file mode 100644
index 329b2ef..0000000
--- a/Alsa-Plugin/Alsa-Policy-Hook/CMakeLists.txt
+++ /dev/null
@@ -1,37 +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.
-###########################################################################
-
-# Activate ALSA  dynamic build build mode get resolve "snd_dlsym_start"
-add_compile_options(-DPIC)
-
-PROJECT_TARGET_ADD(policy_hook_cb)
-
-    # Define targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE PolicyHookCb.c)
-
-    # Alsa Plugin properties
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	PREFIX ""
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    # Library dependencies (include updates automatically)
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        ${link_libraries}
-    )
-    install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib)
diff --git a/Alsa-Plugin/Alsa-Policy-Hook/PolicyHookCb.c b/Alsa-Plugin/Alsa-Policy-Hook/PolicyHookCb.c
deleted file mode 100644
index 54fbe88..0000000
--- a/Alsa-Plugin/Alsa-Policy-Hook/PolicyHookCb.c
+++ /dev/null
@@ -1,554 +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.
- *
- * AfbCallBack (snd_ctl_hal_t *handle, int numid, void **response);
- *  AlsaHookInit is mandatory and called with numid=0
- *
- * Syntax in .asoundrc file
- *   CrlLabel    { cb MyFunctionName name "My_Second_Control" }
- *
- * Testing:
- *   aplay -DAlsaHook /usr/share/sounds/alsa/test.wav
- *
- * References:
- *  https://www.spinics.net/lists/alsa-devel/msg54235.html
- *  https://github.com/shivdasgujare/utilities/blob/master/nexuss/alsa-scenario-hook/src/alsa-wrapper.c
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <alsa/asoundlib.h>
-#include <alsa/conf.h>
-#include <alsa/pcm.h>
-
-#include <systemd/sd-event.h>
-#include <json-c/json.h>
-
-#include "afb/afb-wsj1.h"
-#include "afb/afb-ws-client.h"
-#include <pthread.h>
-#include <semaphore.h>
-
-
-#define PLUGIN_ENTRY_POINT AlsaInstallHook
-    // Fulup Note: What ever you may find on Internet you should use
-    // SND_CONFIG_DLSYM_VERSION_HOOK and not SND_CONFIG_DLSYM_VERSION_HOOK
-    SND_DLSYM_BUILD_VERSION(PLUGIN_ENTRY_POINT, SND_PCM_DLSYM_VERSION)
-
-// this should be more than enough
-#define MAX_API_CALL 10
-#define MAX_EVT_CALL 10
-
-// timeout in ms
-#define REQUEST_DEFAULT_TIMEOUT 500
-#ifndef MAINLOOP_WATCHDOG
-#define MAINLOOP_WATCHDOG 100000
-#endif
-
-// closing message is added to query when PCM is closed
-#define CLOSING_MSG ",\"source\":-1}"
-
-// Currently not implemented
-#define UNUSED_ARG(x) UNUSED_ ## x __attribute__((__unused__))
-void OnRequestCB(void* UNUSED_ARG(handle) , const char* UNUSED_ARG(api), const char* UNUSED_ARG(verb), struct afb_wsj1_msg*UNUSED_ARG(msg)) {}
-
-typedef struct {
-    const char *api;
-    const char *verb;
-    long timeout;
-    char *query;
-    size_t length;
-
-    sd_event_source *evtSource;
-    char *callIdTag;
-    void *afbClient;
-} afbRequestT;
-
-typedef struct {
-    const char *name;
-    int  signal;
-} afbEventT;
-
-typedef struct {
-    snd_pcm_t *pcm;
-    const char *uri;
-    struct afb_wsj1 *wsj1;
-    sd_event *sdLoop;
-    int verbose;
-    sem_t semaphore;
-    int count;
-    int error;
-    afbRequestT **request;
-    afbEventT **event;
-} afbClientT;
-
-
-
-static void *LoopInThread(void *handle) {
-    afbClientT *afbClient = (afbClientT*) handle;
-    int count=0;
-    int watchdog= MAINLOOP_WATCHDOG *1000;
-
-    /* loop until end */
-    for (;;) {
-
-        if (afbClient->verbose) printf("ON-MAINLOOP ping=%d\n", count++);
-        sd_event_run(afbClient->sdLoop, watchdog);
-    }
-
-    return NULL;
-}
-
-// lost connect with the AudioDaemon
-static void OnHangupCB(void *handle, struct afb_wsj1 *wsj1) {
-
-    afbClientT *afbClient = (afbClientT*) handle;
-    SNDERR("(Hoops) Lost Connection to %s", afbClient->uri);
-
-    // try to close PCM when impossible terminate client
-    int err = snd_pcm_close (afbClient->pcm);
-    if (err) exit(1);
-}
-
-typedef enum {
-    HOOK_INSTALL,
-    HOOK_CLOSE,
-} hookActionT;
-
-
-void OnEventCB(void *handle, const char *event, struct afb_wsj1_msg *msg) {
-    afbClientT *afbClient = (afbClientT*) handle;
-    afbEventT **afbEvent = afbClient->event;
-    json_object *eventJ, *tmpJ, *dataJ;
-    const char *label;
-    int value, done, index;
-
-    eventJ = afb_wsj1_msg_object_j(msg);
-    done= json_object_object_get_ex(eventJ,"data", &dataJ);
-    if (!done) {
-        SNDERR ("PCM_HOOK: uri=%s empty event label", afbClient->uri);
-        goto OnErrorExit;
-    }
-
-    json_object_object_get_ex(dataJ,"signal", &tmpJ);
-    label=json_object_get_string(tmpJ);
-
-    json_object_object_get_ex(dataJ,"value", &tmpJ);
-    value=json_object_get_int(tmpJ);
-
-    for (index=0; afbEvent[index]!= NULL; index++) {
-        if (!strcmp(afbEvent[index]->name, label)) break;
-    }
-
-    if (!afbEvent[index] || !afbEvent[index]->signal) {
-        SNDERR ("PCM_HOOK: Unsupported uri=%s label=%s", afbClient->uri, label);
-        return;
-    }
-
-    // send signal to self process
-    kill (getpid(), afbEvent[index]->signal);
-
-    if (afbClient->verbose) printf("ON-EVENT label=%s signal=%d\n", label, value);
-    return;
-
-OnErrorExit:
-    SNDERR("ON-EVENT %s(%s)\n", event, afb_wsj1_msg_object_s(msg));
-    return;
-}
-
-// callback interface for wsj1
-static struct afb_wsj1_itf itf = {
-    .on_hangup = OnHangupCB,
-    .on_call = OnRequestCB,
-    .on_event = OnEventCB
-};
-
-void OnResponseCB(void *handle, struct afb_wsj1_msg *msg) {
-    afbRequestT *afbRequest= (afbRequestT*)handle;
-    afbClientT *afbClient=(afbClientT*)afbRequest->afbClient;
-
-    if (afbClient->verbose) printf("ON-RESPONSE call=%s response=%s\n", afbRequest->callIdTag, afb_wsj1_msg_object_s(msg));
-
-    // Cancel timeout for this request
-    sd_event_source_unref(afbRequest->evtSource);
-
-    if (! afb_wsj1_msg_is_reply_ok(msg)) goto OnErrorExit;
-
-    // When not more waiting call release semaphore
-    afbClient->count--;
-    if (afbClient->count == 0) {
-        if (afbClient->verbose) printf("ON-RESPONSE No More Waiting Request\n");
-        afbClient->error=0;
-        sem_post (&afbClient->semaphore);
-    }
-    return;
-
-OnErrorExit:
-    fprintf(stderr, "ON-RESPONSE ERROR call=%s response=%s\n", afbRequest->callIdTag, afb_wsj1_msg_object_s(msg));
-   afbClient->error=1;
-    sem_post (&afbClient->semaphore);
-}
-
-int OnTimeoutCB (sd_event_source* source, uint64_t timer, void* handle) {
-    afbClientT *afbClient= (afbClientT*)handle;
-
-    SNDERR("\nON-TIMEOUT Call Request Fail URI=%s\n", afbClient->uri);
-
-    // Close PCM and release waiting client
-    afbClient->error=1;
-    sem_post (&afbClient->semaphore);
-
-    return 0;
-}
-
-// Call AGL binder asynchronously by with a timeout
-static int CallWithTimeout(afbClientT *afbClient, afbRequestT *afbRequest, int count, hookActionT action) {
-    uint64_t usec;
-    int err;
-
-    // create a unique tag for request
-    (void) asprintf(&afbRequest->callIdTag, "%d:%s/%s", count, afbRequest->api, afbRequest->verb);
-
-    // create a timer with ~250us accuracy
-    sd_event_now(afbClient->sdLoop, CLOCK_MONOTONIC, &usec);
-    sd_event_add_time(afbClient->sdLoop, &afbRequest->evtSource, CLOCK_MONOTONIC, usec+afbRequest->timeout*1000, 250, OnTimeoutCB, afbClient);
-
-    if (afbClient->verbose) printf("CALL-REQUEST api=%s/%s tag=%s\n", afbRequest->api, afbRequest->verb, afbRequest->callIdTag);
-
-    // on PCM close replace last '}' by CLOSING_MSG
-    if (action == HOOK_CLOSE) {
-        for (size_t index=afbRequest->length; index >0; index--) {
-            if (afbRequest->query[index] == '}') {
-                strcpy (&afbRequest->query[index], CLOSING_MSG);
-                break;
-            }
-        }
-    }
-
-    err = afb_wsj1_call_s(afbClient->wsj1, afbRequest->api, afbRequest->verb, afbRequest->query, OnResponseCB, afbRequest);
-    if (err) goto OnErrorExit;
-
-    // save client handle in request
-    afbRequest->afbClient = afbClient;
-    afbClient->count ++;
-
-    return 0;
-
-OnErrorExit:
-    return -1;
-}
-
-static int LaunchCallRequest(afbClientT *afbClient, hookActionT action) {
-
-    pthread_t tid;
-    int err, idx;
-    afbRequestT **afbRequest= afbClient->request;
-
-    if (action == HOOK_INSTALL) {
-        // init waiting counting semaphore
-        if (sem_init(&afbClient->semaphore, 1, 0) == -1) {
-           fprintf(stderr, "LaunchCallRequest: Fail Semaphore Init: %s\n", afbClient->uri);
-        }
-
-        // Create a main loop
-        err = sd_event_default(&afbClient->sdLoop);
-        if (err < 0) {
-            fprintf(stderr, "LaunchCallRequest: Connection to default event loop failed: %s\n", strerror(-err));
-            goto OnErrorExit;
-        }
-
-        // start a thread with a mainloop to monitor Audio-Agent
-        err = pthread_create(&tid, NULL, &LoopInThread, afbClient);
-        if (err) goto OnErrorExit;
-
-        // connect the websocket wsj1 to the uri given by the first argument
-        afbClient->wsj1 = afb_ws_client_connect_wsj1(afbClient->sdLoop, afbClient->uri, &itf, afbClient);
-        if (afbClient->wsj1 == NULL) {
-            fprintf(stderr, "LaunchCallRequest: Connection to %s failed\n", afbClient->uri);
-            goto OnErrorExit;
-        }
-    }
-
-    // send call request to audio-agent asynchronously (respond with thread mainloop context)
-    for (idx = 0; afbRequest[idx] != NULL; idx++) {
-        err = CallWithTimeout(afbClient, afbRequest[idx], idx, action);
-        if (err) {
-            fprintf(stderr, "LaunchCallRequest: Fail call %s//%s/%s&%s", afbClient->uri, afbRequest[idx]->api, afbRequest[idx]->verb, afbRequest[idx]->query);
-            goto OnErrorExit;
-        }
-    }
-
-    // launch counter to keep track of waiting request call
-    afbClient->count=idx;
-
-    return 0;
-
-OnErrorExit:
-    return -1;
-}
-
-static int AlsaCloseHook(snd_pcm_hook_t *hook) {
-
-    afbClientT *afbClient = (afbClientT*) snd_pcm_hook_get_private (hook);
-
-    // launch call request and create a waiting mainloop thread
-    int err = LaunchCallRequest(afbClient, HOOK_CLOSE);
-    if (err < 0) {
-        fprintf (stderr, "PCM Fail to Enter Mainloop\n");
-        goto OnErrorExit;
-    }
-
-    // wait for all call request to return
-    sem_wait(&afbClient->semaphore);
-    if (afbClient->error) {
-        fprintf (stderr, "AlsaCloseHook: Audio Agent Fail to respond\n");
-        goto OnErrorExit;
-    }
-
-    if (afbClient->verbose) fprintf(stdout, "\nAlsaHook Close Success PCM=%s URI=%s\n", snd_pcm_name(afbClient->pcm), afbClient->uri);
-    return 0;
-
-OnErrorExit:
-    fprintf(stderr, "\nAlsaPcmHook Plugin Close Fail PCM=%s\n", snd_pcm_name(afbClient->pcm));
-    return 0;
-}
-
-// Function call when Plugin PCM is OPEN
-int PLUGIN_ENTRY_POINT (snd_pcm_t *pcm, snd_config_t *conf) {
-    snd_pcm_hook_t *h_close = NULL;
-    snd_config_iterator_t it, next;
-    afbClientT *afbClient = malloc(sizeof (afbClientT));
-    afbRequestT **afbRequest = malloc(MAX_API_CALL * sizeof(afbRequestT*));
-    afbEventT **afbEvent= malloc(MAX_EVT_CALL * sizeof(afbEventT*));
-    int err;
-
-    // start populating client handle
-    afbClient->pcm = pcm;
-    afbClient->verbose = 0;
-    afbClient->request = afbRequest;
-
-    // Get PCM arguments from asoundrc
-    snd_config_for_each(it, next, conf) {
-        snd_config_t *node = snd_config_iterator_entry(it);
-        const char *id;
-
-        // ignore comment en empty lines
-        if (snd_config_get_id(node, &id) < 0) continue;
-        if (strcmp(id, "comment") == 0 || strcmp(id, "hint") == 0) continue;
-
-        if (strcmp(id, "uri") == 0) {
-            const char *uri;
-            if (snd_config_get_string(node, &uri) < 0) {
-                SNDERR("Invalid String for %s", id);
-                goto OnErrorExit;
-            }
-            afbClient->uri=strdup(uri);
-            continue;
-        }
-
-        if (strcmp(id, "verbose") == 0) {
-            afbClient->verbose= snd_config_get_bool(node);
-            if (afbClient->verbose < 0) {
-                SNDERR("Invalid Boolean for %s", id);
-                goto OnErrorExit;
-            }
-            continue;
-        }
-
-        if (strcmp(id, "request") == 0) {
-            const char *callConf, *callLabel;
-            snd_config_type_t ctype;
-            snd_config_iterator_t currentCall, follow;
-            snd_config_t *itemConf;
-            int callCount=0;
-
-            ctype = snd_config_get_type(node);
-            if (ctype != SND_CONFIG_TYPE_COMPOUND) {
-                snd_config_get_string(node, &callConf);
-                SNDERR("Invalid compound type for %s", callConf);
-                goto OnErrorExit;
-            }
-
-
-            // loop on each call
-            snd_config_for_each(currentCall, follow, node) {
-                snd_config_t *ctlconfig = snd_config_iterator_entry(currentCall);
-
-                // ignore empty line
-                if (snd_config_get_id(ctlconfig, &callLabel) < 0) continue;
-
-                // each clt should be a valid config compound
-                ctype = snd_config_get_type(ctlconfig);
-                if (ctype != SND_CONFIG_TYPE_COMPOUND) {
-                    snd_config_get_string(node, &callConf);
-                    SNDERR("Invalid call element for %s value=%s", callLabel, callConf);
-                    goto OnErrorExit;
-                }
-
-                // allocate an empty call request
-                afbRequest[callCount] = calloc(1, sizeof (afbRequestT));
-
-
-                err = snd_config_search(ctlconfig, "api", &itemConf);
-                if (!err) {
-                    const char *api;
-                    if (snd_config_get_string(itemConf, &api) < 0) {
-                        SNDERR("Invalid api string for %s", callLabel);
-                        goto OnErrorExit;
-                    }
-                    afbRequest[callCount]->api=strdup(api);
-                }
-
-                err = snd_config_search(ctlconfig, "verb", &itemConf);
-                if (!err) {
-                    const char *verb;
-                    if (snd_config_get_string(itemConf, &verb) < 0) {
-                        SNDERR("Invalid verb string %s", id);
-                        goto OnErrorExit;
-                    }
-                    afbRequest[callCount]->verb=strdup(verb);
-                }
-
-                err = snd_config_search(ctlconfig, "timeout", &itemConf);
-                if (!err) {
-                    if (snd_config_get_integer(itemConf, &afbRequest[callCount]->timeout) < 0) {
-                        SNDERR("Invalid timeout Integer %s", id);
-                        goto OnErrorExit;
-                    }
-                }
-
-                err = snd_config_search(ctlconfig, "query", &itemConf);
-                if (!err) {
-                    const char *query;
-                    if (snd_config_get_string(itemConf, &query) < 0) {
-                        SNDERR("Invalid args string %s", id);
-                        goto OnErrorExit;
-                    }
-                    // reserve enough space to ad closing message
-                    afbRequest[callCount]->length= strlen(query);
-                    afbRequest[callCount]->query = malloc (afbRequest[callCount]->length+strlen(CLOSING_MSG)+1);
-                    strcpy (afbRequest[callCount]->query, query);
-
-                    // cleanup string for json_tokener
-                    for (int idx = 0; query[idx] != '\0'; idx++) {
-                        if (query[idx] == '\'') afbRequest[callCount]->query[idx] = '"';
-                        else afbRequest[callCount]->query[idx] = query[idx];
-                    }
-                    json_object *queryJ = json_tokener_parse(afbRequest[callCount]->query);
-                    if (!queryJ) {
-                        SNDERR("Invalid Json %s args=%s should be args=\"{'tok1':'val1', 'tok2':'val2'}\" ", id, afbRequest[callCount]->query);
-                        goto OnErrorExit;
-                    }
-                }
-
-                // Simple check on call request validity
-                if (!afbRequest[callCount]->query)   afbRequest[callCount]->query= "";
-                if (!afbRequest[callCount]->timeout) afbRequest[callCount]->timeout=REQUEST_DEFAULT_TIMEOUT ;
-                if (!afbRequest[callCount]->verb || !afbRequest[callCount]->api) {
-                    SNDERR("Missing api/verb %s in asoundrc", callLabel);
-                    goto OnErrorExit;
-                }
-
-                // move to next call if any
-                callCount ++;
-                if (callCount == MAX_API_CALL) {
-                    SNDERR("Too Many call MAX_API_CALL=%d", MAX_API_CALL);
-                    goto OnErrorExit;
-                }
-                afbRequest[callCount]=NULL; // afbRequest array is NULL terminated
-
-            }
-            continue;
-        }
-        if (strcmp(id, "event") == 0) {
-            const char *callConf, *callLabel;
-            snd_config_type_t ctype;
-            snd_config_iterator_t currentCall, follow;
-            int callCount=0;
-
-            ctype = snd_config_get_type(node);
-            if (ctype != SND_CONFIG_TYPE_COMPOUND) {
-                snd_config_get_string(node, &callConf);
-                SNDERR("Invalid compound type for %s", callConf);
-                goto OnErrorExit;
-            }
-
-
-            // loop on each call
-            snd_config_for_each(currentCall, follow, node) {
-                snd_config_t *ctlconfig = snd_config_iterator_entry(currentCall);
-                long sigval;
-
-                // ignore empty line
-                if (snd_config_get_id(ctlconfig, &callLabel) < 0) continue;
-
-                // each clt should be a valid config compound
-                ctype = snd_config_get_type(ctlconfig);
-                if (ctype != SND_CONFIG_TYPE_INTEGER) {
-                    snd_config_get_string(ctlconfig, &callConf);
-                    SNDERR("Invalid signal number for %s value=%s", callLabel, callConf);
-                    goto OnErrorExit;
-                }
-
-                // allocate an empty call request
-                snd_config_get_integer(ctlconfig, &sigval);
-                afbEvent[callCount] = calloc(1, sizeof (afbEventT));
-                afbEvent[callCount]->name=strdup(callLabel);
-                afbEvent[callCount]->signal= (int)sigval;
-
-                // move to next call if any
-                callCount ++;
-                if (callCount == MAX_EVT_CALL) {
-                    SNDERR("Too Many call MAX_EVT_CALL=%d", MAX_EVT_CALL);
-                    goto OnErrorExit;
-                }
-                afbEvent[callCount]=NULL; // afbEvent array is NULL terminated
-
-            }
-            continue;
-        }
-    }
-
-    if (afbClient->verbose) fprintf(stdout, "\nAlsaHook Install Start PCM=%s URI=%s\n", snd_pcm_name(afbClient->pcm), afbClient->uri);
-
-    err = snd_pcm_hook_add(&h_close, afbClient->pcm, SND_PCM_HOOK_TYPE_CLOSE, AlsaCloseHook, afbClient);
-    if (err < 0) goto OnErrorExit;
-
-    // launch call request and create a waiting mainloop thread
-    err = LaunchCallRequest(afbClient, HOOK_INSTALL);
-    if (err < 0) {
-        fprintf (stderr, "PCM Fail to Enter Mainloop\n");
-        goto OnErrorExit;
-    }
-
-    // wait for all call request to return
-    sem_wait(&afbClient->semaphore);
-    if (afbClient->error) {
-        fprintf (stderr, "PCM Authorisation Deny from AAAA Controller (AGL Advanced Audio Agent)\n");
-        goto OnErrorExit;
-    }
-
-    if (afbClient->verbose) fprintf(stdout, "\nAlsaHook Install Success PCM=%s URI=%s\n", snd_pcm_name(afbClient->pcm), afbClient->uri);
-    return 0;
-
-OnErrorExit:
-    fprintf(stderr, "\nAlsaPcmHook Plugin Install Fail PCM=%s\n", snd_pcm_name(pcm));
-    if (h_close)
-        snd_pcm_hook_remove(h_close);
-
-    return -EINVAL;
-}
-
diff --git a/Alsa-Plugin/Alsa-Policy-Hook/README.md b/Alsa-Plugin/Alsa-Policy-Hook/README.md
deleted file mode 100644
index 20186db..0000000
--- a/Alsa-Plugin/Alsa-Policy-Hook/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-Alsa-Hook-Plugin
-
-Object: Provide a Hook on Alsa PCM to check permission again AGL Advance Audio Agent
-Status: Release Candidate
-Author: Fulup Ar Foll fulup@iot.bzh
-Date  : August-2017
-
-Functionalities:
- - Execute a set of websocket RPC request again AGL binders to allow/deny access
- - Keep websocket open in an idepandant thread on order to monitor event receive from AGL audio agent
-
-Installation
- - Alsaplugins are typically search in /usr/share/alsa-lib. Nevertheless a full path might be given
- - This plugin implement a hook on a slave PCM. Typically this slave PCM is a dedicated virtual channel (eg: navigation, emergency,...)
- - Config should be place in ~/.asoundrc (see config sample in PROJECT_ROOT/conf.d/alsa)
-
-Test
- - Install a full .asoundrc from conf.d/project/alsa.d
- - speaker-test -DMyNavigationHook -c2 -twav
-
-Config
-```
-# Define sharelib location and entry point
-# -----------------------------------------
-pcm_hook_type.MyHookPlugin {
-    install "AlsaInstallHook"
-    lib "/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build/Alsa-Plugin/Alsa-Hook-Callback/alsa_hook_cb.so"
-}
-
-# Create PCM HOOK with corresponding request calls to AGL Audio Agent
-# --------------------------------------------------------------------
-pcm.MyNavigationHook {
-    type hooks
-    slave.pcm "MyMixerPCM"
-
-    # Defined used hook sharelib and provide arguments/config to install func
-    hooks.0 {
-        type "MyHookPlugin"
-        hook_args {
-            verbose true # print few log messages (default false);
-
-            # Every Call should return OK in order PCM to open (default timeout 100ms)
-            uri   "ws://localhost:1234/api?token='audio-agent-token'"
-            request {
-                # Request autorisation to write on navigation
-                navigation-ctl {
-                    api   "control"
-                    verb  "dispatch"
-                    args   "{'target':'navigation', 'args':{'device':'Jabra SOLEMATE v1.34.0'}}"
-                }
-                # subscribe to Audio Agent Event map them to signal
-                subscribe-evt {
-                    api   "control"
-                    verb  "monitor"
-                }
-            }
-            # map event reception to self generated signal
-            event {
-                pause  30
-                resume 31
-                stop   3
-            }
-        }
-    }
-}
-
-```
-
-NOTE:
-
-* Hook plugin is loaded by Alsa libasound within player context. It inherits client process attributes, as UID/GID or
-the SMACK label on AGL. This smack label is tested by AGL security framework when requested a call on the audio-agent binder.
-As a result the call will only succeed it the permission attached the application in Cynara matches.
-
-* Hook plugin keep a connection with the Audio-Agent until PCM is closed by the application. This connection allow the
-Audio-Agent to send events. eg: pause, quit, mute, ...
\ No newline at end of file
diff --git a/Alsa-Plugin/CMakeLists.txt b/Alsa-Plugin/CMakeLists.txt
deleted file mode 100644
index b0c2e6a..0000000
--- a/Alsa-Plugin/CMakeLists.txt
+++ /dev/null
@@ -1,23 +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.
-###########################################################################
-
-
-# Include any directory starting with a Capital letter
-# -----------------------------------------------------
-PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN})
-
diff --git a/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlug.h b/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlug.h
deleted file mode 100644
index 98850bf..0000000
--- a/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlug.h
+++ /dev/null
@@ -1,91 +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.
- *
- * AfbCallBack (snd_ctl_hal_t *handle, int numid, void **response);
- *  AfbHalInit is mandatory and called with numid=0
- *
- * Syntaxe in .asoundrc file
- *   CrlLabel    { cb MyFunctionName name "My_Second_Control" }
- */
-
-
-#include <alsa/asoundlib.h>
-#include <alsa/control_external.h>
-#include <linux/soundcard.h>
-
-#ifndef SOUND_HAL_MAX_CTLS
-#define SOUND_HAL_MAX_CTLS 255
-#endif
-
-typedef enum {
-    CTLCB_INIT,
-    CTLCB_CLOSE,
-    CTLCB_ELEM_COUNT,
-    CTLCB_ELEM_LIST,
-    CTLCB_FIND_ELEM,
-    CTLCB_FREE_KEY,
-    CTLCB_GET_ATTRIBUTE,
-    CTLCB_GET_INTEGER_INFO,
-    CTLCB_GET_INTEGER64_INFO,
-    CTLCB_GET_ENUMERATED_INFO,
-    CTLCB_GET_ENUMERATED_NAME,
-    CTLCB_READ_INTEGER,
-    CTLCB_READ_INTEGER64,
-    CTLCB_READ_ENUMERATED,
-    CTLCB_READ_BYTES,
-    CTLCB_READ_IEC958,
-    CTLCB_WRITE_INTEGER,
-    CTLCB_WRITE_INTEGER64,
-    CTLCB_WRITE_ENUMERATED,
-    CTLCB_WRITE_BYTES,
-    CTLCB_WRITE_IEC958,
-    CTLCB_SUBSCRIBE_EVENTS,
-    CTLCB_READ_EVENT,
-    CTLCB_POLL_DESCRIPTORS_COUNT,
-    CTLCB_POLL_DESCRIPTORS
-} snd_ctl_action_t;
-
-typedef struct {
-    int ctlNumid;
-    const char *ctlName;
-} snd_ctl_conf_t;
-
-typedef struct {
-    int type;
-    int acc;
-    unsigned count;
-} snd_ctl_get_attrib_t;
-
-typedef struct {
-    int imin;
-    int imax;
-    int istep;
-} snd_ctl_get_int_info_t;
-
-typedef int(*snd_ctl_cb_t)(void *handle, snd_ctl_action_t action, snd_ctl_ext_key_t key, void *response);
-
-typedef struct snd_ctl_hal {
-    snd_ctl_ext_t ext;
-    char *devid;
-    snd_ctl_t *ctlDev;
-    unsigned int ctlsCount;
-    void *dlHandle;
-    snd_ctl_conf_t ctls[SOUND_HAL_MAX_CTLS];
-    snd_ctl_elem_info_t *infos[SOUND_HAL_MAX_CTLS];
-    snd_ctl_cb_t cbs[SOUND_HAL_MAX_CTLS];
-} snd_ctl_hal_t;
-
-
diff --git a/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlugCb.c b/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlugCb.c
deleted file mode 100644
index 9e55f0c..0000000
--- a/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlugCb.c
+++ /dev/null
@@ -1,66 +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.
- *
- * AfbCallBack (snd_ctl_hal_t *handle, int numid, void **response);
- *  AfbHalInit is mandatory and called with numid=0
- *
- * Syntax in .asoundrc file
- *   CrlLabel    { cb MyFunctionName name "My_Second_Control" }
- *
- * Testing:
- *   amixer -Dagl_hal controls
- *   amixer -Dagl_hal cget name=My_Sample_Callback
- */
-
-
-#include "AlsaHalPlug.h"
-#include <stdio.h>
-
-int AfbHalInitCB(void *handle, snd_ctl_action_t action, int numid, void*response) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) handle;
-
-    fprintf(stdout, "\n  - CB AfbHalInit devid=%s\n", plughandle->devid);
-    return 0;
-}
-
-int AfbHalSampleCB(void *handle, snd_ctl_action_t action, snd_ctl_ext_key_t key, void*response) {
-
-    switch (action) {
-        case CTLCB_GET_ATTRIBUTE:
-        {
-            fprintf(stdout, "  - AfbHalSampleCB CTLCB_GET_ATTRIBUTE numid=%d\n", (int) key + 1);
-            snd_ctl_get_attrib_t *item = (snd_ctl_get_attrib_t*) response;
-            item->type = 1;
-            item->count = 2;
-            item->acc = SND_CTL_EXT_ACCESS_READWRITE;
-            break;
-        }
-
-        case CTLCB_GET_INTEGER_INFO:
-        {
-            fprintf(stdout, "  - AfbHalSampleCB CTLCB_GET_INTEGER_INFO numid=%d\n", (int) key + 1);
-            snd_ctl_get_int_info_t *item = (snd_ctl_get_attrib_t*) response;
-            item->istep = 10;
-            item->imin = 20;
-            item->imax = 200;
-            break;
-        }
-
-        default:
-            fprintf(stdout, "CB AfbHalSampleCB unsupported action=%d numid=%d\n", action, (int) key + 1);
-    }
-    return 0;
-}
diff --git a/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlugCtl.c b/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlugCtl.c
deleted file mode 100644
index 22c217b..0000000
--- a/Alsa-Plugin/_Alsa-Hal-plugin/AlsaHalPlugCtl.c
+++ /dev/null
@@ -1,423 +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.
- *
- * Testing:
- *  1) Copy generated plugin [libasound_module_pcm_afbhal.so] in alsa-lib/ dir visible from LD_LIBRARY_PATH (eg: /usr/lib64/alsa-lib)
- *  2) Create a ~/.asounrc file base on following template
- *      ctl.agl_hal {
- *      type  afbhal
- *      devid "hw:4"
- *      cblib "afbhal_cb_sample.so"
- *      ctls {
- *          # ctlLabel {numid integer name "Alsa Ctl Name"}
- *          MasterSwitch { numid 4 name "My_First_Control" }
- *          MasterVol    { numid 5 name "My_Second_Control" }
- *          CB_sample    { ctlcb @AfbHalSampleCB name "My_Sample_Callback"}
- *      }
- *      pcm.agl_hal {
- *          type copy     # Copy PCM
- *          slave "hw:4"  # Slave name
- *      }
- *
- *  }
- *  3) Test with
- *     - amixer -Dagl_hal controls # should list all your controls
- *     - amixer -Dagl_hal cget numid=1
- *     - amixer -Dagl_hal cset numid=1 '10,20'
- */
-
-
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include "AlsaHalPlug.h"
-#include <dlfcn.h>
-
-static snd_ctl_ext_key_t AfbHalElemFind(snd_ctl_ext_t *ext, const snd_ctl_elem_id_t *id) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    snd_ctl_ext_key_t key = NULL;
-
-    int numid = snd_ctl_elem_id_get_numid(id);
-    if (numid > 0) {
-        if (numid > plughandle->ctlsCount) goto OnErrorExit;
-        key = (snd_ctl_ext_key_t) numid - 1;
-        goto SucessExit;
-    }
-
-    const char *ctlName = snd_ctl_elem_id_get_name(id);
-    if (ctlName == NULL) goto OnErrorExit;
-
-    for (int idx = 0; idx < plughandle->ctlsCount; idx++) {
-        if (!strcmp(ctlName, plughandle->ctls[idx].ctlName)) {
-            key = idx;
-            goto SucessExit;
-        }
-    }
-
-SucessExit:
-    return key;
-
-OnErrorExit:
-    return -1;
-}
-
-static int AfbHalGetAttrib(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, int *type, unsigned int *acc, unsigned int *count) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    snd_ctl_elem_info_t *elemInfo = plughandle->infos[key];
-    snd_ctl_cb_t callback = plughandle->cbs[key];
-
-
-    // search for equivalent NUMID in effective sound card
-    if (elemInfo) {
-        *type = snd_ctl_elem_info_get_type(elemInfo);
-        *count = snd_ctl_elem_info_get_count(elemInfo);
-        *acc = SND_CTL_EXT_ACCESS_READWRITE; // Future ToBeDone
-        return 0;
-    }
-
-    if (callback) {
-        snd_ctl_get_attrib_t item;
-
-        int err = callback(plughandle, CTLCB_GET_ATTRIBUTE, key, &item);
-        if (!err) {
-            *type = item.type;
-            *acc = item.acc;
-            *count = item.count;
-        }
-        return err;
-    }
-
-    return -1;
-}
-
-static int AfbHalGetIntInfo(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, long *imin, long *imax, long *istep) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    snd_ctl_elem_info_t *elemInfo = plughandle->infos[key];
-    snd_ctl_cb_t callback = plughandle->cbs[key];
-
-    if (elemInfo) {
-
-        // Should be normalised to make everything 0-100%
-        *imin = (long) snd_ctl_elem_info_get_min(elemInfo);
-        *imax = (long) snd_ctl_elem_info_get_min(elemInfo);
-        *istep = (long) snd_ctl_elem_info_get_min(elemInfo);
-        return 0;
-    }
-
-    if (callback) {
-        snd_ctl_get_int_info_t item;
-
-        int err = callback(plughandle, CTLCB_GET_INTEGER_INFO, key, &item);
-        if (!err) {
-            *imin = item.imin;
-            *imax = item.imax;
-            *istep = item.istep;
-        }
-        return err;
-    }
-
-    return -1;
-}
-
-static int AfbHalGetEnumInfo(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, unsigned int *items) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    snd_ctl_elem_info_t *elemInfo = plughandle->infos[key];
-    snd_ctl_cb_t callback = plughandle->cbs[key];
-
-    if (elemInfo) *items = snd_ctl_elem_info_get_items(elemInfo);
-    if (callback) callback(plughandle, CTLCB_GET_ENUMERATED_INFO, key, items);
-
-    return 0;
-}
-
-static int AfbHalGetEnumName(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, unsigned int item, char *name, size_t name_max_len) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    snd_ctl_elem_info_t *elemInfo = plughandle->infos[key];
-
-    //name= snd_ctl_elem_info_get_item_name(elemInfo);
-    return 0;
-}
-
-static int AfbHalReadInt(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, long *value) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    snd_ctl_elem_info_t *elemInfo = plughandle->infos[key];
-
-    return 0;
-}
-
-static int AfbHalReadEnumerate(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, unsigned int *items) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-
-    return 0;
-}
-
-static int AfbHalWriteInt(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, long *value) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-
-    return 0;
-}
-
-static int AfbHalWriteEnum(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, unsigned int *items) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-
-    return 0;
-}
-
-static int AfbHalEventRead(snd_ctl_ext_t *ext, snd_ctl_elem_id_t *id, unsigned int *event_mask) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-
-    return -EAGAIN;
-}
-
-static int AfbHalElemList(snd_ctl_ext_t *ext, unsigned int offset, snd_ctl_elem_id_t *id) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-
-    snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_MIXER);
-    snd_ctl_elem_id_set_name(id, plughandle->ctls[offset].ctlName);
-
-    return 0;
-}
-
-static int AfbHalElemCount(snd_ctl_ext_t *ext) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    int count = plughandle->ctlsCount;
-    return count;
-}
-
-static void AfbHalClose(snd_ctl_ext_t *ext) {
-    snd_ctl_hal_t *plughandle = (snd_ctl_hal_t*) ext->private_data;
-    int err;
-
-    for (int idx = 0; idx < plughandle->ctlsCount; idx++) {
-        if (plughandle->ctls[idx].ctlName) free((void*) plughandle->ctls[idx].ctlName);
-    }
-
-    err = snd_ctl_close(plughandle->ctlDev);
-    if (err) SNDERR("Fail Close sndctl: devid=%s err=%s", plughandle->devid, snd_strerror(err));
-
-    if (plughandle->devid) free(plughandle->devid);
-    free(plughandle);
-}
-
-static snd_ctl_ext_callback_t afbHalCBs = {
-    .close = AfbHalClose,
-    .elem_count = AfbHalElemCount,
-    .elem_list = AfbHalElemList,
-    .find_elem = AfbHalElemFind,
-    .get_attribute = AfbHalGetAttrib,
-    .get_integer_info = AfbHalGetIntInfo,
-    .get_enumerated_info = AfbHalGetEnumInfo,
-    .get_enumerated_name = AfbHalGetEnumName,
-    .read_integer = AfbHalReadInt,
-    .read_enumerated = AfbHalReadEnumerate,
-    .write_integer = AfbHalWriteInt,
-    .write_enumerated = AfbHalWriteEnum,
-    .read_event = AfbHalEventRead,
-};
-
-SND_CTL_PLUGIN_DEFINE_FUNC(afbhal) {
-
-    snd_config_iterator_t it, next;
-    snd_ctl_hal_t *plughandle;
-    int err;
-    snd_ctl_cb_t AfbHalInitCB;
-    const char *libname;
-
-    plughandle = calloc(1, sizeof (snd_ctl_hal_t));
-
-    snd_config_for_each(it, next, conf) {
-        snd_config_t *node = snd_config_iterator_entry(it);
-        const char *id;
-
-        // ignore comment en empty lines
-        if (snd_config_get_id(node, &id) < 0) continue;
-        if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) continue;
-
-        // devid should point onto a valid sound card
-        if (strcmp(id, "devid") == 0) {
-            const char *devid;
-            if (snd_config_get_string(node, &devid) < 0) {
-                SNDERR("Invalid string type for %s", id);
-                return -EINVAL;
-            }
-            plughandle->devid = strdup(devid);
-
-            // open control interface for devid
-            err = snd_ctl_open(&plughandle->ctlDev, plughandle->devid, 0);
-            if (err < 0) {
-                SNDERR("Fail to open control device for devid=%s", plughandle->devid);
-                return -EINVAL;
-            }
-            continue;
-        }
-
-        if (strcmp(id, "cblib") == 0) {
-            if (snd_config_get_string(node, &libname) < 0) {
-                SNDERR("Invalid libname string for %s", id);
-                return -EINVAL;
-            }
-
-            plughandle->dlHandle = dlopen(libname, RTLD_NOW);
-            if (!plughandle->dlHandle) {
-                SNDERR("Fail to open callback sharelib=%s error=%s", libname, dlerror());
-                return -EINVAL;
-            }
-
-            AfbHalInitCB = dlsym(plughandle->dlHandle, "AfbHalInitCB");
-            if (!AfbHalInitCB) {
-                SNDERR("Fail find 'AfbHalInitCB' symbol into callbacks sharelib=%s", libname);
-                return -EINVAL;
-            }
-
-            err = (*AfbHalInitCB)(plughandle, CTLCB_INIT, 0, 0);
-            if (err) {
-                SNDERR("Fail AfbHalInitCB err=%d", err);
-                return -EINVAL;
-            }
-
-            continue;
-        }
-
-        if (strcmp(id, "ctl") == 0) {
-            const char *ctlConf;
-            snd_config_type_t ctype;
-            snd_config_iterator_t currentCtl, follow;
-            snd_config_t *itemConf;
-
-            ctype = snd_config_get_type(node);
-            if (ctype != SND_CONFIG_TYPE_COMPOUND) {
-                snd_config_get_string(node, &ctlConf);
-                SNDERR("Invalid compound type for %s", node);
-                return -EINVAL;
-            }
-
-            // loop on each ctl within ctls
-
-            snd_config_for_each(currentCtl, follow, node) {
-                snd_config_t *ctlconfig = snd_config_iterator_entry(currentCtl);
-                snd_ctl_elem_info_t *elemInfo;
-                const char *ctlLabel, *ctlName;
-
-                // ignore empty line
-                if (snd_config_get_id(ctlconfig, &ctlLabel) < 0) continue;
-
-                // each clt should be a valid config compound
-                ctype = snd_config_get_type(ctlconfig);
-                if (ctype != SND_CONFIG_TYPE_COMPOUND) {
-                    snd_config_get_string(node, &ctlConf);
-                    SNDERR("Invalid ctl config for %s", ctlLabel);
-                    return -EINVAL;
-                }
-
-                err = snd_config_search(ctlconfig, "ctl", &itemConf);
-                if (!err) {
-                    if (snd_config_get_integer(itemConf, (long*) &plughandle->ctls[plughandle->ctlsCount].ctlNumid) < 0) {
-                        SNDERR("Not Integer: ctl:%s numid should be a valid integer", ctlLabel);
-                        return -EINVAL;
-                    }
-
-                    // Make sure than numid is valid on slave snd card
-                    snd_ctl_elem_info_malloc(&elemInfo);
-                    snd_ctl_elem_info_set_numid(elemInfo, (int) plughandle->ctls[plughandle->ctlsCount].ctlNumid);
-                    plughandle->infos[plughandle->ctlsCount] = elemInfo;
-
-                    err = snd_ctl_elem_info(plughandle->ctlDev, elemInfo);
-                    if (err) {
-                        SNDERR("Not Found: 'numid=%d' for 'devid=%s'", plughandle->ctls[plughandle->ctlsCount].ctlNumid, plughandle->devid);
-                        return -EINVAL;
-                    }
-                }
-
-                err = snd_config_search(ctlconfig, "ctlcb", &itemConf);
-                if (!err) {
-                    const char *funcname;
-                    void *funcaddr;
-
-                    if (snd_config_get_string(itemConf, &funcname) < 0) {
-                        SNDERR("Not string: ctl:%s cbname should be a valid string", ctlLabel);
-                        return -EINVAL;
-                    }
-
-                    if (funcname[0] != '@') {
-                        SNDERR("Not string: ctl:%s cbname=%s should be prefixed with '@' ", ctlLabel, funcname);
-                        return -EINVAL;
-                    }
-
-                    if (!plughandle->dlHandle) {
-                        SNDERR("No CB: ctl:%s cblib:/my/libcallback missing from asoundrc", ctlLabel);
-                        return -EINVAL;
-                    }
-
-                    funcaddr = dlsym(plughandle->dlHandle, &funcname[1]);
-                    if (!funcaddr) {
-                        SNDERR("NotFound CB: ctl:%s cbname='%s' no symbol into %s", ctlLabel, &funcname[1], libname);
-                        return -EINVAL;
-                    }
-                    plughandle->cbs[plughandle->ctlsCount] = funcaddr;
-                }
-
-                err = snd_config_search(ctlconfig, "name", &itemConf);
-                if (err) {
-                    SNDERR("Not Found: 'name' mandatory in ctl config");
-                    return -EINVAL;
-                }
-
-                if (snd_config_get_string(itemConf, &ctlName) < 0) {
-                    SNDERR("Not String: ctl:%s 'name' should be a valie string", ctlLabel);
-                    return -EINVAL;
-                }
-                plughandle->ctls[plughandle->ctlsCount].ctlName = strdup(ctlName);
-
-                // move to next ctl if any
-                plughandle->ctlsCount++;
-            } // end for each ctl
-            continue;
-        }
-        SNDERR("Unknown field %s", id);
-        return -EINVAL;
-    }
-
-
-
-    // Create ALSA control plugin structure
-    plughandle->ext.version = SND_CTL_EXT_VERSION;
-    plughandle->ext.card_idx = 0; /* FIXME */
-    strcpy(plughandle->ext.id, "AFB-HAL-CTL");
-    strcpy(plughandle->ext.driver, "AFB-HAL");
-    strcpy(plughandle->ext.name, "AFB-HAL Control Plugin");
-    strcpy(plughandle->ext.mixername, "AFB-HAL Mixer Plugin");
-    strcpy(plughandle->ext.longname, "Automotive-Linux Sound Abstraction Control Plugin");
-    plughandle->ext.poll_fd = -1;
-    plughandle->ext.callback = &afbHalCBs;
-    plughandle->ext.private_data = (void*) plughandle;
-
-
-
-    err = snd_ctl_ext_create(&plughandle->ext, name, mode);
-    if (err < 0) {
-        SNDERR("Fail Register sndctl for devid=%s", plughandle->devid);
-        goto OnErrorExit;
-    }
-
-    // Plugin register controls update handlep before exiting
-    *handlep = plughandle->ext.handle;
-    return 0;
-
-OnErrorExit:
-    free(plughandle);
-    return -1;
-}
-
-SND_CTL_PLUGIN_SYMBOL(afbhal);
diff --git a/Alsa-Plugin/_Alsa-Hal-plugin/CMakeLists.txt b/Alsa-Plugin/_Alsa-Hal-plugin/CMakeLists.txt
deleted file mode 100644
index 90ee5a3..0000000
--- a/Alsa-Plugin/_Alsa-Hal-plugin/CMakeLists.txt
+++ /dev/null
@@ -1,55 +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.
-###########################################################################
-
-# Activate ALSA  dynamic build build mode get resolve "snd_dlsym_start"
-add_compile_options(-DPIC)
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(ctl_afbhal)
-
-    # Define targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE HalPlugCtl.c)
-
-    # Alsa Plugin properties
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	PREFIX "libasound_module_"
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    # Library dependencies (include updates automatically)
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        ${link_libraries}
-    )
-    install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib/alsa-lib)
-
-PROJECT_TARGET_ADD(cb_sample)
-
-    # Define targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE HalPlugCb.c)
-
-    # Alsa Plugin properties
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	PREFIX "afbhal_"
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    # Library dependencies (include updates automatically)
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        ${link_libraries}
-    )
-    install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib)
diff --git a/Alsa-Plugin/_Alsa-Hal-plugin/README.md b/Alsa-Plugin/_Alsa-Hal-plugin/README.md
deleted file mode 100644
index a6fc90d..0000000
--- a/Alsa-Plugin/_Alsa-Hal-plugin/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Hal-Plugin
-
-Object: Add virtual soft control to sound card
-Status: Proof of concept and not a usable product
-Author: Fulup Ar Foll
-Date  : June-2017
-
-HAL-plugin allows:
- - to expose any existing NUMID under a customized label name, this is order to abstract sound card config.
- - to add non alsa NUMID supported through a callback mechanism (eg: volume rampdown, power off, ...)
-
-installation
- - Plugin should be placed where ever alsaplugins are located (typically: /usr/share/alsa-lib)
- - Callback sharelib directory should be declare in $LD_LIBRARY_PATH
-
-Config
-```
-cat ~/.asoundrc
-  ctl.agl_hal {
-    type  afbhal
-    devid "hw:4"
-    cblib "afbhal_cb_sample.so"
-    ctls {
-        # ctlLabel {numid integer name "Alsa Ctl Name"}
-        MasterSwitch { numid 4 name "My_First_Control" }
-        MasterVol    { numid 5 name "My_Second_Control" }
-        CB_sample    { ctlcb @AfbHalSampleCB name "My_Sample_Callback"}
-    }
-    pcm.agl_hal {
-        type copy     # Copy PCM
-        slave "hw:4"  # Slave name
-  }
-```
-
-With such a config file
- - numid=4 from sndcard=hw:4 is renamed "My_First_Control"
- - numid=4 from sndcard=hw:4 is renamed "My_Second_Control"
- - numid=4 will call AfbHalSampleCB from afbhal_cb_sample.so
-
-Note: to really implement a usable HAL at minimum every ALSA call should be implemented and read/write of values should be normalised from 0 to 100% with a step of 1.
-
-Conclusion: This demonstrate that implementing a HAL that both abstract ALSA get/set and enable non ALSA support is possible at an acceptable cost
-without having to hack ALSA source code. The beauty of the model is than it is fully transparent to any ALSA application. The limit is that the plugin is loaded
-within every application context, thus interaction with an external event loop remains complete as well as conflict management in case of share resources.
diff --git a/Alsa-afb/Alsa-AddCtl.c b/Alsa-afb/Alsa-AddCtl.c
deleted file mode 100644
index aaa9347..0000000
--- a/Alsa-afb/Alsa-AddCtl.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * AlsaUseCase -- provide low level interface with ALSA lib (extracted from alsa-json-gateway code)
- * Copyright (C) 2015,2016,2017, 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.
- *
- * References:
- *  https://kernel.readthedocs.io/en/sphinx-samples/writing-an-alsa-driver.html#control-names
- *  https://01.org/linuxgraphics/gfx-docs/drm/sound/designs/control-names.html
-
- */
-#define _GNU_SOURCE  // needed for vasprintf
-
-#include <alsa/asoundlib.h>
-#include <alsa/sound/tlv.h>
-#include <systemd/sd-event.h>
-#include <sys/ioctl.h>
-
-#include "Alsa-ApiHat.h"
-
-// Performs like a toggle switch for attenuation, because they're bool (ref:user-ctl-element-set.c)
-
-#ifndef SNDRV_CTL_TLVD_DECLARE_DB_MINMAX
-// taken from alsa-lib-1.1.3:include/sound/tlv.h
-
-#define SNDRV_CTL_TLVD_LENGTH(...) \
-    ((unsigned int)sizeof((const unsigned int[]) { __VA_ARGS__ }))
-
-#define SNDRV_CTL_TLVD_ITEM(type, ...) \
-    (type), SNDRV_CTL_TLVD_LENGTH(__VA_ARGS__), __VA_ARGS__
-
-#define SNDRV_CTL_TLVT_DB_MINMAX 4
-
-#define SNDRV_CTL_TLVD_DB_MINMAX_ITEM(min_dB, max_dB) \
-    SNDRV_CTL_TLVD_ITEM(SNDRV_CTL_TLVT_DB_MINMAX, (min_dB), (max_dB))
-
-#define SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(name, min_dB, max_dB) \
-    unsigned int name[] = { \
-        SNDRV_CTL_TLVD_DB_MINMAX_ITEM(min_dB, max_dB) \
-    }
-
-#define SNDRV_CTL_TLVD_DB_SCALE_MASK    0xffff
-#define SNDRV_CTL_TLVD_DB_SCALE_MUTE    0x10000
-
-#endif
-static const unsigned int *allocate_bool_fake_tlv(void) {
-    static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(range, -10000, 0);
-    unsigned int *tlv = malloc(sizeof (range));
-    if (tlv == NULL) return NULL;
-    memcpy(tlv, range, sizeof (range));
-    return tlv;
-}
-
-static const unsigned int *allocate_int_dbscale_tlv(int min, int step, int mute) {
-    // SNDRV_CTL_TLVD_DECLARE_DB_SCALE(range, min, step, mute);
-    size_t tlvSize = sizeof (4 * sizeof (unsigned int));
-    unsigned int *tlv = malloc(tlvSize);
-    tlv[0] = SNDRV_CTL_TLVT_DB_LINEAR;
-    tlv[1] = (int) tlvSize;
-    tlv[2] = min * 100;
-    tlv[3] = ((step * 100) & SNDRV_CTL_TLVD_DB_SCALE_MASK) | ((mute * 100) ? SNDRV_CTL_TLVD_DB_SCALE_MUTE : 0);
-    return tlv;
-}
-
-static const unsigned int *allocate_int_linear_tlv(int max, int min) {
-    // SNDRV_CTL_TLVD_DECLARE_DB_LINEAR (range, min, max);
-    size_t tlvSize = sizeof (4 * sizeof (unsigned int));
-    unsigned int *tlv = malloc(tlvSize);
-    tlv[0] = SNDRV_CTL_TLVT_DB_LINEAR;
-    tlv[1] = (int) tlvSize;
-    tlv[2] = -min * 100;
-    tlv[3] = max * 100;
-    return tlv;
-}
-
-STATIC json_object * addOneSndCtl(afb_req request, snd_ctl_t *ctlDev, json_object *ctlJ, halQueryMode queryMode) {
-    int err, done, ctlNumid, ctlValue=0, shouldCreate;
-    json_object *tmpJ;
-    const char *ctlName;
-    ctlRequestT ctlRequest;
-    int ctlMax=100, ctlMin=0, ctlStep, ctlCount, ctlSubDev=0, ctlSndDev=0;
-    snd_ctl_elem_type_t ctlType=SND_CTL_ELEM_TYPE_NONE;
-    snd_ctl_elem_info_t *elemInfo;
-    snd_ctl_elem_id_t *elemId;
-    snd_ctl_elem_value_t *elemValue;
-    const unsigned int *elemTlv = NULL;
-
-    // parse json ctl object
-    json_object_object_get_ex(ctlJ, "name", &tmpJ);
-    ctlName = json_object_get_string(tmpJ);
-
-    json_object_object_get_ex(ctlJ, "ctl", &tmpJ);
-    ctlNumid = json_object_get_int(tmpJ);
-
-    if (!ctlNumid && !ctlName) {
-        afb_req_fail_f(request, "ctl-invalid", "crl=%s name or numid missing", json_object_get_string(ctlJ));
-        goto OnErrorExit;
-    }
-
-
-    // We are facing a software ctl
-    if (ctlNumid == CTL_AUTO) {
-        done = json_object_object_get_ex(ctlJ, "type", &tmpJ);
-        if (done) ctlType = json_object_get_int(tmpJ);
-        else ctlType = SND_CTL_ELEM_TYPE_INTEGER;
-
-        json_object_object_get_ex(ctlJ, "val", &tmpJ);
-        ctlValue = json_object_get_int(tmpJ);
-
-        // default for json_object_get_int is zero
-        json_object_object_get_ex(ctlJ, "min", &tmpJ);
-        ctlMin = json_object_get_int(tmpJ);
-
-        done = json_object_object_get_ex(ctlJ, "max", &tmpJ);
-        if (done) ctlMax = json_object_get_int(tmpJ);
-        else {
-            if (ctlType == SND_CTL_ELEM_TYPE_BOOLEAN) ctlMax = 1;
-            else ctlMax = 100;
-        }
-
-        done = json_object_object_get_ex(ctlJ, "step", &tmpJ);
-        if (!done) ctlStep = 1;
-        else ctlStep = json_object_get_int(tmpJ);
-
-        done = json_object_object_get_ex(ctlJ, "count", &tmpJ);
-        if (!done) ctlCount = 1;
-        else ctlCount = json_object_get_int(tmpJ);
-
-        json_object_object_get_ex(ctlJ, "snddev", &tmpJ);
-        ctlSndDev = json_object_get_int(tmpJ);
-
-        json_object_object_get_ex(ctlJ, "subdev", &tmpJ);
-        ctlSubDev = json_object_get_int(tmpJ);
-    }
-
-    // Assert that this ctls is not used
-    snd_ctl_elem_info_alloca(&elemInfo);
-    if (ctlName) snd_ctl_elem_info_set_name(elemInfo, ctlName);
-    if (ctlNumid > 0)snd_ctl_elem_info_set_numid(elemInfo, ctlNumid);
-    snd_ctl_elem_info_set_interface(elemInfo, SND_CTL_ELEM_IFACE_MIXER);
-
-    // If control exist try to reuse it
-    err = snd_ctl_elem_info(ctlDev, elemInfo);
-    if (err) {
-        shouldCreate = 1;
-    } else {
-        int count, min, max, sndDev, subDev;
-        snd_ctl_elem_type_t type;
-
-        // ctl exit let's get associated elemID
-        snd_ctl_elem_id_alloca(&elemId);
-        snd_ctl_elem_info_get_id(elemInfo, elemId);
-
-        // If this is a hardware ctl only update value
-        if (ctlNumid != CTL_AUTO) {
-            json_object_object_get_ex(ctlJ, "val", &tmpJ);
-            ctlValue = json_object_get_int(tmpJ);
-            goto UpdateDefaultVal;
-        }
-
-        count = snd_ctl_elem_info_get_count(elemInfo);
-        min = (int) snd_ctl_elem_info_get_min(elemInfo);
-        max = (int) snd_ctl_elem_info_get_max(elemInfo);
-        type = snd_ctl_elem_info_get_type(elemInfo);
-        sndDev = (int) snd_ctl_elem_info_get_device(elemInfo);
-        subDev = (int) snd_ctl_elem_info_get_subdevice(elemInfo);
-
-        if (count == ctlCount && min == ctlMin && max == ctlMax && type == ctlType && sndDev == ctlSndDev && subDev == ctlSubDev) {
-            // Adjust value to best fit request
-            shouldCreate = 0;
-        } else {
-            err = snd_ctl_elem_remove(ctlDev, elemId);
-            shouldCreate = 1;
-            if (err < 0) {
-                AFB_ERROR("addOneSndCtl: ctlName=%s numid=%d fail to reset", snd_ctl_elem_info_get_name(elemInfo), snd_ctl_elem_info_get_numid(elemInfo));
-                goto DoNotUpdate;
-            };
-
-            // Control was deleted need to refresh elemInfo
-            snd_ctl_elem_info_alloca(&elemInfo);
-            if (ctlName) snd_ctl_elem_info_set_name(elemInfo, ctlName);
-            snd_ctl_elem_info_set_interface(elemInfo, SND_CTL_ELEM_IFACE_MIXER);
-            snd_ctl_elem_info(ctlDev, elemInfo);
-        }
-    }
-
-    // Add requested ID into elemInfo
-    snd_ctl_elem_info_set_device(elemInfo, ctlSndDev);
-    snd_ctl_elem_info_set_subdevice(elemInfo, ctlSubDev);
-
-    switch (ctlType) {
-        case SND_CTL_ELEM_TYPE_BOOLEAN:
-            if (shouldCreate) {
-                err = snd_ctl_add_boolean_elem_set(ctlDev, elemInfo, 1, ctlCount);
-                if (err) {
-                    AFB_ERROR("AddOntSndCtl Boolean: devid='%s' name='%s' count=%d", snd_ctl_name(ctlDev), ctlName, ctlCount);
-                    afb_req_fail_f(request, "ctl-invalid-bool", "devid='%s' name='%s' count=%d", snd_ctl_name(ctlDev), ctlName, ctlCount);
-                    goto OnErrorExit;
-                }
-            }
-
-            // Create a dummy TLV
-            elemTlv = allocate_bool_fake_tlv();
-
-            break;
-
-        case SND_CTL_ELEM_TYPE_INTEGER:
-            if (shouldCreate) {
-                err = snd_ctl_add_integer_elem_set(ctlDev, elemInfo, 1, ctlCount, ctlMin, ctlMax, ctlStep);
-                if (err) {
-                    AFB_ERROR("AddOntSndCtl Integer: devid='%s' name='%s' count=%d min=%d max=%d step=%d", snd_ctl_name(ctlDev), ctlName, ctlCount, ctlMin, ctlMax, ctlStep);
-                    afb_req_fail_f(request, "ctl-invalid-bool", "devid='%s' name='%s' count=%d min=%d max=%d step=%d", snd_ctl_name(ctlDev), ctlName, ctlCount, ctlMin, ctlMax, ctlStep);
-                    goto OnErrorExit;
-                }
-            }
-
-            // Fulup needed to be tested with some dB expert !!!
-            json_object *dbscaleJ;
-            if (json_object_object_get_ex(ctlJ, "dbscale", &dbscaleJ)) {
-                int min, max;
-
-                if (json_object_get_type(dbscaleJ) != json_type_object) {
-                    afb_req_fail_f(request, "ctl-invalid-dbscale", "devid=%s crl=%s invalid json in integer control", snd_ctl_name(ctlDev), json_object_get_string(ctlJ));
-                    goto OnErrorExit;
-
-                    json_object_object_get_ex(ctlJ, "min", &tmpJ);
-                    min = json_object_get_int(tmpJ);
-                    if (min >= 0) {
-                        afb_req_fail_f(request, "ctl-invalid-dbscale", "devid=%s crl=%s min should be a negative number", snd_ctl_name(ctlDev), json_object_get_string(ctlJ));
-                        goto OnErrorExit;
-                    }
-
-                    // default value 0=mute
-                    json_object_object_get_ex(ctlJ, "max", &tmpJ);
-                    max = json_object_get_int(tmpJ);
-
-                    // default value 1dB
-                    json_object_object_get_ex(ctlJ, "step", &tmpJ);
-                    int step = json_object_get_int(tmpJ);
-                    if (step <= 0) step = 1;
-
-                    elemTlv = allocate_int_dbscale_tlv(min, max, step);
-
-                }
-            } else {
-                // provide a fake linear TLV
-                elemTlv = allocate_int_linear_tlv(ctlMin, ctlMax);
-            }
-            break;
-
-        case SND_CTL_ELEM_TYPE_ENUMERATED:
-
-            if (shouldCreate) {
-                json_object *enumsJ;
-                json_object_object_get_ex(ctlJ, "enums", &enumsJ);
-                if (json_object_get_type(enumsJ) != json_type_array) {
-                    afb_req_fail_f(request, "ctl-missing-enums", "devid=%s crl=%s mandatory enum=xxx missing in enumerated control", snd_ctl_name(ctlDev), json_object_get_string(ctlJ));
-                    goto OnErrorExit;
-                }
-
-                int length = json_object_array_length(enumsJ);
-                const char **enumlabels = malloc(length * sizeof (char*));
-
-                for (int jdx = 0; jdx < length; jdx++) {
-                    tmpJ = json_object_array_get_idx(enumsJ, jdx);
-                    enumlabels[jdx] = json_object_get_string(tmpJ);
-                }
-
-                err = snd_ctl_add_enumerated_elem_set(ctlDev, elemInfo, 1, ctlCount, length, enumlabels);
-                if (err) {
-                    afb_req_fail_f(request, "ctl-invalid-bool", "devid=%s crl=%s invalid enumerated control", snd_ctl_name(ctlDev), json_object_get_string(ctlJ));
-                    goto OnErrorExit;
-                }
-
-                // Fulup should be an empty container
-                elemTlv = allocate_bool_fake_tlv();
-            }
-            break;
-
-            // Long Term Waiting ToDoList
-        case SND_CTL_ELEM_TYPE_INTEGER64:
-        case SND_CTL_ELEM_TYPE_BYTES:
-        default:
-            afb_req_fail_f(request, "ctl-invalid-type", "crl=%s unsupported type type=%d numid=%d", json_object_get_string(ctlJ), ctlType, ctlNumid);
-            goto OnErrorExit;
-    }
-
-UpdateDefaultVal:
-
-    // Set Value to default
-    snd_ctl_elem_value_alloca(&elemValue);
-    for (int idx = 0; idx < snd_ctl_elem_info_get_count(elemInfo); idx++) {
-        snd_ctl_elem_value_set_integer(elemValue, idx, ctlValue);
-    }
-
-    // write default values in newly created control
-    snd_ctl_elem_id_alloca(&elemId);
-    snd_ctl_elem_info(ctlDev, elemInfo);
-    snd_ctl_elem_info_get_id(elemInfo, elemId);
-    snd_ctl_elem_value_set_id(elemValue, elemId);
-    err = snd_ctl_elem_write(ctlDev, elemValue);
-    if (err < 0) {
-        AFB_WARNING("addOneSndCtl: crl=%s numid=%d fail to write Values error=%s", json_object_get_string(ctlJ), snd_ctl_elem_info_get_numid(elemInfo), snd_strerror(err));
-        goto DoNotUpdate;
-    }
-
-    // write a default null TLV (if usefull should be implemented for every ctl type)
-    if (elemTlv) {
-        err = snd_ctl_elem_tlv_write(ctlDev, elemId, elemTlv);
-        if (err < 0) {
-            AFB_WARNING("addOneSndCtl: crl=%s numid=%d fail to write TLV error=%s", json_object_get_string(ctlJ), snd_ctl_elem_info_get_numid(elemInfo), snd_strerror(err));
-            goto DoNotUpdate;
-        }
-    }
-
-DoNotUpdate:
-    // return newly created as a JSON object
-    alsaGetSingleCtl(ctlDev, elemId, &ctlRequest, queryMode);
-    if (ctlRequest.used < 0) {
-        AFB_WARNING("addOneSndCtl: crl=%s numid=%d Fail to get value", json_object_get_string(ctlJ), snd_ctl_elem_info_get_numid(elemInfo));
-    }
-    return ctlRequest.valuesJ;
-
-OnErrorExit:
-    return NULL;
-}
-
-PUBLIC void alsaAddCustomCtls(afb_req request) {
-    int err;
-    json_object *ctlsJ, *ctlsValues, *ctlValues;
-    enum json_type;
-    snd_ctl_t *ctlDev = NULL;
-    const char *devid, *mode;
-
-    devid = afb_req_value(request, "devid");
-    if (devid == NULL) {
-        afb_req_fail_f(request, "devid-missing", "devid MUST be defined for alsaAddCustomCtls");
-        goto OnErrorExit;
-    }
-
-    // open control interface for devid
-    err = snd_ctl_open(&ctlDev, devid, 0);
-    if (err < 0) {
-        afb_req_fail_f(request, "devid-unknown", "SndCard devid=[%s] Not Found err=%s", devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    // get verbosity level
-    halQueryMode queryMode = QUERY_QUIET;
-    mode = afb_req_value(request, "mode");
-    if (mode != NULL) {
-        sscanf(mode, "%i", (int*) &queryMode);
-    }
-
-    // extract sound controls and parse json
-    ctlsJ = json_tokener_parse(afb_req_value(request, "ctl"));
-    if (!ctlsJ) {
-        afb_req_fail_f(request, "ctls-missing", "ctls MUST be defined as a JSON array for alsaAddCustomCtls");
-        goto OnErrorExit;
-    }
-
-    switch (json_object_get_type(ctlsJ)) {
-        case json_type_object:
-            ctlsValues = addOneSndCtl(request, ctlDev, ctlsJ, queryMode);
-            if (!ctlsValues) goto OnErrorExit;
-            break;
-
-        case json_type_array:
-            ctlsValues = json_object_new_array();
-            for (int idx = 0; idx < json_object_array_length(ctlsJ); idx++) {
-                json_object *ctlJ = json_object_array_get_idx(ctlsJ, idx);
-                ctlValues = addOneSndCtl(request, ctlDev, ctlJ, queryMode);
-                if (ctlValues) json_object_array_add(ctlsValues, ctlValues);
-                else goto OnErrorExit;
-            }
-            break;
-
-        default:
-            afb_req_fail_f(request, "ctls-invalid", "ctls=%s not valid JSON array", json_object_get_string(ctlsJ));
-            goto OnErrorExit;
-    }
-
-    // get ctl as a json response
-    afb_req_success(request, ctlsValues, NULL);
-
-OnErrorExit:
-    if (ctlDev) snd_ctl_close(ctlDev);
-    return;
-}
diff --git a/Alsa-afb/Alsa-ApiHat.c b/Alsa-afb/Alsa-ApiHat.c
deleted file mode 100644
index e5172de..0000000
--- a/Alsa-afb/Alsa-ApiHat.c
+++ /dev/null
@@ -1,69 +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.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <math.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/prctl.h>
-
-
-#include "Alsa-ApiHat.h"
-
-STATIC int AlsaInit(void) {
-    int rc= prctl(PR_SET_NAME, "afb-aaaa-agent",NULL,NULL,NULL);
-    if (rc) AFB_ERROR("ERROR: AlsaCore fail to rename process");
-
-    return rc;
-}
-
-/*
- * array of the verbs exported to afb-daemon
- */
-static const struct afb_verb_v2 api_verbs[] = {
-    /* VERB'S NAME          FUNCTION TO CALL  */
-    { .verb = "ping", .callback = pingtest, .info="Ping Presence Check on API"},
-    { .verb = "infoget", .callback = alsaGetInfo, .info="Return sound cards list"},
-    { .verb = "ctlget", .callback = alsaGetCtls, .info="Get one or many control values"},
-    { .verb = "ctlset", .callback = alsaSetCtls, .info="Set one control or more"},
-    { .verb = "subscribe", .callback = alsaEvtSubcribe, .info="subscribe to alsa events"},
-    { .verb = "cardidget", .callback = alsaGetCardId, .info="get sound card id"},
-    { .verb = "halregister", .callback = alsaRegisterHal, .info="register a new HAL in alsacore"},
-    { .verb = "hallist", .callback = alsaActiveHal, .info="Get list of currently active HAL"},
-    { .verb = "ucmquery", .callback = alsaUseCaseQuery,.info="Use Case Manager Query"},
-    { .verb = "ucmset", .callback = alsaUseCaseSet,.info="Use Case Manager set"},
-    { .verb = "ucmget", .callback = alsaUseCaseGet,.info="Use Case Manager Get"},
-    { .verb = "ucmreset", .callback = alsaUseCaseReset, .info="Use Case Manager Reset"},
-    { .verb = "ucmclose", .callback = alsaUseCaseClose, .info="Use Case Manager Close"},
-    { .verb = "addcustomctl", .callback = alsaAddCustomCtls, .info="Add Software Alsa Custom Control"},
-    { .verb = NULL} /* marker for end of the array */
-};
-
-/*
- * description of the binding for afb-daemon
- */
-const afb_binding_v2 afbBindingV2 = {
-    .api = "alsacore",
-    .verbs = api_verbs,
-    .preinit  = AlsaInit,
-};
diff --git a/Alsa-afb/Alsa-ApiHat.h b/Alsa-afb/Alsa-ApiHat.h
deleted file mode 100644
index bd70740..0000000
--- a/Alsa-afb/Alsa-ApiHat.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * AlsaLibMapping -- provide low level interface with ALSA lib (extracted from alsa-json-gateway code)
- * Copyright (C) 2015,2016,2017, 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.
- */
-
-
-#ifndef ALSALIBMAPPING_H
-#define ALSALIBMAPPING_H
-
-
-#include <alsa/asoundlib.h>
-#include <systemd/sd-event.h>
-#include "audio-common.h"
-
-typedef enum {
-    ACTION_SET,
-    ACTION_GET
-} ActionSetGetT;
-
-// generic structure to pass parsed query values
-typedef struct {
-  const char *devid;
-  json_object *numidsJ;
-  halQueryMode mode;
-  int count;
-} queryValuesT;
-
-// use to store crl numid user request
-typedef struct {
-    unsigned int numId;
-    json_object *jToken;
-    json_object *valuesJ;
-    int used;
-} ctlRequestT;
-
-// import from AlsaAfbBinding
-extern const struct afb_binding_interface *afbIface;
-PUBLIC json_object *alsaCheckQuery (struct afb_req request, queryValuesT *queryValues);
-
-// AlseCoreSetGet exports
-PUBLIC int alsaGetSingleCtl (snd_ctl_t *ctlDev, snd_ctl_elem_id_t *elemId, ctlRequestT *ctlRequest, halQueryMode queryMode);
-PUBLIC void alsaGetInfo (struct afb_req request);
-PUBLIC void alsaGetCtls(struct afb_req request);
-PUBLIC void alsaSetCtls(struct afb_req request);
-
-
-// AlsaUseCase exports
-PUBLIC void alsaUseCaseQuery(struct afb_req request);
-PUBLIC void alsaUseCaseSet(struct afb_req request);
-PUBLIC void alsaUseCaseGet(struct afb_req request);
-PUBLIC void alsaUseCaseClose(struct afb_req request);
-PUBLIC void alsaUseCaseReset(struct afb_req request);
-PUBLIC void alsaAddCustomCtls(struct afb_req request);
-
-// AlsaRegEvt
-PUBLIC void alsaEvtSubcribe (struct afb_req request);
-PUBLIC void alsaGetCardId (struct afb_req request);
-PUBLIC void alsaRegisterHal (struct afb_req request);
-PUBLIC void alsaActiveHal (struct afb_req request);
-
-#endif /* ALSALIBMAPPING_H */
-
diff --git a/Alsa-afb/Alsa-RegEvt.c b/Alsa-afb/Alsa-RegEvt.c
deleted file mode 100644
index 41db207..0000000
--- a/Alsa-afb/Alsa-RegEvt.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * AlsaLibMapping -- provide low level interface with ALSA lib (extracted from alsa-json-gateway code)
- * Copyright (C) 2015,2016,2017, 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.
-
- */
-
-#define _GNU_SOURCE  // needed for vasprintf
-
-#include "Alsa-ApiHat.h"
-
-// generic sndctrl event handle hook to event callback when pooling
-
-typedef struct {
-    struct pollfd pfds;
-    sd_event_source *src;
-    snd_ctl_t *ctlDev;
-    int mode;
-    struct afb_event afbevt;
-} evtHandleT;
-
-typedef struct {
-    int ucount;
-    int cardId;
-    evtHandleT *evtHandle;
-} sndHandleT;
-
-typedef struct {
-    char *devid;
-    char *apiprefix;
-    char *shortname;
-    char *longname;
-} cardRegistryT;
-
-cardRegistryT *cardRegistry[MAX_SND_CARD + 1];
-
-PUBLIC json_object *alsaCheckQuery(afb_req request, queryValuesT *queryValues) {
-
-    json_object *tmpJ;
-    int done;
-
-    // get query from request
-    json_object *queryInJ = afb_req_json(request);
-
-    done = json_object_object_get_ex(queryInJ, "devid", &tmpJ);
-    if (!done) {
-        afb_req_fail_f(request, "devid-missing", "Invalid query='%s'", json_object_get_string(queryInJ));
-        goto OnErrorExit;
-    }
-    queryValues->devid = json_object_get_string(tmpJ);
-
-    done = json_object_object_get_ex(queryInJ, "mode", &tmpJ);
-    if (!done) queryValues->mode = QUERY_QUIET; // default quiet
-    else queryValues->mode = json_object_get_int(tmpJ);
-
-    return queryInJ;
-
-OnErrorExit:
-    return NULL;
-}
-
-// This routine is called when ALSA event are fired
-
-STATIC int sndCtlEventCB(sd_event_source* src, int fd, uint32_t revents, void* userData) {
-    int err, ctlNumid;
-    evtHandleT *evtHandle = (evtHandleT*) userData;
-    snd_ctl_event_t *eventId;
-    json_object *ctlEventJ;
-    unsigned int mask;
-    int iface;
-    int device;
-    int subdev;
-    const char*ctlName;
-    ctlRequestT ctlRequest;
-    snd_ctl_elem_id_t *elemId;
-
-    if ((revents & EPOLLHUP) != 0) {
-        AFB_NOTICE("SndCtl hanghup [car disconnected]");
-        goto ExitOnSucess;
-    }
-
-    if ((revents & EPOLLIN) != 0) {
-
-        // initialise event structure on stack
-        snd_ctl_event_alloca(&eventId);
-        snd_ctl_elem_id_alloca(&elemId);
-
-        err = snd_ctl_read(evtHandle->ctlDev, eventId);
-        if (err < 0) goto OnErrorExit;
-
-        // we only process sndctrl element
-        if (snd_ctl_event_get_type(eventId) != SND_CTL_EVENT_ELEM) goto ExitOnSucess;
-
-        // we only process value changed events
-        mask = snd_ctl_event_elem_get_mask(eventId);
-        if (!(mask & SND_CTL_EVENT_MASK_VALUE)) goto ExitOnSucess;
-
-        snd_ctl_event_elem_get_id(eventId, elemId);
-
-        err = alsaGetSingleCtl(evtHandle->ctlDev, elemId, &ctlRequest, evtHandle->mode);
-        if (err) goto OnErrorExit;
-
-        // If CTL as a value use it as container for response
-        if (ctlRequest.valuesJ) ctlEventJ = ctlRequest.valuesJ;
-        else {
-            ctlEventJ = json_object_new_object();
-            ctlNumid = snd_ctl_event_elem_get_numid(eventId);
-            json_object_object_add(ctlEventJ, "id", json_object_new_int(ctlNumid));
-        }
-
-        if (evtHandle->mode >= QUERY_COMPACT) {
-            ctlName = snd_ctl_event_elem_get_name(eventId);
-            json_object_object_add(ctlEventJ, "name", json_object_new_string(ctlName));
-        }
-
-        if (evtHandle->mode >= QUERY_VERBOSE) {
-            iface = snd_ctl_event_elem_get_interface(eventId);
-            device = snd_ctl_event_elem_get_device(eventId);
-            subdev = snd_ctl_event_elem_get_subdevice(eventId);
-            json_object_object_add(ctlEventJ, "ifc", json_object_new_int(iface));
-            json_object_object_add(ctlEventJ, "dev", json_object_new_int(device));
-            json_object_object_add(ctlEventJ, "sub", json_object_new_int(subdev));
-        }
-
-
-        AFB_DEBUG("sndCtlEventCB=%s", json_object_get_string(ctlEventJ));
-        afb_event_push(evtHandle->afbevt, ctlEventJ);
-    }
-
-ExitOnSucess:
-    return 0;
-
-OnErrorExit:
-    AFB_WARNING("sndCtlEventCB: ignored unsupported event type");
-    return (0);
-}
-
-// Subscribe to every Alsa CtlEvent send by a given board
-
-PUBLIC void alsaEvtSubcribe(afb_req request) {
-    static sndHandleT sndHandles[MAX_SND_CARD];
-    evtHandleT *evtHandle = NULL;
-    snd_ctl_t *ctlDev = NULL;
-    int err, idx, cardId, idxFree = -1;
-    snd_ctl_card_info_t *cardinfo;
-    queryValuesT queryValues;
-
-    json_object *queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-
-    // open control interface for devid
-    err = snd_ctl_open(&ctlDev, queryValues.devid, SND_CTL_READONLY);
-    if (err < 0) {
-        afb_req_fail_f(request, "devid-unknown", "SndCard devid=%s Not Found err=%s", queryValues.devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    snd_ctl_card_info_alloca(&cardinfo);
-    if ((err = snd_ctl_card_info(ctlDev, cardinfo)) < 0) {
-        afb_req_fail_f(request, "devid-invalid", "SndCard devid=%s Not Found err=%s", queryValues.devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    cardId = snd_ctl_card_info_get_card(cardinfo);
-
-    // search for an existing subscription and mark 1st free slot
-    for (idx = 0; idx < MAX_SND_CARD; idx++) {
-        if (sndHandles[idx].ucount > 0 && cardId == sndHandles[idx].cardId) {
-            evtHandle = sndHandles[idx].evtHandle;
-            break;
-        } else if (idxFree == -1) idxFree = idx;
-    };
-
-    // if not subscription exist for the event let's create one
-    if (idx == MAX_SND_CARD) {
-
-        // reach MAX_SND_CARD event registration
-        if (idxFree == -1) {
-            afb_req_fail_f(request, "register-toomany", "Cannot register new event Maxcard==%d", idx);
-            goto OnErrorExit;
-        }
-
-        evtHandle = malloc(sizeof (evtHandleT));
-        evtHandle->ctlDev = ctlDev;
-        evtHandle->mode = queryValues.mode;
-        sndHandles[idxFree].ucount = 0;
-        sndHandles[idxFree].cardId = cardId;
-        sndHandles[idxFree].evtHandle = evtHandle;
-
-        // subscribe for sndctl events attached to devid
-        err = snd_ctl_subscribe_events(evtHandle->ctlDev, 1);
-        if (err < 0) {
-            afb_req_fail_f(request, "subscribe-fail", "Cannot subscribe events from devid=%s err=%d", queryValues.devid, err);
-            goto OnErrorExit;
-        }
-
-        // get pollfd attach to this sound board
-        snd_ctl_poll_descriptors(evtHandle->ctlDev, &evtHandle->pfds, 1);
-
-        // register sound event to binder main loop
-        err = sd_event_add_io(afb_daemon_get_event_loop(), &evtHandle->src, evtHandle->pfds.fd, EPOLLIN, sndCtlEventCB, evtHandle);
-        if (err < 0) {
-            afb_req_fail_f(request, "register-mainloop", "Cannot hook events to mainloop devid=%s err=%d", queryValues.devid, err);
-            goto OnErrorExit;
-        }
-
-        // create binder event attached to devid name
-        evtHandle->afbevt = afb_daemon_make_event(queryValues.devid);
-        if (!afb_event_is_valid(evtHandle->afbevt)) {
-            afb_req_fail_f(request, "register-event", "Cannot register new binder event name=%s", queryValues.devid);
-            goto OnErrorExit;
-        }
-
-        // everything looks OK let's move forward
-        idx = idxFree;
-    }
-
-    // subscribe to binder event
-    err = afb_req_subscribe(request, evtHandle->afbevt);
-    if (err != 0) {
-        afb_req_fail_f(request, "register-eventname", "Cannot subscribe binder event name=%s [invalid channel]", queryValues.devid);
-        goto OnErrorExit;
-    }
-
-    // increase usage count and return success
-    sndHandles[idx].ucount++;
-    afb_req_success(request, NULL, NULL);
-    return;
-
-OnErrorExit:
-    if (ctlDev) snd_ctl_close(ctlDev);
-    return;
-}
-
-// Subscribe to every Alsa CtlEvent send by a given board
-
-STATIC json_object *alsaProbeCardId(afb_req request) {
-    char devid [10];
-    const char *ctlName, *shortname, *longname;
-    int card, err, index, idx;
-    json_object *responseJ;
-    snd_ctl_t *ctlDev;
-    snd_ctl_card_info_t *cardinfo;
-
-    const char *sndname = afb_req_value(request, "sndname");
-    if (sndname == NULL) {
-        afb_req_fail_f(request, "argument-missing", "sndname=SndCardName missing");
-        goto OnErrorExit;
-    }
-
-    // loop on potential card number
-    snd_ctl_card_info_alloca(&cardinfo);
-    for (card = 0; card < MAX_SND_CARD; card++) {
-
-        // build card devid and probe it
-        snprintf(devid, sizeof (devid), "hw:%i", card);
-
-        // open control interface for devid
-        err = snd_ctl_open(&ctlDev, devid, SND_CTL_READONLY);
-        if (err < 0) continue;
-
-        // extract sound card information
-        snd_ctl_card_info(ctlDev, cardinfo);
-        index = snd_ctl_card_info_get_card(cardinfo);
-        ctlName = snd_ctl_card_info_get_id(cardinfo);
-        shortname = snd_ctl_card_info_get_name(cardinfo);
-        longname = snd_ctl_card_info_get_longname(cardinfo);
-
-        // check if short|long name match
-        if (!strcmp(sndname, ctlName)) break;
-        if (!strcmp(sndname, shortname)) break;
-        if (!strcmp(sndname, longname)) break;
-    }
-
-    if (card == MAX_SND_CARD) {
-        afb_req_fail_f(request, "ctlDev-notfound", "Fail to find card with name=%s", sndname);
-        goto OnErrorExit;
-    }
-
-    // proxy ctlevent as a binder event
-    responseJ = json_object_new_object();
-    json_object_object_add(responseJ, "index", json_object_new_int(index));
-    json_object_object_add(responseJ, "devid", json_object_new_string(devid));
-    json_object_object_add(responseJ, "shortname", json_object_new_string(shortname));
-    json_object_object_add(responseJ, "longname", json_object_new_string(longname));
-
-    // search for a HAL binder card mapping name to api prefix
-    for (idx = 0; (idx < MAX_SND_CARD && cardRegistry[idx]); idx++) {
-        if (!strcmp(cardRegistry[idx]->shortname, shortname)) {
-            json_object_object_add(responseJ, "halapi", json_object_new_string(cardRegistry[idx]->apiprefix));
-            break;
-        }
-    }
-
-    return responseJ;
-
-OnErrorExit:
-    return NULL;
-}
-
-// Make alsaProbeCardId compatible with AFB request
-
-PUBLIC void alsaGetCardId(afb_req request) {
-
-    json_object *responseJ = alsaProbeCardId(request);
-    if (responseJ) afb_req_success(request, responseJ, NULL);
-}
-
-// Return list of active resgistrated HAL with corresponding sndcard
-
-PUBLIC void alsaActiveHal(afb_req request) {
-    json_object *responseJ = json_object_new_array();
-
-    for (int idx = 0; idx < MAX_SND_CARD; idx++) {
-        if (!cardRegistry[idx]) break;
-
-        json_object *haldevJ = json_object_new_object();
-        json_object_object_add(haldevJ, "api", json_object_new_string(cardRegistry[idx]->apiprefix));
-        if (cardRegistry[idx]->devid) json_object_object_add(haldevJ, "devid", json_object_new_string(cardRegistry[idx]->devid));
-        if (cardRegistry[idx]->shortname)json_object_object_add(haldevJ, "shortname", json_object_new_string(cardRegistry[idx]->shortname));
-        if (cardRegistry[idx]->longname) json_object_object_add(haldevJ, "longname", json_object_new_string(cardRegistry[idx]->longname));
-        json_object_array_add(responseJ, haldevJ);
-    }
-
-    afb_req_success(request, responseJ, NULL);
-}
-
-
-// Register loaded HAL with board Name and API prefix
-
-PUBLIC void alsaRegisterHal(afb_req request) {
-    static int index = 0;
-    json_object *responseJ;
-    const char *shortname, *apiPrefix;
-
-    apiPrefix = afb_req_value(request, "prefix");
-    if (apiPrefix == NULL) {
-        afb_req_fail_f(request, "argument-missing", "prefix=BindingApiPrefix missing");
-        goto OnErrorExit;
-    }
-
-    shortname = afb_req_value(request, "sndname");
-    if (shortname == NULL) {
-        afb_req_fail_f(request, "argument-missing", "sndname=SndCardName missing");
-        goto OnErrorExit;
-    }
-
-    if (index == MAX_SND_CARD) {
-        afb_req_fail_f(request, "alsahal-toomany", "Fail to register sndname=[%s]", shortname);
-        goto OnErrorExit;
-    }
-
-    // alsaGetCardId should be check to register only valid card
-    responseJ = alsaProbeCardId(request);
-    if (responseJ) {
-        json_object *tmpJ;
-        int done;
-
-        cardRegistry[index] = malloc(sizeof (cardRegistry));
-        cardRegistry[index]->apiprefix = strdup(apiPrefix);
-        cardRegistry[index]->shortname = strdup(shortname);
-
-        done = json_object_object_get_ex(responseJ, "devid", &tmpJ);
-        if (done) cardRegistry[index]->devid = strdup(json_object_get_string(tmpJ));
-        else cardRegistry[index]->devid = NULL;
-
-        done = json_object_object_get_ex(responseJ, "longname", &tmpJ);
-        if (done) cardRegistry[index]->longname = strdup(json_object_get_string(tmpJ));
-        else cardRegistry[index]->longname = NULL;
-
-        // make sure register close with a null value
-        index++;
-        cardRegistry[index] = NULL;
-
-        afb_req_success(request, responseJ, NULL);
-    }
-
-    // If OK return sound card Alsa ID+Info
-    return;
-
-OnErrorExit:
-    return;
-}
-
diff --git a/Alsa-afb/Alsa-SetGet.c b/Alsa-afb/Alsa-SetGet.c
deleted file mode 100644
index f70c5d6..0000000
--- a/Alsa-afb/Alsa-SetGet.c
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
- * AlsaLibMapping -- provide low level interface with ALSA lib (extracted from alsa-json-gateway code)
- * Copyright (C) 2015,2016,2017, 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.
-
-   References:
-   https://github.com/fulup-bzh/AlsaJsonGateway (original code)
-   http://alsa-lib.sourcearchive.com/documentation/1.0.20/modules.html
-   http://alsa-lib.sourcearchive.com/documentation/1.0.8/group__Control_gd48d44da8e3bfe150e928267008b8ff5.html
-   http://alsa.opensrc.org/HowTo_access_a_mixer_control
-   https://github.com/gch1p/alsa-volume-monitor/blob/master/main.c
-   https://github.com/DongheonKim/android_hardware_alsa-sound/blob/master/ALSAControl.cpp (ALSA low level API)
-   https://www.kernel.org/doc/html/v4.11/sound/index.html
-
- */
-
-#define _GNU_SOURCE  // needed for vasprintf
-#include "Alsa-ApiHat.h"
-
-PUBLIC void NumidsListParse(ActionSetGetT action, queryValuesT *queryValues, ctlRequestT *ctlRequest) {
-    int length;
-
-    for (int idx = 0; idx < queryValues->count; idx++) {
-        json_object *jId, *valuesJ;
-        ctlRequest[idx].used = 0;
-        ctlRequest[idx].valuesJ = NULL;
-
-        // when only one NUMID is provided it might not be encapsulated in a JSON array
-        if (json_type_array == json_object_get_type(queryValues->numidsJ)) ctlRequest[idx].jToken = json_object_array_get_idx(queryValues->numidsJ, idx);
-        else ctlRequest[idx].jToken = queryValues->numidsJ;
-
-        enum json_type jtype = json_object_get_type(ctlRequest[idx].jToken);
-        switch (jtype) {
-
-            case json_type_int:
-                // if NUMID is not an array then it should be an integer numid with no value
-                ctlRequest[idx].numId = json_object_get_int(ctlRequest[idx].jToken);
-
-                // Special SET simple short numid form [numid, [VAL1...VALX]]
-                if (action == ACTION_SET && queryValues->count == 2) {
-                    ctlRequest[idx].valuesJ = json_object_array_get_idx(queryValues->numidsJ, 1);
-                    queryValues->count = 1; //In this form count==2 , when only one numid is to set
-                    idx++;
-                    continue;
-                } else
-                    break;
-
-            case json_type_array:
-                // NUMID is an array 1st slot should be numid, optionally values may come after
-                length = json_object_array_length(ctlRequest[idx].jToken);
-
-                // numid must be in 1st slot of numid json array
-                ctlRequest[idx].numId = json_object_get_int(json_object_array_get_idx(ctlRequest[idx].jToken, 0));
-                if (action == ACTION_GET) continue;
-
-                // In Write mode second value should be the value
-                if (action == ACTION_SET && length == 2) {
-                    ctlRequest[idx].valuesJ = json_object_array_get_idx(ctlRequest[idx].jToken, 1);
-                    continue;
-                }
-
-                // no numid value
-                ctlRequest[idx].used = -1;
-                break;
-
-            case json_type_object:
-                // numid+values formated as {id:xxx, val:[aa,bb...,nn]}
-                if (!json_object_object_get_ex(ctlRequest[idx].jToken, "id", &jId)) {
-                    AFB_NOTICE("Invalid Json=%s missing 'id'", json_object_get_string(ctlRequest[idx].jToken));
-                    ctlRequest[idx].used = -1;
-                } else {
-                    ctlRequest[idx].numId = json_object_get_int(jId);
-                    if (action == ACTION_SET) {
-                        if (!json_object_object_get_ex(ctlRequest[idx].jToken, "val", &valuesJ)) {
-                            AFB_NOTICE("Invalid Json=%s missing 'val'", json_object_get_string(ctlRequest[idx].jToken));
-                            ctlRequest[idx].used = -1;                            
-                        } else
-                            ctlRequest[idx].valuesJ = valuesJ;                        
-                    }
-                }
-                break;
-
-            default:
-                ctlRequest[idx].used = -1;
-        }
-    }
-}
-
-STATIC json_object *DB2StringJsonOject(long dB) {
-    char label [20];
-    if (dB < 0) {
-        snprintf(label, sizeof (label), "-%li.%02lidB", -dB / 100, -dB % 100);
-    } else {
-        snprintf(label, sizeof (label), "%li.%02lidB", dB / 100, dB % 100);
-    }
-
-    // json function takes care of string copy
-    return (json_object_new_string(label));
-}
-
-
-// Direct port from amixer TLV decode routine. This code is too complex for me.
-// I hopefully did not break it when porting it.
-
-STATIC json_object *decodeTlv(unsigned int *tlv, unsigned int tlv_size, int mode) {
-    char label[20];
-    unsigned int type = tlv[0];
-    unsigned int size;
-    unsigned int idx = 0;
-    const char *chmap_type = NULL;
-    json_object * decodeTlvJson = json_object_new_object();
-
-    if (tlv_size < (unsigned int) (2 * sizeof (unsigned int))) {
-        printf("TLV size error!\n");
-        return NULL;
-    }
-    type = tlv[idx++];
-    size = tlv[idx++];
-    tlv_size -= (unsigned int) (2 * sizeof (unsigned int));
-    if (size > tlv_size) {
-        fprintf(stderr, "TLV size error (%i, %i, %i)!\n", type, size, tlv_size);
-        return NULL;
-    }
-    switch (type) {
-
-        case SND_CTL_TLVT_CONTAINER:
-        {
-            json_object * containerJson = json_object_new_array();
-
-            size += (unsigned int) (sizeof (unsigned int) - 1);
-            size /= (unsigned int) (sizeof (unsigned int));
-            while (idx < size) {
-                json_object *embedJson;
-
-                if (tlv[idx + 1] > (size - idx) * sizeof (unsigned int)) {
-                    fprintf(stderr, "TLV size error in compound!\n");
-                    return NULL;
-                }
-                embedJson = decodeTlv(tlv + idx, tlv[idx + 1] + 8, mode);
-                json_object_array_add(containerJson, embedJson);
-                idx += (unsigned int) (2 + (tlv[idx + 1] + sizeof (unsigned int) - 1) / sizeof (unsigned int));
-            }
-            json_object_object_add(decodeTlvJson, "container", containerJson);
-            break;
-        }
-
-        case SND_CTL_TLVT_DB_SCALE:
-        {
-            json_object * dbscaleJson = json_object_new_object();
-
-            if (size != 2 * sizeof (unsigned int)) {
-                json_object * arrayJson = json_object_new_array();
-                while (size > 0) {
-                    if (mode >= QUERY_VERBOSE) {
-                        snprintf(label, sizeof (label), "0x%08x,", tlv[idx++]);
-                        json_object_array_add(arrayJson, json_object_new_string(label));
-                    } else {
-                        json_object_array_add(arrayJson, json_object_new_int(tlv[idx++]));
-                    }
-                    size -= (unsigned int) sizeof (unsigned int);
-                }
-                json_object_object_add(dbscaleJson, "array", arrayJson);
-            } else {
-                if (mode >= QUERY_VERBOSE) {
-                    json_object_object_add(dbscaleJson, "min", DB2StringJsonOject((int) tlv[2]));
-                    json_object_object_add(dbscaleJson, "step", DB2StringJsonOject(tlv[3] & 0xffff));
-                    json_object_object_add(dbscaleJson, "mute", DB2StringJsonOject((tlv[3] >> 16) & 1));
-                } else {
-                    json_object_object_add(dbscaleJson, "min", json_object_new_int((int) tlv[2]));
-                    json_object_object_add(dbscaleJson, "step", json_object_new_int(tlv[3] & 0xffff));
-                    json_object_object_add(dbscaleJson, "mute", json_object_new_int((tlv[3] >> 16) & 1));
-                }
-            }
-            json_object_object_add(decodeTlvJson, "dbscale", dbscaleJson);
-            break;
-        }
-
-#ifdef SND_CTL_TLVT_DB_LINEAR
-        case SND_CTL_TLVT_DB_LINEAR:
-        {
-            json_object * dbLinearJson = json_object_new_object();
-
-            if (size != 2 * sizeof (unsigned int)) {
-                json_object * arrayJson = json_object_new_array();
-                while (size > 0) {
-                    if (mode >= QUERY_VERBOSE) {
-                        snprintf(label, sizeof (label), "0x%08x,", tlv[idx++]);
-                        json_object_array_add(arrayJson, json_object_new_string(label));
-                    } else {
-                        json_object_array_add(arrayJson, json_object_new_int(tlv[idx++]));
-                    }
-                    size -= (unsigned int) sizeof (unsigned int);
-                }
-                json_object_object_add(dbLinearJson, "offset", arrayJson);
-            } else {
-                if (mode >= QUERY_VERBOSE) {
-                    json_object_object_add(dbLinearJson, "min", DB2StringJsonOject((int) tlv[2]));
-                    json_object_object_add(dbLinearJson, "max", DB2StringJsonOject((int) tlv[3]));
-                } else {
-                    json_object_object_add(dbLinearJson, "min", json_object_new_int((int) tlv[2]));
-                    json_object_object_add(dbLinearJson, "max", json_object_new_int((int) tlv[3]));
-                }
-            }
-            json_object_object_add(decodeTlvJson, "dblinear", dbLinearJson);
-            break;
-        }
-#endif
-
-#ifdef SND_CTL_TLVT_DB_RANGE
-        case SND_CTL_TLVT_DB_RANGE:
-        {
-            json_object *dbRangeJson = json_object_new_object();
-
-            if ((size % (6 * sizeof (unsigned int))) != 0) {
-                json_object *arrayJson = json_object_new_array();
-                while (size > 0) {
-                    if (mode >= QUERY_VERBOSE) {
-                        snprintf(label, sizeof (label), "0x%08x,", tlv[idx++]);
-                        json_object_array_add(arrayJson, json_object_new_string(label));
-                    } else {
-                        json_object_array_add(arrayJson, json_object_new_int(tlv[idx++]));
-                    }
-                    size -= (unsigned int) sizeof (unsigned int);
-                }
-                json_object_object_add(dbRangeJson, "dbrange", arrayJson);
-                break;
-            }
-            while (size > 0) {
-                json_object * embedJson = json_object_new_object();
-                json_object_object_add(embedJson, "rangemin", json_object_new_int(tlv[idx++]));
-                json_object_object_add(embedJson, "rangemax", json_object_new_int(tlv[idx++]));
-                embedJson = decodeTlv(tlv + idx, 4 * sizeof (unsigned int), mode);
-                json_object_object_add(embedJson, "tlv", embedJson);
-                idx += 4;
-                size -= (unsigned int) (6 * sizeof (unsigned int));
-                json_object_array_add(dbRangeJson, embedJson);
-            }
-            json_object_object_add(decodeTlvJson, "dbrange", dbRangeJson);
-            break;
-        }
-#endif
-#ifdef SND_CTL_TLVT_DB_MINMAX
-        case SND_CTL_TLVT_DB_MINMAX:
-        case SND_CTL_TLVT_DB_MINMAX_MUTE:
-        {
-            json_object * dbMinMaxJson = json_object_new_object();
-
-            if (size != 2 * sizeof (unsigned int)) {
-                json_object * arrayJson = json_object_new_array();
-                while (size > 0) {
-                    if (mode >= QUERY_VERBOSE) {
-                        snprintf(label, sizeof (label), "0x%08x,", tlv[idx++]);
-                        json_object_array_add(arrayJson, json_object_new_string(label));
-                    } else {
-                        json_object_array_add(arrayJson, json_object_new_int(tlv[idx++]));
-                    }
-                    size -= (unsigned int) sizeof (unsigned int);
-                }
-                json_object_object_add(dbMinMaxJson, "array", arrayJson);
-
-            } else {
-                if (mode >= QUERY_VERBOSE) {
-                    json_object_object_add(dbMinMaxJson, "min", DB2StringJsonOject((int) tlv[2]));
-                    json_object_object_add(dbMinMaxJson, "max", DB2StringJsonOject((int) tlv[3]));
-                } else {
-                    json_object_object_add(dbMinMaxJson, "min", json_object_new_int((int) tlv[2]));
-                    json_object_object_add(dbMinMaxJson, "max", json_object_new_int((int) tlv[3]));
-                }
-            }
-
-            if (type == SND_CTL_TLVT_DB_MINMAX_MUTE) {
-                json_object_object_add(decodeTlvJson, "dbminmaxmute", dbMinMaxJson);
-            } else {
-                json_object_object_add(decodeTlvJson, "dbminmax", dbMinMaxJson);
-            }
-            break;
-        }
-#endif
-#ifdef SND_CTL_TLVT_CHMAP_FIXED
-        case SND_CTL_TLVT_CHMAP_FIXED:
-            chmap_type = "fixed";
-            /* Fall through */
-        case SND_CTL_TLVT_CHMAP_VAR:
-            if (!chmap_type)
-                chmap_type = "variable";
-            /* Fall through */
-        case SND_CTL_TLVT_CHMAP_PAIRED:
-            if (!chmap_type)
-                chmap_type = "paired";
-
-            json_object * chmapJson = json_object_new_object();
-            json_object * arrayJson = json_object_new_array();
-
-            while (size > 0) {
-                snprintf(label, sizeof (label), "%s", snd_pcm_chmap_name(tlv[idx++]));
-                size -= (unsigned int) sizeof (unsigned int);
-                json_object_array_add(arrayJson, json_object_new_string(label));
-            }
-            json_object_object_add(chmapJson, chmap_type, arrayJson);
-            json_object_object_add(decodeTlvJson, "chmap", chmapJson);
-            break;
-#endif
-        default:
-        {
-            printf("unk-%i-", type);
-            json_object * arrayJson = json_object_new_array();
-
-            while (size > 0) {
-                snprintf(label, sizeof (label), "0x%08x,", tlv[idx++]);
-                size -= (unsigned int) sizeof (unsigned int);
-                json_object_array_add(arrayJson, json_object_new_string(label));
-            }
-            break;
-            json_object_object_add(decodeTlvJson, "unknown", arrayJson);
-        }
-    }
-
-    return (decodeTlvJson);
-}
-
-
-// retreive info for one given card
-
-STATIC json_object* alsaCardProbe(const char *rqtSndId) {
-    const char *info, *name;
-    const char *devid, *driver;
-    json_object *ctlDev;
-    snd_ctl_t *handle;
-    snd_ctl_card_info_t *cardinfo;
-    int err;
-
-    if ((err = snd_ctl_open(&handle, rqtSndId, 0)) < 0) {
-        AFB_INFO("alsaCardProbe '%s' Not Found", rqtSndId);
-        return NULL;
-    }
-
-    snd_ctl_card_info_alloca(&cardinfo);
-    if ((err = snd_ctl_card_info(handle, cardinfo)) < 0) {
-        snd_ctl_close(handle);
-        AFB_WARNING("SndCard '%s' info error: %s", rqtSndId, snd_strerror(err));
-        return NULL;
-    }
-
-    // start a new json object to store card info
-    ctlDev = json_object_new_object();
-
-    devid = snd_ctl_card_info_get_id(cardinfo);
-    json_object_object_add(ctlDev, "devid", json_object_new_string(devid));
-    name = snd_ctl_card_info_get_name(cardinfo);
-    json_object_object_add(ctlDev, "name", json_object_new_string(name));
-
-    if (AFB_GET_VERBOSITY > 1) {
-        json_object_object_add(ctlDev, "devid", json_object_new_string(rqtSndId));
-        driver = snd_ctl_card_info_get_driver(cardinfo);
-        json_object_object_add(ctlDev, "driver", json_object_new_string(driver));
-        info = strdup(snd_ctl_card_info_get_longname(cardinfo));
-        json_object_object_add(ctlDev, "info", json_object_new_string(info));
-        AFB_INFO("AJG: Soundcard Devid=%-5s devid=%-7s Name=%s\n", rqtSndId, devid, info);
-    }
-
-    // free card handle and return info
-    snd_ctl_close(handle);
-    return (ctlDev);
-}
-
-// Loop on every potential Sound card and register active one
-
-PUBLIC void alsaGetInfo(afb_req request) {
-    int card;
-    json_object *ctlDev, *ctlDevs;
-    char devid[32];
-
-    const char *rqtSndId = afb_req_value(request, "devid");
-
-    // if no specific card requested loop on all
-
-    if (rqtSndId != NULL) {
-        // only one card was requested let's probe it
-        ctlDev = alsaCardProbe(rqtSndId);
-        if (ctlDev != NULL) afb_req_success(request, ctlDev, NULL);
-        else afb_req_fail_f(request, "sndscard-notfound", "SndCard '%s' Not Found", rqtSndId);
-
-    } else {
-        // return an array of ctlDev
-        ctlDevs = json_object_new_array();
-
-        // loop on potential card number
-        for (card = 0; card < MAX_SND_CARD; card++) {
-
-            // build card devid and probe it
-            snprintf(devid, sizeof (devid), "hw:%i", card);
-            ctlDev = alsaCardProbe(devid);
-
-            // Alsa has hole within card list [ignore them]
-            if (ctlDev != NULL) {
-                // add current ctlDev to ctlDevs object
-                json_object_array_add(ctlDevs, ctlDev);
-            }
-        }
-        afb_req_success(request, ctlDevs, NULL);
-    }
-}
-
-// pack Alsa element's ACL into a JSON object
-
-STATIC json_object *getControlAcl(snd_ctl_elem_info_t *info) {
-
-    json_object * jsonAclCtl = json_object_new_object();
-
-    json_object_object_add(jsonAclCtl, "read", json_object_new_boolean(snd_ctl_elem_info_is_readable(info)));
-    json_object_object_add(jsonAclCtl, "write", json_object_new_boolean(snd_ctl_elem_info_is_writable(info)));
-    json_object_object_add(jsonAclCtl, "inact", json_object_new_boolean(snd_ctl_elem_info_is_inactive(info)));
-    json_object_object_add(jsonAclCtl, "volat", json_object_new_boolean(snd_ctl_elem_info_is_volatile(info)));
-    json_object_object_add(jsonAclCtl, "lock", json_object_new_boolean(snd_ctl_elem_info_is_locked(info)));
-
-    // if TLV is readable we insert its ACL
-    if (!snd_ctl_elem_info_is_tlv_readable(info)) {
-        json_object * jsonTlv = json_object_new_object();
-
-        json_object_object_add(jsonTlv, "read", json_object_new_boolean(snd_ctl_elem_info_is_tlv_readable(info)));
-        json_object_object_add(jsonTlv, "write", json_object_new_boolean(snd_ctl_elem_info_is_tlv_writable(info)));
-        json_object_object_add(jsonTlv, "command", json_object_new_boolean(snd_ctl_elem_info_is_tlv_commandable(info)));
-
-        json_object_object_add(jsonAclCtl, "tlv", jsonTlv);
-    }
-    return (jsonAclCtl);
-}
-
-// process ALSA control and store resulting value into ctlRequest
-
-PUBLIC int alsaSetSingleCtl(snd_ctl_t *ctlDev, snd_ctl_elem_id_t *elemId, ctlRequestT *ctlRequest) {
-    snd_ctl_elem_value_t *elemData;
-    snd_ctl_elem_info_t *elemInfo;
-    int count, length, err, valueIsArray = 0;
-
-    // let's make sure we are processing the right control
-    if (ctlRequest->numId != snd_ctl_elem_id_get_numid(elemId)) goto OnErrorExit;
-
-    // set info event ID and get value
-    snd_ctl_elem_info_alloca(&elemInfo);
-    snd_ctl_elem_info_set_id(elemInfo, elemId); // map ctlInfo to ctlId elemInfo is updated !!!
-    if (snd_ctl_elem_info(ctlDev, elemInfo) < 0) {
-        AFB_NOTICE("Fail to load ALSA NUMID=%d Values='%s'", ctlRequest->numId, json_object_get_string(ctlRequest->valuesJ));
-        goto OnErrorExit;
-    }
-
-    if (!snd_ctl_elem_info_is_writable(elemInfo)) {
-        AFB_NOTICE("Not Writable ALSA NUMID=%d Values='%s'", ctlRequest->numId, json_object_get_string(ctlRequest->valuesJ));
-        goto OnErrorExit;
-    }
-
-    count = snd_ctl_elem_info_get_count(elemInfo);
-    if (count == 0) goto OnErrorExit;
-
-    enum json_type jtype = json_object_get_type(ctlRequest->valuesJ);
-    switch (jtype) {
-        case json_type_array:
-            length = json_object_array_length(ctlRequest->valuesJ);
-            valueIsArray = 1;
-            break;
-        case json_type_int:
-            length = 1;
-            valueIsArray = 0;
-            break;
-        default:
-            length = 0;
-            break;
-    }
-
-
-    if (length == 0) {
-        AFB_NOTICE("Invalid values NUMID='%d' Values='%s' count='%d' wanted='%d'", ctlRequest->numId, json_object_get_string(ctlRequest->valuesJ), length, count);
-        goto OnErrorExit;
-    }
-
-    snd_ctl_elem_value_alloca(&elemData);
-    snd_ctl_elem_value_set_id(elemData, elemId); // map ctlInfo to ctlId elemInfo is updated !!!
-    if (snd_ctl_elem_read(ctlDev, elemData) < 0) goto OnErrorExit;
-
-    // Loop on every control value and push to sndcard
-    for (int index = 0; index < count; index++) {
-        json_object *element;
-        int value;
-
-        // when not enough value duplicate last provided one
-        if (!valueIsArray) element = ctlRequest->valuesJ;
-        else {
-            if (index < length) element = json_object_array_get_idx(ctlRequest->valuesJ, index);
-            else element = json_object_array_get_idx(ctlRequest->valuesJ, length - 1);
-        }
-
-        value = json_object_get_int(element);
-        snd_ctl_elem_value_set_integer(elemData, index, value);
-    }
-
-    err = snd_ctl_elem_write(ctlDev, elemData);
-    if (err < 0) {
-        AFB_NOTICE("Fail to write ALSA NUMID=%d Values='%s' Error=%s", ctlRequest->numId, json_object_get_string(ctlRequest->valuesJ), snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    ctlRequest->used = 1;
-    return 0;
-
-OnErrorExit:
-    ctlRequest->used = -1;
-    return -1;
-}
-
-// process ALSA control and store then into ctlRequest
-
-PUBLIC int alsaGetSingleCtl(snd_ctl_t *ctlDev, snd_ctl_elem_id_t *elemId, ctlRequestT *ctlRequest, halQueryMode queryMode) {
-    snd_ctl_elem_type_t elemType;
-    snd_ctl_elem_value_t *elemData;
-    snd_ctl_elem_info_t *elemInfo;
-    int count, idx, err;
-
-
-    // set info event ID and get value
-
-    snd_ctl_elem_info_alloca(&elemInfo);
-    snd_ctl_elem_info_set_id(elemInfo, elemId);
-    if (snd_ctl_elem_info(ctlDev, elemInfo) < 0) goto OnErrorExit;
-    count = snd_ctl_elem_info_get_count(elemInfo);
-    if (count == 0) goto OnErrorExit;
-
-    if (!snd_ctl_elem_info_is_readable(elemInfo)) goto OnErrorExit;
-    elemType = snd_ctl_elem_info_get_type(elemInfo);
-
-    snd_ctl_elem_value_alloca(&elemData);
-    snd_ctl_elem_value_set_id(elemData, elemId);
-    if (snd_ctl_elem_read(ctlDev, elemData) < 0) goto OnErrorExit;
-
-    int numid = snd_ctl_elem_info_get_numid(elemInfo);
-
-    ctlRequest->valuesJ = json_object_new_object();
-    json_object_object_add(ctlRequest->valuesJ, "id", json_object_new_int(numid));
-    if (queryMode >= 1) json_object_object_add(ctlRequest->valuesJ, "name", json_object_new_string(snd_ctl_elem_id_get_name(elemId)));
-    if (queryMode >= 2) json_object_object_add(ctlRequest->valuesJ, "iface", json_object_new_string(snd_ctl_elem_iface_name(snd_ctl_elem_id_get_interface(elemId))));
-    if (queryMode >= 3) json_object_object_add(ctlRequest->valuesJ, "actif", json_object_new_boolean(!snd_ctl_elem_info_is_inactive(elemInfo)));
-
-    json_object *jsonValuesCtl = json_object_new_array();
-    for (idx = 0; idx < count; idx++) { // start from one in amixer.c !!!
-        switch (elemType) {
-            case SND_CTL_ELEM_TYPE_BOOLEAN:
-            {
-                json_object_array_add(jsonValuesCtl, json_object_new_boolean(snd_ctl_elem_value_get_boolean(elemData, idx)));
-                break;
-            }
-            case SND_CTL_ELEM_TYPE_INTEGER:
-                json_object_array_add(jsonValuesCtl, json_object_new_int((int) snd_ctl_elem_value_get_integer(elemData, idx)));
-                break;
-            case SND_CTL_ELEM_TYPE_INTEGER64:
-                json_object_array_add(jsonValuesCtl, json_object_new_int64(snd_ctl_elem_value_get_integer64(elemData, idx)));
-                break;
-            case SND_CTL_ELEM_TYPE_ENUMERATED:
-                json_object_array_add(jsonValuesCtl, json_object_new_int(snd_ctl_elem_value_get_enumerated(elemData, idx)));
-                break;
-            case SND_CTL_ELEM_TYPE_BYTES:
-                json_object_array_add(jsonValuesCtl, json_object_new_int((int) snd_ctl_elem_value_get_byte(elemData, idx)));
-                break;
-            case SND_CTL_ELEM_TYPE_IEC958:
-            {
-                json_object *jsonIec958Ctl = json_object_new_object();
-                snd_aes_iec958_t iec958;
-                snd_ctl_elem_value_get_iec958(elemData, &iec958);
-
-                json_object_object_add(jsonIec958Ctl, "AES0", json_object_new_int(iec958.status[0]));
-                json_object_object_add(jsonIec958Ctl, "AES1", json_object_new_int(iec958.status[1]));
-                json_object_object_add(jsonIec958Ctl, "AES2", json_object_new_int(iec958.status[2]));
-                json_object_object_add(jsonIec958Ctl, "AES3", json_object_new_int(iec958.status[3]));
-                json_object_array_add(jsonValuesCtl, jsonIec958Ctl);
-                break;
-            }
-            default:
-                json_object_array_add(jsonValuesCtl, json_object_new_string("?unknown?"));
-                break;
-        }
-    }
-    json_object_object_add(ctlRequest->valuesJ, "val", jsonValuesCtl);
-
-    if (queryMode >= 1) { // in simple mode do not print usable values
-        json_object *jsonClassCtl = json_object_new_object();
-        json_object_object_add(jsonClassCtl, "type", json_object_new_int(elemType));
-        json_object_object_add(jsonClassCtl, "count", json_object_new_int(count));
-
-        switch (elemType) {
-            case SND_CTL_ELEM_TYPE_INTEGER:
-                json_object_object_add(jsonClassCtl, "min", json_object_new_int((int) snd_ctl_elem_info_get_min(elemInfo)));
-                json_object_object_add(jsonClassCtl, "max", json_object_new_int((int) snd_ctl_elem_info_get_max(elemInfo)));
-                json_object_object_add(jsonClassCtl, "step", json_object_new_int((int) snd_ctl_elem_info_get_step(elemInfo)));
-                break;
-            case SND_CTL_ELEM_TYPE_INTEGER64:
-                json_object_object_add(jsonClassCtl, "min", json_object_new_int64(snd_ctl_elem_info_get_min64(elemInfo)));
-                json_object_object_add(jsonClassCtl, "max", json_object_new_int64(snd_ctl_elem_info_get_max64(elemInfo)));
-                json_object_object_add(jsonClassCtl, "step", json_object_new_int64(snd_ctl_elem_info_get_step64(elemInfo)));
-                break;
-            case SND_CTL_ELEM_TYPE_ENUMERATED:
-            {
-                unsigned int item, items = snd_ctl_elem_info_get_items(elemInfo);
-                json_object *jsonEnum = json_object_new_array();
-
-                for (item = 0; item < items; item++) {
-                    snd_ctl_elem_info_set_item(elemInfo, item);
-                    if ((err = snd_ctl_elem_info(ctlDev, elemInfo)) >= 0) {
-                        json_object_array_add(jsonEnum, json_object_new_string(snd_ctl_elem_info_get_item_name(elemInfo)));
-                    }
-                }
-                json_object_object_add(jsonClassCtl, "enums", jsonEnum);
-                break;
-            }
-            default: break; // ignore any unknown type
-        }
-
-        // add collected class info with associated ACLs
-        json_object_object_add(ctlRequest->valuesJ, "ctl", jsonClassCtl);
-
-        if (queryMode >= QUERY_FULL) json_object_object_add(ctlRequest->valuesJ, "acl", getControlAcl(elemInfo));
-
-        // check for tlv [direct port from amixer.c]
-        if (snd_ctl_elem_info_is_tlv_readable(elemInfo)) {
-            unsigned int *tlv = alloca(TLV_BYTE_SIZE);
-            if ((err = snd_ctl_elem_tlv_read(ctlDev, elemId, tlv, 4096)) < 0) {
-                AFB_NOTICE("Control numid=%d err=%s element TLV read error\n", numid, snd_strerror(err));
-                goto OnErrorExit;
-            } else {
-                json_object_object_add(ctlRequest->valuesJ, "tlv", decodeTlv(tlv, TLV_BYTE_SIZE, queryMode));
-            }
-        }
-    }
-
-    ctlRequest->used = 1;
-    return 0;
-
-OnErrorExit:
-    ctlRequest->used = -1;
-    return -1;
-}
-
-// assign multiple control to the same value
-
-STATIC void alsaSetGetCtls(ActionSetGetT action, afb_req request) {
-    ctlRequestT *ctlRequest;
-    const char *warmsg = NULL;
-    int err = 0, status = 0, done;
-    unsigned int ctlCount;
-    snd_ctl_t *ctlDev;
-    snd_ctl_elem_list_t *ctlList;
-    queryValuesT queryValues;
-    json_object *queryJ, *numidsJ, *sndctls;
-
-    queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-
-    // Prase Numids + optional values
-    done = json_object_object_get_ex(queryJ, "ctl", &numidsJ);
-    if (!done) queryValues.count = 0;
-    else {
-        enum json_type jtype = json_object_get_type(numidsJ);
-        switch (jtype) {
-            case json_type_array:
-                queryValues.numidsJ = numidsJ;
-                queryValues.count = json_object_array_length(numidsJ);
-                break;
-
-            case json_type_int:
-            case json_type_object:
-                queryValues.count = 1;
-                queryValues.numidsJ = numidsJ;
-                break;
-
-            default:
-                afb_req_fail_f(request, "numid-notarray", "NumId=%s NumId not valid JSON array", json_object_get_string(numidsJ));
-                goto OnErrorExit;
-        }
-    }
-
-    if ((err = snd_ctl_open(&ctlDev, queryValues.devid, 0)) < 0) {
-        afb_req_fail_f(request, "sndcrl-notfound", "devid='%s' load fail error=%s\n", queryValues.devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    snd_ctl_elem_list_alloca(&ctlList);
-    if ((err = snd_ctl_elem_list(ctlDev, ctlList)) < 0) {
-        afb_req_fail_f(request, "listInit-failed", "devid='%s' load fail error=%s\n", queryValues.devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    if ((err = snd_ctl_elem_list_alloc_space(ctlList, snd_ctl_elem_list_get_count(ctlList))) < 0) {
-        afb_req_fail_f(request, "listAlloc-failed", "devid='%s' load fail error=%s\n", queryValues.devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    if ((err = snd_ctl_elem_list(ctlDev, ctlList)) < 0) {
-        afb_req_fail_f(request, "listOpen-failed", "devid='%s' load fail error=%s\n", queryValues.devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    // Parse numids string (empty == all)
-    ctlCount = snd_ctl_elem_list_get_used(ctlList);
-    if (queryValues.count == 0) {
-        ctlRequest = alloca(sizeof (ctlRequestT)*(ctlCount));
-    } else {
-        ctlRequest = alloca(sizeof (ctlRequestT)*(queryValues.count));
-        NumidsListParse(action, &queryValues, ctlRequest);
-    }
-
-    // if more than one crl requested prepare an array for response
-    if (queryValues.count != 1 && action == ACTION_GET) sndctls = json_object_new_array();
-    else sndctls = NULL;
-
-    // Loop on all ctlDev controls
-    for (int ctlIndex = 0; ctlIndex < ctlCount; ctlIndex++) {
-        unsigned int selected = 0;
-        int jdx;
-
-        if (queryValues.count == 0 && action == ACTION_GET) {
-            selected = 1; // check is this numid is selected within query
-            jdx = ctlIndex; // map all existing ctl as requested
-        } else {
-            int numid = snd_ctl_elem_list_get_numid(ctlList, ctlIndex);
-            if (numid < 0) {
-                AFB_NOTICE("snd_ctl_elem_list_get_numid index=%d fail", ctlIndex);
-                continue;
-            }
-            // check if current control was requested in query numids list
-            for (jdx = 0; jdx < queryValues.count; jdx++) {
-                if (numid == ctlRequest[jdx].numId) {
-                    selected = 1;
-                    break;
-                }
-            }
-        }
-
-        // control is selected open ctlid and get value
-        if (selected) {
-            snd_ctl_elem_id_t *elemId;
-            snd_ctl_elem_id_alloca(&elemId);
-
-            snd_ctl_elem_list_get_id(ctlList, ctlIndex, elemId);
-            switch (action) {
-                case ACTION_GET:
-                    err = alsaGetSingleCtl(ctlDev, elemId, &ctlRequest[jdx], queryValues.mode);
-                    break;
-
-                case ACTION_SET:
-                    err = alsaSetSingleCtl(ctlDev, elemId, &ctlRequest[jdx]);
-                    break;
-
-                default:
-                    err = 1;
-            }
-            if (err) status++;
-            else {
-                // Do not embed response in an array when only one ctl was requested
-                if (action == ACTION_GET) {
-                    if (queryValues.count == 1) sndctls = ctlRequest[jdx].valuesJ;
-                    else json_object_array_add(sndctls, ctlRequest[jdx].valuesJ);
-                }
-            }
-        }
-    }
-
-    // if we had error let's add them into response message info
-    json_object *warningsJ = json_object_new_array();
-    for (int jdx = 0; jdx < queryValues.count; jdx++) {
-        if (ctlRequest[jdx].used <= 0) {
-            json_object *failctl = json_object_new_object();
-            if (ctlRequest[jdx].numId == -1) json_object_object_add(failctl, "warning", json_object_new_string("Numid Invalid"));
-            else {
-                if (ctlRequest[jdx].used == 0) json_object_object_add(failctl, "warning", json_object_new_string("Numid Does Not Exist"));
-                if (ctlRequest[jdx].used == -1) json_object_object_add(failctl, "warning", json_object_new_string("Value Refused"));
-            }
-
-            json_object_object_add(failctl, "ctl", ctlRequest[jdx].jToken);
-
-            json_object_array_add(warningsJ, failctl);
-        }
-        /* WARNING!!!! Check with Jose why following put free valuesJ
-        if (ctlRequest[jdx].jToken) json_object_put(ctlRequest[jdx].jToken);
-        if (ctlRequest[jdx].valuesJ) json_object_put(ctlRequest[jdx].valuesJ);
-         */
-    }
-
-    if (json_object_array_length(warningsJ) > 0) warmsg = json_object_get_string(warningsJ);
-    else json_object_put(warningsJ);
-
-    // send response+warning if any
-    afb_req_success(request, sndctls, warmsg);
-    snd_ctl_elem_list_clear(ctlList);
-
-OnErrorExit:
-    return;
-}
-
-PUBLIC void alsaGetCtls(afb_req request) {
-    alsaSetGetCtls(ACTION_GET, request);
-}
-
-PUBLIC void alsaSetCtls(afb_req request) {
-    alsaSetGetCtls(ACTION_SET, request);
-}
-
-
diff --git a/Alsa-afb/Alsa-Ucm.c b/Alsa-afb/Alsa-Ucm.c
deleted file mode 100644
index 0bfffc9..0000000
--- a/Alsa-afb/Alsa-Ucm.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * AlsaUseCase -- provide low level interface with ALSA lib (extracted from alsa-json-gateway code)
- * Copyright (C) 2015,2016,2017, 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.
-
-   References:
-      http://www.alsa-project.org/alsa-doc/alsa-lib/group__ucm.html
-      https://www.alsa-project.org/main/index.php/DAPM
-      http://alsa-lib.sourcearchive.com/documentation/1.0.24.1-2/group__Use_ga4332c6bb50481bbdaf21be11551fb930.html
-      https://android.googlesource.com/platform/hardware/qcom/audio/+/jb-mr1-dev/libalsa-intf/alsa_ucm.h
-
-   Sample alsaucm commands using /usr/share/alsa/ucm/PandaBoard
-    - alsaucm  -c PandaBoard list _verbs
-    - alsaucm  -c PandaBoard list _devices/HiFi
-    - alsaucm  -c PandaBoard list _modifiers/HiFi  #need to uncomment modifiers section
-    - alsaucm  -c PandaBoard list TQ/HiFi
-    - alsaucm  -c PandaBoard get TQ/HiFi/Voice
-    - alsaucm  -c PandaBoard get PlaybackPCM//HiFi
-    - alsaucm  -c PandaBoard set _verb HiFi
-    - alsaucm  -c PandaBoard set _verb HiFi _enadev Headset
-    - alsaucm  -c 'HDA Intel PCH'  set _verb HiFi set  _enadev Headphone set _enamod RecordMedia
-    - alsaucm  -c 'HDA Intel PCH'  set _verb HiFi get OutputDspName//
-
- */
-#define _GNU_SOURCE  // needed for vasprintf
-
-#include <alsa/asoundlib.h>
-#include <alsa/asoundlib.h>
-#include <alsa/use-case.h>
-
-#include "Alsa-ApiHat.h"
-
-typedef struct {
-    snd_use_case_mgr_t *ucm;
-    int cardId;
-    char *cardName;
-} ucmHandleT;
-
-static ucmHandleT ucmHandles[MAX_SND_CARD];
-
-// Cache opened UCM handles
-
-STATIC int alsaUseCaseOpen(struct afb_req request, queryValuesT *queryValues, int allowNewMgr) {
-    snd_ctl_t *ctlDev;
-    snd_ctl_card_info_t *cardinfo;
-    snd_use_case_mgr_t *ucmHandle;
-    const char *cardName;
-    int cardId, idx, idxFree = -1, err;
-
-    // open control interface for devid
-    err = snd_ctl_open(&ctlDev, queryValues->devid, SND_CTL_READONLY);
-    if (err < 0) {
-        ctlDev = NULL;
-        afb_req_fail_f(request, "devid-unknown", "SndCard devid=[%s] Not Found err=%d", queryValues->devid, err);
-        goto OnErrorExit;
-    }
-
-    snd_ctl_card_info_alloca(&cardinfo);
-    if ((err = snd_ctl_card_info(ctlDev, cardinfo)) < 0) {
-        afb_req_fail_f(request, "devid-invalid", "SndCard devid=[%s] Not Found err=%s", queryValues->devid, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    // search for an existing subscription and mark 1st free slot
-    cardId = snd_ctl_card_info_get_card(cardinfo);
-    for (idx = 0; idx < MAX_SND_CARD; idx++) {
-        if (ucmHandles[idx].ucm != NULL) {
-            if (ucmHandles[idx].cardId == cardId) goto OnSuccessExit;
-        } else if (idxFree == -1) idxFree = idx;
-    };
-
-    if (!allowNewMgr) {
-        afb_req_fail_f(request, "ucm-nomgr", "SndCard devid=[%s] no exiting UCM manager session", queryValues->devid);
-        goto OnErrorExit;
-    }
-
-    if (idxFree < 0 && idx == MAX_SND_CARD) {
-        afb_req_fail_f(request, "ucm-toomany", "SndCard devid=[%s] too many open UCM Max=%d", queryValues->devid, MAX_SND_CARD);
-        goto OnErrorExit;
-    }
-
-    idx = idxFree;
-    cardName = snd_ctl_card_info_get_name(cardinfo);
-    err = snd_use_case_mgr_open(&ucmHandle, cardName);
-    if (err) {
-        afb_req_fail_f(request, "ucm-open", "SndCard devid=[%s] name=[%s] No UCM Profile err=%s", queryValues->devid, cardName, snd_strerror(err));
-        goto OnErrorExit;
-    }
-    ucmHandles[idx].ucm = ucmHandle;
-    ucmHandles[idx].cardId = cardId;
-    ucmHandles[idx].cardName = strdup(cardName);
-
-OnSuccessExit:
-    if (ctlDev) snd_ctl_close(ctlDev);
-    return idx;
-
-OnErrorExit:
-    if (ctlDev) snd_ctl_close(ctlDev);
-    return -1;
-}
-
-PUBLIC void alsaUseCaseQuery(struct afb_req request) {
-    int verbCount, ucmIdx;
-    const char **verbList;
-    snd_use_case_mgr_t *ucmHandle;
-    queryValuesT queryValues;
-    json_object *ucmJs;
-    const char *cardName;
-
-    json_object *queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-
-    ucmIdx = alsaUseCaseOpen(request, &queryValues, TRUE);
-    if (ucmIdx < 0) goto OnErrorExit;
-    ucmHandle = ucmHandles [ucmIdx].ucm;
-    cardName = ucmHandles [ucmIdx].cardName;
-
-    verbCount = snd_use_case_get_list(ucmHandle, "_verbs", &verbList);
-    if (verbCount < 0) {
-        afb_req_fail_f(request, "ucm-list", "SndCard devid=[%s] name=[%s] No UCM Verbs", queryValues.devid, cardName);
-        goto OnErrorExit;
-    }
-
-    ucmJs = json_object_new_array();
-    for (int idx = 0; idx < verbCount; idx += 2) {
-        int devCount, modCount, tqCount;
-        const char **devList, **modList, **tqList;
-        json_object *ucmJ = json_object_new_object();
-        char identifier[32];
-
-        json_object_object_add(ucmJ, "verb", json_object_new_string(verbList[idx]));
-        if (verbList[idx + 1]) json_object_object_add(ucmJ, "info", json_object_new_string(verbList[idx + 1]));
-
-        AFB_DEBUG("Verb[%d] Action=%s Info=%s", idx, verbList[idx], verbList[idx + 1]);
-
-        snprintf(identifier, sizeof (identifier), "_devices/%s", verbList[idx]);
-        devCount = snd_use_case_get_list(ucmHandle, identifier, &devList);
-        if (devCount > 0) {
-            json_object *devsJ = json_object_new_array();
-
-            for (int jdx = 0; jdx < devCount; jdx += 2) {
-                json_object *devJ = json_object_new_object();
-                AFB_DEBUG("device[%d] Action=%s Info=%s", jdx, devList[jdx], devList[jdx + 1]);
-                json_object_object_add(devJ, "dev", json_object_new_string(devList[jdx]));
-                if (devList[jdx + 1]) json_object_object_add(devJ, "info", json_object_new_string(devList[jdx + 1]));
-                json_object_array_add(devsJ, devJ);
-            }
-            json_object_object_add(ucmJ, "devices", devsJ);
-            snd_use_case_free_list(devList, devCount);
-        }
-
-        snprintf(identifier, sizeof (identifier), "_modifiers/%s", verbList[idx]);
-        modCount = snd_use_case_get_list(ucmHandle, identifier, &modList);
-        if (modCount > 0) {
-            json_object *modsJ = json_object_new_array();
-
-            for (int jdx = 0; jdx < modCount; jdx += 2) {
-                json_object *modJ = json_object_new_object();
-                AFB_DEBUG("modifier[%d] Action=%s Info=%s", jdx, modList[jdx], modList[jdx + 1]);
-                json_object_object_add(modJ, "mod", json_object_new_string(modList[jdx]));
-                if (modList[jdx + 1]) json_object_object_add(modJ, "info", json_object_new_string(modList[jdx + 1]));
-                json_object_array_add(modsJ, modJ);
-            }
-            json_object_object_add(ucmJ, "modifiers", modsJ);
-            snd_use_case_free_list(modList, modCount);
-        }
-
-        snprintf(identifier, sizeof (identifier), "TQ/%s", verbList[idx]);
-        tqCount = snd_use_case_get_list(ucmHandle, identifier, &tqList);
-        if (tqCount > 0) {
-            json_object *tqsJ = json_object_new_array();
-
-            for (int jdx = 0; jdx < tqCount; jdx += 2) {
-                json_object *tqJ = json_object_new_object();
-                AFB_DEBUG("toneqa[%d] Action=%s Info=%s", jdx, tqList[jdx], tqList[jdx + 1]);
-                json_object_object_add(tqJ, "tq", json_object_new_string(tqList[jdx]));
-                if (tqList[jdx + 1]) json_object_object_add(tqJ, "info", json_object_new_string(tqList[jdx + 1]));
-                json_object_array_add(tqsJ, tqJ);
-            }
-            json_object_object_add(ucmJ, "tqs", tqsJ);
-            snd_use_case_free_list(tqList, tqCount);
-        }
-
-        json_object_array_add(ucmJs, ucmJ);
-    }
-
-    afb_req_success(request, ucmJs, NULL);
-    snd_use_case_free_list(verbList, verbCount);
-
-OnErrorExit:
-    return;
-}
-
-STATIC json_object *ucmGetValue(ucmHandleT *ucmHandle, const char *verb, const char *mod, const char *label) {
-    char identifier[80];
-    char *value;
-    int err;
-    json_object *jValue;
-
-    // handle optional parameters
-    if (!mod) mod = "";
-    if (!verb) verb = "";
-
-    if (!label) {
-        AFB_NOTICE("ucmGetValue cardname=[%s] value label missing", ucmHandle->cardName);
-        goto OnErrorExit;
-    }
-
-    snprintf(identifier, sizeof (identifier), "%s/%s/%s", label, mod, verb);
-    err = snd_use_case_get(ucmHandle->ucm, identifier, (const char**) &value); // Note: value casting is a known "FEATURE" of AlsaUCM API
-    if (err) {
-        AFB_DEBUG("ucmGetValue cardname=[%s] identifier=[%s] error=%s", ucmHandle->cardName, identifier, snd_strerror(err));
-        goto OnErrorExit;
-    }
-
-    // copy value into json object and free string
-    jValue = json_object_new_string(value);
-    free(value);
-    return (jValue);
-
-OnErrorExit:
-    return (NULL);
-}
-
-PUBLIC void alsaUseCaseGet(struct afb_req request) {
-    int ucmIdx, labelCount;
-    queryValuesT queryValues;
-    json_object *jResponse = json_object_new_object();
-    json_object *jWarnings = json_object_new_array();
-    const char *warnings = NULL;
-
-    json_object *queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-    ;
-
-    ucmIdx = alsaUseCaseOpen(request, &queryValues, TRUE);
-    if (ucmIdx < 0) goto OnErrorExit;
-
-    const char *cardName = ucmHandles[ucmIdx].cardName;
-
-    const char *verb = afb_req_value(request, "verb");
-    const char *mod = afb_req_value(request, "mod");
-    const char *dev = afb_req_value(request, "dev");
-
-    if (dev && mod) {
-        afb_req_fail_f(request, "ucmget-labels", "SndCard devid=[%s] name=[%s] UCM mod+dev incompatible", queryValues.devid, cardName);
-        goto OnErrorExit;
-    }
-
-    // device selection is handle as a modifier
-    if (dev) mod = dev;
-
-    const char *labels = afb_req_value(request, "value");
-    if (!labels) {
-        afb_req_fail_f(request, "ucmget-labels", "SndCard devid=[%s] name=[%s] UCM values name missing", queryValues.devid, cardName);
-        goto OnErrorExit;
-    }
-
-    json_object *jLabels = json_tokener_parse(labels);
-    if (!jLabels) {
-        afb_req_fail_f(request, "ucmget-notjson", "labels=%s not a valid json entry", labels);
-        goto OnErrorExit;
-    };
-
-    enum json_type jtype = json_object_get_type(jLabels);
-    switch (jtype) {
-            json_object *tmpJ;
-
-        case json_type_array:
-            labelCount = json_object_array_length(jLabels);
-            break;
-
-        case json_type_string:
-            tmpJ = json_object_new_array();
-            labelCount = 1;
-            json_object_array_add(tmpJ, jLabels);
-            jLabels = tmpJ;
-            break;
-
-        default:
-            afb_req_fail_f(request, "ucmget-notarray", "labels=%s not valid JSON array", labels);
-            goto OnErrorExit;
-    }
-
-    for (int idx = 0; idx < labelCount; idx++) {
-        json_object *jValue, *jLabel;
-        const char *label;
-
-        jLabel = json_object_array_get_idx(jLabels, idx);
-        label = json_object_get_string(jLabel);
-        jValue = ucmGetValue(&ucmHandles[ucmIdx], verb, mod, label);
-        if (jValue) json_object_object_add(jResponse, label, jValue);
-        else {
-            json_object_array_add(jWarnings, jLabel);
-        }
-    }
-
-    // use info section to notified not found values label
-    if (json_object_array_length(jWarnings) > 0) {
-        json_object *tmpJ = json_object_new_object();
-        json_object_object_add(tmpJ, "no-context", jWarnings);
-        warnings = json_object_get_string(tmpJ);
-    }
-    afb_req_success(request, jResponse, warnings);
-
-OnErrorExit:
-    return;
-}
-
-PUBLIC void alsaUseCaseSet(struct afb_req request) {
-    int err, ucmIdx;
-    queryValuesT queryValues;
-    json_object *jResponse = json_object_new_object();
-
-    json_object *queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-
-
-    ucmIdx = alsaUseCaseOpen(request, &queryValues, TRUE);
-    if (ucmIdx < 0) goto OnErrorExit;
-
-    snd_use_case_mgr_t *ucmMgr = ucmHandles[ucmIdx].ucm;
-    const char *cardName = ucmHandles[ucmIdx].cardName;
-
-    const char *verb = afb_req_value(request, "verb");
-    const char *mod = afb_req_value(request, "mod");
-    const char *dev = afb_req_value(request, "dev");
-    // Known identifiers: _verb - set current verb = value _enadev - enable given device = value _disdev - disable given device = value _swdev/{old_device} - new_device = value
-
-    if (verb) {
-        err = snd_use_case_set(ucmMgr, "_verb", verb);
-        if (err) {
-            afb_req_fail_f(request, "ucmset-verb", "SndCard devid=[%s] name=[%s] Invalid UCM verb=[%s] err=%s", queryValues.devid, cardName, verb, snd_strerror(err));
-            goto OnErrorExit;
-        }
-    }
-
-    if (dev) {
-        err = snd_use_case_set(ucmMgr, "_enadev", dev);
-        if (err) {
-            afb_req_fail_f(request, "ucmset-dev", "SndCard devid=[%s] name=[%s] Invalid UCMverb=[%s] dev=%s err=%s", queryValues.devid, cardName, verb, dev, snd_strerror(err));
-            goto OnErrorExit;
-        }
-    }
-
-    if (mod) {
-        err = snd_use_case_set(ucmMgr, "_enamod", mod);
-        if (err) {
-            afb_req_fail_f(request, "ucmset-mod", "SndCard devid=[%s] name=[%s] Invalid UCM verb=[%s] mod=[%s] err=%s", queryValues.devid, cardName, verb, mod, snd_strerror(err));
-            goto OnErrorExit;
-        }
-    }
-
-    // label are requested transfert request to get
-    if (afb_req_value(request, "value")) return alsaUseCaseGet(request);
-
-    if (queryValues.mode <= 3) {
-        json_object *jValue;
-
-        jValue = ucmGetValue(&ucmHandles[ucmIdx], verb, dev, "OutputDspName");
-        if (jValue) json_object_object_add(jResponse, "OutputDspName", jValue);
-
-        jValue = ucmGetValue(&ucmHandles[ucmIdx], verb, dev, "PlaybackPCM");
-        if (jValue) json_object_object_add(jResponse, "PlaybackPCM", jValue);
-
-        jValue = ucmGetValue(&ucmHandles[ucmIdx], verb, mod, "CapturePCM");
-        if (jValue) json_object_object_add(jResponse, "CapturePCM", jValue);
-    }
-    afb_req_success(request, jResponse, NULL);
-
-OnErrorExit:
-    return;
-}
-
-PUBLIC void alsaUseCaseReset(struct afb_req request) {
-    int err, ucmIdx;
-    queryValuesT queryValues;
-
-    json_object *queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-
-    ucmIdx = alsaUseCaseOpen(request, &queryValues, FALSE);
-    if (ucmIdx < 0) goto OnErrorExit;
-
-    err = snd_use_case_mgr_reset(ucmHandles[ucmIdx].ucm);
-    if (err) {
-        afb_req_fail_f(request, "ucmreset-fail", "devid=%s Card Name=%s", queryValues.devid, ucmHandles[ucmIdx].cardName);
-        goto OnErrorExit;
-    }
-
-    afb_req_success(request, NULL, NULL);
-
-OnErrorExit:
-    return;
-}
-
-PUBLIC void alsaUseCaseClose(struct afb_req request) {
-    int err, ucmIdx;
-    queryValuesT queryValues;
-
-    json_object *queryJ = alsaCheckQuery(request, &queryValues);
-    if (!queryJ) goto OnErrorExit;
-
-    ucmIdx = alsaUseCaseOpen(request, &queryValues, FALSE);
-    if (ucmIdx < 0) goto OnErrorExit;
-
-    err = snd_use_case_mgr_close(ucmHandles[ucmIdx].ucm);
-    if (err) {
-        afb_req_fail_f(request, "ucmreset-close", "devid=%s Card Name=%s", queryValues.devid, ucmHandles[ucmIdx].cardName);
-        goto OnErrorExit;
-    }
-
-    // do not forget to release sound card name string
-    free(ucmHandles[ucmIdx].cardName);
-
-    afb_req_success(request, NULL, NULL);
-
-OnErrorExit:
-    return;
-}
-
-
diff --git a/Alsa-afb/CMakeLists.txt b/Alsa-afb/CMakeLists.txt
deleted file mode 100644
index a608a80..0000000
--- a/Alsa-afb/CMakeLists.txt
+++ /dev/null
@@ -1,38 +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.
-###########################################################################
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(alsa-lowlevel)
-
-    # Define project Targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE Alsa-ApiHat.c  Alsa-SetGet.c  Alsa-Ucm.c Alsa-AddCtl.c Alsa-RegEvt.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}
-        audio-common
-        ${link_libraries}
-    )
-
diff --git a/Alsa-afb/README.md b/Alsa-afb/README.md
deleted file mode 100644
index 93d2d4d..0000000
--- a/Alsa-afb/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-------------------------------------------------------------------------
-   AlsaCore Low level binding maps AlsaLib APIs
-------------------------------------------------------------------------
-
-Testing: (from project directory bindings)
- * start binder:  ~/opt/bin/afb-daemon --ldpaths=./build --token=mysecret --roothttp=htdocs
- * connect browser on http://localhost:1234?devid=hw:0
-
- # List Avaliable Sound cards
- http://localhost:1234/api/alsacore/getinfo
-
- # Get Info on a given Sound Card
- http://localhost:1234/api/alsacore/getinfo?devid=hw:0
-
- # Get shortname/longname for a given card
- http://localhost:1234/api/alsacore/getcardid?devid=hw:0
-
- # Get all controls from a given sound card
- http://localhost:1234/api/alsacore/getctl?devid=hw:0
-
- # Get detail on a given control (optional mode=0=verbose,1,2)
- http://localhost:1234/api/alsacore/getctl?devid=hw:0&numid=1&mode=0
-
-# Debug event with afb-client-demo
-```
- ~/opt/bin/afb-client-demo localhost:1234/api?token=mysecret
- alsacore subscribe {"devid":"hw:0"}
-```
-
-# Open AlsaMixer and play with Volume
-```
- alsamixer -D hw:0
-```
diff --git a/Audio-Common/CMakeLists.txt b/Audio-Common/CMakeLists.txt
deleted file mode 100644
index 72e0df7..0000000
--- a/Audio-Common/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.
-###########################################################################
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(audio-common)
-
-    # Define targets
-    ADD_LIBRARY(${TARGET_NAME} STATIC audio-common.c)
-
-    # Library properties
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    # Library dependencies
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-      afb-utilities
-      ${link_libraries}
-    )
-
-    # Define target includes
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
-        PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22adb2a..ef16567 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 ###########################################################################
 # Copyright 2015, 2016, 2017 IoT.bzh
 #
-# author: Fulup Ar Foll <rfulup@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.
@@ -15,7 +15,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ###########################################################################
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 
-# Do not change this file, config is located into conf.d
-include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake)
+
+# Add target to project dependency list
+PROJECT_TARGET_ADD(hal-utilities)
+
+    # Define targets
+    ADD_LIBRARY(${TARGET_NAME} STATIC hal-volume.c hal-volramp.c hal-interface.c hal-statics.c)
+
+    # Library properties
+    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES OUTPUT_NAME halinterface)
+
+    # Library dependencies (include updates automatically)
+    TARGET_LINK_LIBRARIES(${TARGET_NAME}
+    )
+
+    # Define target includes
+    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
+        PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
+    )
diff --git a/HAL-afb/CMakeLists.txt b/HAL-afb/CMakeLists.txt
deleted file mode 100644
index 201d407..0000000
--- a/HAL-afb/CMakeLists.txt
+++ /dev/null
@@ -1,23 +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.
-###########################################################################
-
-
-# Include any directory not starting with _
-# -----------------------------------------------------
-PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN})
-
diff --git a/HAL-afb/HAL-interface/CMakeLists.txt b/HAL-afb/HAL-interface/CMakeLists.txt
deleted file mode 100644
index bbe2e94..0000000
--- a/HAL-afb/HAL-interface/CMakeLists.txt
+++ /dev/null
@@ -1,37 +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.
-###########################################################################
-
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(hal-interface)
-
-    # Define targets
-    ADD_LIBRARY(${TARGET_NAME} STATIC hal-volume.c hal-volramp.c hal-interface.c)
-
-    # Library properties
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES OUTPUT_NAME halinterface)
-
-    # Library dependencies (include updates automatically)
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        audio-common
-    )
-
-    # Define target includes
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
-        PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
-    )
diff --git a/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt
deleted file mode 100644
index 3204dd1..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt
+++ /dev/null
@@ -1,46 +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.
-###########################################################################
-
-ADD_SUBDIRECTORY(ucs2-vol)
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(hal-most-unicens)
-
-    # Define project Targets
-    ADD_LIBRARY(hal-most-unicens MODULE hal_most_unicens.c wrap-json.c wrap_unicens.c wrap_volume.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-interface
-        audio-common
-        ucs2-volume
-        ${link_libraries}
-    )
-
-    # Define properties to expose when others use this target
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
-       PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc
-    )
diff --git a/HAL-afb/HAL_MOST_UNICENS/README.md b/HAL-afb/HAL_MOST_UNICENS/README.md
deleted file mode 100644
index 4ce4261..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-
-# HAL for MOST Sound Card
-
-## Introduction
-This Hardware Abstraction Layer (HAL) is intended to control MOST audio via
-standard ALSA mixer controls. Therefore the HAL add's controls to the MOST sound
-card. Modification of the mixer controls is mapped to control commands which are
-send to MOST nodes.
-
-The HAL requires to access the UNICENS V2 binding which is setting up the MOST
-network and the MOST node.
-
-Please check the following required components:
-* MOST Linux Driver
-* User must be member of "audio" group
-* UNICENS V2 binding
-* [K2L MOST150 Audio 5.1 Kit](https://www.k2l.de/products/74/MOST150%20Audio%205.1%20Kit/)
-
-## Possible Modifications
-Check if you need to adapt the default path for UNICENS configuration, e.g.
-```
-#define XML_CONFIG_PATH "/opt/AGL/unicens2-binding/config_multichannel_audio_kit.xml"
-```
-
-Check if you need to adapt the name of the MOST sound card.
-```
-#define ALSA_CARD_NAME  "Microchip MOST:1"
-```
-
-You can check your MOST sound card name by calling ```aplay -l```, e.g.
-```
-aplay -l
-**** List of PLAYBACK Hardware Devices ****
-card 0: PCH [HDA Intel PCH], device 0: 92HD90BXX Analog [92HD90BXX Analog]
-  Subdevices: 1/1
-  Subdevice #0: subdevice #0
-card 1: ep016ch [Microchip MOST:1], device 0: ep01-6ch []
-  Subdevices: 1/1
-  Subdevice #0: subdevice #0
-card 2: ep022ch [Microchip MOST:2], device 0: ep02-2ch []
-  Subdevices: 1/1
-  Subdevice #0: subdevice #0
-
-```
-Choose the first sound card with 6 channels, e.g. if you see ```ep01-6ch``` just
-take ```Microchip MOST:1```.
-
-If you get messed up with card enumeration the following action may help:
-- Unplug your MOST USB hardware from target
-- Call ```sudo rm /var/lib/alsa/asound.state```
-- Connect MOST USB hardware after reboot or restart of ALSA
diff --git a/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c
deleted file mode 100644
index 5e29b59..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.
- * Author Tobias Jahnke
- *
- * 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.
- *
- */
-#define _GNU_SOURCE
-#include <string.h>
-#include "hal-interface.h"
-#include "audio-common.h"
-#include "wrap-json.h"
-#include "wrap_unicens.h"
-#include "wrap_volume.h"
-
-#ifndef UCS2_CFG_PATH
-# define UCS2_CFG_PATH "/home/agluser/DEVELOPMENT/AGL/BINDING/unicens2-binding/data"
-#endif
-
-#define ALSA_CARD_NAME    "Microchip MOST:1"
-#define ALSA_DEVICE_ID    "hw:1"
-#define PCM_MAX_CHANNELS  6
-
-static int master_volume;
-static json_bool master_switch;
-static int pcm_volume[PCM_MAX_CHANNELS];
-
-static void unicens_request_card_values_cb(void *closure, int status, struct json_object *j_response) {
-    
-    json_object *j_obj;
-    int num_id;
-    int values[6];
-    
-    AFB_INFO("unicens_request_card_values_cb: closure=%p status=%d, res=%s", closure, status, json_object_to_json_string(j_response));
-    
-    json_object_object_get_ex(j_response, "response", &j_obj);
-    
-    if (json_object_is_type(j_obj, json_type_object)) {
-       
-    }
-    else if (json_object_is_type(j_obj, json_type_array)) {
-        AFB_ERROR("unicens_request_card_values_cb: array not handled yet");
-        return;
-    }
-    else {
-        AFB_ERROR("unicens_request_card_values_cb: unknown response type");
-        return;
-    }
-    
-    if (wrap_json_unpack(j_obj, "{s:i, s:[iiiiii!]}", "id", &num_id, "val", 
-            &values[0], &values[1], &values[2], &values[3], &values[4], &values[5])
-            == 0) {
-        AFB_NOTICE("unicens_request_card_values_cb: success, num id:%d", num_id);
-    }
-    else {
-        AFB_ERROR("unicens_request_card_values_cb: unpack failure");
-        return;
-    }
-    
-#if 0
-    if (num_id == 2) {
-        wrap_volume_pcm(&values[0], 6);
-    }
-#endif
-    
-}
-
-__attribute__ ((unused)) static void unicens_request_card_values(const char* dev_id) {
-
-    int err;
-    json_object *j_query = NULL;
-    
-    err = wrap_json_pack(&j_query, "{s:s, s:i}", "devid", dev_id, "mode", 0);
-
-    if (err) {
-        AFB_ERROR("Failed to call wrap_json_pack");
-        goto OnErrorExit;
-    }   
-
-    afb_service_call("alsacore", "ctlget", j_query,
-            &unicens_request_card_values_cb,
-            NULL);
-    
-    if (err) {
-        AFB_ERROR("Failed to call listconfig");
-        goto OnErrorExit;
-    }
-    
-OnErrorExit:
-    return;
-}
-
-void unicens_master_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle,  json_object *j_obj) {
-
-    const char *j_str = json_object_to_json_string(j_obj);
-
-    if (wrap_json_unpack(j_obj, "[i!]", &master_volume) == 0) {
-        AFB_NOTICE("master_volume: %s, value=%d", j_str, master_volume);
-        wrap_volume_master(master_volume);
-    }
-    else {
-        AFB_NOTICE("master_volume: INVALID STRING %s", j_str);
-    }
-}
-
-void unicens_master_switch_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle,  json_object *j_obj) {
-
-    const char *j_str = json_object_to_json_string(j_obj);
-
-    if (wrap_json_unpack(j_obj, "[b!]", &master_switch) == 0) {
-        AFB_NOTICE("master_switch: %s, value=%d", j_str, master_switch);
-    }
-    else {
-        AFB_NOTICE("master_switch: INVALID STRING %s", j_str);
-    }
-}
-
-void unicens_pcm_vol_cb(halCtlsTagT tag, alsaHalCtlMapT *control, void* handle,  json_object *j_obj) {
-
-    const char *j_str = json_object_to_json_string(j_obj);
-
-    if (wrap_json_unpack(j_obj, "[iiiiii!]", &pcm_volume[0], &pcm_volume[1], &pcm_volume[2], &pcm_volume[3],
-                                             &pcm_volume[4], &pcm_volume[5]) == 0) {
-        AFB_NOTICE("pcm_vol: %s", j_str);
-        wrap_volume_pcm(pcm_volume, PCM_MAX_CHANNELS/*array size*/);
-    }
-    else {
-        AFB_NOTICE("pcm_vol: INVALID STRING %s", j_str);
-    }
-}
-
-/* declare ALSA mixer controls */
-STATIC alsaHalMapT  alsaHalMap[]= {
-  { .tag=Master_Playback_Volume, .cb={.callback=unicens_master_vol_cb, .handle=&master_volume}, .info="Sets master playback volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=50, .name="Master Playback Volume"}
-  },
-  /*{ .tag=Master_OnOff_Switch, .cb={.callback=unicens_master_switch_cb, .handle=&master_switch}, .info="Sets master playback switch",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_BOOLEAN, .count=1, .minval=0, .maxval=1, .step=1, .value=1, .name="Master Playback Switch"}
-  },*/
-  { .tag=PCM_Playback_Volume, .cb={.callback=unicens_pcm_vol_cb, .handle=&pcm_volume}, .info="Sets PCM playback volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=6, .minval=0, .maxval=100, .step=1, .value=100, .name="PCM Playback Volume"}
-  },
-  { .tag=EndHalCrlTag}              /* marker for end of the array */
-} ;
-
-/* HAL sound card mapping info */
-STATIC alsaHalSndCardT alsaHalSndCard  = {
-    .name  = ALSA_CARD_NAME,   /*  WARNING: name MUST match with 'aplay -l' */
-    .info  = "HAL for MICROCHIP MOST sound card controlled by UNICENS binding",
-    .ctls  = alsaHalMap,
-    .volumeCB = NULL,               /* use default volume normalization function */
-};
-
-/* initializes ALSA sound card, UNICENS API */
-STATIC int unicens_service_init() {
-    int err = 0;
-    char *config_file = NULL;
-    AFB_NOTICE("Initializing HAL-MOST-UNICENS-BINDING");
-
-    err = halServiceInit(afbBindingV2.api, &alsaHalSndCard);
-    if (err) {
-        AFB_ERROR("Cannot initialize ALSA soundcard.");
-        goto OnErrorExit;
-    }
-
-    err= afb_daemon_require_api("UNICENS", 1);
-    if (err) {
-        AFB_ERROR("Failed to access UNICENS API");
-        goto OnErrorExit;
-    }
-
-    err = wrap_ucs_getconfig_sync(UCS2_CFG_PATH, &config_file);
-    if (err || (config_file == NULL)) {
-        AFB_ERROR("Failed to retrieve configuration");
-        goto OnErrorExit;
-    }
-    else {
-        AFB_NOTICE("Found configuration: %s", config_file);
-    }
-
-    err = wrap_ucs_subscribe_sync();
-    if (err) {
-        AFB_ERROR("Failed to subscribe to UNICENS binding");
-        goto OnErrorExit;
-    }
-
-    err = wrap_ucs_initialize_sync(config_file);
-    free(config_file);
-    config_file = NULL;
-
-    if (err) {
-        AFB_ERROR("Failed to initialize UNICENS binding");
-        goto OnErrorExit;
-    }
-
-    err = wrap_volume_init();
-    if (err) {
-        AFB_ERROR("Failed to initialize wrapper for volume library");
-        goto OnErrorExit;
-    }
-    
-    /* request of initial card values */
-    /* unicens_request_card_values(ALSA_DEVICE_ID); */
-    
-OnErrorExit:
-    AFB_NOTICE("Initializing HAL-MOST-UNICENS-BINDING done..");
-    return err;
-}
-
-// This receive all event this binding subscribe to
-PUBLIC void unicens_event_cb(const char *evtname, json_object *j_event) {
-
-    if (strncmp(evtname, "alsacore/", 9) == 0) {
-        halServiceEvent(evtname, j_event);
-        return;
-    }
-
-    if (strncmp(evtname, "UNICENS/", 8) == 0) {
-        //AFB_NOTICE("unicens_event_cb: evtname=%s, event=%s", evtname, json_object_get_string(j_event));
-        if (strcmp(evtname, "UNICENS/node-availibility") == 0) {
-            
-            int node;
-            int available;
-            if (wrap_json_unpack(j_event, "{s:i,s:b}", "node", &node, "available", &available) == 0) {
-                AFB_NOTICE("Node-Availability: node=0x%03X, available=%d", node, available);
-                wrap_volume_node_avail(node, available);
-            }
-        }
-        
-        return;
-    }
-    
-    AFB_NOTICE("unicens_event_cb: UNHANDLED EVENT, evtname=%s, event=%s", evtname, json_object_get_string(j_event));
-}
-
-/* API prefix should be unique for each snd card */
-PUBLIC const struct afb_binding_v2 afbBindingV2 = {
-    .api     = "hal-most-unicens",
-    .init    = unicens_service_init,
-    .verbs   = halServiceApi,
-    .onevent = unicens_event_cb,
-};
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt
deleted file mode 100644
index c734639..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt
+++ /dev/null
@@ -1,26 +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.
-###########################################################################
-
-
-
-# Define subproject targets
-ADD_SUBDIRECTORY(src)
-
-
-
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_container.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_container.h
deleted file mode 100644
index 9fabdb5..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_container.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-
-#ifndef DEVICECONTAINER_H
-#define	DEVICECONTAINER_H
-
-#include "device_value.h"
-#include "libmostvolume.h"
-
-class CDeviceContainer {
-
-public:
-    CDeviceContainer();
-    virtual ~CDeviceContainer();
-
-    void AssignService(lib_most_volume_init_t *init_ptr) {_init_ptr = init_ptr;}
-
-    void RegisterValues(CDeviceValue** list_pptr, uint16_t list_sz);
-    void SetValue(uint16_t key, uint8_t value);
-    void ClearValues();
-    void Update();
-    void ChangeNodeAvailable(uint16_t address, bool available);
-
-private:
-    void RequestService(uint16_t timeout);
-    void IncrementProcIndex(void);
-    void HandleI2cResult(uint8_t result);
-    static void OnI2cResult(uint8_t result, void *obj_ptr);
-
-    uint16_t _idx_processing;
-    uint16_t _values_sz;
-    CDeviceValue **_values_pptr;
-    bool _tx_busy;
-    bool _service_requested;
-    lib_most_volume_init_t *_init_ptr;
-};
-
-#endif	/* DEVICECONTAINER_H */
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h
deleted file mode 100644
index bc8f142..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-
-#ifndef DEVICEVALUE_H
-#define	DEVICEVALUE_H
-
-#include <stdint.h>
-#include "libmostvolume.h"
-
-struct SRxMessage {
-    uint32_t devInst;   /*instance if multiple devices are using the same group id*/
-    uint32_t sourceAddr;
-    uint32_t targetAddr;
-    uint32_t nFBlock;
-    uint32_t nInst;
-    uint32_t nFunc;
-    uint32_t nOpType;
-    const uint8_t *pPayload;
-    uint32_t payloadLen;
-};
-
-struct STxMessage {
-    uint32_t devInst;   /*instance if multiple devices are using the same group id*/
-    uint32_t targetAddr;
-    uint32_t nFBlock;
-    uint32_t nInst;
-    uint32_t nFunc;
-    uint32_t nOpType;
-    const uint8_t *pPayload;
-    uint32_t payloadLen;
-};
-
-enum DeviceValueType {
-    DEVICE_VAL_MASTER = 0,
-    DEVICE_VAL_LEFT = 1,
-    DEVICE_VAL_RIGHT = 2
-
-};
-
-class CDeviceValue {
-public:
-    CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key);
-    virtual ~CDeviceValue();
-
-    uint16_t GetKey(){return _key;}
-    DeviceValueType GetType(){return _type;}        // returns the assigned type
-    void SetValue(uint8_t value){_target_value = value;}   // sets desired value
-
-    bool RequiresUpdate();      // returns true if target is not actual value
-                                // returns true if success, false if failed
-                                // -> stop transmission
-    bool FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr,
-                           lib_most_volume_writei2c_result_cb_t result_fptr,
-                           void *result_user_ptr);// fires message & updates actual value
-    
-    void SetAvailable(bool active){this->_is_available = active; _actual_value = 0x01u;}
-    bool IsAvailable() {return this->_is_available;}
-    uint16_t GetAddress() {return this->_address;}
-
-private:
-    void ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[]);
-    void HandleI2cResult(uint8_t result);
-    static void OnI2cResult(uint8_t result, void *obj_ptr);
-
-    bool     _is_available;     // related node is available
-    bool     _is_busy;          // do not update while busy
-    DeviceValueType _type;      // determines the remote i2c command
-    uint16_t _key;              // lookup key
-    uint16_t _address;          // target node/group address
-    uint8_t  _target_value;     // desired value
-    uint8_t  _transmitted_value;// value pending during transmission        
-    uint8_t  _actual_value;     // value set and confirmed via network
-    uint8_t  _tx_payload[20];
-    uint8_t  _tx_payload_sz;
-    
-    lib_most_volume_writei2c_result_cb_t _result_fptr;
-    void *_result_user_ptr;
-};
-
-#endif	/* DEVICEPROPERTY_H */
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h
deleted file mode 100644
index 1147993..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-
-#ifndef LIB_MOST_VOLUME_H
-#define	LIB_MOST_VOLUME_H
-
-#include <stdint.h>
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/** Describes the volume control */
-enum lib_most_volume_channel_t{
-    LIB_MOST_VOLUME_CH_FRONT_LEFT   = 0,
-    LIB_MOST_VOLUME_CH_FRONT_RIGHT  = 1,
-    LIB_MOST_VOLUME_CH_REAR_LEFT    = 2,
-    LIB_MOST_VOLUME_CH_REAR_RIGHT   = 3,
-    LIB_MOST_VOLUME_CH_CENTER       = 4,
-    LIB_MOST_VOLUME_CH_SUB          = 5,
-    LIB_MOST_VOLUME_MASTER          = 6
-};
-
-/** Is fired when the application shall call "lib_most_volume_service()" after a certain time
-  * \param timeout  Time in ms after which the application shall call lib_most_volume_service().
-  *                 Valid values:
-  *                 0x0000: as soon as possible,
-  *                 0x0001..0xFFFE: timeout in ms,
-  *                 0xFFFF: never
-  */
-typedef void (*lib_most_volume_service_cb_t)(uint16_t timeout);
-
-typedef void (*lib_most_volume_writei2c_result_cb_t)(uint8_t result, void *user_ptr);
-
-/** Callback function required to write volume changes to network devices
-  * \param node     The node address
-  * \param data_ptr I2C command data
-  * \param data_sz  Size of the I2C command data
-  * \return         Returns \c 0 for success, other value on failure.
-  */
-typedef int (*lib_most_volume_writei2c_cb_t)(uint16_t node, uint8_t *data_ptr, uint8_t data_sz,
-                                            lib_most_volume_writei2c_result_cb_t result_fptr,
-                                            void *result_user_ptr);
-
-typedef struct lib_most_volume_init_ {
-    lib_most_volume_service_cb_t  service_cb;
-    lib_most_volume_writei2c_cb_t writei2c_cb;
-
-} lib_most_volume_init_t;
-
-
-/** Initializes the library
-  * \param   UNICENS_inst       Reference to the UNICENS instance, created by the application.
-  * \param   req_service_fptr   Callback function which is fired if the application shall call
-  *                             lib_most_volume_service.
-  * \return  '0' on success, otherwise value >'0'.
-  */
-extern uint8_t lib_most_volume_init(lib_most_volume_init_t *init_ptr);
-
-/** Terminates the library
-  * \return  '0' on success, otherwise value >'0'.
-  */
-extern uint8_t lib_most_volume_exit(void);
-
-/** Sets a single volume value.
-  * \param   channel        The volume control to be set.
-  * \param   volume         The volume value to be set. Valid values: 0..255.
-  * \return  '0' on success, otherwise value >'0'.
-  */
-extern uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, uint8_t volume);
-
-/** Must be called when the availability of a node has changed
-  * \param   address        The node address
-  * \param   available      Availability: 0 - not available, 1 - available
-  * \return  '0' on success, otherwise value >'0'.
-  */
-extern uint8_t lib_most_volume_node_available(uint16_t address, uint8_t available);
-
-/** Shall be called either cyclically (e.g. 50ms -> polling) or after "timeout"
-  * when "service_fptr" is fired (-> event triggered).
-  * \return  '0' on success, otherwise value >'0'.
-  */
-extern uint8_t lib_most_volume_service(void);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* LIB_MOST_VOLUME_H */
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/setup.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/setup.h
deleted file mode 100644
index e7cda01..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/setup.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-
-#ifndef SETUP_H
-#define	SETUP_H
-
-#include "libmostvolume.h"
-#include "device_value.h"
-#include "device_container.h"
-
-#define MAX_CHANNELS    (LIB_MOST_VOLUME_MASTER + 1u)
-#define MAX_MASTERS     3u
-
-class CSetup {
-
-public:
-    void Configure(lib_most_volume_init_t *init_ptr);
-    void SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume);
-    void Update();
-    void SetNodeAvailable(uint16_t address, bool available);
-
-private:
-    CDeviceValue _volume_amp_270_m;
-    CDeviceValue _volume_amp_270_l;
-    CDeviceValue _volume_amp_270_r;
-
-    CDeviceValue _volume_amp_271_m;
-    CDeviceValue _volume_amp_271_l;
-    CDeviceValue _volume_amp_271_r;
-
-    CDeviceValue _volume_amp_272_m;
-    CDeviceValue _volume_amp_272_l;
-    CDeviceValue _volume_amp_272_r;
-
-    CDeviceContainer _value_container;
-    lib_most_volume_init_t init_data;
-
-public:
-    static CSetup* GetInstance();   // singleton
-    static void Release();          // singleton
-
-protected:
-    CSetup();                       // singleton
-    virtual ~CSetup();              // singleton
-
-private:
-    static CSetup* _instance;       // singleton
-};
-
-#endif	/* SETUP_H */
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/CMakeLists.txt
deleted file mode 100644
index 1be7184..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/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.
-###########################################################################
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(ucs2-volume)
-
-# Define targets source files
-ADD_LIBRARY(${TARGET_NAME} STATIC device_container.cpp  device_value.cpp  libmostvolume.cpp  setup.cpp)
-
-    # Library properties
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    # Library dependencies from PKG_REQUIRED_LIST
-    #TARGET_LINK_LIBRARIES(ucs2-volume     # Library dependencies (include updates automatically)
-    #    ${link_libraries}
-    #)
-
-    # Define properties to expose when others use this target
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
-       PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../inc
-    )
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp
deleted file mode 100644
index f8b1961..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-
-#include <stddef.h>
-#include "device_container.h"
-
-#define DEVCONT_TIME_RETRIGGER      (uint16_t)30U
-#define DEVCONT_TIME_NOW            (uint16_t)0U
-#define DEVCONT_TIME_STOP           (uint16_t)0xFFFFU
-
-#define DEVCONT_UNUSED(a)     (a = a)
-
-CDeviceContainer::CDeviceContainer()
-{
-    this->_idx_processing = 0U;
-    this->_values_pptr = NULL;
-    this->_values_sz = 0U;
-    this->_tx_busy = false;
-    this->_service_requested = false;
-    this->_init_ptr = NULL;
-}
-
-CDeviceContainer::~CDeviceContainer()
-{
-    /*Clb_RegisterI2CResultCB(NULL, NULL);*/    /* avoid that the result callback is fired after object is destroyed */
-}
-
-void CDeviceContainer::RegisterValues(CDeviceValue** list_pptr, uint16_t list_sz)
-{
-    this->_idx_processing = 0U;
-    this->_values_pptr = list_pptr;
-    this->_values_sz = list_sz;
-    this->_tx_busy = false;
-
-    if ((list_pptr != NULL) && (list_sz > 0U))
-    {
-        this->_idx_processing = (uint16_t)(list_sz - 1U);
-    }
-}
-
-void CDeviceContainer::ClearValues()
-{
-    this->_idx_processing = 0U;
-    this->_values_pptr = NULL;
-    this->_values_sz = 0U;
-    this->_tx_busy = false;
-}
-
-void CDeviceContainer::SetValue(uint16_t key, uint8_t value)
-{
-     uint16_t idx;
-     bool req_update = false;
-
-     for (idx = 0U; idx < this->_values_sz; idx++)
-     {
-         if (this->_values_pptr[idx]->GetKey() == key)
-         {
-            this->_values_pptr[idx]->SetValue(value);
-            if (this->_values_pptr[idx]->RequiresUpdate())
-            {
-                req_update = true;
-            }
-         }
-     }
-
-    if (req_update && (!this->_tx_busy))
-    {
-        RequestService(DEVCONT_TIME_NOW); //fire callback
-    }
-}
-
-void CDeviceContainer::IncrementProcIndex(void)
-{
-    if ((_idx_processing + 1U) >=  this->_values_sz)
-    {
-        _idx_processing = 0U;
-    }
-    else
-    {
-        _idx_processing++;
-    }
-}
-
-// starts at latest position, searches next value to update, waits until response
-void CDeviceContainer::Update()
-{
-    uint16_t cnt;
-    bool error = false;
-    _service_requested = false;
-
-    if (this->_tx_busy)
-    {
-        return;
-    }
-
-    for (cnt = 0u; cnt < this->_values_sz; cnt++)   /* just run one cycle */
-    {
-        IncrementProcIndex();
-
-        if (_values_pptr[_idx_processing]->RequiresUpdate())
-        {
-            if (_values_pptr[_idx_processing]->FireUpdateMessage(this->_init_ptr->writei2c_cb,
-                                                                 &OnI2cResult,
-                                                                 this))
-            {
-                this->_tx_busy = true;
-                error = false;
-                break;
-            }
-            else
-            {
-                error = true;
-                break;
-            }
-        }
-    }
-
-    if (error)
-    {
-        RequestService(DEVCONT_TIME_RETRIGGER);
-    }
-}
-
-void CDeviceContainer::HandleI2cResult(uint8_t result)
-{
-    this->_tx_busy = false;
-    if (result == 0)
-        this->RequestService(DEVCONT_TIME_NOW);
-    else
-        this->RequestService(DEVCONT_TIME_RETRIGGER);
-}
-
-void CDeviceContainer::OnI2cResult(uint8_t result, void *obj_ptr)
-{
-    ((CDeviceContainer*)obj_ptr)->HandleI2cResult(result);
-}
-
-void CDeviceContainer::RequestService(uint16_t timeout)
-{
-    if (!_service_requested)
-    {
-        _service_requested = true;
-
-        if (this->_init_ptr && this->_init_ptr->service_cb)
-        {
-            this->_init_ptr->service_cb(timeout);
-        }
-    }
-}
-
-void CDeviceContainer::ChangeNodeAvailable(uint16_t address, bool available)
-{
-    uint16_t idx;
-    
-    for (idx = 0U; idx < this->_values_sz; idx++)
-    {
-        if (this->_values_pptr[idx]->GetAddress() == address)
-        {
-            this->_values_pptr[idx]->SetAvailable(available);
-        }
-    }
-    
-    if (available)
-    {
-        RequestService(DEVCONT_TIME_RETRIGGER);
-    }
-}
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp
deleted file mode 100644
index 7103192..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-#include <stddef.h>
-#include "device_value.h"
-#include "setup.h"
-
-#define MUTE_VALUE      0x03FFU
-#define MUTE_VALUE_HB   0x03U
-#define MUTE_VALUE_LB   0xFFU
-
-#define CONTROL_MASTER  0x07U
-#define CONTROL_CH_1    0x08U
-#define CONTROL_CH_2    0x09U
-
-CDeviceValue::CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key)
-{
-    this->_is_available = false;
-    this->_is_busy = false;
-    this->_address = address;
-    this->_target_value = 0x01u;
-    this->_actual_value = 0x01u;
-    
-    this->_result_fptr = NULL;
-    this->_result_user_ptr = NULL;
-
-    this->_type = type;
-    this->_key = key;
-
-    _tx_payload[0] = CONTROL_MASTER;// 7: master, 8: channel 1, 9: Channel 2
-    _tx_payload[1] = MUTE_VALUE_HB; //HB:Volume
-    _tx_payload[2] = MUTE_VALUE_LB; //LB:Volume
-    _tx_payload_sz = 3u;
-}
-
-CDeviceValue::~CDeviceValue()
-{
-}
-
-void CDeviceValue::ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[])
-{
-    uint16_t tmp = MUTE_VALUE;
-
-    switch (type)
-    {
-        case DEVICE_VAL_LEFT:
-            tmp = (uint16_t)(0x80U + 0x37FU - (0x37FU * ((int32_t)value) / (0xFFU)));
-            //tmp = 0x3FF - (0x3FF * ((int32_t)value) / (0xFF));
-            //tmp = 0x100 + 0x2FF - (0x2FF * ((int32_t)value) / (0xFF));
-            tx_payload[0] = CONTROL_CH_1;
-            break;
-        case DEVICE_VAL_RIGHT:
-            tmp = (uint16_t)(0x80U + 0x37FU - (0x37FU * ((int32_t)value) / (0xFFU)));
-            //tmp = 0x3FF - (0x3FF * ((int32_t)value) / (0xFF));
-            //tmp = 0x100 + 0x2FF - (0x2FF * ((int32_t)value) / (0xFF));
-            tx_payload[0] = CONTROL_CH_2;
-            break;
-        default:
-            /*std::cerr << "CDeviceValue::ApplyMostValue() error matching incorrect" << std::endl;*/
-        case DEVICE_VAL_MASTER:
-            tmp = (uint16_t)(0x100U + 0x2FFU - (0x2FFU * ((int32_t)value) / (0xFFU)));
-            tx_payload[0] = CONTROL_MASTER;
-            break;
-    }
-
-    tx_payload[1] = (uint8_t)((tmp >> 8U) & (uint16_t)0xFFU); //HB:Volume
-    tx_payload[2] = (uint8_t)(tmp  & (uint16_t)0xFFU); //LB:Volume
-}
-
-// returns true if target is not actual value
-bool CDeviceValue::RequiresUpdate()
-{
-    if (this->_is_available && !this->_is_busy && (this->_target_value != this->_actual_value))
-    {
-        return true;
-    }
-
-    return false;
-}
-
-bool CDeviceValue::FireUpdateMessage(lib_most_volume_writei2c_cb_t writei2c_fptr,
-                                     lib_most_volume_writei2c_result_cb_t result_fptr,
-                                     void *result_user_ptr)
-{
-    int ret = -1;
-    ApplyMostValue(this->_target_value, _type, _tx_payload);
-
-    if (this->_is_available && !this->_is_busy)
-    {
-        ret = writei2c_fptr(this->_address, &_tx_payload[0], _tx_payload_sz, 
-                            &OnI2cResult,
-                            this);
-        
-        if (ret == 0)
-        {
-            this->_transmitted_value = this->_target_value;
-            this->_is_busy = true;
-            this->_result_fptr = result_fptr;
-            this->_result_user_ptr = result_user_ptr;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void CDeviceValue::HandleI2cResult(uint8_t result)
-{
-    if (result == 0)
-    {
-        /* transmission succeeded - now apply transmitted value */
-        this->_actual_value = this->_transmitted_value;
-    }
-    
-    if (this->_result_fptr)
-    {
-        /* notify container */
-        this->_result_fptr(result, this->_result_user_ptr);
-    }
-    
-    this->_result_fptr = NULL;
-    this->_result_user_ptr = NULL;
-    this->_is_busy = false;
-}
-
-void CDeviceValue::OnI2cResult(uint8_t result, void *obj_ptr)
-{
-    ((CDeviceValue*)obj_ptr)->HandleI2cResult(result);
-}
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp
deleted file mode 100644
index 5eea3fd..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-
-#include "libmostvolume.h"
-#include "setup.h"
-/*#include <iostream>*/
-
-static bool _running = false;
-
-extern "C" uint8_t lib_most_volume_init(lib_most_volume_init_t *init_ptr)
-{
-    uint8_t success = 1U;
-    /*std::cerr << "lib_most_volume_init(): called" << std::endl;*/
-
-    if (!_running && init_ptr)
-    {
-        CSetup::GetInstance()->Configure(init_ptr);
-        success = 0U;
-        _running = true;
-    }
-
-    return success;
-}
-
-extern "C" uint8_t lib_most_volume_exit(void)
-{
-    uint8_t success = 1U;
-    /*std::cerr << "lib_most_volume_exit(): called" << std::endl;*/
-
-    if (_running)
-    {
-        CSetup::Release();
-        success = 0U;
-        _running = false;
-    }
-
-    return success;
-}
-
-extern "C" uint8_t lib_most_volume_set(enum lib_most_volume_channel_t channel, uint8_t volume)
-{
-    uint8_t success = 1U;
-    /*std::cerr << "lib_most_volume_set(): channel=" << channel << ", volume=" << (int)volume << std::endl;*/
-
-    if (_running)
-    {
-        CSetup::GetInstance()->SetVolume(channel, volume);
-        success = 0U;
-    }
-
-    return success;
-}
-
-extern uint8_t lib_most_volume_node_available(uint16_t address, uint8_t available)
-{
-    uint8_t success = 1U;
-    
-    if (_running)
-    {
-        CSetup::GetInstance()->SetNodeAvailable(address, available);
-        success = 0U;
-    } 
-    
-    return success;
-}
-
-extern "C" uint8_t lib_most_volume_service(void)
-{
-    uint8_t success = 1U;
-    /*std::cerr << "lib_most_volume_service(): called" << std::endl;*/
-
-    if (_running)
-    {
-        CSetup::GetInstance()->Update();
-        success = 0U;
-    }
-
-    return success;
-}
diff --git a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp
deleted file mode 100644
index dd6675b..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * libmostvolume example
- *
- * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You may also obtain this software under a propriety license from Microchip.
- * Please contact Microchip for further information.
- *
- */
-#include <stddef.h>
-#include "setup.h"
-
-CSetup* CSetup::_instance = NULL;
-
-// singleton
-CSetup* CSetup::GetInstance() {
-    if (_instance == NULL) {
-        _instance = new CSetup();
-    }
-
-    return _instance;
-}
-
-// singleton
-void CSetup::Release() {
-    if (_instance != NULL) {
-        delete _instance;
-    }
-    _instance = NULL;
-}
-
-CSetup::CSetup()
-    :   _volume_amp_270_m(0x270U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER),
-        _volume_amp_270_l(0x270U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_FRONT_LEFT),
-        _volume_amp_270_r(0x270U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_FRONT_RIGHT),
-        _volume_amp_271_m(0x271U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER),
-        _volume_amp_271_l(0x271U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_REAR_LEFT),
-        _volume_amp_271_r(0x271U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_REAR_RIGHT),
-        _volume_amp_272_m(0x272U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER),
-        _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER),
-        _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB),
-        _value_container()
-{
-    static CDeviceValue* value_list[9] = {  &_volume_amp_270_m,
-                                            &_volume_amp_270_l,
-                                            &_volume_amp_270_r,
-                                            &_volume_amp_271_m,
-                                            &_volume_amp_271_l,
-                                            &_volume_amp_271_r,
-                                            &_volume_amp_272_m,
-                                            &_volume_amp_272_l,
-                                            &_volume_amp_272_r};
-
-    _value_container.RegisterValues(value_list, 9U);
-}
-
-CSetup::~CSetup()
-{
-
-}
-
-void CSetup::Configure(lib_most_volume_init_t *init_ptr)
-{
-    this->init_data = *init_ptr;
-    _value_container.AssignService(&this->init_data);
-}
-
-void CSetup::SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume)
-{
-    _value_container.SetValue((uint16_t)channel, volume);
-}
-
-void CSetup::Update()
-{
-    _value_container.Update();
-}
-
-void CSetup::SetNodeAvailable(uint16_t address, bool available)
-{
-    _value_container.ChangeNodeAvailable(address, available);
-}
diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap-json.c b/HAL-afb/HAL_MOST_UNICENS/wrap-json.c
deleted file mode 100644
index 987a008..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap-json.c
+++ /dev/null
@@ -1,940 +0,0 @@
-/*

- Copyright (C) 2016, 2017 "IoT.bzh"

-

- author: José Bollo <jose.bollo@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.

-*/

-

-#include <string.h>

-

-#include "wrap-json.h"

-

-#define STACKCOUNT  32

-#define STRCOUNT    8

-

-enum {

-	wrap_json_error_none,

-	wrap_json_error_null_object,

-	wrap_json_error_truncated,

-	wrap_json_error_internal_error,

-	wrap_json_error_out_of_memory,

-	wrap_json_error_invalid_character,

-	wrap_json_error_too_long,

-	wrap_json_error_too_deep,

-	wrap_json_error_null_spec,

-	wrap_json_error_null_key,

-	wrap_json_error_null_string,

-	wrap_json_error_out_of_range,

-	wrap_json_error_incomplete,

-	wrap_json_error_missfit_type,

-	wrap_json_error_key_not_found,

-	_wrap_json_error_count_

-};

-

-static const char ignore_all[] = " \t\n\r,:";

-static const char pack_accept_arr[] = "][{snbiIfoO";

-static const char pack_accept_key[] = "s}";

-#define pack_accept_any (&pack_accept_arr[1])

-

-static const char unpack_accept_arr[] = "*!][{snbiIfFoO";

-static const char unpack_accept_key[] = "*!s}";

-#define unpack_accept_any (&unpack_accept_arr[3])

-

-static const char *pack_errors[_wrap_json_error_count_] =

-{

-	[wrap_json_error_none] = "unknown error",

-	[wrap_json_error_null_object] = "null object",

-	[wrap_json_error_truncated] = "truncated",

-	[wrap_json_error_internal_error] = "internal error",

-	[wrap_json_error_out_of_memory] = "out of memory",

-	[wrap_json_error_invalid_character] = "invalid character",

-	[wrap_json_error_too_long] = "too long",

-	[wrap_json_error_too_deep] = "too deep",

-	[wrap_json_error_null_spec] = "spec is NULL",

-	[wrap_json_error_null_key] = "key is NULL",

-	[wrap_json_error_null_string] = "string is NULL",

-	[wrap_json_error_out_of_range] = "array too small",

-	[wrap_json_error_incomplete] = "incomplete container",

-	[wrap_json_error_missfit_type] = "missfit of type",

-	[wrap_json_error_key_not_found] = "key not found"

-};

-

-int wrap_json_get_error_position(int rc)

-{

-	if (rc < 0)

-		rc = -rc;

-	return (rc >> 4) + 1;

-}

-

-int wrap_json_get_error_code(int rc)

-{

-	if (rc < 0)

-		rc = -rc;

-	return rc & 15;

-}

-

-const char *wrap_json_get_error_string(int rc)

-{

-	rc = wrap_json_get_error_code(rc);

-	if (rc >= sizeof pack_errors / sizeof *pack_errors)

-		rc = 0;

-	return pack_errors[rc];

-}

-

-

-

-static inline const char *skip(const char *d)

-{

-	while (*d && strchr(ignore_all, *d))

-		d++;

-	return d;

-}

-

-int wrap_json_vpack(struct json_object **result, const char *desc, va_list args)

-{

-	/* TODO: the case of structs with key being single char should be optimized */

-	int nstr, notnull, nullable, rc;

-	size_t sz, dsz, ssz;

-	char *s;

-	char c;

-	const char *d;

-	char buffer[256];

-	struct { const char *str; size_t sz; } strs[STRCOUNT];

-	struct { struct json_object *cont, *key; const char *acc; char type; } stack[STACKCOUNT], *top;

-	struct json_object *obj;

-

-	ssz = sizeof buffer;

-	s = buffer;

-	top = stack;

-	top->key = NULL;

-	top->cont = NULL;

-	top->acc = pack_accept_any;

-	top->type = 0;

-	d = desc;

-	if (!d)

-		goto null_spec;

-	d = skip(d);

-	for(;;) {

-		c = *d;

-		if (!c)

-			goto truncated;

-		if (!strchr(top->acc, c))

-			goto invalid_character;

-		d = skip(++d);

-		switch(c) {

-		case 's':

-			nullable = 0;

-			notnull = 0;

-			nstr = 0;

-			sz = 0;

-			for (;;) {

-				strs[nstr].str = va_arg(args, const char*);

-				if (strs[nstr].str)

-					notnull = 1;

-				if (*d == '?') {

-					d = skip(++d);

-					nullable = 1;

-				}

-				switch(*d) {

-				case '%': strs[nstr].sz = va_arg(args, size_t); d = skip(++d); break;

-				case '#': strs[nstr].sz = (size_t)va_arg(args, int); d = skip(++d); break;

-				default: strs[nstr].sz = strs[nstr].str ? strlen(strs[nstr].str) : 0; break;

-				}

-				sz += strs[nstr++].sz;

-				if (*d == '?') {

-					d = skip(++d);

-					nullable = 1;

-				}

-				if (*d != '+')

-					break;

-				if (nstr >= STRCOUNT)

-					goto too_long;

-				d = skip(++d);

-			}

-			if (*d == '*')

-				nullable = 1;

-			if (notnull) {

-				if (sz > ssz) {

-					ssz += ssz;

-					if (ssz < sz)

-						ssz = sz;

-					s = alloca(sz);

-				}

-				dsz = sz;

-				while (nstr) {

-					nstr--;

-					dsz -= strs[nstr].sz;

-					memcpy(&s[dsz], strs[nstr].str, strs[nstr].sz);

-				}

-				obj = json_object_new_string_len(s, (int)sz);

-				if (!obj)

-					goto out_of_memory;

-			} else if (nullable)

-				obj = NULL;

-			else

-				goto null_string;

-			break;

-		case 'n':

-			obj = NULL;

-			break;

-		case 'b':

-			obj = json_object_new_boolean(va_arg(args, int));

-			if (!obj)

-				goto out_of_memory;

-			break;

-		case 'i':

-			obj = json_object_new_int(va_arg(args, int));

-			if (!obj)

-				goto out_of_memory;

-			break;

-		case 'I':

-			obj = json_object_new_int64(va_arg(args, int64_t));

-			if (!obj)

-				goto out_of_memory;

-			break;

-		case 'f':

-			obj = json_object_new_double(va_arg(args, double));

-			if (!obj)

-				goto out_of_memory;

-			break;

-		case 'o':

-		case 'O':

-			obj = va_arg(args, struct json_object*);

-			if (*d == '?')

-				d = skip(++d);

-			else if (*d != '*' && !obj)

-				goto null_object;

-			if (c == 'O')

-				json_object_get(obj);

-			break;

-		case '[':

-		case '{':

-			if (++top >= &stack[STACKCOUNT])

-				goto too_deep;

-			top->key = NULL;

-			if (c == '[') {

-				top->type = ']';

-				top->acc = pack_accept_arr;

-				top->cont = json_object_new_array();

-			} else {

-				top->type = '}';

-				top->acc = pack_accept_key;

-				top->cont = json_object_new_object();

-			}

-			if (!top->cont)

-				goto out_of_memory;

-			continue;

-		case '}':

-		case ']':

-			if (c != top->type || top <= stack)

-				goto internal_error;

-			obj = (top--)->cont;

-			if (*d == '*' && !(c == '}' ? json_object_object_length(obj) : json_object_array_length(obj))) {

-				json_object_put(obj);

-				obj = NULL;

-			}

-			break;

-		default:

-			goto internal_error;

-		}

-		switch (top->type) {

-		case 0:

-			if (top != stack)

-				goto internal_error;

-			if (*d)

-				goto invalid_character;

-			*result = obj;

-			return 0;

-		case ']':

-			if (obj || *d != '*')

-				json_object_array_add(top->cont, obj);

-			if (*d == '*')

-				d = skip(++d);

-			break;

-		case '}':

-			if (!obj)

-				goto null_key;

-			top->key = obj;

-			top->acc = pack_accept_any;

-			top->type = ':';

-			break;

-		case ':':

-			if (obj || *d != '*')

-				json_object_object_add(top->cont, json_object_get_string(top->key), obj);

-			if (*d == '*')

-				d = skip(++d);

-			json_object_put(top->key);

-			top->key = NULL;

-			top->acc = pack_accept_key;

-			top->type = '}';

-			break;

-		default:

-			goto internal_error;

-		}

-	}

-

-null_object:

-	rc = wrap_json_error_null_object;

-	goto error;

-truncated:

-	rc = wrap_json_error_truncated;

-	goto error;

-internal_error:

-	rc = wrap_json_error_internal_error;

-	goto error;

-out_of_memory:

-	rc = wrap_json_error_out_of_memory;

-	goto error;

-invalid_character:

-	rc = wrap_json_error_invalid_character;

-	goto error;

-too_long:

-	rc = wrap_json_error_too_long;

-	goto error;

-too_deep:

-	rc = wrap_json_error_too_deep;

-	goto error;

-null_spec:

-	rc = wrap_json_error_null_spec;

-	goto error;

-null_key:

-	rc = wrap_json_error_null_key;

-	goto error;

-null_string:

-	rc = wrap_json_error_null_string;

-	goto error;

-error:

-	do {

-		json_object_put(top->key);

-		json_object_put(top->cont);

-	} while (--top >= stack);

-	*result = NULL;

-	rc = rc | (int)((d - desc) << 4);

-	return -rc;

-}

-

-int wrap_json_pack(struct json_object **result, const char *desc, ...)

-{

-	int rc;

-	va_list args;

-

-	va_start(args, desc);

-	rc = wrap_json_vpack(result, desc, args);

-	va_end(args);

-	return rc;

-}

-

-static int vunpack(struct json_object *object, const char *desc, va_list args, int store)

-{

-	int rc = 0, optionnal, ignore;

-	char c, xacc[2] = { 0, 0 };

-	const char *acc;

-	const char *d, *fit = NULL;

-	const char *key = NULL;

-	const char **ps = NULL;

-	double *pf = NULL;

-	int *pi = NULL;

-	int64_t *pI = NULL;

-	size_t *pz = NULL;

-	struct { struct json_object *parent; const char *acc; int index, count; char type; } stack[STACKCOUNT], *top;

-	struct json_object *obj;

-	struct json_object **po;

-

-	xacc[0] = 0;

-	ignore = 0;

-	top = NULL;

-	acc = unpack_accept_any;

-	d = desc;

-	if (!d)

-		goto null_spec;

-	d = skip(d);

-	obj = object;

-	for(;;) {

-		fit = d;

-		c = *d;

-		if (!c)

-			goto truncated;

-		if (!strchr(acc, c))

-			goto invalid_character;

-		d = skip(++d);

-		switch(c) {

-		case 's':

-			if (xacc[0] == '}') {

-				/* expects a key */

-				key = va_arg(args, const char *);

-				if (!key)

-					goto null_key;

-				if (*d != '?')

-					optionnal = 0;

-				else {

-					optionnal = 1;

-					d = skip(++d);

-				}

-				if (ignore)

-					ignore++;

-				else {

-					if (json_object_object_get_ex(top->parent, key, &obj)) {

-						/* found */

-						top->index++;

-					} else {

-						/* not found */

-						if (!optionnal)

-							goto key_not_found;

-						ignore = 1;

-						obj = NULL;

-					}

-				}

-				xacc[0] = ':';

-				acc = unpack_accept_any;

-				continue;

-			}

-			/* get a string */

-			if (store)

-				ps = va_arg(args, const char **);

-			if (!ignore) {

-				if (!json_object_is_type(obj, json_type_string))

-					goto missfit;

-				if (store && ps)

-					*ps = json_object_get_string(obj);

-			}

-			if (*d == '%') {

-				d = skip(++d);

-				if (store) {

-					pz = va_arg(args, size_t *);

-					if (!ignore && pz)

-						*pz = (size_t)json_object_get_string_len(obj);

-				}

-			}

-			break;

-		case 'n':

-			if (!ignore && !json_object_is_type(obj, json_type_null))

-				goto missfit;

-			break;

-		case 'b':

-			if (store)

-				pi = va_arg(args, int *);

-

-			if (!ignore) {

-				if (!json_object_is_type(obj, json_type_boolean))

-					goto missfit;

-				if (store && pi)

-					*pi = json_object_get_boolean(obj);

-			}

-			break;

-		case 'i':

-			if (store)

-				pi = va_arg(args, int *);

-

-			if (!ignore) {

-				if (!json_object_is_type(obj, json_type_int))

-					goto missfit;

-				if (store && pi)

-					*pi = json_object_get_int(obj);

-			}

-			break;

-		case 'I':

-			if (store)

-				pI = va_arg(args, int64_t *);

-

-			if (!ignore) {

-				if (!json_object_is_type(obj, json_type_int))

-					goto missfit;

-				if (store && pI)

-					*pI = json_object_get_int64(obj);

-			}

-			break;

-		case 'f':

-		case 'F':

-			if (store)

-				pf = va_arg(args, double *);

-

-			if (!ignore) {

-				if (!(json_object_is_type(obj, json_type_double) || (c == 'F' && json_object_is_type(obj, json_type_int))))

-					goto missfit;

-				if (store && pf)

-					*pf = json_object_get_double(obj);

-			}

-			break;

-		case 'o':

-		case 'O':

-			if (store) {

-				po = va_arg(args, struct json_object **);

-				if (!ignore && po) {

-					if (c == 'O')

-						obj = json_object_get(obj);

-					*po = obj;

-				}

-			}

-			break;

-

-		case '[':

-		case '{':

-			if (!top)

-				top = stack;

-			else if (++top  >= &stack[STACKCOUNT])

-				goto too_deep;

-

-			top->acc = acc;

-			top->type = xacc[0];

-			top->index = 0;

-			top->parent = obj;

-			if (ignore)

-				ignore++;

-			if (c == '[') {

-				if (!ignore) {

-					if (!json_object_is_type(obj, json_type_array))

-						goto missfit;

-					top->count = json_object_array_length(obj);

-				}

-				xacc[0] = ']';

-				acc = unpack_accept_arr;

-			} else {

-				if (!ignore) {

-					if (!json_object_is_type(obj, json_type_object))

-						goto missfit;

-					top->count = json_object_object_length(obj);

-				}

-				xacc[0] = '}';

-				acc = unpack_accept_key;

-				continue;

-			}

-			break;

-		case '}':

-		case ']':

-			if (!top || c != xacc[0])

-				goto internal_error;

-			acc = top->acc;

-			xacc[0] = top->type;

-			top = top == stack ? NULL : top - 1;

-			if (ignore)

-				ignore--;

-			break;

-		case '!':

-			if (*d != xacc[0])

-				goto invalid_character;

-			if (!ignore && top->index != top->count)

-				goto incomplete;

-			/*@fallthrough@*/

-		case '*':

-			acc = xacc;

-			continue;

-		default:

-			goto internal_error;

-		}

-		switch (xacc[0]) {

-		case 0:

-			if (top)

-				goto internal_error;

-			if (*d)

-				goto invalid_character;

-			return 0;

-		case ']':

-			if (!ignore) {

-				key = strchr(unpack_accept_arr, *d);

-				if (key && key >= unpack_accept_any) {

-					if (top->index >= top->count)

-						goto out_of_range;

-					obj = json_object_array_get_idx(top->parent, top->index++);

-				}

-			}

-			break;

-		case ':':

-			acc = unpack_accept_key;

-			xacc[0] = '}';

-			if (ignore)

-				ignore--;

-			break;

-		default:

-			goto internal_error;

-		}

-	}

-truncated:

-	rc = wrap_json_error_truncated;

-	goto error;

-internal_error:

-	rc = wrap_json_error_internal_error;

-	goto error;

-invalid_character:

-	rc = wrap_json_error_invalid_character;

-	goto error;

-too_deep:

-	rc = wrap_json_error_too_deep;

-	goto error;

-null_spec:

-	rc = wrap_json_error_null_spec;

-	goto error;

-null_key:

-	rc = wrap_json_error_null_key;

-	goto error;

-out_of_range:

-	rc = wrap_json_error_out_of_range;

-	goto error;

-incomplete:

-	rc = wrap_json_error_incomplete;

-	goto error;

-missfit:

-	rc = wrap_json_error_missfit_type;

-	goto errorfit;

-key_not_found:

-	rc = wrap_json_error_key_not_found;

-	goto error;

-errorfit:

-	d = fit;

-error:

-	rc = rc | (int)((d - desc) << 4);

-	return -rc;

-}

-

-int wrap_json_vcheck(struct json_object *object, const char *desc, va_list args)

-{

-	return vunpack(object, desc, args, 0);

-}

-

-int wrap_json_check(struct json_object *object, const char *desc, ...)

-{

-	int rc;

-	va_list args;

-

-	va_start(args, desc);

-	rc = vunpack(object, desc, args, 0);

-	va_end(args);

-	return rc;

-}

-

-int wrap_json_vmatch(struct json_object *object, const char *desc, va_list args)

-{

-	return !vunpack(object, desc, args, 0);

-}

-

-int wrap_json_match(struct json_object *object, const char *desc, ...)

-{

-	int rc;

-	va_list args;

-

-	va_start(args, desc);

-	rc = vunpack(object, desc, args, 0);

-	va_end(args);

-	return !rc;

-}

-

-int wrap_json_vunpack(struct json_object *object, const char *desc, va_list args)

-{

-	return vunpack(object, desc, args, 1);

-}

-

-int wrap_json_unpack(struct json_object *object, const char *desc, ...)

-{

-	int rc;

-	va_list args;

-

-	va_start(args, desc);

-	rc = vunpack(object, desc, args, 1);

-	va_end(args);

-	return rc;

-}

-

-static void object_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure)

-{

-	struct json_object_iterator it = json_object_iter_begin(object);

-	struct json_object_iterator end = json_object_iter_end(object);

-	while (!json_object_iter_equal(&it, &end)) {

-		callback(closure, json_object_iter_peek_value(&it), json_object_iter_peek_name(&it));

-		json_object_iter_next(&it);

-	}

-}

-

-static void array_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure)

-{

-	int n = json_object_array_length(object);

-	int i = 0;

-	while(i < n)

-		callback(closure, json_object_array_get_idx(object, i++));

-}

-

-void wrap_json_optarray_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure)

-{

-	if (json_object_is_type(object, json_type_array))

-		array_for_all(object, callback, closure);

-	else

-		callback(closure, object);

-}

-

-void wrap_json_array_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure)

-{

-	if (json_object_is_type(object, json_type_array))

-		array_for_all(object, callback, closure);

-}

-

-void wrap_json_object_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure)

-{

-	if (json_object_is_type(object, json_type_object))

-		object_for_all(object, callback, closure);

-}

-

-void wrap_json_optobject_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure)

-{

-	if (json_object_is_type(object, json_type_object))

-		object_for_all(object, callback, closure);

-	else

-		callback(closure, object, NULL);

-}

-

-void wrap_json_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure)

-{

-	if (!object)

-		/* do nothing */;

-	else if (json_object_is_type(object, json_type_object))

-		object_for_all(object, callback, closure);

-	else if (!json_object_is_type(object, json_type_array))

-		callback(closure, object, NULL);

-	else {

-		int n = json_object_array_length(object);

-		int i = 0;

-		while(i < n)

-			callback(closure, json_object_array_get_idx(object, i++), NULL);

-	}

-}

-

-#if defined(WRAP_JSON_TEST)

-#include <stdio.h>

-

-void p(const char *desc, ...)

-{

-	int rc;

-	va_list args;

-	struct json_object *result;

-

-	va_start(args, desc);

-	rc = wrap_json_vpack(&result, desc, args);

-	va_end(args);

-	if (!rc) 

-		printf("  SUCCESS %s\n\n", json_object_to_json_string(result));

-	else

-		printf("  ERROR[char %d err %d] %s\n\n", wrap_json_get_error_position(rc), wrap_json_get_error_code(rc), wrap_json_get_error_string(rc));

-	json_object_put(result);

-}

-

-const char *xs[10];

-int *xi[10];

-int64_t *xI[10];

-double *xf[10];

-struct json_object *xo[10];

-size_t xz[10];

-

-void u(const char *value, const char *desc, ...)

-{

-	unsigned m, k;

-	int rc;

-	va_list args;

-	struct json_object *obj, *o;

-

-	memset(xs, 0, sizeof xs);

-	memset(xi, 0, sizeof xi);

-	memset(xI, 0, sizeof xI);

-	memset(xf, 0, sizeof xf);

-	memset(xo, 0, sizeof xo);

-	memset(xz, 0, sizeof xz);

-	obj = json_tokener_parse(value);

-	va_start(args, desc);

-	rc = wrap_json_vunpack(obj, desc, args);

-	va_end(args);

-	if (rc) 

-		printf("  ERROR[char %d err %d] %s\n\n", wrap_json_get_error_position(rc), wrap_json_get_error_code(rc), wrap_json_get_error_string(rc));

-	else {

-		value = NULL;

-		printf("  SUCCESS");

-		va_start(args, desc);

-		k = m = 0;

-		while(*desc) {

-			switch(*desc) {

-			case '{': m = (m << 1) | 1; k = 1; break;

-			case '}': m = m >> 1; k = m&1; break;

-			case '[': m = m << 1; k = 0; break;

-			case ']': m = m >> 1; k = m&1; break;

-			case 's': printf(" s:%s", k ? va_arg(args, const char*) : *(va_arg(args, const char**)?:&value)); k ^= m&1; break;

-			case '%': printf(" %%:%zu", *va_arg(args, size_t*)); k = m&1; break;

-			case 'n': printf(" n"); k = m&1; break;

-			case 'b': printf(" b:%d", *va_arg(args, int*)); k = m&1; break;

-			case 'i': printf(" i:%d", *va_arg(args, int*)); k = m&1; break;

-			case 'I': printf(" I:%lld", *va_arg(args, int64_t*)); k = m&1; break;

-			case 'f': printf(" f:%f", *va_arg(args, double*)); k = m&1; break;

-			case 'F': printf(" F:%f", *va_arg(args, double*)); k = m&1; break;

-			case 'o': printf(" o:%s", json_object_to_json_string(*va_arg(args, struct json_object**))); k = m&1; break;

-			case 'O': o = *va_arg(args, struct json_object**); printf(" O:%s", json_object_to_json_string(o)); json_object_put(o); k = m&1; break;

-			default: break;

-			}

-			desc++;

-		}

-		va_end(args);

-		printf("\n\n");

-	}

-	json_object_put(obj);

-}

-

-#define P(...) do{ printf("pack(%s)\n",#__VA_ARGS__); p(__VA_ARGS__); } while(0)

-#define U(...) do{ printf("unpack(%s)\n",#__VA_ARGS__); u(__VA_ARGS__); } while(0)

-

-int main()

-{

-	char buffer[4] = {'t', 'e', 's', 't'};

-

-	P("n");

-	P("b", 1);

-	P("b", 0);

-	P("i", 1);

-	P("I", (uint64_t)0x123456789abcdef);

-	P("f", 3.14);

-	P("s", "test");

-	P("s?", "test");

-	P("s?", NULL);

-	P("s#", "test asdf", 4);

-	P("s%", "test asdf", (size_t)4);

-	P("s#", buffer, 4);

-	P("s%", buffer, (size_t)4);

-	P("s++", "te", "st", "ing");

-	P("s#+#+", "test", 1, "test", 2, "test");

-	P("s%+%+", "test", (size_t)1, "test", (size_t)2, "test");

-	P("{}", 1.0);

-	P("[]", 1.0);

-	P("o", json_object_new_int(1));

-	P("o?", json_object_new_int(1));

-	P("o?", NULL);

-	P("O", json_object_new_int(1));

-	P("O?", json_object_new_int(1));

-	P("O?", NULL);

-	P("{s:[]}", "foo");

-	P("{s+#+: []}", "foo", "barbar", 3, "baz");

-	P("{s:s,s:o,s:O}", "a", NULL, "b", NULL, "c", NULL);

-	P("{s:**}", "a", NULL);

-	P("{s:s*,s:o*,s:O*}", "a", NULL, "b", NULL, "c", NULL);

-	P("[i,i,i]", 0, 1, 2);

-	P("[s,o,O]", NULL, NULL, NULL);

-	P("[**]", NULL);

-	P("[s*,o*,O*]", NULL, NULL, NULL);

-	P(" s ", "test");

-	P("[ ]");

-	P("[ i , i,  i ] ", 1, 2, 3);

-	P("{\n\n1");

-	P("[}");

-	P("{]");

-	P("[");

-	P("{");

-	P("[i]a", 42);

-	P("ia", 42);

-	P("s", NULL);

-	P("+", NULL);

-	P(NULL);

-	P("{s:i}", NULL, 1);

-	P("{ {}: s }", "foo");

-	P("{ s: {},  s:[ii{} }", "foo", "bar", 12, 13);

-	P("[[[[[   [[[[[  [[[[ }]]]] ]]]] ]]]]]");

-

-	U("true", "b", &xi[0]);

-	U("false", "b", &xi[0]);

-	U("null", "n");

-	U("42", "i", &xi[0]);

-	U("123456789", "I", &xI[0]);

-	U("3.14", "f", &xf[0]);

-	U("12345", "F", &xf[0]);

-	U("3.14", "F", &xf[0]);

-	U("\"foo\"", "s", &xs[0]);

-	U("\"foo\"", "s%", &xs[0], &xz[0]);

-	U("{}", "{}");

-	U("[]", "[]");

-	U("{}", "o", &xo[0]);

-	U("{}", "O", &xo[0]);

-	U("{\"foo\":42}", "{si}", "foo", &xi[0]);

-	U("[1,2,3]", "[i,i,i]", &xi[0], &xi[1], &xi[2]);

-	U("{\"a\":1,\"b\":2,\"c\":3}", "{s:i, s:i, s:i}", "a", &xi[0], "b", &xi[1], "c", &xi[2]);

-	U("42", "z");

-	U("null", "[i]");

-	U("[]", "[}");

-	U("{}", "{]");

-	U("[]", "[");

-	U("{}", "{");

-	U("[42]", "[i]a", &xi[0]);

-	U("42", "ia", &xi[0]);

-	U("[]", NULL);

-	U("\"foo\"", "s", NULL);

-	U("42", "s", NULL);

-	U("42", "n");

-	U("42", "b", NULL);

-	U("42", "f", NULL);

-	U("42", "[i]", NULL);

-	U("42", "{si}", "foo", NULL);

-	U("\"foo\"", "n");

-	U("\"foo\"", "b", NULL);

-	U("\"foo\"", "i", NULL);

-	U("\"foo\"", "I", NULL);

-	U("\"foo\"", "f", NULL);

-	U("\"foo\"", "F", NULL);

-	U("true", "s", NULL);

-	U("true", "n");

-	U("true", "i", NULL);

-	U("true", "I", NULL);

-	U("true", "f", NULL);

-	U("true", "F", NULL);

-	U("[42]", "[ii]", &xi[0], &xi[1]);

-	U("{\"foo\":42}", "{si}", NULL, &xi[0]);

-	U("{\"foo\":42}", "{si}", "baz", &xi[0]);

-	U("[1,2,3]", "[iii!]", &xi[0], &xi[1], &xi[2]);

-	U("[1,2,3]", "[ii!]", &xi[0], &xi[1]);

-	U("[1,2,3]", "[ii]", &xi[0], &xi[1]);

-	U("[1,2,3]", "[ii*]", &xi[0], &xi[1]);

-	U("{\"foo\":42,\"baz\":45}", "{sisi}", "baz", &xi[0], "foo", &xi[1]);

-	U("{\"foo\":42,\"baz\":45}", "{sisi*}", "baz", &xi[0], "foo", &xi[1]);

-	U("{\"foo\":42,\"baz\":45}", "{sisi!}", "baz", &xi[0], "foo", &xi[1]);

-	U("{\"foo\":42,\"baz\":45}", "{si}", "baz", &xi[0], "foo", &xi[1]);

-	U("{\"foo\":42,\"baz\":45}", "{si*}", "baz", &xi[0], "foo", &xi[1]);

-	U("{\"foo\":42,\"baz\":45}", "{si!}", "baz", &xi[0], "foo", &xi[1]);

-	U("[1,{\"foo\":2,\"bar\":null},[3,4]]", "[i{sisn}[ii]]", &xi[0], "foo", &xi[1], "bar", &xi[2], &xi[3]);

-	U("[1,2,3]", "[ii!i]", &xi[0], &xi[1], &xi[2]);

-	U("[1,2,3]", "[ii*i]", &xi[0], &xi[1], &xi[2]);

-	U("{\"foo\":1,\"bar\":2}", "{si!si}", "foo", &xi[1], "bar", &xi[2]);

-	U("{\"foo\":1,\"bar\":2}", "{si*si}", "foo", &xi[1], "bar", &xi[2]);

-	U("{\"foo\":{\"baz\":null,\"bar\":null}}", "{s{sn!}}", "foo", "bar");

-	U("[[1,2,3]]", "[[ii!]]", &xi[0], &xi[1]);

-	U("{}", "{s?i}", "foo", &xi[0]);

-	U("{\"foo\":1}", "{s?i}", "foo", &xi[0]);

-	U("{}", "{s?[ii]s?{s{si!}}}", "foo", &xi[0], &xi[1], "bar", "baz", "quux", &xi[2]);

-	U("{\"foo\":[1,2]}", "{s?[ii]s?{s{si!}}}", "foo", &xi[0], &xi[1], "bar", "baz", "quux", &xi[2]);

-	U("{\"bar\":{\"baz\":{\"quux\":15}}}", "{s?[ii]s?{s{si!}}}", "foo", &xi[0], &xi[1], "bar", "baz", "quux", &xi[2]);

-	U("{\"foo\":{\"bar\":4}}", "{s?{s?i}}", "foo", "bar", &xi[0]);

-	U("{\"foo\":{}}", "{s?{s?i}}", "foo", "bar", &xi[0]);

-	U("{}", "{s?{s?i}}", "foo", "bar", &xi[0]);

-	U("{\"foo\":42,\"baz\":45}", "{s?isi!}", "baz", &xi[0], "foo", &xi[1]);

-	U("{\"foo\":42}", "{s?isi!}", "baz", &xi[0], "foo", &xi[1]);

-	return 0;

-}

-

-#endif

-

-#if 0

-

-

-    /* Unpack the same item twice */

-    j = json_pack("{s:s, s:i, s:b}", "foo", "bar", "baz", 42, "quux", 1);

-    if(!json_unpack_ex(j, &error, 0, "{s:s,s:s!}", "foo", &s, "foo", &s))

-        fail("json_unpack object with strict validation failed");

-    {

-        const char *possible_errors[] = {

-            "2 object item(s) left unpacked: baz, quux",

-            "2 object item(s) left unpacked: quux, baz"

-        };

-        check_errors(possible_errors, 2, "<validation>", 1, 10, 10);

-    }

-    json_decref(j);

-

-#endif

-
\ No newline at end of file
diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap-json.h b/HAL-afb/HAL_MOST_UNICENS/wrap-json.h
deleted file mode 100644
index b5eadf5..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap-json.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*

- Copyright (C) 2016, 2017 "IoT.bzh"

-

- author: José Bollo <jose.bollo@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.

-*/

-

-#pragma once

-

-#include <stdarg.h>

-#include <json-c/json.h>

-

-extern int wrap_json_get_error_position(int rc);

-extern int wrap_json_get_error_code(int rc);

-extern const char *wrap_json_get_error_string(int rc);

-

-extern int wrap_json_vpack(struct json_object **result, const char *desc, va_list args);

-extern int wrap_json_pack(struct json_object **result, const char *desc, ...);

-

-extern int wrap_json_vunpack(struct json_object *object, const char *desc, va_list args);

-extern int wrap_json_unpack(struct json_object *object, const char *desc, ...);

-extern int wrap_json_vcheck(struct json_object *object, const char *desc, va_list args);

-extern int wrap_json_check(struct json_object *object, const char *desc, ...);

-extern int wrap_json_vmatch(struct json_object *object, const char *desc, va_list args);

-extern int wrap_json_match(struct json_object *object, const char *desc, ...);

-

-extern void wrap_json_optarray_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure);

-extern void wrap_json_array_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure);

-

-extern void wrap_json_optarray_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure);

-extern void wrap_json_array_for_all(struct json_object *object, void (*callback)(void*,struct json_object*), void *closure);

-extern void wrap_json_object_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure);

-extern void wrap_json_optobject_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure);

-extern void wrap_json_for_all(struct json_object *object, void (*callback)(void*,struct json_object*,const char*), void *closure);

-

-
\ No newline at end of file
diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap-json.md b/HAL-afb/HAL_MOST_UNICENS/wrap-json.md
deleted file mode 100644
index 3718b66..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap-json.md
+++ /dev/null
@@ -1,306 +0,0 @@
-WRAP-JSON facility

-==================

-

-The facility wrap-json is based on the pack/unpack API on the

-libray jansson. The two chapters below are copied from the

-documentation of jansson library copyrighted by Petri Lehtinen

-(see at end).

-

-Building Values

----------------

-

-This section describes functions that help to create, or *pack*, complex

-JSON values, especially nested objects and arrays. Value building is

-based on a *format string* that is used to tell the functions about the

-expected arguments.

-

-For example, the format string `"i"` specifies a single integer value,

-while the format string `"[ssb]"` or the equivalent `"[s, s, b]"`

-specifies an array value with two strings and a boolean as its items:

-

-    /* Create the JSON integer 42 */

-    wrap_json_pack(&result, "i", 42);

-

-    /* Create the JSON array ["foo", "bar", true] */

-    wrap_json_pack(&result, "[ssb]", "foo", "bar", 1);

-

-Here's the full list of format specifiers. The type in parentheses

-denotes the resulting JSON type, and the type in brackets (if any)

-denotes the C type that is expected as the corresponding argument or

-arguments.

-

-`s` (string) \[const char \*\]

-

-:   Convert a null terminated UTF-8 string to a JSON string.

-

-`s?` (string) \[const char \*\]

-

-:   Like `s`, but if the argument is *NULL*, output a JSON null value.

-

-`s*` (string) \[const char \*\]

-

-:   Like `s`, but if the argument is *NULL*, do not output any value.

-    This format can only be used inside an object or an array. If used

-    inside an object, the corresponding key is additionally suppressed

-    when the value is omitted. See below for an example.

-

-`s#` (string) \[const char \*, int\]

-

-:   Convert a UTF-8 buffer of a given length to a JSON string.

-

-`s%` (string) \[const char \*, size\_t\]

-

-:   Like `s#` but the length argument is of type size\_t.

-

-`+` \[const char \*\]

-

-:   Like `s`, but concatenate to the previous string. Only valid after

-    `s`, `s#`, `+` or `+#`.

-

-`+#` \[const char \*, int\]

-

-:   Like `s#`, but concatenate to the previous string. Only valid after

-    `s`, `s#`, `+` or `+#`.

-

-`+%` (string) \[const char \*, size\_t\]

-

-:   Like `+#` but the length argument is of type size\_t.

-

-`n` (null)

-

-:   Output a JSON null value. No argument is consumed.

-

-`b` (boolean) \[int\]

-

-:   Convert a C int to JSON boolean value. Zero is converted to `false`

-    and non-zero to `true`.

-

-`i` (integer) \[int\]

-

-:   Convert a C int to JSON integer.

-

-`I` (integer) \[json\_int\_t\]

-

-:   Convert a C json\_int\_t to JSON integer.

-

-`f` (real) \[double\]

-

-:   Convert a C double to JSON real.

-

-`o` (any value) \[json\_t \*\]

-

-:   Output any given JSON value as-is. If the value is added to an array

-    or object, the reference to the value passed to `o` is stolen by the

-    container.

-

-`O` (any value) \[json\_t \*\]

-

-:   Like `o`, but the argument's reference count is incremented. This is

-    useful if you pack into an array or object and want to keep the

-    reference for the JSON value consumed by `O` to yourself.

-

-`o?`, `O?` (any value) \[json\_t \*\]

-

-:   Like `o` and `O`, respectively, but if the argument is *NULL*,

-    output a JSON null value.

-

-`o*`, `O*` (any value) \[json\_t \*\]

-

-:   Like `o` and `O`, respectively, but if the argument is *NULL*, do

-    not output any value. This format can only be used inside an object

-    or an array. If used inside an object, the corresponding key is

-    additionally suppressed. See below for an example.

-

-`[fmt]` (array)

-

-:   Build an array with contents from the inner format string. `fmt` may

-    contain objects and arrays, i.e. recursive value building is

-    supported.

-

-`{fmt}` (object)

-

-:   Build an object with contents from the inner format string `fmt`.

-    The first, third, etc. format specifier represent a key, and must be

-    a string (see `s`, `s#`, `+` and `+#` above), as object keys are

-    always strings. The second, fourth, etc. format specifier represent

-    a value. Any value may be an object or array, i.e. recursive value

-    building is supported.

-

-Whitespace, `:` and `,` are ignored.

-

-More examples:

-

-    /* Build an empty JSON object */

-    wrap_json_pack(&result, "{}");

-

-    /* Build the JSON object {"foo": 42, "bar": 7} */

-    wrap_json_pack(&result, "{sisi}", "foo", 42, "bar", 7);

-

-    /* Like above, ':', ',' and whitespace are ignored */

-    wrap_json_pack(&result, "{s:i, s:i}", "foo", 42, "bar", 7);

-

-    /* Build the JSON array [[1, 2], {"cool": true}] */

-    wrap_json_pack(&result, "[[i,i],{s:b}]", 1, 2, "cool", 1);

-

-    /* Build a string from a non-null terminated buffer */

-    char buffer[4] = {'t', 'e', 's', 't'};

-    wrap_json_pack(&result, "s#", buffer, 4);

-

-    /* Concatenate strings together to build the JSON string "foobarbaz" */

-    wrap_json_pack(&result, "s++", "foo", "bar", "baz");

-

-    /* Create an empty object or array when optional members are missing */

-    wrap_json_pack(&result, "{s:s*,s:o*,s:O*}", "foo", NULL, "bar", NULL, "baz", NULL);

-    wrap_json_pack(&result, "[s*,o*,O*]", NULL, NULL, NULL);

-

-Parsing and Validating Values

------------------------------

-

-This section describes functions that help to validate complex values

-and extract, or *unpack*, data from them. Like building values

-&lt;apiref-pack&gt;, this is also based on format strings.

-

-While a JSON value is unpacked, the type specified in the format string

-is checked to match that of the JSON value. This is the validation part

-of the process. In addition to this, the unpacking functions can also

-check that all items of arrays and objects are unpacked. This check be

-enabled with the format specifier `!` or by using the flag

-`JSON_STRICT`. See below for details.

-

-Here's the full list of format specifiers. The type in parentheses

-denotes the JSON type, and the type in brackets (if any) denotes the C

-type whose address should be passed.

-

-`s` (string) \[const char \*\]

-

-:   Convert a JSON string to a pointer to a null terminated UTF-8

-    string. The resulting string is extracted by using

-    json\_string\_value() internally, so it exists as long as there are

-    still references to the corresponding JSON string.

-

-`s%` (string) \[const char \*, size\_t \*\]

-

-:   Convert a JSON string to a pointer to a null terminated UTF-8 string

-    and its length.

-

-`n` (null)

-

-:   Expect a JSON null value. Nothing is extracted.

-

-`b` (boolean) \[int\]

-

-:   Convert a JSON boolean value to a C int, so that `true` is converted

-    to 1 and `false` to 0.

-

-`i` (integer) \[int\]

-

-:   Convert a JSON integer to C int.

-

-`I` (integer) \[json\_int\_t\]

-

-:   Convert a JSON integer to C json\_int\_t.

-

-`f` (real) \[double\]

-

-:   Convert a JSON real to C double.

-

-`F` (integer or real) \[double\]

-

-:   Convert a JSON number (integer or real) to C double.

-

-`o` (any value) \[json\_t \*\]

-

-:   Store a JSON value with no conversion to a json\_t pointer.

-

-`O` (any value) \[json\_t \*\]

-

-:   Like `O`, but the JSON value's reference count is incremented.

-

-`[fmt]` (array)

-

-:   Convert each item in the JSON array according to the inner format

-    string. `fmt` may contain objects and arrays, i.e. recursive value

-    extraction is supported.

-

-`{fmt}` (object)

-

-:   Convert each item in the JSON object according to the inner format

-    string `fmt`. The first, third, etc. format specifier represent a

-    key, and must be `s`. The corresponding argument to unpack functions

-    is read as the object key. The second fourth, etc. format specifier

-    represent a value and is written to the address given as the

-    corresponding argument. **Note** that every other argument is read

-    from and every other is written to.

-

-    `fmt` may contain objects and arrays as values, i.e. recursive value

-    extraction is supported.

-

-`!`

-

-:   This special format specifier is used to enable the check that all

-    object and array items are accessed, on a per-value basis. It must

-    appear inside an array or object as the last format specifier before

-    the closing bracket or brace.

-

-`*`

-

-:   This special format specifier is the opposite of `!`. This is the default.

-    It must appear inside an array or object as the last format specifier

-    before the closing bracket or brace.

-

-Whitespace, `:` and `,` are ignored.

-

-Examples:

-

-    /* root is the JSON integer 42 */

-    int myint;

-    wrap_json_unpack(root, "i", &myint);

-    assert(myint == 42);

-

-    /* root is the JSON object {"foo": "bar", "quux": true} */

-    const char *str;

-    int boolean;

-    wrap_json_unpack(root, "{s:s, s:b}", "foo", &str, "quux", &boolean);

-    assert(strcmp(str, "bar") == 0 && boolean == 1);

-

-    /* root is the JSON array [[1, 2], {"baz": null} */

-    wrap_json_check(root, "[[i,i], {s:n}]", "baz");

-    /* returns 0 for validation success, nothing is extracted */

-

-    /* root is the JSON array [1, 2, 3, 4, 5] */

-    int myint1, myint2;

-    wrap_json_unpack(root, "[ii!]", &myint1, &myint2);

-    /* returns -1 for failed validation */

-

-    /* root is an empty JSON object */

-    int myint = 0, myint2 = 0, myint3 = 0;

-    wrap_json_unpack(root, "{s?i, s?[ii]}",

-                "foo", &myint1,

-                "bar", &myint2, &myint3);

-    /* myint1, myint2 or myint3 is no touched as "foo" and "bar" don't exist */

-

-

-Copyright

----------

-

-Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>

-

-Permission is hereby granted, free of charge, to any person obtaining a copy

-of this software and associated documentation files (the "Software"), to deal

-in the Software without restriction, including without limitation the rights

-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-copies of the Software, and to permit persons to whom the Software is

-furnished to do so, subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-THE SOFTWARE.

-

-
\ No newline at end of file
diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c b/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c
deleted file mode 100644
index 095a2fe..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.
- * Author Tobias Jahnke
- *
- * 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.
- *
- */
-#define _GNU_SOURCE
-#define AFB_BINDING_VERSION 2
-
-#include <string.h>
-#include <json-c/json.h>
-#include <afb/afb-binding.h>
-#include "wrap_unicens.h"
-#include "wrap-json.h"
-
-typedef struct async_job_ {
-    wrap_ucs_result_cb_t result_fptr;
-    void *result_user_ptr;
-} async_job_t;
-
-typedef struct parse_result_ {
-    int done;
-    char *str_result;
-} parse_result_t;
-
-/* Subscribes to unicens2-binding events.
- * \return  Returns 0 if successful, otherwise != 0".
- */
-extern int wrap_ucs_subscribe_sync() {
-
-    json_object *j_response, *j_query = NULL;
-    int err;
-
-    /* Build an empty JSON object */
-    err = wrap_json_pack(&j_query, "{}");
-    if (err) {
-        AFB_ERROR("Failed to create subscribe json object");
-        goto OnErrorExit;
-    }
-
-    err = afb_service_call_sync("UNICENS", "subscribe", j_query, &j_response);
-    if (err) {
-        AFB_ERROR("Fail subscribing to UNICENS events");
-        goto OnErrorExit;
-    }
-    else {
-        AFB_NOTICE("Subscribed to UNICENS events, res=%s", json_object_to_json_string(j_response));
-        json_object_put(j_response);
-    }
-    json_object_put(j_query);
-    j_query = NULL;
-
-OnErrorExit:
-    if (j_query)
-        json_object_put(j_query);
-    return err;
-}
-
-/* Checks if name ends with a given letter. */
-static int wrap_ucs_string_ends_with(const char *name, char letter) {
-
-    int result = 0;
-    size_t len = strlen(name);
-
-    if (len > 0) {
-
-        if (name[len] == letter) {
-            result = 1;
-        }
-    }
-
-    return result;
-}
-
-/* Callback for iteration through found files. Marks search as "done" as
- * soon as the search pattern "kit.xml" matches.
- * \param closure   User reference. Points to parse_result_t.
- * \param j_obj     Points to json object within array.
- */
-static void wrap_ucs_find_xml_cb(void *closure, struct json_object *j_obj) {
-
-    const char *dir, *name;
-    parse_result_t *result;
-
-    if (!closure)
-        return;
-
-    result = (parse_result_t *)closure;
-    if (result->done)
-        return;
-
-    wrap_json_unpack(j_obj, "{s:s, s:s}", "dirpath", &dir, "basename", &name);
-    AFB_DEBUG("Found file: %s", name);
-
-    if(strstr(name, "kit.xml") != NULL) {
-        size_t sz = strlen(dir)+strlen(name)+10;
-        char * full_path = malloc(sz);
-
-        strncpy(full_path, dir, sz);
-
-        if (!wrap_ucs_string_ends_with(dir, '/'))
-            strncat(full_path, "/", sz);
-
-        strncat(full_path, name, sz);
-        AFB_DEBUG("Found XML file: %s", full_path);
-
-        result->done = 1;
-        result->str_result = full_path;
-    }
-}
-
-/* Retrieves XML configuration path to initialize unicens2-binding.
- * \param   config_path Directory containing XML configuration file(s).
- * \param   file_found  Points to found file_path or NULL if not found.
- *          Memory must be released by calling free().
- * \return  Returns 0 if successful, otherwise != 0".
- */
-extern int wrap_ucs_getconfig_sync(const char *config_path, char **file_found) {
-
-    int err = 0;
-    json_object *j_response, *j_query, *j_paths = NULL;
-    parse_result_t result = {.done = 0, .str_result = NULL};
-
-    *file_found = NULL;
-
-    /* Build JSON object to retrieve UNICENS configuration */
-    if ((config_path == NULL) || (strcmp(config_path, "") == 0))
-        err = wrap_json_pack(&j_query, "{}");
-    else
-        err = wrap_json_pack(&j_query, "{s:s}", "cfgpath", config_path);
-
-    if (err) {
-        AFB_ERROR("Failed to create listconfig json object");
-        goto OnErrorExit;
-    }
-
-    err = afb_service_call_sync("UNICENS", "listconfig", j_query, &j_response);
-    if (err) {
-        AFB_ERROR("Failed to call listconfig");
-        goto OnErrorExit;
-    }
-    else {
-        AFB_DEBUG("UNICENS listconfig result, res=%s", json_object_to_json_string(j_response));
-
-        if (json_object_object_get_ex(j_response, "response", &j_paths)) {
-
-            AFB_DEBUG("UNICENS listconfig result, paths=%s", json_object_to_json_string(j_paths));
-
-            wrap_json_optarray_for_all(j_paths, &wrap_ucs_find_xml_cb, &result);
-
-            if (result.done) {
-                *file_found = strdup(result.str_result);
-                free(result.str_result);
-                result.str_result = NULL;
-            }
-            else {
-                AFB_NOTICE("wrap_ucs_getconfig_sync, search pattern does not match for paths=%s", json_object_to_json_string(j_paths));
-                err = -1;
-            }
-        }
-
-        json_object_put(j_response);
-    }
-    json_object_put(j_query);
-    j_query = NULL;
-
-OnErrorExit:
-    if (j_query)
-        json_object_put(j_query);
-    return err;
-}
-
-/* Initializes the unicens2-binding.
- * \param   file_name     Path to XML configuration file or \c NULL for
- *                        first found file in default path.
- * \return  Returns 0 if successful, otherwise != 0".
- */
-extern int wrap_ucs_initialize_sync(const char *file_name) {
-    json_object *j_response, *j_query = NULL;
-    int err;
-
-    /* Build JSON object to initialize UNICENS */
-    if (file_name != NULL)
-        err = wrap_json_pack(&j_query, "{s:s}", "filename", file_name);
-    else
-        err = wrap_json_pack(&j_query, "{}");
-
-    if (err) {
-        AFB_ERROR("Failed to create initialize json object");
-        goto OnErrorExit;
-    }
-    err = afb_service_call_sync("UNICENS", "initialise", j_query, &j_response);
-    if (err) {
-        AFB_ERROR("Failed to initialize UNICENS");
-        goto OnErrorExit;
-    }
-    else {
-        AFB_NOTICE("Initialized UNICENS, res=%s", json_object_to_json_string(j_response));
-        json_object_put(j_response);
-    }
-
-    json_object_put(j_query);
-    j_query = NULL;
-
-OnErrorExit:
-    if (j_query)
-        json_object_put(j_query);
-    return err;
-}
-
-/* Write I2C command to a network node.
- * \param   node     Node address
- * \param   data_ptr Reference to command data
- * \param   data_sz  Size of the command data. Valid values: 1..32.
- * \return  Returns 0 if successful, otherwise != 0".
- */
-extern int wrap_ucs_i2cwrite_sync(uint16_t node, uint8_t *data_ptr, uint8_t data_sz) {
-
-    json_object *j_response, *j_query, *j_array = NULL;
-    int err;
-    uint8_t cnt;
-
-    j_query = json_object_new_object();
-    j_array = json_object_new_array();
-
-    if (!j_query || !j_array) {
-        err = -1;
-        AFB_ERROR("Failed to create writei2c json objects");
-        goto OnErrorExit;
-    }
-
-    for (cnt = 0U; cnt < data_sz; cnt++) {
-        json_object_array_add(j_array, json_object_new_int(data_ptr[cnt]));
-    }
-
-    json_object_object_add(j_query, "node", json_object_new_int(node));
-    json_object_object_add(j_query, "data", j_array);
-
-    err = afb_service_call_sync("UNICENS", "writei2c", j_query, &j_response);
-
-    if (err) {
-        AFB_ERROR("Failed to call writei2c_sync");
-        goto OnErrorExit;
-    }
-    else {
-        AFB_INFO("Called writei2c_sync, res=%s", json_object_to_json_string(j_response));
-        json_object_put(j_response);
-    }
-
-    json_object_put(j_query);
-    j_query = NULL;
-
-OnErrorExit:
-    if (j_query)
-        json_object_put(j_query);
-    return err;
-}
-
-/* ------------------ ASYNCHRONOUS API ---------------------------------------*/
-
-static void wrap_ucs_i2cwrite_cb(void *closure, int status, struct json_object *j_result) {
-
-    AFB_INFO("wrap_ucs_i2cwrite_cb: closure=%p status=%d, res=%s", closure, status, json_object_to_json_string(j_result));
-
-    if (closure) {
-        async_job_t *job_ptr = (async_job_t *)closure;
-
-        if (job_ptr->result_fptr)
-            job_ptr->result_fptr((uint8_t)abs(status), job_ptr->result_user_ptr);
-        
-        free(closure);
-    }
-}
-
-/* Write I2C command to a network node.
- * \param   node     Node address
- * \param   data_ptr Reference to command data
- * \param   data_sz  Size of the command data. Valid values: 1..32.
- * \return  Returns 0 if successful, otherwise != 0".
- */
-extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz,
-                             wrap_ucs_result_cb_t result_fptr,
-                             void *result_user_ptr) {
-
-    json_object *j_query, *j_array = NULL;
-    async_job_t *job_ptr = NULL;
-    int err;
-    uint8_t cnt;
-
-    j_query = json_object_new_object();
-    j_array = json_object_new_array();
-
-    if (!j_query || !j_array) {
-        err = -1;
-        AFB_ERROR("Failed to create writei2c json objects");
-        goto OnErrorExit;
-    }
-
-    for (cnt = 0U; cnt < data_sz; cnt++) {
-        json_object_array_add(j_array, json_object_new_int(data_ptr[cnt]));
-    }
-
-    json_object_object_add(j_query, "node", json_object_new_int(node));
-    json_object_object_add(j_query, "data", j_array);
-
-    job_ptr = malloc(sizeof(async_job_t));
-
-    if (!job_ptr) {
-        err = -1;
-        AFB_ERROR("Failed to create async job object");
-        goto OnErrorExit;
-    }
-
-    job_ptr->result_fptr = result_fptr;
-    job_ptr->result_user_ptr = result_user_ptr;
-
-    afb_service_call("UNICENS", "writei2c", j_query, wrap_ucs_i2cwrite_cb, job_ptr);
-    err = 0;
-    j_query = NULL;
-
-OnErrorExit:
-    if (j_query)
-        json_object_put(j_query);
-    return err;
-}
diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.h b/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.h
deleted file mode 100644
index c28d13a..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*

- * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.

- * Author Tobias Jahnke

- *

- * 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.

- * 

- */

-

-#pragma once

-#include <stdint.h>

-

-/* Asynchronous API: result callback */

-typedef void (*wrap_ucs_result_cb_t)(uint8_t result, void *user_ptr);

-

-/* Asynchronous API: functions */

-extern int wrap_ucs_i2cwrite(uint16_t node, uint8_t *data_ptr, uint8_t data_sz,

-                             wrap_ucs_result_cb_t result_fptr, 

-                             void *result_user_ptr);

-

-/* Synchronous API: functions */

-extern int wrap_ucs_subscribe_sync();

-extern int wrap_ucs_getconfig_sync(const char *config_path, char **file_found);

-extern int wrap_ucs_initialize_sync(const char* file_name);

-extern int wrap_ucs_i2cwrite_sync(uint16_t node, uint8_t *data_ptr, uint8_t data_sz);

diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap_volume.c b/HAL-afb/HAL_MOST_UNICENS/wrap_volume.c
deleted file mode 100644
index 5bc1e84..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap_volume.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.
- * Author Tobias Jahnke
- *
- * 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.
- *
- */
-#define _GNU_SOURCE
-#define AFB_BINDING_VERSION 2
-
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-#include <json-c/json.h>
-#include <afb/afb-binding.h>
-
-#include "wrap_volume.h"
-#include "wrap_unicens.h"
-#include "libmostvolume.h"
-
-static int wrap_volume_service_timeout_cb(sd_event_source* source,
-        uint64_t timer __attribute__((__unused__)),
-        void *userdata __attribute__((__unused__))) {
-
-    uint8_t ret;
-
-    sd_event_source_unref(source);
-    ret = lib_most_volume_service();
-
-    if (ret != 0U) {
-        AFB_ERROR("lib_most_volume_service returns %d", ret);
-    }
-
-    return 0;
-}
-
-static void wrap_volume_service_cb(uint16_t timeout) {
-    uint64_t usec;
-    sd_event_now(afb_daemon_get_event_loop(), CLOCK_BOOTTIME, &usec);
-    sd_event_add_time(  afb_daemon_get_event_loop(), NULL, CLOCK_MONOTONIC,
-                        usec + (timeout*1000),
-                        250,
-                        wrap_volume_service_timeout_cb,
-                        NULL);
-}
-
-/* Retrieves a new value adapted to a new maximum value. Minimum value is
- * always zero. */
-static int wrap_volume_calculate(int value, int max_old, int max_new) {
-
-    if (value > max_old)
-        value = max_old;
-
-    value = (value * max_new) / max_old; /* calculate range: 0..255 */
-    assert(value <= max_new);
-
-    return value;
-}
-
-extern int wrap_volume_init(void) {
-
-    uint8_t ret = 0U;
-    lib_most_volume_init_t mv_init;
-
-    mv_init.writei2c_cb = &wrap_ucs_i2cwrite;
-    mv_init.service_cb = wrap_volume_service_cb;
-
-    ret = lib_most_volume_init(&mv_init);
-
-    return ret * (-1);
-}
-
-extern int wrap_volume_master(int volume) {
-
-    int new_value, ret;
-
-    new_value = wrap_volume_calculate(volume, 100, 255);
-    ret = lib_most_volume_set(LIB_MOST_VOLUME_MASTER, (uint8_t)new_value);
-
-    if (ret != 0) {
-        AFB_ERROR("wrap_volume_master: volume library not ready.");
-        ret = ret * (-1); /* make return value negative */
-    }
-
-    return ret;
-}
-
-extern int wrap_volume_pcm(int *volume_ptr, int volume_sz) {
-
-    const int MAX_PCM_CHANNELS = 6;
-    int cnt, ret;
-    assert(volume_ptr != NULL);
-    assert(volume_sz <= MAX_PCM_CHANNELS);
-
-    for (cnt = 0; cnt < volume_sz; cnt ++) {
-
-        int new_value = wrap_volume_calculate(volume_ptr[cnt], 100, 255);
-        ret = lib_most_volume_set((enum lib_most_volume_channel_t)cnt, (uint8_t)new_value);
-
-        if (ret != 0) {
-            AFB_ERROR("wrap_volume_pcm: volume library not ready.");
-            ret = ret * (-1); /* make return value negative */
-            break;
-        }
-    }
-
-    return ret;
-}
-
-extern int wrap_volume_node_avail(int node, int available) {
-    
-    int ret;
-    ret = lib_most_volume_node_available((uint16_t)node, (uint8_t)available);
-    
-    if (ret != 0) {
-        AFB_ERROR("wrap_volume_node_avail: volume library not ready.");
-        ret = ret * (-1); /* make return value negative */
-    }
-    
-    return ret;
-}
-
diff --git a/HAL-afb/HAL_MOST_UNICENS/wrap_volume.h b/HAL-afb/HAL_MOST_UNICENS/wrap_volume.h
deleted file mode 100644
index 099b70c..0000000
--- a/HAL-afb/HAL_MOST_UNICENS/wrap_volume.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*

- * Copyright (C) 2017, Microchip Technology Inc. and its subsidiaries.

- * Author Tobias Jahnke

- *

- * 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.

- * 

- */

-

-#pragma once

-#include <stdint.h>

-#include <systemd/sd-event.h>

-

-extern int wrap_volume_init(void);

-extern int wrap_volume_master(int volume);

-extern int wrap_volume_pcm(int *volume_ptr, int volume_sz);

-extern int wrap_volume_node_avail(int node, int available);

diff --git a/HAL-afb/HDA-intel/CMakeLists.txt b/HAL-afb/HDA-intel/CMakeLists.txt
deleted file mode 100644
index 380e493..0000000
--- a/HAL-afb/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.
-###########################################################################
-
-
-# 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-interface
-        audio-common
-    )
-
diff --git a/HAL-afb/HDA-intel/IntelHdaHAL.c b/HAL-afb/HDA-intel/IntelHdaHAL.c
deleted file mode 100644
index d41b6ba..0000000
--- a/HAL-afb/HDA-intel/IntelHdaHAL.c
+++ /dev/null
@@ -1,123 +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"
-#include "audio-common.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,
-};
-
-STATIC halVolRampT volRampMultimedia= {
-    .slave   = PCM_Volume_Multimedia,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 2,
-    .stepUp  = 1,
-};
-
-STATIC halVolRampT volRampNavigation= {
-    .slave   = PCM_Volume_Navigation,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 4,
-    .stepUp  = 2,
-};
-// Default Values for MasterVolume Ramping
-STATIC halVolRampT volRampEmergency= {
-    .slave   = PCM_Volume_Emergency,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 3,
-};
-
-// 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="PCM Playback Volume", .value=50 } },
-  { .tag=PCM_Playback_Volume     , .ctl={.name="PCM Playback Volume", .value=50 } },
-  { .tag=PCM_Playback_Switch     , .ctl={.name="PCM Playback Switch", .value=01 } },
-  { .tag=Capture_Volume          , .ctl={.name="Mic 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, .count=1, .minval=0, .maxval=100, .step=1, .name="Rampup Master"}
-  },
-
-  // Implement Rampup Volume for Virtual Channels
-  { .tag=Navigation_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Navigation Ramp", .value=80 }
-  },
-  { .tag=Emergency_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampEmergency}, .info="Rampup Emergency Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Emergency Ramp", .value=80 }
-  },
-
-  // Sound Card does not support hardware channel volume mixer (note softvol default range 0-256)
-  { .tag=Multimedia_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="Ramp-up Multimedia Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Playback Multimedia Ramp", .value=80 }
-  },
-  { .tag=PCM_Volume_Multimedia, .info="Playback Multimedia Softvol",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Multimedia"}
-  },
-  { .tag=PCM_Volume_Navigation, .info="Playback Navigation Softvol",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255,.value=200, .name="Playback Navigation"}
-  },
-  { .tag=PCM_Volume_Emergency, .info="Playback Emergency Softvol",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Emergency"}
-  },
-
-
-  { .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/HAL-afb/Jabra-Solemate/CMakeLists.txt b/HAL-afb/Jabra-Solemate/CMakeLists.txt
deleted file mode 100644
index d2705b0..0000000
--- a/HAL-afb/Jabra-Solemate/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.
-###########################################################################
-
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(hal-jabra-usb)
-
-    # Define project Targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE JabraUsbHAL.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-interface
-        audio-common
-        ${link_libraries}
-    )
diff --git a/HAL-afb/Jabra-Solemate/JabraUsbHAL.c b/HAL-afb/Jabra-Solemate/JabraUsbHAL.c
deleted file mode 100644
index a9c5c63..0000000
--- a/HAL-afb/Jabra-Solemate/JabraUsbHAL.c
+++ /dev/null
@@ -1,123 +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: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"
-#include "audio-common.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,
-};
-
-STATIC halVolRampT volRampMultimedia= {
-    .slave   = PCM_Volume_Multimedia,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 2,
-    .stepUp  = 1,
-};
-
-STATIC halVolRampT volRampNavigation= {
-    .slave   = PCM_Volume_Navigation,
-    .delay   = 100*1000, // ramping delay in us
-    .stepDown= 4,
-    .stepUp  = 2,
-};
-// Default Values for MasterVolume Ramping
-STATIC halVolRampT volRampEmergency= {
-    .slave   = PCM_Volume_Emergency,
-    .delay   = 50*1000, // ramping delay in us
-    .stepDown= 6,
-    .stepUp  = 3,
-};
-
-// 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="PCM Playback Volume", .value=12 }},
-  { .tag=PCM_Playback_Volume     , .ctl={.name="PCM Playback Volume", .value=12 }},
-  { .tag=PCM_Playback_Switch     , .ctl={.name="PCM Playback Switch", .value=01 }},
-  { .tag=Capture_Volume          , .ctl={.name="Mic 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, .count=1, .minval=0, .maxval=100, .step=1, .name="Rampup Master"}
-  },
-
-  // Implement Rampup Volume for Virtual Channels
-  { .tag=Navigation_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampNavigation}, .info="RampUp Navigation Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Navigation Ramp", .value=80 }
-  },
-  { .tag=Emergency_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampEmergency}, .info="Rampup Emergency Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER,.name="Playback Emergency Ramp", .value=80 }
-  },
-
-  // Sound Card does not support hardware channel volume mixer (note softvol default range 0-256)
-  { .tag=Multimedia_Playback_Volume, .cb={.callback=volumeRamp, .handle=&volRampMultimedia}, .info="Ramp-up Multimedia Volume",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .name="Playback Multimedia Ramp", .value=80 }
-  },
-  { .tag=PCM_Volume_Multimedia, .info="Playback Multimedia Softvol",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Multimedia"}
-  },
-  { .tag=PCM_Volume_Navigation, .info="Playback Navigation Softvol",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255,.value=200, .name="Playback Navigation"}
-  },
-  { .tag=PCM_Volume_Emergency, .info="Playback Emergency Softvol",
-    .ctl={.numid=CTL_AUTO, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=2, .maxval=255, .value=200, .name="Playback Emergency"}
-  },
-
-
-  { .tag=EndHalCrlTag}  /* marker for end of the array */
-} ;
-
-// HAL sound card mapping info
-STATIC alsaHalSndCardT alsaHalSndCard  = {
-    .name  = "Jabra SOLEMATE v1.34.0", //  WARNING: name MUST match with 'aplay -l'
-    .info  = "Hardware Abstraction Layer for Jabra Solamte USB 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     = "jabra-usb",
-    .init    = sndServiceInit,
-    .verbs   = halServiceApi,
-    .onevent = halServiceEvent,
-};
diff --git a/HAL-afb/Scarlett-Focusrite/CMakeLists.txt b/HAL-afb/Scarlett-Focusrite/CMakeLists.txt
deleted file mode 100644
index d2a1742..0000000
--- a/HAL-afb/Scarlett-Focusrite/CMakeLists.txt
+++ /dev/null
@@ -1,38 +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.
-###########################################################################
-
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(hal-scalett-usb)
-
-    # Define project Targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE ScarlettUsbHAL.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-interface
-        audio-common
-    )
diff --git a/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c b/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c
deleted file mode 100644
index cff213c..0000000
--- a/HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c
+++ /dev/null
@@ -1,90 +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:USB controls # get supported controls
- *  amixer -Dhw:USB cget name=Power-Switch
- *  amixer -Dhw:USB cset name=Power-Switch true
- *
- */
-#define _GNU_SOURCE
-#include "hal-interface.h"
-#include "audio-common.h"
-
-// 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,
-};
-
-// 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" } },
-  { .tag=PCM_Playback_Volume     , .ctl={.name="Master 1 (Monitor) Playback Volume" } },
-  { .tag=PCM_Playback_Switch     , .ctl={.numid=05 } },
-  { .tag=Capture_Volume          , .ctl={.numid=12 } },
-
-  { .tag=Vol_Ramp_Set_Mode       , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="select volramp speed",
-    .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_ENUMERATED, .count=1, .value=RAMP_VOL_NORMAL, .name="Hal-VolRamp-Mode", .enums=halVolRampModes}
-  },
-  { .tag=Vol_Ramp_Set_Slave      , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set slave volume master numid",
-    .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .value=Master_Playback_Volume, .name="Hal-VolRamp-Slave", .enums=halVolRampModes}
-  },
-  { .tag=Vol_Ramp_Set_Delay    , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set ramp delay [default 250ms]",
-    .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=1000, .step=100, .value=250, .name="Hal-VolRamp-Step-Down"}
-  },
-  { .tag=Vol_Ramp_Set_Down   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set linear step down ramp [default 10]",
-    .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=10, .name="Hal-VolRamp-Step-Down"}
-  },
-  { .tag=Vol_Ramp_Set_Up   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="set linear step up ramp [default 10]",
-    .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .value=10, .name="Hal-VolRamp-Step-Up"}
-  },
-  { .tag=Master_Playback_Volume   , .cb={.callback=volumeRamp, .handle=&volRampMaster}, .info="ramp volume linearly according to current ramp setting",
-    .ctl={.numid=0, .type=SND_CTL_ELEM_TYPE_INTEGER, .count=1, .minval=0, .maxval=100, .step=1, .name="Hal-VolRamp"}
-  },
-
-  { .tag=EndHalCrlTag}  /* marker for end of the array */
-} ;
-
-// HAL sound card mapping info
-STATIC alsaHalSndCardT alsaHalSndCard  = {
-    .name  = "Scarlett 18i8 USB", //  WARNING: name MUST match with 'aplay -l'
-    .info  = "Hardware Abstraction Layer for Scarlett Focusrite USB professional music sound card",
-    .ctls  = alsaHalMap,
-    .volumeCB = NULL, // use default volume normalisation function
-};
-
-
-STATIC int sndServiceInit () {
-    int err;
-    AFB_DEBUG ("Scarlett 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     = "scarlett-usb",
-    .init    = sndServiceInit,
-    .verbs   = halServiceApi,
-    .onevent = halServiceEvent,
-};
diff --git a/README.md b/README.md
index c3d75a1..5f8b0fb 100644
--- a/README.md
+++ b/README.md
@@ -1,264 +1,26 @@
 ------------------------------------------------------------------------
-                  AGL-Advanced-Audio-Agent
+ Audio Hardware Abstraction Layer common utilities
 ------------------------------------------------------------------------
 
-# Cloning Audio-Binding from Git
 
-```bash
-# Initial clone with submodules
-git clone --recurse-submodules https://github.com/iotbzh/afb-aaaa
-cd  audio-binding
+HAL-utilities provide generic call to implement a new audio abstraction layer inside AGL 4a.
 
-# Do not forget submodules with pulling
-git pull --recurse-submodules https://github.com/iotbzh/afb-aaaa
-git submodule update
-```
-
-# AFB-daemon dependencies
-
-OpenSuse >=42.2, Fedora>=25, Ubuntu>=16.4 AGL Binary packages installation from
-[this wiki](https://en.opensuse.org/LinuxAutomotive)
-
-For other distro see chapter [# Building AFB-daemon from source on Standard Linux Distribution](#Build)
-
-# Specific Dependencies
-
-* alsa-devel >= 1.1.3 Warning some distro like Fedora 25 still ship version 1.1.1 as default
-
-> **NOTE**: On Ubuntu 16.4 you should recompile AlsaLib from [source](ftp://ftp.alsa-project.org/pub/lib/)
-> as today latest stable is 1.1.4.
-
-  OpenSuse
-     - Alsa-devel ```zypper install alsa-devel # 42.3 is shipped default with 1.1.4```
-
-  Fedora 26 (out of the box)
-     - Alsa-devel 1.1.4
+## Cloning Audio-Binding from Git
 
-  Ubuntu-16.4
-     - Alsa should be recompiled from source
-
-```bash
-wget ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.4.1.tar.bz2
-tar -xjf alsa-lib-1.1.4.1.tar.bz2
-cd alsa-lib-1.1.4.1
-./configure --prefix=/opt
 ```
-
-  Ubuntu-17.04 (out of the box)
-     - Alsa 1.1.4
-
-> **WARNING**: do not forget to upgrade your PKG_CONFIG_PATH=/opt/lib/pkgconfig
-> or whatever is the place where your installed alsa.
-
-# Compile AGL-Advanced-Audio-Agent
-
-* Edit your ~/.config/app-templates/cmake.d/00-common-userconf.cmake to reflect
- your local configuration
-
-```cmake
-    message(STATUS "*** Fulup Local Config For Native Linux ***")
-    add_compile_options(-DNATIVE_LINUX)
-
-    set (RSYNC_TARGET "10.20.101.198")
-    set (RSYNC_PREFIX "opt")
-
-    set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
-    set(BINDINGS_INSTALL_PREFIX $ENV{HOME}/opt)
-
-    set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-    set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
-
-```
-
-```bash
-    mkdir -p build
-    cd build
-    cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX ..
-    make
-
-    # Note: 
-      1) Controller is now a standalone project and should added on top of project bindings
-      2) If you want monitoring add '--alias=/monitoring:$HOME/opt/afb-monitoring'  (should point to monitoring HTML5 pages)
-      3) To expose AAAA control interface add '--ws-server=unix:/var/tmp/afb-ws/ctl-aaaa'
-
-    afb-daemon --workdir=. --ldpaths=. --binding=../../afb-controller/build/afb-source/afb-control-afb.so --port=1234  --roothttp=../htdocs --token="" --verbose
-    
-
-    Warning: See below net on GDB requiring (--workdir=.)
+    ## Initial clone with submodules
+    git clone --recurse-submodules https://github.com/fulup-bzh/hal-utilities-4a
+    cd  hal-utilities-4a
 ```
 
-# Note: GDB Source Debug limits/features
-
-Warning: technically AGL bindings are shared libraries loaded thought 'dlopen'. GDB supports source debug of dynamically
-loaded libraries, but user should be warn that the actual path to sharelib symbols is directly inherited from DLOPEN.
-As a result if you change your directory after binder start with --workdir=xxx then GDB will stop working.
+## Usage
 
-Conclusion: double-check that --workdir=. and run debug session from ./build directory. Any IDEs like Netbeans or VisualCode should work out of the box.
+HAL-utilities are designed to be included as a submodule into each HAL
 
-```bash
-    Examples:
-
-    # WORK when running in direct
-    afb-daemon --workdir=.. --ldpaths=build --port=1234 --roothttp=./htdocs
-
-    # FAIL when using GDB with warning: Could not load shared library ....
-    gdb -args afb-daemon --workdir=.. --ldpaths=build --port=1234 --roothttp=./htdocs
-    ...
-    warning: Could not load shared library symbols for ./build/ucs2-afb/afb-ucs2.so.
-    Do you need "set solib-search-path" or "set sysroot"?
-    ...
 ```
-
-To debug sharelib symbol path: start your binder under GDB. Then break your session after the binder has
-loaded its bindings. Finally use "info sharedlibrary" and check 'SymsRead'. If equal to 'No' then either you start GDB
-from the wrong relative directory, either you have to use 'set solib-search-path' to force the path.
-
-```bash
-    gdb -args afb-daemon --workdir=.. --ldpaths=build --port=1234 --roothttp=./htdocs
-    run
-        ...
-        NOTICE: API UNICENS added
-        NOTICE: Waiting port=1234 rootdir=.
-        NOTICE: Browser URL= http://localhost:1234
-    (hit Ctrl-C to break the execution)
-    info sharedlibrary afb-*
+    git submodule add git@github.com:fulup-bzh/hal-utilities-4a
 ```
 
-# Running an debugging on a target
-
-```bash
-export RSYNC_TARGET=root@xx.xx.xx.xx
-export RSYNC_PREFIX=/opt    # WARNING: installation directory should exist
-
-mkdir $RSYNC_TARGET
-cd    $RSYNC_TARGET
-
-cmake -DRSYNC_TARGET=$RSYNC_TARGET -DRSYNC_PREFIX=$RSYNC_PREFIX ..
-make remote-target-populate
-
-    ./build/target/start-${RSYNC_TARGET}.sh
-    firefox http://localhost:1234    # WARNING: do not forget firewall if any
+## Samples
 
-    ssh -tt ${RSYNC_TARGET} speaker-test -twav -D hw:ep01 -c 2
-```
-
-Note: remote-target-populate will
-
-* create a script to remotely start the binder on the target in ./build/target/start-on-target-name.sh
-* create a gdbinit file to transparently debug remotely in source code with gdb -x ./build/target/gdb-on-target-name.ini
-* to run and debug directly from your IDE just configure the run and debug properties with the corresponding filename
-* run a generic control and pass virtual channel as a parameter (check remaning PCM in plugin)
-
-Note that Netbeans impose to set debug directory to ./build/pkgout or it won't find binding symbols for source debugging
-
-# <a name="Build"></a> Building AFB-daemon from source on Standard Linux Distribution
-
-## Handle dependencies using packager > (OpenSuse-42.2, Fedora-25, Ubuntu 16.04.2LTS)
-
-Using system package repositories:
-
-* gcc > 4.8
-* systemd-devel (libsystemd-dev>=222)
-* libuuid-devel (OpenSuse) or uuid-dev (Ubuntu)
-* file-devel(OpenSuSe) or libmagic-dev(Ubuntu)
-* libjson-c-devel
-* ElectricFence (BUG should not be mandatory)
-* libopenssl-devel libgcrypt-devel libgnutls-devel (optional but requested by libmicrohttpd for https)
-
-Using [AGL repositories](https://en.opensuse.org/LinuxAutomotive):
-
-* libmicrohttpd>=0.9.55 (as today OpenSuse-42.2, 42.3 or Ubuntu-16.4 ship older versions)
-* afb-daemon from AGL Gerrit ```git clone https://gerrit.automotivelinux.org/gerrit/src/app-framework-binder```
-
-OpenSuse >= 42.2:
-
-```bash
-export DISTRO="openSUSE_Leap_42.2"
-sudo zypper ar http://download.opensuse.org/repositories/isv:/LinuxAutomotive:/app-Framework/${DISTRO}/isv:LinuxAutomotive:app-Framework.repo
-sudo zypper ref
-#For openSUSE_Leap_42.2 gcc config
-sudo zypper install agl-gcc5-setup
-#For openSUSE_Leap_42.3 gcc config
-#sudo zypper install agl-gcc6-setup
-#Install application framework
-sudo zypper install agl-app-framework-binder
-
-# Other needed system devel packages:
-zypper in gcc5 gdb gcc5-c++ git cmake make ElectricFence systemd-devel libopenssl-devel libuuid-devel alsa-devel libgcrypt-devel libgnutls-devel libjson-c-devel file-devel mxml-devel
-```
-
-Fedora >= 26:
-
-```bash
-export DISTRO="Fedora_26"
-sudo dnf config-manager --add-repo http://download.opensuse.org/repositories/isv:/LinuxAutomotive:/app-Framework/${DISTRO}/isv:LinuxAutomotive:app-Framework.repo
-#Install application framework
-sudo zypper install agl-app-framework-binder
-
-# Other needed system devel packages:
-dnf install gdb git cmake make ElectricFence systemd-devel libopenssl-devel libuuid-devel alsa-devel libgcrypt-devel libgnutls-devel libjson-c-devel file-devel mxml-devel
-```
-
-Ubuntu >= 16.4:
-
-```bash
-export DISTRO="xUbuntu_16.04"
-wget -O - http://download.opensuse.org/repositories/isv:/LinuxAutomotive:/app-Framework/${DISTRO}/Release.key | sudo apt-key add -
-sudo bash -c "cat >> /etc/apt/sources.list.d/AGL.list <<EOF
-#AGL
-deb http://download.opensuse.org/repositories/isv:/LinuxAutomotive:/app-Framework/${DISTRO}/ ./
-EOF"
-sudo apt-get update
-#Install application framework
-sudo apt-get install agl-app-framework-binder
-# Or for Ubuntu 17.04
-#sudo apt-get install agl-app-framework-binder-bin
-#sudo apt-get install agl-app-framework-binder-dev
-
-# Other needed system devel packages:
-apt-get install cmake git electric-fence libsystemd-dev libssl-dev uuid-dev libasound2-dev libgcrypt20-dev libgnutls-dev libgnutls-dev libjson-c-dev libmagic-dev  libmxml-dev
-```
-
-You might want to add following variables into ~/.bashrc:
-
-```bash
-    echo "#----------  AGL options Start ---------" >>~/.bashrc
-    echo "# Object: AGL cmake option for  binder/bindings" >>~/.bashrc
-    echo "# Date: `date`" >>~/.bashrc
-    echo 'export CC=gcc-5; export CXX=g++-5' >>~/.bashrc   # if using gcc5
-    echo 'export INSTALL_PREFIX=$HOME/opt' >>~/.bashrc
-    echo 'export LD_LIBRARY_PATH=$INSTALL_PREFIX/lib64:$INSTALL_PREFIX/lib' >>~/.bashrc
-    echo 'export LIBRARY_PATH=$INSTALL_PREFIX/lib64:$INSTALL_PREFIX/lib' >>~/.bashrc
-    echo 'export PKG_CONFIG_PATH=$INSTALL_PREFIX/lib64/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig' >>~/.bashrc
-    echo 'export PATH=$INSTALL_PREFIX/bin:$PATH' >>~/.bashrc
-    echo 'export RSYNC_TARGET=MY_TARGET_HOSTNAME' >>~/.bashrc
-    echo 'export RSYNC_PREFIX=./opt' >>~/.bashrc
-
-    echo "#----------  AGL options End ---------" >>~/.bashrc
-    source ~/.bashrc
-```
-
-## Handle dependencies from sources
-
-Install devel packages from your system official repositories and use the
-following instructions to install `libmicrohttpd` and `app-framework-binder`:
-
-```bash
-    # install LibMicroHttpd
-    LIB_MH_VERSION=0.9.55
-    wget https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${LIB_MH_VERSION}.tar.gz
-    tar -xzf libmicrohttpd-${LIB_MH_VERSION}.tar.gz
-    cd libmicrohttpd-${LIB_MH_VERSION}
-    ./configure --prefix=${INSTALL_PREFIX}
-    make
-    sudo make install-strip
-
-    # retrieve last AFB_daemon from AGL
-    git clone https://gerrit.automotivelinux.org/gerrit/src/app-framework-binder
-
-    # Warning: previous GCC options should be set before initial cmake (clean Build/*)
-    cd app-framework-binder; mkdir -p build; cd build
-    cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX ..
-    make
-    make install
-```
+Check for hal-samples-4a repository
\ No newline at end of file
diff --git a/afb-utilities b/afb-utilities
deleted file mode 160000
-Subproject be1205fd4ab6bd20dd9bc44ed63c35d999ece76
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject b5fb4364e02d4d3db339e966c69cbe1177f4f52
diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild
deleted file mode 100755
index 4811441..0000000
--- a/conf.d/autobuild/agl/autobuild
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015, 2016 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@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.
-
-THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
-DEST      := ${BUILD_DIR}/target
-
-.PHONY: all clean distclean configure build package help update
-
-all: help
-
-help:
-	@echo "List of targets available:"
-	@echo ""
-	@echo "- all"
-	@echo "- clean"
-	@echo "- distclean"
-	@echo "- configure"
-	@echo "- build"
-	@echo "- package"
-	@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"
-
-update: configure
-	@cmake --build ${BUILD_DIR} --target autobuild
-
-clean:
-	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
-
-distclean:
-	@rm -rf ${BUILD_DIR}
-
-configure: ${BUILD_DIR}/Makefile
-
-build: configure
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
-
-package: build
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/data
-	@cmake --build ${BUILD_DIR} --target widget
-	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
-
-${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
deleted file mode 100755
index 4811441..0000000
--- a/conf.d/autobuild/linux/autobuild
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015, 2016 "IoT.bzh"
-# Author "Romain Forlot" <romain.forlot@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.
-
-THISFILE  := $(lastword $(MAKEFILE_LIST))
-BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
-DEST      := ${BUILD_DIR}/target
-
-.PHONY: all clean distclean configure build package help update
-
-all: help
-
-help:
-	@echo "List of targets available:"
-	@echo ""
-	@echo "- all"
-	@echo "- clean"
-	@echo "- distclean"
-	@echo "- configure"
-	@echo "- build"
-	@echo "- package"
-	@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"
-
-update: configure
-	@cmake --build ${BUILD_DIR} --target autobuild
-
-clean:
-	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
-
-distclean:
-	@rm -rf ${BUILD_DIR}
-
-configure: ${BUILD_DIR}/Makefile
-
-build: configure
-	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
-
-package: build
-	@mkdir -p ${BUILD_DIR}/$@/bin
-	@mkdir -p ${BUILD_DIR}/$@/etc
-	@mkdir -p ${BUILD_DIR}/$@/lib
-	@mkdir -p ${BUILD_DIR}/$@/htdocs
-	@mkdir -p ${BUILD_DIR}/$@/data
-	@cmake --build ${BUILD_DIR} --target widget
-	@mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
-
-${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/cmake/config.cmake b/conf.d/cmake/config.cmake
deleted file mode 100644
index 8157981..0000000
--- a/conf.d/cmake/config.cmake
+++ /dev/null
@@ -1,221 +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.
-###########################################################################
-
-# Project Info
-# ------------------
-set(PROJECT_NAME afb-aaaa)
-set(PROJECT_VERSION "0.1")
-set(PROJECT_PRETTY_NAME "Audio Agent")
-set(PROJECT_DESCRIPTION "Expose Alsa through AGL AppFw")
-set(PROJECT_URL "https://github.com/iotbzh/audio-bindings")
-set(PROJECT_ICON "icon.png")
-set(PROJECT_AUTHOR "Fulup, Ar Foll")
-set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh")
-set(PROJECT_LICENSE "Apache-V2")
-set(PROJECT_LANGUAGES,"C")
-
-# Where are stored default templates files from submodule or subtree app-templates in your project tree
-# relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
-
-# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
-# but used and must be built and linked.
-# set(PROJECT_LIBDIR "libs")
-
-# Where are stored data for your application. Pictures, static resources must be placed in that folder.
-# set(PROJECT_RESOURCES "data")
-
-# Which directories inspect to find CMakeLists.txt target files
-set(PROJECT_SRC_DIR_PATTERN "[^_]*")
-
-# Compilation Mode (DEBUG, RELEASE)
-# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
-
-# Kernel selection if needed. You can choose between a
-# mandatory version to impose a minimal version.
-# Or check Kernel minimal version and just print a Warning
-# about missing features and define a preprocessor variable
-# to be used as preprocessor condition in code to disable
-# incompatibles features. Preprocessor define is named
-# KERNEL_MINIMAL_VERSION_OK.
-#
-# NOTE*** FOR NOW IT CHECKS KERNEL Yocto environment and
-# Yocto SDK Kernel version.
-# -----------------------------------------------
-#set (kernel_mandatory_version 4.8)
-#set (kernel_minimal_version 4.8)
-
-# Compiler selection if needed. Impose a minimal version.
-# -----------------------------------------------
-set (gcc_minimal_version 4.9)
-
-# PKG_CONFIG required packages
-# -----------------------------
-set (PKG_REQUIRED_LIST
-	json-c
-	libsystemd>=222
-	afb-daemon
-	libmicrohttpd>=0.9.55
-	libafbwsc
-	alsa>=1.1.2
-)
-
-# Prefix path where will be installed the files
-# Default: /usr/local (need root permission to write in)
-# ------------------------------------------------------
-#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
-
-# Customize link option
-# -----------------------------
-list(APPEND link_libraries -lpthread -lm)
-
-# Compilation options definition
-# Use CMake generator expressions to specify only for a specific language
-# Values are prefilled with default options that is currently used.
-# Either separate options with ";", or each options must be quoted separately
-# DO NOT PUT ALL OPTION QUOTED AT ONCE , COMPILATION COULD FAILED !
-# ----------------------------------------------------------------------------
-set(COMPILE_OPTIONS
--Wall
--Wextra
--Wconversion
--Wno-unused-parameter
--Wno-sign-compare
--Wno-sign-conversion
--Werror=maybe-uninitialized
--Werror=implicit-function-declaration
--ffunction-sections
--fdata-sections
--fPIC
-# Personal compilation options
--DMAX_SND_CARD=16        # should be more than enough even in luxury vehicule
--DMAX_LINEAR_DB_SCALE=24 # until 24db volume normalisation use a simple linear scale
--DTLV_BYTE_SIZE=256      # Alsa use 4096 as default but 256 should fit most sndcards
--DCONTROL_MAXPATH_LEN=255
- CACHE STRING "Compilation flags")
-#set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.")
-#set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.")
-#set(PROFILING_COMPILE_OPTIONS
-# -g
-# -O0
-# -pg
-# -Wp,-U_FORTIFY_SOURCE
-# CACHE STRING "Compilation flags for PROFILING build type.")
-#set(DEBUG_COMPILE_OPTIONS
-# -g
-# -ggdb
-# -Wp,-U_FORTIFY_SOURCE
-# CACHE STRING "Compilation flags for DEBUG build type.")
-#set(CCOV_COMPILE_OPTIONS
-# -g
-# -O2
-# --coverage
-# CACHE STRING "Compilation flags for CCOV build type.")
-#set(RELEASE_COMPILE_OPTIONS
-# -g
-# -O2
-# CACHE STRING "Compilation flags for RELEASE build type.")
-
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
-# ---------------------------------------------------------------------
-set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
-
-# Optional location for config.xml.in
-# -----------------------------------
-#set(WIDGET_ICON conf.d/wgt/${PROJECT_ICON} CACHE PATH "Path to the widget icon")
-#set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in CACHE PATH "Path to widget config file template (config.xml.in)")
-
-# Mandatory widget Mimetype specification of the main unit
-# --------------------------------------------------------------------------
-# Choose between :
-#- text/html : HTML application,
-#	content.src designates the home page of the application
-#
-#- application/vnd.agl.native : AGL compatible native,
-#	content.src designates the relative path of the binary.
-#
-# - application/vnd.agl.service: AGL service, content.src is not used.
-#
-#- ***application/x-executable***: Native application,
-#	content.src designates the relative path of the binary.
-#	For such application, only security setup is made.
-#
-set(WIDGET_TYPE MimeType_Not_Set)
-
-# Mandatory Widget entry point file of the main unit
-# --------------------------------------------------------------
-# This is the file that will be executed, loaded,
-# at launch time by the application framework.
-#
-set(WIDGET_ENTRY_POINT EntryPoint_Path_Not_Set)
-
-# Optional dependencies order
-# ---------------------------
-#set(EXTRA_DEPENDENCIES_ORDER)
-
-# Optional Extra global include path
-# -----------------------------------
-#set(EXTRA_INCLUDE_DIRS)
-
-# Optional extra libraries
-# -------------------------
-#set(EXTRA_LINK_LIBRARIES)
-
-# Optional force binding Linking flag
-# ------------------------------------
-# set(BINDINGS_LINK_FLAG LinkOptions )
-
-# Optional force package prefix generation, like widget
-# -----------------------------------------------------
-# set(PKG_PREFIX DestinationPath)
-
-# Optional Application Framework security token
-# and port use for remote debugging.
-#------------------------------------------------------------
-set(AFB_TOKEN   ""     CACHE PATH "Default binder security token")
-set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port")
-
-# Print a helper message when every thing is finished
-# ----------------------------------------------------
-if(IS_DIRECTORY $ENV{HOME}/opt/afb-monitoring)
-set(MONITORING_ALIAS "--alias=/monitoring:$ENV{HOME}/opt/afb-monitoring")
-endif()
-
-if(EXISTS ${CMAKE_SOURCE_DIR}/../afb-controller/build/afb-source/afb-control-afb.so)
-set(CTL_BUILD_PATH "--binding=../../afb-controller/build/afb-source/afb-control-afb.so")
-endif()
-set(CLOSING_MESSAGE "Debug from afb-daemon --port=1234 ${MONITORING_ALIAS} --ldpaths=. ${CTL_BUILD_PATH} --workdir=. --roothttp=../htdocs --tracereq=common --token= --verbose ")
-set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
-
-# When Present LUA is used by the controller
-# ---------------------------------------------------------------
-set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support")
-
-# Optional schema validator about now only XML, LUA and JSON
-# are supported
-#------------------------------------------------------------
-#set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
-#set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
-#set(JSON_CHECKER "json_verify" CACHE STRING "JSON linter")
-
-# This include is mandatory and MUST happens at the end
-# of this file, else you expose you to unexpected behavior
-# -----------------------------------------------------------
-include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
diff --git a/conf.d/packaging/agl-afb-aaaa_0.1.orig.tar.gz b/conf.d/packaging/agl-afb-aaaa_0.1.orig.tar.gz
deleted file mode 100644
index 6a5980d..0000000
--- a/conf.d/packaging/agl-afb-aaaa_0.1.orig.tar.gz
+++ /dev/null
diff --git a/conf.d/project/CMakeLists.txt b/conf.d/project/CMakeLists.txt
deleted file mode 100644
index fd4d454..0000000
--- a/conf.d/project/CMakeLists.txt
+++ /dev/null
@@ -1,24 +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.
-###########################################################################
-
-
-
-# Include anything not starting with _
-PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN})
-
-
diff --git a/conf.d/project/alsa.d/README.md b/conf.d/project/alsa.d/README.md
deleted file mode 100644
index aa2a54e..0000000
--- a/conf.d/project/alsa.d/README.md
+++ /dev/null
@@ -1,175 +0,0 @@
-
-Alsa Configuration is not complex, but it's heavy and every except intuitive. 
-
-In order to set your configuration move step by step. And verify at each new step that you did not introduce a regression.
-
-### Make sure your board is not taken by PulseAudio
-
-* Pavucontrol is your friend. Go in device configuration and switch to off the device you want to make available to ALSA.
-* Check for your device list with 'play -l'. Note that just after card number your get an alias for your sound card. 
-  it is simpler to use this alias, card number will change depending on plug/unplug of device when this alias name
-  is more stable (except for few stupid driver who use 'USB' as sound card name.
-* When your know your sound alias (eg:v1340 in mu case) you can test it with 'speaker-test -D v1340 -c2 -twav'. You may also
-  use sound card number with 'speaker-test -D hw:0 -c2 -twav'. Nevertheless as said previously this number is not stable.
-* you are now ready to write your $HOME/.asoundrc config
-
-Note that $HOME/.asoundrc is loaded within libasound client and not by Alsa kernel, this is the reason why you do not need
-to activate any control or restart a daemon for modifications to be taken in account.
-
-To use ALSA with AAAA and the controller you need to write 1 section in your ALSA config
- 
-* Sound Card Mixer: Allows multiple audio stream to be played on the same sound card. If hardware support mixer, Alsa will use it. If  
-  not it will provide mixing by software.
-* Audio Role Volume: They provide independent volume for each audio role. For reference, we use Alsa softvolume, depending on 
-  your hardware you may have this directly avaliable from your sound card.
-* Authorised Audio PCM: those channel are designed for applications we do not trust and then enforce AAAA control check
-  before granting the access to a given channel. 
-
-### Sound Card Mixer
-
-```
-pcm.SoundCardMixer {
-    type dmix
-    ipc_key 1024
-    ipc_key_add_uid false
-    ipc_perm 0666   # mixing for all users
-
-    # Define target effective sound card (cannot be a plugin)
-    slave { pcm "hw:v1340" } #Jabra Solmate
-
-    # DMIX can only map two channels
-    bindings {
-        0 0
-        1 1
-    }
-}
-```
-
-Warning: if you have more than one Mixer each of them should have a unique ipc_key. You sound card alias move in the slave section.
-When this is done you may try your mixer with:
-
-```
- speaker-test -D MyMixerPCM -c2 -twav
-```
-
-
-### Audio Role
-
-```
-pcm.NavigationRole {
-    type        softvol
-
-    # Point Slave on HOOK for policies control
-    slave.pcm   "SoundCardMixer"
-
-    # name should match with HAL but do not set card=xx
-    control.name    "Playback Navigation"
-
-}
-
-```
-
-The slave you point to your SoundCardMixer, and the control.name should be EXACTLY the same as the one defined in your HAL.
-
-
-WARNING: The control here  "Playback Navigation" is a user defined kernel control. It means that this kernel is created in
-kernel space, but that its action happen in user space. When create those control remains visible until you reset your
-sound card (eg: unplug USB), but they are save each time you reboot. It is recommended to start AAAA binder before testing
-your softvol audio role channel. If you do the opposite the control will be create by Alsa Plugin and this will not inherit
-of the default value you have in your HAL.
-
-When in place you should test it with:
-```
- speaker-test -D NavigationRole -c2 -twav
-```
-
-IMPORTANT: control volume are attache to your physical hardware and not to intermediary level (Softvol or Mixer). To see the
-newly created channel you should use
-```
-  amixer -Dhw:v1340 controls | grep -i playback
-```
-
-## Authorised Audio PCM
-
-This PCM is supervised with the AAAA audio hook plugin. The pluging and will any application request on this PCM and will
-1st request an autorisation from AAAA controller to grant access for the client application. To do so, two things:
-* the plugin should be declared (only once)
-* you should declare as many authorized PCM as you need.
-
-### Plugin declaration
-
-```
-pcm_hook_type.MyHookPlugin {
-    install "AlsaInstallHook"
-    lib "/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build/Alsa-Plugin/Alsa-Policy-Hook/policy_hook_cb.so"
-}
-
-```
-
-Lib is the path where to find AAAA Alsa hook plugin, install is the name of the init function it should not be changed.
-
-
-When your plugin is defined you may declare your authorised PCM. Those PCM like softvol will take a slave, typically a lower
-level of the audio role, or directly a mixer if your goal is to protect directly the Mixer. The AAAA Plugin hook take as
-
-```
-pcm.AuthorisedToNavigationOnly {
-    type hooks
-    slave.pcm "NavigationRole"
-    # Defined used hook sharelib and provide arguments/config to install func
-    hooks.0 {
-        type "MyHookPlugin"
-        hook_args {
-            verbose true # print few log messages (default false);
-
-            # Every Call should return OK in order PCM to open (default timeout 100ms)
-            uri   "ws://localhost:1234/api?token=audio-agent-token&uuid=audio-agent-session"
-            request {
-                # Request autorisation to write on navigation
-                RequestNavigation {
-                    api    "control"
-                    verb   "dispatch"
-	            query  "{'target':'navigation', 'args':{'device':'Jabra SOLEMATE v1.34.0'}}"
-                }
-            }
-            # map event reception to self generated signal
-            event {
-                pause  30
-                resume 31
-                stop   3
-            }
-        }
-    }
-}
-
-```
-
- * The slave is the PCM that application will be transfer to if access to control is granted. 
- * Request is a suite à control action that respond to AGL standard application framework API
- * Event is the mapping of signal an appplication will receive in case AAAA controller push event to the audio application.
-
-When using AAAA controller, most action should be transfert to the controller that will take action to authorise/deny the access. 
-Nevertheless it is also possible to directly access a lower level (e.g. call alsa Use Case Manager). People may also have their
-own audio policy engine and request it directly from here.
-
-To test this last part your need to have a controller ready to respond to your request. Otherwise control will systematically
-be denied. When your AAAA controller is ready to serve your request you may check this with
-```  
-  amixer -Dhw:AuthorisedToMusicOnly controls | grep -i playback
-  amixer -Dhw:AuthorisedToNavigationOnly controls | grep -i playback
-```
-
-IMPORTANT: you need at least to audio role to really test this part. While you may assert with one channel that your flow
-to accept/deny application works. You need two simultaneous audio stream to really play with the control. Typically when playing
-music if you send a navigation message then the audio will be lower during the rendering of the navigation message.
-
-The action on how you lower an audio role when an other one with a higger level of priority come in place not defined at the
-plugin level, but in the AAAA controller, where the API control/dispatch?target=xxxxx will execute a set of actions corresponding
-the set/unset accept/deny of requested control.
-
-Remark: to understand what is happening it is a good idea to have an alxamixer option on the your soundcard
-```
- amixer -Dhw:v1340
-```
-
-(!) Do not forget to replace 'hw:v1340' by what ever is the alias of your sound card.
\ No newline at end of file
diff --git a/conf.d/project/alsa.d/asoundrc.sample b/conf.d/project/alsa.d/asoundrc.sample
deleted file mode 100644
index 0716b11..0000000
--- a/conf.d/project/alsa.d/asoundrc.sample
+++ /dev/null
@@ -1,140 +0,0 @@
-#
-# Author: Fulup Ar Foll
-# Object: PCM hook type
-#
-# Test  :  Note: Jabra_USB=hw:v1340
-#  Check SoundCard  speaker-test -Dhw:v1340 -c2 -twav
-#  Check MixerPCM   speaker-test -DMyMixerPCM -c2 -twav
-#  Check HookPCM    speaker-test -DMyNavigationHook -c2 -twav
-#  Check NavPCM     speaker-test -DMyNavPCM -c2 -twav
-#  MultiMedia aplay -DDMyNavPCM /usr/share/sounds/alsa/test.wav
-#
-# Bug/Feature: when softvol control is initialised from plugin and not
-#    from AGL binding. At 1st run ctl has invalid TLV and cannot be
-#    use. Bypass Solution:
-#     * start audio-binder before playing sound (binding create control before softvol plugin)
-#     * run a dummy aplay -DMyNavPCM "" to get a clean control
-#
-# References: https://www.spinics.net/lists/alsa-devel/msg54235.html
-# --------------------------------------------------------------------
-
-# Mixer PCM allow to play multiple stream simultaneously
-# ------------------------------------------------------
-pcm.MyMixerPCM {
-    type dmix
-    ipc_key 1024
-    ipc_key_add_uid false
-    ipc_perm 0666   # mixing for all users
-
-    # Define target effective sound card (cannot be a plugin)
-    slave { pcm "hw:v1340" } #Jabra Solmate
-
-    # DMIX can only map two channels
-    bindings {
-        0 0
-        1 1
-    }
-}
-
-# Define a Hook_type with a private sharelib
-# -------------------------------------------
-pcm_hook_type.MyHookPlugin {
-    install "AlsaInstallHook"
-    lib "/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/build/Alsa-Plugin/Alsa-Policy-Hook/policy_hook_cb.so"
-}
-
-
-# Define a HookedPCM that point to Hook_type sharelib
-# ----------------------------------------------------
-pcm.MyNavigationHook {
-    type hooks
-    slave.pcm "MyMixerPCM"
-    # Defined used hook sharelib and provide arguments/config to install func
-    hooks.0 {
-        type "MyHookPlugin"
-        hook_args {
-            verbose true # print few log messages (default false);
-
-            # Every Call should return OK in order PCM to open (default timeout 100ms)
-            uri   "ws://localhost:1234/api?token=audio-agent-token&uuid=audio-agent-session"
-            request {
-                # Request autorisation to write on navigation
-                RequestNavigation {
-                    api    "control"
-                    verb   "dispatch"
-	            query  "{'target':'navigation', 'args':{'device':'Jabra SOLEMATE v1.34.0'}}"
-                }
-            }
-            # map event reception to self generated signal
-            event {
-                pause  30
-                resume 31
-                stop   3
-            }
-        }
-    }
-}
-
-# If hardware does not support mixer emulate it with softvol
-# -----------------------------------------------------------
-pcm.MyMultimediaPCM {
-    type        softvol
-
-    # Point Slave on HOOK for policies control
-    slave.pcm   "MyNavigationHook"
-
-    # resolution=HAL(valMax+1) (default=256)
-    resolution 256
-
-    # name should match with HAL but do not set card=xx
-    control.name    "Playback Navigation"
-
-    # Make this plugin visible from aplay -L
-    hint {
-      show on
-      description "Navigation SolftVol PCM"
-    }
-}
-
-# If hardware does not support mixer emulate it with softvol
-# -----------------------------------------------------------
-pcm.MyNavPCM {
-    type        softvol
-
-    # Point Slave on HOOK for policies control
-    slave.pcm   "MyNavigationHook"
-
-    # resolution=HAL(valMax+1) (default=256)
-    resolution 256
-
-    # name should match with HAL but do not set card=xx
-    control.name    "Playback Navigation"
-
-    # Make this plugin visible from aplay -L
-    hint {
-      show on
-      description "Navigation SolftVol PCM"
-    }
-}
-
-# If hardware does not support mixer emulate it with softvol
-# -----------------------------------------------------------
-pcm.MyAlarmPCM {
-    type        softvol
-
-    # Point Slave on HOOK for policies control
-    slave.pcm   "MyNavigationHook"
-
-    # resolution=HAL(valMax+1) (default=256)
-    resolution 256
-
-    # name should match with HAL but do not set card=xx
-    control.name    "Playback Navigation"
-
-    # Make this plugin visible from aplay -L
-    hint {
-      show on
-      description "Navigation SolftVol PCM"
-    }
-}
-
diff --git a/conf.d/project/alsa.d/ucm.sample/HDA Intel PCH.conf b/conf.d/project/alsa.d/ucm.sample/HDA Intel PCH.conf
deleted file mode 100644
index f6608a0..0000000
--- a/conf.d/project/alsa.d/ucm.sample/HDA Intel PCH.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Comment "Leon internal card"
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "Default"
-}
diff --git a/conf.d/project/alsa.d/ucm.sample/HiFi.conf b/conf.d/project/alsa.d/ucm.sample/HiFi.conf
deleted file mode 100644
index 9a53c8c..0000000
--- a/conf.d/project/alsa.d/ucm.sample/HiFi.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-SectionVerb {
-	EnableSequence [
-		cdev "hw:PCH"
-
-		cset "name='Master Playback Switch' on"
-		cset "name='Headphone Playback Switch' off"
-		cset "name='Speaker Playback Switch' on"
-
-		cset "name='Capture Switch' on"
-		cset "name='Capture Volume' 39"
-		cset "name='Mic Boost Volume' 2"
-		cset "name='Internal Mic Boost Volume' 0"
-		#cset "name='Capture Source' 0"
-	]
-	DisableSequence [
-	]
-	Value {
-                TQ "Music"
-		OutputDspName "speaker_eq"
-                PlaybackPCM "hw:PCH,0"
-	}
-}
-
-SectionDevice."Headphone".0 {
-	Value {
-		JackName "Headphone Jack"
-		OutputDspName "Jheadphone"
-	}
-	EnableSequence [
-		cdev "hw:PCH"
-
-		cset "name='Speaker Playback Switch' off"
-		cset "name='Headphone Playback Switch' on"
-	]
-	DisableSequence [
-		cdev "hw:PCH"
-
-		cset "name='Headphone Playback Switch' off"
-		cset "name='Speaker Playback Switch' on"
-	]
-}
-
-SectionDevice."Mic".0 {
-	Value {
-		JackName "Mic Jack"
-	}
-	EnableSequence [
-		cdev "hw:PCH"
-
-		#cset "name='Capture Source' 1"
-	]
-	DisableSequence [
-		cdev "hw:PCH"
-
-		cset "name='Capture Source' 0"
-	]
-}
-
-SectionModifier."RecordMedia".0 {
-        SupportedDevice [
-                "Headphone"
-        ]
-        EnableSequence [
-                cdev "hw:PCH"
-        ]
-
-        DisableSequence [
-                cdev "hw:PCH"
-        ]
-
-        TransitionSequence."ToModifierName" [
-                cdev "hw:PCH"
-        ]
-
-        # Optional TQ and ALSA PCMs
-        Value {
-                TQ Voice
-                CapturePCM "hw:1"
-                PlaybackVolume "name='Master Playback Volume',index=2"
-                PlaybackSwitch "name='Master Playback Switch',index=2"
-        }
-
-}
-
diff --git a/conf.d/project/alsa.d/ucm.sample/README b/conf.d/project/alsa.d/ucm.sample/README
deleted file mode 100644
index e7f08ae..0000000
--- a/conf.d/project/alsa.d/ucm.sample/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Should match sound card name ex: "HDA Intel PCH"
-cp -r . /usr/share/alsa/ucm
diff --git a/conf.d/project/json.d/CMakeLists.txt b/conf.d/project/json.d/CMakeLists.txt
deleted file mode 100644
index 8070997..0000000
--- a/conf.d/project/json.d/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-###########################################################################
-# Copyright 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.
-###########################################################################
-
-
-##################################################
-# Control Policy Config file
-##################################################
-PROJECT_TARGET_ADD(ctl-config.d)
-
-    file(GLOB XML_FILES "*.json")
-
-    add_input_files("${XML_FILES}")
-
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	LABELS "DATA"
-	OUTPUT_NAME ${TARGET_NAME}
-    )
diff --git a/conf.d/project/json.d/README.md b/conf.d/project/json.d/README.md
deleted file mode 100644
index 0f4967d..0000000
--- a/conf.d/project/json.d/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-By default controller searches for a config filename with the same 'middlename' as daemon process. As an example if your process name is afb-daemon then middle name is 'daemon'.
-
-```
- onload-middlename-xxxxx.json
-
- # Middlename is taken from process middlename.
-```
-
-You may overload config search path with environement variables
- * AFB_BINDER_NAME: change patern config search path. 'export AFB_BINDER_NAME=sample' will make controller to search for a configfile name 'onload-sample-xxx.json'.
- * CONTROL_CONFIG_PATH: change default reserch path for configuration. You may provide multiple directories separated by ':'.
- * CONTROL_LUA_PATH: same as CONTROL_CONFIG_PATH but for Lua script files.
-
-Example to load a config name 'onload-myconfig-test.json' do
-```
-  AFB_BINDER_NAME='myconfig' afb-daemon --verbose ...'
-```
-
-Note: you may change search pattern for Lua script by adding 'ctlname=afb-middlename-xxx' in the metadata section of your config 'onload-*.json'
-
-WARNING: Audio Control are the one from the HAL and not from Alsa LowLevel
-
diff --git a/conf.d/project/json.d/onload-aaaa-sample.json b/conf.d/project/json.d/onload-aaaa-sample.json
deleted file mode 100644
index 2b0ad7f..0000000
--- a/conf.d/project/json.d/onload-aaaa-sample.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "$schema": "ToBeDone",
-    "metadata": {
-        "label": "sample-aaaa-control",
-        "info": "Sample of Video AAAA controls",
-        "name": "afb-sample-controller",
-        "version": "1.0"
-    },
-    "onload": [{
-            "label": "onload-default",
-            "info": "onload initialisation config",
-            "require": ["alsacore","jabra-usb","intel-hda","hal-most-unicens"],
-            "actions":
-                    {
-                        "label": "control-init",
-                        "lua": "_Audio_Controller_Init",
-                        "args": {
-                            "evtname": "agl-audio"
-                        }
-                    }
-        }],
-    "controls":
-            [
-                {
-                    "label": "Volume",
-                    "permissions": "urn:AGL:permission:audio:public:multimedia",
-                    "actions": {
-                        "label": "adjust-master-volume",
-                        "info" : "volume value should be provided by requesting client",
-                        "lua": "_Permament_Control",
-                        "args": {
-                            "ctl" : "Master_Playback_Volume"
-                        }
-                    }
-                },{
-                    "label": "Multimedia",
-                    "permissions": "urn:AGL:permission:audio:public:multimedia",
-                    "actions": {
-                        "label": "authorize-multimedia",
-                        "lua": "_Temporarily_Control",
-                        "args": {
-                            "ctl" : "Multimedia_Playback_Volume",
-                            "val": 80
-                        }
-                    }
-                }, {
-                    "label": "Navigation",
-                    "permissions": "urn:AGL:permission:audio:public:navigation",
-                    "actions": {
-                        "label": "authorize-navigation",
-                        "lua": "_Temporarily_Control",
-                        "args": {
-                            "ctl" : "Multimedia_Playback_Volume",
-                            "val": 40
-                        }
-                    }
-                }, {
-                    "label": "Telephony",
-                    "permissions": "urn:AGL:permission:audio:public:telephony",
-                    "actions": {
-                        "label": "authorize-multimedia",
-                        "lua": "_Temporarily_Control",
-                        "args": {
-                            "ctl" : "Multimedia_Playback_Volume",
-                            "val": 20
-                        }
-                    }
-                }, {
-                    "label": "Emergency",
-                    "permissions": "urn:AGL:permission:audio:public:emergency",
-                    "actions": {
-                        "label": "authorize-multimedia",
-                        "lua": "_Temporarily_Control",
-                        "args": {
-                            "ctl" : "Multimedia_Playback_Switch",
-                            "val": 0
-                        },
-                        "label": "authorize-multimedia",
-                        "lua": "_Temporarily_Control",
-                        "args": {
-                            "ctl" : "Navigation_Playback_Switch",
-                            "val": 0
-                        }
-                    }
-                }
-            ],
-    "events":
-            [
-                {
-                    "label": "ReverseEngage",
-                    "actions": [{
-                            "label": "adjust_volume-reverse",
-                            "lua": "_Temporarily_Control",
-                            "args": {
-                                "ctl": "Multimedia_Playback_Volume",
-                                "val": 20
-                            }
-                        },
-                        {
-                            "label": "prevent-telephony",
-                            "lua": "_Temporarily_Control",
-                            "args": {
-                                "ctl": "Telephony_Playback_Switch",
-                                "val": 0
-                            }
-                        }
-                    ]
-                },
-                {
-                    "label": "SpeedChanged",
-                    "actions": {
-                        "label": "adjust_volume",
-                        "lua": "_Adjust_Volume"
-                    }
-                }
-            ]
-}
-
diff --git a/conf.d/project/lua.d/CMakeLists.txt b/conf.d/project/lua.d/CMakeLists.txt
deleted file mode 100644
index 71b3371..0000000
--- a/conf.d/project/lua.d/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-###########################################################################
-# Copyright 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.
-###########################################################################
-
-
-##################################################
-# Control Policy Config file
-##################################################
-PROJECT_TARGET_ADD(ctl-lua.d)
-    file(GLOB LUA_FILES "*.lua")
-
-    # Romain work around to activate lua compilation
-    set(LUA_LIST "${LUA_FILES}" CACHE STRING "")
-
-    add_input_files("${LUA_FILES}")
-
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-    LABELS "DATA"
-    OUTPUT_NAME ${TARGET_NAME}
-    )
\ No newline at end of file
diff --git a/conf.d/project/lua.d/README.md b/conf.d/project/lua.d/README.md
deleted file mode 100644
index fc3548b..0000000
--- a/conf.d/project/lua.d/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-WARNING: controller is now independent from AAAA and thus should be imported by your binder before requesting it.
-
-For this your only have to provide the path where to find your controller you are in your development tree probably with something
-like --binding=../../afb-controller/build/ctl-binding/afb-controller.so on the other hand if you controller was installed you
-should import it from where ever you install it.
-
-To run this controller sample from your developpement environement use
-```
-
-export BUILD_DIR=build
-
-# with an internal MPDC (Pusic Player Daemon Client) API
-afb-daemon --port=1234 --workdir=. --roothttp=../htdocs --token= --verbose \
---alias=/monitoring:$HOME/opt/afb-monitoring  \
---ldpaths=package/lib  \
---alias=/monitoring:/home/fulup/opt/afb-monitoring  \
---binding=../../afb-controller/$BUILD_DIR/package/lib/afb-controller.so  \
---binding=../../afb-mpdc/$BUILD_DIR/package/lib/afb-mpdc-api.so  \
---ws-server=unix:/var/tmp/afb-ws/mpdc
-
-# with an exernal MPDC API
-afb-daemon --port=1234 --workdir=. --roothttp=../htdocs --token= --verbose \
---alias=/monitoring:$HOME/opt/afb-monitoring  \
---ldpaths=.  \
---alias=/monitoring:/home/fulup/opt/afb-monitoring  \
---binding=../../afb-controller/$BUILD_DIR/ctl-binding/afb-controller.so  \
---ws-client=unix:/var/tmp/afb-ws/mpdc
-
-# Note: 
-  - Both sample make the assumption the monitoring HTML5 app is avaliable at $HOME/opt/afb-monitoring
-  - With second sample you should obviously have your MPDC service exposing its API with --ws-server=unix:/var/tmp/afb-ws/mpdc
-  - Should use 'make populate' to get ./build/package/lib to be uptodate
-
-```
-
-Running AAAA from you IDE ![Sample config](netbeans-aaaa-run-config.png)
diff --git a/conf.d/project/lua.d/netbeans-aaaa-run-config.png b/conf.d/project/lua.d/netbeans-aaaa-run-config.png
deleted file mode 100644
index ffb0e5d..0000000
--- a/conf.d/project/lua.d/netbeans-aaaa-run-config.png
+++ /dev/null
diff --git a/conf.d/project/lua.d/onload-aaaa-00-utils.lua b/conf.d/project/lua.d/onload-aaaa-00-utils.lua
deleted file mode 100644
index 29d2c70..0000000
--- a/conf.d/project/lua.d/onload-aaaa-00-utils.lua
+++ /dev/null
@@ -1,86 +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.
-
-  Note: this file should be called before any other to assert declare function
-  is loaded before anything else.
-
-  References:
-    http://lua-users.org/wiki/DetectingUndefinedVariables
-
---]]
-
-
---===================================================
---=  Niklas Frykholm
--- basically if user tries to create global variable
--- the system will not let them!!
--- call GLOBAL_lock(_G)
---
---===================================================
-function GLOBAL_lock(t)
-  local mt = getmetatable(t) or {}
-  mt.__newindex = lock_new_index
-  setmetatable(t, mt)
-end
-
---===================================================
--- call GLOBAL_unlock(_G)
--- to change things back to normal.
---===================================================
-function GLOBAL_unlock(t)
-  local mt = getmetatable(t) or {}
-  mt.__newindex = unlock_new_index
-  setmetatable(t, mt)
-end
-
-function lock_new_index(t, k, v)
-  if (string.sub(k,1,1) ~= "_") then
-    GLOBAL_unlock(_G)
-    error("GLOBALS are locked -- " .. k ..
-          " must be declared local or prefix with '_' for globals.", 2)
-  else
-    rawset(t, k, v)
-  end
-end
-
-function unlock_new_index(t, k, v)
-  rawset(t, k, v)
-end
-
--- return serialised version of printable table
-function Dump_Table(o)
-   if type(o) == 'table' then
-      local s = '{ '
-      for k,v in pairs(o) do
-         if type(k) ~= 'number' then k = '"'..k..'"' end
-         s = s .. '['..k..'] = ' .. Dump_Table(v) .. ','
-      end
-      return s .. '} '
-   else
-      return tostring(o)
-   end
-end
-
-
--- simulate C prinf function
-printf = function(s,...)
-    io.write(s:format(...))
-    io.write("\n")
-    return
-end
-
--- lock global variable
-GLOBAL_lock(_G)
diff --git a/conf.d/project/lua.d/onload-aaaa-01-init.lua b/conf.d/project/lua.d/onload-aaaa-01-init.lua
deleted file mode 100644
index 5ebc695..0000000
--- a/conf.d/project/lua.d/onload-aaaa-01-init.lua
+++ /dev/null
@@ -1,48 +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.
---]]
-
--- Global variable SHOULD start with _
-_Global_Context={}
-
---[[
-   This function is call during controller init phase as describe in onload-daemon-sample.json
-   It receives two argument 1st one is the source (here on load) second one is the arguments
-   as expose in config file.
-
-   In this sample we create an event that take the name of args["zzzz"], the resulting handle
-   is save into _Global_Context for further use.
-
-   Note: init functions are not call from a client and thus do not receive query
-
---]]
-function _Audio_Controller_Init(source, control)
-
-    printf ("[--> Audio_Controller_Init -->] source=%d control=%s", source, Dump_Table(control))
-
-    -- create an event from configuration name
-    _Global_Context["event"]=AFB:evtmake(control["evtname"])
-
-    -- query HAL to retrieve sound card.
-    local err,result= AFB:servsync ("alsacore", "hallist", {})
-
-    if (err) then
-        AFB:error("Fail to retrieve Audio HAL")
-    else 
-        _Global_Context["registry"]=result["response"]
-        printf("[<-- Audio_Controller_Init <--] Active HAL=%s", Dump_Table(result["response"]))
-    end
-end
diff --git a/conf.d/project/lua.d/onload-aaaa-03-controls.lua b/conf.d/project/lua.d/onload-aaaa-03-controls.lua
deleted file mode 100644
index ae1269b..0000000
--- a/conf.d/project/lua.d/onload-aaaa-03-controls.lua
+++ /dev/null
@@ -1,158 +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.
-
-  Following function are called when a control activate a label with
-  labeller api -> APi=label VERB=dispatch
-  arguments are
-    - source (0) when requesting the label (-1) when releasing
-    - label comme from config given with 'control' in onload-middlename-xxxxx.json
-    - control is the argument part of the query as providing by control requesting the label.
-
---]]
-
-_CurrentHalVolume={}
-
-
-
---[[ Apply control
- * source=1  permanent change requested
- * source=0  temporally request control
- * source=-1 temporally release control
--- ------------------------------------ --]]
-local function Apply_Hal_Control(source, label, adjustment) 
- local HAL = _Global_Context["registry"]
- 
-    -- check we really got some data
-    if (adjustment == nil) then
-        AFB:error ("--* (Hoops) Control should provide volume adjustment")  
-        return 1
-    end
-
-    -- loop on each HAL save current volume and push adjustment
-    for key,hal in pairs(_Global_Context["registry"]) do
-       printf ("--- HAL=%s", Dump_Table(hal))
-
-        -- action set loop on active HAL and get current volume
-        -- if label respond then do volume adjustment
-
-        if (source >= 0) then
-
-            -- get current volume for each HAL
-            local err,result= AFB:servsync(hal["api"],"ctlget", {["label"]=label})
-
-            -- if no error save current volume and set adjustment
-            if (err ~= nil) then
-                local response= result["response"]
-                printf ("--- Response %s=%s", hal["api"], Dump_Table(response))
-
-                if (response == nil) then
-                   printf ("--- Fail to Activate '%s'='%s' result=%s", hal["api"], label, Dump_Table(result)) 
-                   return 1 -- unhappy
-                end
-
-                -- save response in global space 
-                _CurrentHalVolume [hal["api"]] = response
-
-                -- finally set the new value
-                local query= {
-                    ["tag"]= response["tag"],
-                    ["val"]= adjustment
-                }
-
-                -- best effort to set adjustment value
-                AFB:servsync(hal["api"],"ctlset",query)
-            end
-
-        else  -- when label is release reverse action at preempt time
-           
-            if (_CurrentHalVolume [hal["api"]] ~= nil) then
-
-                printf("--- Restoring initial volume HAL=%s Control=%s", hal["api"], _CurrentHalVolume [hal["api"]])
-
-                AFB:servsync(hal["api"],"ctlset", _CurrentHalVolume [hal["api"]])
-            end
-        end    
-
-    end
-    return 0 -- happy end
-end
-
-
--- Temporally adjust volume
-function _Temporarily_Control(source, control, client)
-
-    printf ("[--> _Temporarily_Control -->] source=%d control=%s client=%s", source, Dump_Table(control), Dump_Table(client))
-
-    -- Init should have been properly done
-    if (_Global_Context["registry"] == nil) then
-       AFB:error ("--* (Hoops) No Hal in _Global_Context=%s", Dump_Table(_Global_Context)) 
-       return 1
-    end
-
-    -- make sure label as valid
-    if (control["ctl"] == nil or control["val"] == nil) then
-        AFB:error ("--* Action Ignore no/invalid control=%s", Dump_Table(control)) 
-        return 1 -- unhappy
-    end
-
-    if (source == 0) then
-        AFB:info("-- Adjust %s=%d", control["ctl"], control["val"])
-        local error=Apply_Hal_Control(source, control["ctl"], control["val"])
-        if (error == nil) then 
-            return 1 -- unhappy
-        end
-        AFB:notice ("[<-- _Temporarily_Control Granted<--]")
-    else
-        Apply_Hal_Control(source, control["ctl"],0)
-        AFB:notice ("[<-- _Temporarily_Control Restore--]")
-    end
-
-    return 0 -- happy return
-end
-
-
--- Permanent Adjust volume
-function _Permanent_Control(source, control, client)
-
-    printf ("[--> _Permanent_Control -->] source=%d control=%s client=%s", source, Dump_Table(control), Dump_Table(client))
-
-    -- Init should have been properly done
-    if (_Global_Context["registry"] == nil) then
-       AFB:error ("--* (Hoops) No Hal in _Global_Context=%s", Dump_Table(_Global_Context)) 
-       return 1
-    end
-
-    -- make sure label as valid
-    if (control["ctl"] == nil or control["val"] == nil) then
-        AFB:error ("--* Action Ignore no/invalid control=%s", Dump_Table(control)) 
-        return 1 -- unhappy
-    end
-
-    if (source == 0) then
-        AFB:info("-- Adjust %s=%d", control["ctl"], control["val"])
-        local error=Apply_Hal_Control(1, control["ctl"], control["val"])
-        if (error == nil) then 
-            return 1 -- unhappy
-        end
-        AFB:notice ("[<-- _Permanent_Control Granted<--]")
-    else
-        Apply_Hal_Control(source, control["ctl"],0)
-        AFB:notice ("[<-- _Permanent_Control Restore--]")
-    end
-
-    return 0 -- happy return
-end
-
diff --git a/conf.d/project/lua.d/onload-aaaa-10-event.lua b/conf.d/project/lua.d/onload-aaaa-10-event.lua
deleted file mode 100644
index 474ebe0..0000000
--- a/conf.d/project/lua.d/onload-aaaa-10-event.lua
+++ /dev/null
@@ -1,74 +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.
-
-
-  Provide Sample Timer Handing to push event from LUA
---]]
-
--- Create event on Lua script load
-_MyContext={}
-
--- WARNING: call back are global and should start with '_'
-function _Timer_Test_CB (timer, context)
-
-   local evtinfo= AFB:timerget(timer)
-   printf ("[-- _Timer_Test_C --] evtInfo=%s", Dump_Table(evtinfo))
-
-   --send an event an event with count as value
-   AFB:evtpush (_MyContext["event"], {["label"]= evtinfo["label"], ["count"]=evtinfo["count"], ["info"]=context["info"]})
-
-   -- note when timerCB return!=0 timer is kill
-   return 0
-
-end
-
--- sendback event depending on count and delay
-function _Simple_Timer_Test (request, client)
-
-    local context = {
-        ["info"]="My 1st private Event",
-    }
-
-    -- if event does not exit create it now.
-    if (_MyContext["event"] == nil) then
-      _MyContext["event"]= AFB:evtmake(client["label"])
-    end
-
-    -- if delay not defined default is 5s
-    if (client["delay"]==nil) then client["delay"]=5000 end
-
-    -- if count is not defined default is 10
-    if (client["count"]==nil) then client["count"]=10 end
-
-    -- we could use directly client but it is a sample
-    local myTimer = {
-       ["label"]=client["label"],
-       ["delay"]=client["delay"],
-       ["count"]=client["count"],
-    }
-    AFB:notice ("Test_Timer myTimer=%s", myTimer)
-
-    -- subscribe to event
-    AFB:subscribe (request, _MyContext["event"])
-
-    -- settimer take a table with delay+count as input (count==0 means infinite)
-    AFB:timerset (myTimer, "_Timer_Test_CB", context)
-
-    -- nothing special to return send back
-    AFB:success (request, myTimer)
-
-    return 0
-end
diff --git a/HAL-afb/HAL-interface/hal-interface.c b/hal-interface.c
index 4a32d72..b7bdc14 100644
--- a/HAL-afb/HAL-interface/hal-interface.c
+++ b/hal-interface.c
@@ -29,6 +29,12 @@ alsaHalSndCardT *halSndCard;
 // Force specific HAL to depend on ShareHalLib
 PUBLIC char* SharedHalLibVersion = "1.0";
 
+
+STATIC void pingtest(struct afb_req request) {
+    json_object *query = afb_req_json(request);
+    afb_req_success(request, query, NULL);
+}
+
 // Subscribe to AudioBinding events
 
 STATIC void halSubscribe(afb_req request) {
diff --git a/HAL-afb/HAL-interface/hal-interface.h b/hal-interface.h
index c210f02..41ecbd7 100644
--- a/HAL-afb/HAL-interface/hal-interface.h
+++ b/hal-interface.h
@@ -15,14 +15,19 @@
  * limitations under the License.
  */
 
-#ifndef SHAREHALLIB_H
-#define SHAREHALLIB_H
+#ifndef HAL_INTERFACE_H
+#define HAL_INTERFACE_H
 
 #include <stdio.h>
 #include <alsa/asoundlib.h>
 
-#include "audio-common.h"
+#define AFB_BINDING_VERSION 2
+#include <afb/afb-binding.h>
+
+#include "hal-statics.h"
 #include <systemd/sd-event.h>
+#include <json-c/json.h>
+
 
 typedef enum {
     ACTION_SET,
@@ -102,5 +107,5 @@ PUBLIC void volumeRamp(halCtlsTagT halTag, alsaHalCtlMapT *control, void* handle
 PUBLIC json_object *volumeNormalise(ActionSetGetT action, const alsaHalCtlMapT *halCtls, json_object *valuesJ);
 
 
-#endif /* SHAREHALLIB_H */
+#endif /* HAL_INTERFACE_H */
 
diff --git a/Audio-Common/audio-common.c b/hal-statics.c
index 25629b5..d71c913 100644
--- a/Audio-Common/audio-common.c
+++ b/hal-statics.c
@@ -16,7 +16,8 @@
  *
  */
 #define _GNU_SOURCE  // needed for vasprintf
-#include "audio-common.h"
+#include "hal-statics.h"
+#include <stdio.h>
 
 PUBLIC const char *halCtlsLabels[] = {
 
@@ -58,8 +59,3 @@ PUBLIC const char *halVolRampModes[] = {
    [EndHalVolMod] = NULL,
 
 };
-
-PUBLIC void pingtest(struct afb_req request) {
-    json_object *query = afb_req_json(request);
-    afb_req_success(request, query, NULL);
-}
diff --git a/Audio-Common/audio-common.h b/hal-statics.h
index 7077eab..136d49a 100644
--- a/Audio-Common/audio-common.h
+++ b/hal-statics.h
@@ -19,27 +19,17 @@
  *   http://www.tldp.org/HOWTO/Alsa-sound-6.html
  */
 
-#ifndef AUDIO_INTERF_H
-#define AUDIO_INTERF_H
+#ifndef HAL_STATIC_H
+#define HAL_STATIC_H
 
-#define AFB_BINDING_VERSION 2
-#include <afb/afb-binding.h>
-#include <json-c/json.h>
-#include <filescan-utils.h>
-#include <wrap-json.h>
-
-// Waiting for official macro from José
-#define AFB_GET_VERBOSITY afb_get_verbosity_v2()
+// Soft control have dynamically allocated numid
+#define CTL_AUTO -1
 
 #ifndef PUBLIC
   #define PUBLIC
 #endif
 #define STATIC static
 
-
-// Soft control have dynamically allocated numid
-#define CTL_AUTO -1
-
 typedef enum {
   QUERY_QUIET   =0,
   QUERY_COMPACT =1,
@@ -107,9 +97,8 @@ typedef enum {
 
 } halRampEnumT;
 
-PUBLIC void pingtest(struct afb_req request);
 extern const char *halVolRampModes[];
 extern const char *halCtlsLabels[];
 
-#endif /* AUDIO_INTERF_H */
+#endif /* HAL_STATIC_H */
 
diff --git a/HAL-afb/HAL-interface/hal-volramp.c b/hal-volramp.c
index 60e91d6..a56816c 100644
--- a/HAL-afb/HAL-interface/hal-volramp.c
+++ b/hal-volramp.c
@@ -24,6 +24,7 @@ STATIC int RampTimerCB(sd_event_source* source, uint64_t timer, void* handle) {
     int err;
     uint64_t usec;
 
+    
     // RampDown
     if (volRamp->current > volRamp->target) {
         volRamp->current = volRamp->current - volRamp->stepDown;
@@ -41,14 +42,17 @@ STATIC int RampTimerCB(sd_event_source* source, uint64_t timer, void* handle) {
     if (err) goto OnErrorExit;
 
     // we reach target stop volram event
-    if (volRamp->current == volRamp->target) sd_event_source_unref(source);
-    else {
-        // otherwise validate timer for a new run
-        sd_event_now(afb_daemon_get_event_loop(), CLOCK_MONOTONIC, &usec);
-        sd_event_source_set_enabled(source, SD_EVENT_ONESHOT);
-        err = sd_event_source_set_time(source, usec + volRamp->delay);
+    if (volRamp->current == volRamp->target) {
+        AFB_NOTICE("RampTimerCB Done tag=%d target=%d", Master_Playback_Volume, volRamp->current);
+        sd_event_source_unref(source);
+        return 0;
     }
 
+    // otherwise validate timer for a new run
+    sd_event_now(afb_daemon_get_event_loop(), CLOCK_MONOTONIC, &usec);
+    sd_event_source_set_enabled(source, SD_EVENT_ONESHOT);
+    err = sd_event_source_set_time(source, usec + volRamp->delay);
+
     return 0;
 
 OnErrorExit:
diff --git a/HAL-afb/HAL-interface/hal-volume.c b/hal-volume.c
index 997ce98..997ce98 100644
--- a/HAL-afb/HAL-interface/hal-volume.c
+++ b/hal-volume.c
diff --git a/htdocs/AFB-websock.js b/htdocs/AFB-websock.js
deleted file mode 100644
index 99ab3b8..0000000
--- a/htdocs/AFB-websock.js
+++ /dev/null
@@ -1,177 +0,0 @@
-var urlws;
-var urlhttp;
-
-AFB = function(base, initialtoken){
-
-urlws = "ws://"+window.location.host+"/"+base;
-urlhttp = "http://"+window.location.host+"/"+base;
-
-/*********************************************/
-/****                                     ****/
-/****             AFB_context             ****/
-/****                                     ****/
-/*********************************************/
-var AFB_context;
-{
-	var UUID = undefined;
-	var TOKEN = initialtoken;
-
-	var context = function(token, uuid) {
-		this.token = token;
-		this.uuid = uuid;
-	}
-
-	context.prototype = {
-		get token() {return TOKEN;},
-		set token(tok) {if(tok) TOKEN=tok;},
-		get uuid() {return UUID;},
-		set uuid(id) {if(id) UUID=id;}
-	};
-
-	AFB_context = new context();
-}
-/*********************************************/
-/****                                     ****/
-/****             AFB_websocket           ****/
-/****                                     ****/
-/*********************************************/
-var AFB_websocket;
-{
-	var CALL = 2;
-	var RETOK = 3;
-	var RETERR = 4;
-	var EVENT = 5;
-
-	var PROTO1 = "x-afb-ws-json1";
-
-	AFB_websocket = function(onopen, onabort) {
-		var u = urlws;
-		if (AFB_context.token) {
-			u = u + '?x-afb-token=' + AFB_context.token;
-			if (AFB_context.uuid)
-				u = u + '&x-afb-uuid=' + AFB_context.uuid;
-		}
-		this.ws = new WebSocket(u, [ PROTO1 ]);
-		this.pendings = {};
-		this.awaitens = {};
-		this.counter = 0;
-		this.ws.onopen = onopen.bind(this);
-		this.ws.onerror = onerror.bind(this);
-		this.ws.onclose = onclose.bind(this);
-		this.ws.onmessage = onmessage.bind(this);
-		this.onopen = onopen;
-		this.onabort = onabort;
-		this.onclose = onabort;
-	}
-
-	function onerror(event) {
-		var f = this.onabort;
-		if (f) {
-			delete this.onopen;
-			delete this.onabort;
-			f && f(this);
-		}
-		this.onerror && this.onerror(this);
-	}
-
-	function onopen(event) {
-		var f = this.onopen;
-		delete this.onopen;
-		delete this.onabort;
-		f && f(this);
-	}
-
-	function onclose(event) {
-		for (var id in this.pendings) {
-			var ferr = this.pendings[id].onerror;
-			ferr && ferr(null, this);
-		}
-		this.pendings = {};
-		this.onclose && this.onclose();
-	}
-
-	function fire(awaitens, name, data) {
-		var a = awaitens[name];
-		if (a)
-			a.forEach(function(handler){handler(data);});
-		var i = name.indexOf("/");
-		if (i >= 0) {
-			a = awaitens[name.substring(0,i)];
-			if (a)
-				a.forEach(function(handler){handler(data);});
-		}
-		a = awaitens["*"];
-		if (a)
-			a.forEach(function(handler){handler(data);});
-	}
-
-	function reply(pendings, id, ans, offset) {
-		if (id in pendings) {
-			var p = pendings[id];
-			delete pendings[id];
-			var f = p[offset];
-			f(ans);
-		}
-	}
-
-	function onmessage(event) {
-		var obj = JSON.parse(event.data);
-		var code = obj[0];
-		var id = obj[1];
-		var ans = obj[2];
-		AFB_context.token = obj[3];
-		switch (code) {
-		case RETOK:
-			reply(this.pendings, id, ans, 0);
-			break;
-		case RETERR:
-			reply(this.pendings, id, ans, 1);
-			break;
-		case EVENT:
-		default:
-			fire(this.awaitens, id, ans);
-			break;
-		}
-	}
-
-	function close() {
-		this.ws.close();
-                this.onabort();
-	}
-
-	function call(method, request) {
-		return new Promise((function(resolve, reject){
-			var id, arr;
-			do {
-			   id = String(this.counter = 4095 & (this.counter + 1));
-			} while (id in this.pendings);
-			this.pendings[id] = [ resolve, reject ];
-			arr = [CALL, id, method, request ];
-			if (AFB_context.token) arr.push(AFB_context.token);
-			this.ws.send(JSON.stringify(arr));
-		}).bind(this));
-	}
-
-	function onevent(name, handler) {
-		var id = name;
-		var list = this.awaitens[id] || (this.awaitens[id] = []);
-		list.push(handler);
-	}
-
-	AFB_websocket.prototype = {
-		close: close,
-		call: call,
-		onevent: onevent
-	};
-}
-/*********************************************/
-/****                                     ****/
-/****                                     ****/
-/****                                     ****/
-/*********************************************/
-return {
-	context: AFB_context,
-	ws: AFB_websocket
-};
-};
-
diff --git a/htdocs/AudioBinding.css b/htdocs/AudioBinding.css
deleted file mode 100644
index 1052aa7..0000000
--- a/htdocs/AudioBinding.css
+++ /dev/null
@@ -1,7 +0,0 @@
-pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
-.string { color: green; }
-.number { color: darkorange; }
-.boolean { color: blue; }
-.null { color: magenta; }
-.key { color: red; }
-
diff --git a/htdocs/AudioBinding.js b/htdocs/AudioBinding.js
deleted file mode 100644
index 0f5caf9..0000000
--- a/htdocs/AudioBinding.js
+++ /dev/null
@@ -1,197 +0,0 @@
-    var afb = new AFB("api", "mysecret");
-    var ws;
-    var sndcard="HALNotSelected";
-    var evtidx=0;
-    var numid=0;
-
-    function syntaxHighlight(json) {
-        if (typeof json !== 'string') {
-             json = JSON.stringify(json, undefined, 2);
-        }
-        json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-        return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
-            var cls = 'number';
-            if (/^"/.test(match)) {
-                if (/:$/.test(match)) {
-                    cls = 'key';
-                } else {
-                    cls = 'string';
-                }
-            } else if (/true|false/.test(match)) {
-                cls = 'boolean';
-            } else if (/null/.test(match)) {
-                cls = 'null';
-            }
-            return '<span class="' + cls + '">' + match + '</span>';
-        });
-    }
-
-    function getParameterByName(name, url) {
-        if (!url) {
-          url = window.location.href;
-        }
-        name = name.replace(/[\[\]]/g, "\\$&");
-        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
-            results = regex.exec(url);
-        if (!results) return null;
-        if (!results[2]) return '';
-        return decodeURIComponent(results[2].replace(/\+/g, " "));
-    }
-
-    // default soundcard is "PCH"
-    var devid=getParameterByName("devid");
-    if (!devid) devid="hw:1";
-
-    var haldev=getParameterByName("haldev");
-    if (!haldev) haldev="scarlett-usb";
-
-    var sndname=getParameterByName("sndname");
-    if (!sndname) sndname="PCH";
-
-    var mode=getParameterByName("mode");
-    if (!mode) mode="0";
-
-
-
-
-    function replyok(obj) {
-            console.log("replyok:" + JSON.stringify(obj));
-            document.getElementById("output").innerHTML = "OK: "+ syntaxHighlight(obj);
-    }
-
-    function replyerr(obj) {
-            console.log("replyerr:" + JSON.stringify(obj));
-            document.getElementById("output").innerHTML = "ERROR: "+ syntaxHighlight(obj);
-    }
-
-    function gotevent(obj) {
-            console.log("gotevent:" + JSON.stringify(obj));
-            document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj);
-    }
-
-    function send(message) {
-            var api = document.getElementById("api").value;
-            var verb = document.getElementById("verb").value;
-            document.getElementById("question").innerHTML = "subscribe: "+api+"/"+verb + " (" + JSON.stringify(message) +")";
-            ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr);
-    }
-
-
-     // On button click from HTML page
-    function callbinder(api, verb, query) {
-            console.log ("subscribe api="+api+" verb="+verb+" query=" +query);
-            var question = urlws +"/" +api +"/" +verb + "?query=" + JSON.stringify(query);
-            document.getElementById("question").innerHTML = syntaxHighlight(question);
-            ws.call(api+"/"+verb, query).then(replyok, replyerr);
-    }
-
-
-    // Retreive Select value and Text from the binder
-    // Note: selection of value/text for a given context is huggly!!!
-    function querySelectList (elemid, api, verb, query) {
-
-        console.log("querySelectList elemid=%s api=%s verb=%s query=%s", elemid, api, verb, query);
-
-        var selectobj = document.getElementById(elemid);
-        if (!selectobj) {
-            return;
-        }
-
-        // onlick update selected HAL api
-        selectobj.onclick=function(){
-           sndcard= this.value;
-           console.log ("Default Selection=" + sndcard);
-        };
-
-        function gotit (result) {
-
-            // display response as for normal onclick action
-            replyok(result);
-            var response=result.response;
-
-            // fulfill select with avaliable active HAL
-            for (idx=0; idx<response.length; idx++) {
-                var opt = document.createElement('option');
-
-                // Alsa LowLevel selection mode
-                if (response[idx].name)  opt.text   = response[idx].name;
-                if (response[idx].devid) opt.value  = response[idx].devid;
-
-                // HAL selection mode
-                if (response[idx].shortname) opt.text  = response[idx].shortname;
-                if (response[idx].api) opt.value = response[idx].api;
-
-                selectobj.appendChild(opt);
-            }
-
-           sndcard= selectobj.value;
-        }
-
-        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
-        document.getElementById("question").innerHTML = syntaxHighlight(question);
-
-        // request lowlevel ALSA to get API list
-        ws.call(api+"/"+verb, query).then(gotit, replyerr);
-    }
-
-    function refresh_list (self, api, verb, query) {
-        console.log("refresh_list id=%s api=%s verb=%s query=%s", self.id, api, verb, query);
-
-        if (self.value > 0) return;
-
-        // onlick update selected HAL api
-        self.onclick=function(){
-           numid = parseInt(self.value);
-           console.log ("Default numid=%d", numid);
-        };
-
-        function gotit (result) {
-
-            // display response as for normal onclick action
-            replyok(result);
-            var response=result.response;
-
-
-
-            // fulfill select with avaliable active HAL
-            for (idx=0; idx<response.length; idx++) {
-                var opt = document.createElement('option');
-
-                // Alsa LowLevel selection mode
-                opt.text   = response[idx].name + ' id=' + response[idx].id;
-                opt.value  = response[idx].id;
-
-                self.appendChild(opt);
-            }
-            self.selectedIndex=2;
-            numid = parseInt (self.value);
-        }
-
-        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
-        document.getElementById("question").innerHTML = syntaxHighlight(question);
-
-        // request lowlevel ALSA to get API list
-        ws.call(api+"/"+verb, query).then(gotit, replyerr);
-    }
-
-
-    function init(elemid, api, verb, query) {
-
-        function onopen() {
-                // check for active HALs
-                querySelectList (elemid, api, verb, query);
-
-                document.getElementById("main").style.visibility = "visible";
-                document.getElementById("connected").innerHTML = "Binder WS Active";
-                document.getElementById("connected").style.background  = "lightgreen";
-                ws.onevent("*", gotevent);
-        }
-
-        function onabort() {
-                document.getElementById("main").style.visibility = "hidden";
-                document.getElementById("connected").innerHTML = "Connected Closed";
-                document.getElementById("connected").style.background  = "red";
-
-        }
-        ws = new afb.ws(onopen, onabort);
-    }
diff --git a/htdocs/CMakeLists.txt b/htdocs/CMakeLists.txt
deleted file mode 100644
index 322033d..0000000
--- a/htdocs/CMakeLists.txt
+++ /dev/null
@@ -1,34 +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.
-###########################################################################
-
-
-
-##################################################
-# HTML Testing Files
-##################################################
-PROJECT_TARGET_ADD(htdocs)
-
-    file(GLOB SOURCE_FILES "*.html" "*.js" "*.jpg" "*.css")
-
-	add_input_files("${SOURCE_FILES}")
-
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	LABELS "HTDOCS"
-	OUTPUT_NAME ${TARGET_NAME}
-    )
-
diff --git a/htdocs/README.md b/htdocs/README.md
deleted file mode 100644
index bb5f9fb..0000000
--- a/htdocs/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-------------------------------------------------------------------------
-   Basic HTML & WS test
-------------------------------------------------------------------------
-
-  # Load bindings directly from development tree for debug
-  afb-daemon --verbose --verbose --token="" --ldpaths=build --port=1234 --roothttp=htdocs
-
diff --git a/htdocs/alsa-core.html b/htdocs/alsa-core.html
deleted file mode 100644
index a61c28e..0000000
--- a/htdocs/alsa-core.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-    <link rel="stylesheet" href="AudioBinding.css">
-    <title>Alsa Low Level Simple Test</title>
-
-    <script type="text/javascript" src="AFB-websock.js"></script>
-    <script type="text/javascript" src="AudioBinding.js"></script>
-</head>
-
-<body onload="init('alsa_registry','alsacore', 'infoget')">
-
-    <button id="connected" onclick="init('alsa_registry','alsacore', 'infoget');">Binder WS Fail</button>
-    <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_audio')">Debug/Monitoring</a></button>
-
-    <br><br>
-    <b>Selected SndCard </b>
-    <select id='alsa_registry'></select>
-
-    <b>Select NUMID </b>
-    <select id='alsa_ctl_list' onclick="refresh_list(this, 'alsacore', 'ctlget', {devid:sndcard, mode:1})">
-        <option value='-1'>Refresh NUMID list</option>
-    </select>
-
-    <b>API Verbosity </b>
-    <select id='api_verbosity' onclick='mode=this.value'>
-        <option value='0'>Quiet</option>
-        <option value='1'>Compact</option>
-        <option value='2'>Verbose</option>
-        <option value='3'>Full</option>
-    </select>
-
-
-    <br>
-    <ol>
-    <li><button onclick="callbinder('alsacore','ctlget', {devid:sndcard, mode:mode})">Get all Alsa Ctls</button></li>
-    <li><button onclick="callbinder('alsacore','ctlget', {devid:sndcard, mode:mode, ctl:numid})">Get Alsa Ctls [numid]</button></li>
-    <li><button onclick="callbinder('alsacore','ctlget', {devid:sndcard, mode:mode, ctl:[numid,numid+1]})">Get Alsa Ctls [numid,numid+1]</button></li>
-    <br>
-
-
-    <li><button onclick="callbinder('alsacore','ctlset', {devid:sndcard, mode:mode, ctl:[[9,20]]})">Set Alsa Ctl ctl:[[9,20]]</button></li>
-    <li><button onclick="callbinder('alsacore','ctlset', {devid:sndcard, mode:mode, ctl:[{id:9,val:50}]})">Set Alsa Ctl ctl:[{id:9,val:50}]}</button></li>
-    <li><button onclick="callbinder('alsacore','ctlset', {devid:sndcard, mode:mode, ctl:[[6,[20,20]]]})">Set Alsa Ctl  ctl:[[6,[20,20]]]</button></li>
-    <li><button onclick="callbinder('alsacore','ctlset', {devid:sndcard, mode:mode, ctl:[{id:6,val:[50,50]}]})">Set Alsa Ctl ctl:[{id:2,val:[50,50]}]</button></li>
-    <li><button onclick="callbinder('alsacore','ctlset', {devid:sndcard, mode:mode, ctl:[{id:6,val:[50,50]}, {id:9,val:50,50}]})">Set Alsa Ctl ctl:[{id:6,val:[50,50]}, {id:9,val:50,50}]</button></li>
-    <br>
-    <li><button onclick="callbinder('alsacore','ucmquery', {devid:sndcard, mode:mode})">List UCM verbs</button></li>
-    <li><button onclick="callbinder('alsacore','ucmset'  , {devid:sndcard, mode:mode, verb:'HiFi'})">Set UCM HiFi</button></li>
-    <li><button onclick="callbinder('alsacore','ucmset'  , {devid:sndcard, mode:mode, verb:'HiFi', dev:'Headphone'})">Set UCM HiFi+Headphone</button></li>
-    <li><button onclick="callbinder('alsacore','ucmset'  , {devid:sndcard, mode:mode, verb:'HiFi', dev:'Headphone', mod:'RecordMedia'})">Set UCM HiFi+Headphone+RecordMedia</button></li>
-    <br>
-    <li><button onclick="callbinder('alsacore','ucmget'  , {devid:sndcard, mode:mode, values:['OutputDspName','PlaybackPCM','CapturePCM']})">Get UCM OutputDspName+PlaybackPCM+CapturePCM (SET UCM)</button></li>
-    <br>
-    <li><button onclick="callbinder('alsacore','subscribe', {devid:sndcard})">Subscribe AlsaCtl Events</button></li>
-    <br>
-    </ol>
-
-    <div id="main" style="visibility:hidden">
-    <ol>
-    <li>Question <pre id="question"></pre>
-    <li>Response <pre id="output"></pre>
-    <li>Events:  <pre id="outevt"></pre>
-    </ol>
-    </div>
diff --git a/htdocs/alsa-hal.html b/htdocs/alsa-hal.html
deleted file mode 100644
index f41d37c..0000000
--- a/htdocs/alsa-hal.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-    <title>Basic Audio Hardware Abstraction Layer Test</title>
-    <link rel="stylesheet" href="AudioBinding.css">
-    <script type="text/javascript" src="AFB-websock.js"></script>
-    <script type="text/javascript" src="AudioBinding.js"></script>
-</head>
-
-
-<body onload="init('hal_registry','alsacore', 'hallist')">
-
-    <h1>Simple AlsaHAL tests</h1>
-    <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button>
-    <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_audio')">Debug/Monitoring</a></button>
-
-    <br><br>
-    <b>Selected HAL </b>
-    <select id='hal_registry'></select>
-
-    <b>API Verbosity </b>
-    <select id='api_verbosity' onclick='mode=this.value'>
-        <option value='0'>Quiet</option>
-        <option value='1'>Compact</option>
-        <option value='2'>Verbose</option>
-        <option value='3'>Full</option>
-    </select>
-    <br>
-
-    <br>
-    <ol>
-
-    <li><button onclick="callbinder(sndcard,'ctllist')">List Selected HAL Controls </button></li>
-    <li><button onclick="callbinder(sndcard,'ctlget', {label:'Master_Playback_Volume'})">Get  {label:'Master_Playback_Volume'}</button></li>
-    <li><button onclick="callbinder(sndcard,'ctlget', [{tag:4},{tag:5}])">Get[{tag:4},{tag:5}]</button></li>
-    <li><button onclick="callbinder(sndcard,'ctlget', [4,5])">Get [4,5]</button></li>
-    <br>
-    <li><button onclick="callbinder(sndcard,'ctlset', {label:'Master_Playback_Volume', val:[50]})">Set {label:'Master_Playback_Volume', value=[50]}</button></li>
-    <li><button onclick="callbinder(sndcard,'ctlset', {tag: 4, val:5})">Set {tag: 4, val:5}</button></li>
-    <li><button onclick="callbinder(sndcard,'ctlset', [{tag:4, val:25},{tag:5, val:25}])">Set[{tag:4, val:25},{tag:5, val:25}]</button></li>
-    <li><button onclick="callbinder(sndcard,'ctlset', [{tag:4, val:[55,45]},{tag:5, val:[45,55]}])">Set[{tag:4, val:[55,45]},{tag:5, val:[45,55]}]]</button></li>
-    <br>
-
-    <li>
-        <label for="volramp">Volume Ramp</label>
-        <input id="volramp" type="number" min=0 max=100 step=10 maxlength=3 placeholder="Enter 0-100" onChange="callbinder(sndcard,'ctl-set', {label:'Volume_Ramp', val:this.value})">
-    </li>
-    <br>
-    </ol>
-
-    <div id="main" style="visibility:hidden">
-    <ol>
-    <li>Question <pre id="question"></pre>
-    <li>Response <pre id="output"></pre>
-    <li>Events: <pre id="outevt"></pre>
-    </ol>
-    </div>
diff --git a/htdocs/audio-control.html b/htdocs/audio-control.html
deleted file mode 100644
index 8216601..0000000
--- a/htdocs/audio-control.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-    <title>Basic Audio Hardware Abstraction Layer Test</title>
-    <link rel="stylesheet" href="AudioBinding.css">
-    <script type="text/javascript" src="AFB-websock.js"></script>
-    <script type="text/javascript" src="AudioBinding.js"></script>
-</head>
-
-<body onload="init('hal_registry','alsacore', 'hallist')">
-
-    <h1>Simple Audio Control Test</h1>
-    <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button>
-    <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_audio')">Debug/Monitoring</a></button>
-    <ol>
-
-    <li><button onclick="callbinder('control','dispatch' ,{'target':'navigation'});">Dispatch Navigation</button></li>
-    <li><button onclick="callbinder('control','dispatch' ,{'target':'multimedia'});">Dispatch Multimedia</button></li>
-    <li><button onclick="callbinder('control','dispatch' ,{'target':'emergency' });">Dispatch Emergency</button></li>
-    <br>
-    </ol>
-
-    <div id="main" style="visibility:hidden">
-    <ol>
-    <li>Question <pre id="question"></pre>
-    <li>Response <pre id="output"></pre>
-    <li>Events: <pre id="outevt"></pre>
-    </ol>
-    </div>
diff --git a/htdocs/docs/AAAA-architecture.odg b/htdocs/docs/AAAA-architecture.odg
deleted file mode 100644
index 90a2486..0000000
--- a/htdocs/docs/AAAA-architecture.odg
+++ /dev/null
diff --git a/htdocs/docs/AAAA-architecture.pdf b/htdocs/docs/AAAA-architecture.pdf
deleted file mode 100644
index 3b6280d..0000000
--- a/htdocs/docs/AAAA-architecture.pdf
+++ /dev/null
diff --git a/htdocs/index.html b/htdocs/index.html
deleted file mode 100644
index e424feb..0000000
--- a/htdocs/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-  <head>
-    <title>AGL-AudioBindins tests</title>
-  <body>
-    <h1>audio-bindings test</h1>
-    <ol>
-     <li><a href="alsa-core.html">AlsaCore Low Level Binding</a>
-     <li><a href="alsa-hal.html" >AlsaHAL  Hardware Abstraction Layer</a>
-     <li><a href="audio-control.html">AudioControl Control/Policy API</a>
-     <li><a href="/monitoring/monitor.html">Binding Monitoring Dashboard</a>
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 9700858..1005280 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -19,7 +19,6 @@
         </df>
       </df>
       <df name="Audio-Common">
-        <in>audio-common.c</in>
         <in>filescan-utils.c</in>
         <in>wrap-json.c</in>
       </df>
@@ -35,37 +34,9 @@
         <in>ctl-timer.c</in>
       </df>
       <df name="HAL-afb">
-        <df name="HAL-interface">
-          <in>hal-interface.c</in>
-          <in>hal-volramp.c</in>
-          <in>hal-volume.c</in>
-        </df>
         <df name="HAL-plugin">
           <in>HalPlugPcm.c</in>
         </df>
-        <df name="HAL_MOST_UNICENS">
-          <df name="ucs2-vol">
-            <df name="src">
-              <in>device_container.cpp</in>
-              <in>device_value.cpp</in>
-              <in>libmostvolume.cpp</in>
-              <in>setup.cpp</in>
-            </df>
-          </df>
-          <in>hal_most_unicens.c</in>
-          <in>wrap-json.c</in>
-          <in>wrap_unicens.c</in>
-          <in>wrap_volume.c</in>
-        </df>
-        <df name="HDA-intel">
-          <in>IntelHdaHAL.c</in>
-        </df>
-        <df name="Jabra-Solemate">
-          <in>JabraUsbHAL.c</in>
-        </df>
-        <df name="Scarlett-Focusrite">
-          <in>ScarlettUsbHAL.c</in>
-        </df>
         <df name="Unicens-USB">
           <in>UnicensHAL.c</in>
           <in>UnicensVol.c</in>
@@ -93,6 +64,9 @@
         <in>Mediator.cpp</in>
         <in>libmostvolume.cpp</in>
       </df>
+      <in>hal-statics.c</in>
+      <in>hal-statics.h</in>
+      <in>hal-volume.c</in>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -131,7 +105,7 @@
           <buildCommand>${MAKE} -f Makefile install</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
-          <cTool flags="0">
+          <cTool flags="2">
           </cTool>
         </makeTool>
         <preBuild>
@@ -154,7 +128,6 @@
             <pElem>Alsa-afb</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
@@ -168,7 +141,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
           <preprocessorList>
@@ -198,7 +170,6 @@
             <pElem>Alsa-afb</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
@@ -211,7 +182,6 @@
             <pElem>Alsa-afb</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
@@ -224,22 +194,11 @@
             <pElem>Alsa-afb</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
         </cTool>
       </item>
-      <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/Audio-Common</pElem>
-          </incDir>
-        </cTool>
-      </item>
       <item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
           <incDir>
@@ -248,7 +207,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Audio-Common</pElem>
           </incDir>
           <preprocessorList>
@@ -273,7 +231,6 @@
       <item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3">
         <cTool flags="2">
           <incDir>
-            <pElem>Audio-Common</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>build/Audio-Common</pElem>
           </incDir>
@@ -291,7 +248,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
           <preprocessorList>
@@ -322,7 +278,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
           <preprocessorList>
@@ -353,7 +308,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
           <preprocessorList>
@@ -394,7 +348,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
           <preprocessorList>
@@ -425,7 +378,6 @@
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
           <preprocessorList>
@@ -448,57 +400,10 @@
           </preprocessorList>
         </cTool>
       </item>
-      <item path="HAL-afb/HAL-interface/hal-interface.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL-interface/hal-volramp.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
       <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3">
         <cTool flags="2">
         </cTool>
       </item>
-      <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
       <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
         <cTool flags="4">
           <incDir>
@@ -558,9 +463,19 @@
       </item>
       <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
       </item>
+      <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="0">
+        <cTool flags="0">
+        </cTool>
+      </item>
+      <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="0">
+        <cTool flags="0">
+        </cTool>
+      </item>
       <folder path="0/Alsa-Plugin">
         <cTool>
           <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/p11-kit-1</pElem>
@@ -589,15 +504,32 @@
           </preprocessorList>
         </cTool>
       </folder>
+      <folder path="0/Alsa-afb">
+        <cTool>
+          <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/Audio-Common">
+        <cTool>
+          <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
+          </incDir>
+        </cTool>
+      </folder>
       <folder path="0/Common">
         <cTool>
           <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
             <pElem>build/HAL-afb/HAL-plugin</pElem>
             <pElem>/usr/include/alsa</pElem>
@@ -623,16 +555,31 @@
           </preprocessorList>
         </cTool>
       </folder>
+      <folder path="0/Controller-afb">
+        <cTool>
+          <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
+          </incDir>
+        </cTool>
+      </folder>
       <folder path="0/HAL-afb">
         <cTool>
           <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
+            <pElem>build/Controller-afb</pElem>
+            <pElem>build/HAL-afb/HAL-plugin</pElem>
+            <pElem>../../../opt/include/afb</pElem>
           </incDir>
           <preprocessorList>
+            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
+            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
             <Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/AGL-AppFW/audio-bindings-dev/conf.d/project/config.d:/usr/local/controller/config.d"</Elem>
             <Elem>CONTROL_CONFIG_POST="control"</Elem>
             <Elem>CONTROL_CONFIG_PRE="onload"</Elem>
@@ -645,93 +592,35 @@
             <Elem>MAX_LINEAR_DB_SCALE=24</Elem>
             <Elem>MAX_SND_CARD=16</Elem>
             <Elem>TLV_BYTE_SIZE=256</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/HAL-interface">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/HAL-plugin">
-        <cTool>
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>build/Controller-afb</pElem>
-            <pElem>build/HAL-afb/HAL-plugin</pElem>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL-plugin</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
-            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
             <Elem>audio_plugin_sample_EXPORTS</Elem>
             <Elem>control_afb_EXPORTS</Elem>
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/HAL-afb/HDA-intel">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HDA-intel</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/HDA-intel</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/Jabra-Solemate">
-        <cTool>
-          <incDir>
-            <pElem>HAL-afb/Jabra-Solemate</pElem>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/Jabra-Solemate</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/Scarlett-Focusrite">
+      <folder path="0/HAL-afb/HAL-plugin">
         <cTool>
           <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/Scarlett-Focusrite</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
+            <pElem>HAL-afb/HAL-plugin</pElem>
           </incDir>
         </cTool>
       </folder>
       <folder path="0/HAL-afb/Unicens-USB">
         <cTool>
           <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>build/Controller-afb</pElem>
-            <pElem>build/HAL-afb/HAL-plugin</pElem>
-            <pElem>../../../opt/include/afb</pElem>
             <pElem>HAL-afb/Unicens-USB</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
-            <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
-            <Elem>audio_plugin_sample_EXPORTS</Elem>
-            <Elem>control_afb_EXPORTS</Elem>
-          </preprocessorList>
         </cTool>
       </folder>
       <folder path="0/HighLevel-afb">
         <cTool>
           <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
             <pElem>build/HAL-afb/HAL-plugin</pElem>
             <pElem>../../../opt/include/afb</pElem>
@@ -760,12 +649,13 @@
       <folder path="0/MostVolume">
         <cTool>
           <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
             <pElem>../../../opt/include</pElem>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/p11-kit-1</pElem>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
-            <pElem>Audio-Common</pElem>
             <pElem>build/Controller-afb</pElem>
             <pElem>build/HAL-afb/HAL-plugin</pElem>
           </incDir>
@@ -787,6 +677,52 @@
           </preprocessorList>
         </cTool>
       </folder>
+      <folder path="0/afb-utilities">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/json-c</pElem>
+            <pElem>../../../opt/include</pElem>
+            <pElem>/usr/include/p11-kit-1</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-statics.c" ex="false" tool="0" flavor2="2">
+        <cTool>
+          <incDir>
+            <pElem>Audio-Common</pElem>
+            <pElem>build/HAL-afb/HAL-interface</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="hal-volume.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</pElem>
+            <pElem>build/hal-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>
+      </item>
     </conf>
     <conf name="Local_Alias" type="0">
       <toolsSet>
@@ -796,10 +732,9 @@
       </toolsSet>
       <flagsDictionary>
         <element flagsID="0" commonFlags="-g -fPIC -fPIC -g"/>
-        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
-        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
-        <element flagsID="3" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
-        <element flagsID="4"
+        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
+        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
+        <element flagsID="3"
                  commonFlags="-mtune=generic -march=x86-64 -g -ggdb -g -ggdb -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
@@ -811,8 +746,47 @@
           <buildCommand>${MAKE} -f Makefile install</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
-          <cTool flags="-g -fPIC -fPIC">
+          <cTool flags="1">
+            <incDir>
+              <pElem>Audio-Common</pElem>
+              <pElem>../../../opt/include</pElem>
+              <pElem>build/HAL-afb/HAL-interface</pElem>
+              <pElem>Audio-Common</pElem>
+              <pElem>build/HAL-afb/HAL-interface</pElem>
+              <pElem>build/HAL-afb/HAL-interface</pElem>
+              <pElem>../../../opt/include/afb</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>../../../opt/include/alsa</pElem>
+              <pElem>/usr/include/json-c</pElem>
+              <pElem>Audio-Common</pElem>
+              <pElem>HAL-afb/HAL-interface</pElem>
+              <pElem>../../../opt/include</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>/usr/include/json-c</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>../../../opt/include/afb</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>/usr/include/json-c</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>../../../opt/include/afb</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+            </incDir>
           </cTool>
+          <ccTool flags="-mtune=generic -march=x86-64 -fPIC">
+            <incDir>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+            </incDir>
+          </ccTool>
         </makeTool>
         <preBuild>
           <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir>
@@ -823,11 +797,11 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -838,14 +812,14 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -856,7 +830,7 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -867,7 +841,7 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -877,18 +851,8 @@
           </incDir>
         </cTool>
       </item>
-      <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/Audio-Common</pElem>
-          </incDir>
-        </cTool>
-      </item>
       <item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/afb</pElem>
             <pElem>Audio-Common</pElem>
@@ -898,7 +862,7 @@
         </cTool>
       </item>
       <item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>Audio-Common</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -911,14 +875,14 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-binding.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>build/Controller-afb</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="Controller-afb/ctl-dispatch.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
@@ -929,7 +893,7 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
@@ -940,7 +904,7 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>build/Controller-afb</pElem>
@@ -948,7 +912,7 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
@@ -957,166 +921,19 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
         </cTool>
       </item>
-      <item path="HAL-afb/HAL-interface/hal-interface.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL-interface/hal-volramp.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
       <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/wrap_volume.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>HAL-afb/HAL-interface</pElem>
@@ -1125,7 +942,7 @@
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>HAL-afb/HAL-interface</pElem>
             <pElem>build/HAL-afb/Unicens-USB</pElem>
@@ -1133,11 +950,11 @@
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4">
@@ -1175,7 +992,7 @@
       <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
       </item>
       <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/afb</pElem>
             <pElem>afb-utilities</pElem>
@@ -1185,7 +1002,7 @@
         </cTool>
       </item>
       <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>afb-utilities</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1299,14 +1116,6 @@
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="0/HAL-afb/HAL-interface">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </folder>
       <folder path="0/HAL-afb/HAL-plugin">
         <cTool>
           <incDir>
@@ -1333,39 +1142,6 @@
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/HAL-afb/HDA-intel">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HDA-intel</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/HDA-intel</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/Jabra-Solemate">
-        <cTool>
-          <incDir>
-            <pElem>HAL-afb/Jabra-Solemate</pElem>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/Jabra-Solemate</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/Scarlett-Focusrite">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/Scarlett-Focusrite</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
-          </incDir>
-        </cTool>
-      </folder>
       <folder path="0/HAL-afb/Unicens-USB">
         <cTool>
           <incDir>
@@ -1456,6 +1232,10 @@
           </preprocessorList>
         </cTool>
       </folder>
+      <item path="hal-statics.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="hal-statics.h" ex="false" tool="3" flavor2="0">
+      </item>
     </conf>
     <conf name="Local-Ctl" type="0">
       <toolsSet>
@@ -1465,10 +1245,9 @@
       </toolsSet>
       <flagsDictionary>
         <element flagsID="0" commonFlags="-g -fPIC -fPIC -g"/>
-        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIC"/>
-        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
-        <element flagsID="3" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
-        <element flagsID="4"
+        <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -g -fPIC"/>
+        <element flagsID="2" commonFlags="-mtune=generic -march=x86-64 -g -g -fPIC"/>
+        <element flagsID="3"
                  commonFlags="-mtune=generic -march=x86-64 -g -ggdb -g -ggdb -fPIC"/>
       </flagsDictionary>
       <codeAssistance>
@@ -1480,8 +1259,47 @@
           <buildCommand>${MAKE} -f Makefile populate</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/CMakeFiles/feature_tests.bin</executablePath>
-          <cTool flags="-g -fPIC -fPIC">
+          <cTool flags="1">
+            <incDir>
+              <pElem>Audio-Common</pElem>
+              <pElem>../../../opt/include</pElem>
+              <pElem>build/HAL-afb/HAL-interface</pElem>
+              <pElem>Audio-Common</pElem>
+              <pElem>build/HAL-afb/HAL-interface</pElem>
+              <pElem>build/HAL-afb/HAL-interface</pElem>
+              <pElem>../../../opt/include/afb</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>../../../opt/include/alsa</pElem>
+              <pElem>/usr/include/json-c</pElem>
+              <pElem>Audio-Common</pElem>
+              <pElem>HAL-afb/HAL-interface</pElem>
+              <pElem>../../../opt/include</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>/usr/include/json-c</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>../../../opt/include/afb</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>/usr/include/json-c</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>../../../opt/include/afb</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
+            </incDir>
           </cTool>
+          <ccTool flags="-mtune=generic -march=x86-64 -fPIC">
+            <incDir>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
+              <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
+            </incDir>
+          </ccTool>
         </makeTool>
         <preBuild>
           <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir>
@@ -1492,11 +1310,11 @@
             ex="false"
             tool="0"
             flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-AddCtl.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1507,14 +1325,14 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-ApiHat.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>build/Alsa-afb</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-RegEvt.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1525,7 +1343,7 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-SetGet.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1536,7 +1354,7 @@
         </cTool>
       </item>
       <item path="Alsa-afb/Alsa-Ucm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/alsa</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1546,18 +1364,8 @@
           </incDir>
         </cTool>
       </item>
-      <item path="Audio-Common/audio-common.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/Audio-Common</pElem>
-          </incDir>
-        </cTool>
-      </item>
       <item path="Audio-Common/filescan-utils.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/afb</pElem>
             <pElem>Audio-Common</pElem>
@@ -1567,7 +1375,7 @@
         </cTool>
       </item>
       <item path="Audio-Common/wrap-json.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>Audio-Common</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1580,14 +1388,14 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-binding.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>build/Controller-afb</pElem>
           </incDir>
         </cTool>
       </item>
       <item path="Controller-afb/ctl-dispatch.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
@@ -1598,7 +1406,7 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-lua.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
@@ -1609,7 +1417,7 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-misc.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>build/Controller-afb</pElem>
@@ -1617,7 +1425,7 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>/usr/include/json-c</pElem>
             <pElem>/usr/include/lua5.3</pElem>
@@ -1626,166 +1434,19 @@
         </cTool>
       </item>
       <item path="Controller-afb/ctl-timer.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include</pElem>
             <pElem>build/Controller-afb</pElem>
           </incDir>
         </cTool>
       </item>
-      <item path="HAL-afb/HAL-interface/hal-interface.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL-interface/hal-volramp.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>Audio-Common</pElem>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>build/HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </item>
       <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>../../../opt/include/alsa</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>../../../opt/include</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-        <ccTool flags="1">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src</pElem>
-          </incDir>
-        </ccTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>/usr/include/json-c</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HAL_MOST_UNICENS/wrap_volume.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS</pElem>
-            <pElem>HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc</pElem>
-            <pElem>build/HAL-afb/HAL_MOST_UNICENS</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/Jabra-Solemate/JabraUsbHAL.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
-        </cTool>
-      </item>
-      <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>Shared-Interface</pElem>
             <pElem>HAL-afb/HAL-interface</pElem>
@@ -1794,7 +1455,7 @@
         </cTool>
       </item>
       <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="4">
+        <cTool flags="3">
           <incDir>
             <pElem>HAL-afb/HAL-interface</pElem>
             <pElem>build/HAL-afb/Unicens-USB</pElem>
@@ -1802,11 +1463,11 @@
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="HighLevel-afb/HighLevelBinding.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="3">
+        <cTool flags="2">
         </cTool>
       </item>
       <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="4">
@@ -1844,7 +1505,7 @@
       <item path="MostVolume/libmostvolume.cpp" ex="false" tool="1" flavor2="4">
       </item>
       <item path="afb-utilities/filescan-utils.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>../../../opt/include/afb</pElem>
             <pElem>afb-utilities</pElem>
@@ -1854,7 +1515,7 @@
         </cTool>
       </item>
       <item path="afb-utilities/wrap-json.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="2">
+        <cTool flags="1">
           <incDir>
             <pElem>afb-utilities</pElem>
             <pElem>/usr/include/json-c</pElem>
@@ -1968,14 +1629,6 @@
           </preprocessorList>
         </ccTool>
       </folder>
-      <folder path="0/HAL-afb/HAL-interface">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-          </incDir>
-        </cTool>
-      </folder>
       <folder path="0/HAL-afb/HAL-plugin">
         <cTool>
           <incDir>
@@ -2002,39 +1655,6 @@
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/HAL-afb/HDA-intel">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/HDA-intel</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/HDA-intel</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/Jabra-Solemate">
-        <cTool>
-          <incDir>
-            <pElem>HAL-afb/Jabra-Solemate</pElem>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/Jabra-Solemate</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/HAL-afb/Scarlett-Focusrite">
-        <cTool>
-          <incDir>
-            <pElem>../../../opt/include/afb</pElem>
-            <pElem>HAL-afb/Scarlett-Focusrite</pElem>
-            <pElem>Audio-Common</pElem>
-            <pElem>HAL-afb/HAL-interface</pElem>
-            <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
-          </incDir>
-        </cTool>
-      </folder>
       <folder path="0/HAL-afb/Unicens-USB">
         <cTool>
           <incDir>
@@ -2125,6 +1745,10 @@
           </preprocessorList>
         </cTool>
       </folder>
+      <item path="hal-statics.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="hal-statics.h" ex="false" tool="3" flavor2="0">
+      </item>
     </conf>
   </confs>
 </configurationDescriptor>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 59b688d..4379b98 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -3,9 +3,9 @@
     <type>org.netbeans.modules.cnd.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>AFB-aaaa</name>
+            <name>hal-utilities-4a</name>
             <c-extensions>c</c-extensions>
-            <cpp-extensions>cpp,cxx</cpp-extensions>
+            <cpp-extensions>cpp</cpp-extensions>
             <header-extensions>h</header-extensions>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects/>