4a-hal-unicens: prepare import of plugin

Bug-AGL: SPEC-1505

- remove all files from legacy hal binding

Change-Id: I69e6d170cfa6a16d116f63263a1a5f75e2098d5b
Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>

17 files changed, 0 insertions, 1879 deletions

diff --git a/MOST_UNICENS/CMakeLists.txt b/MOST_UNICENS/CMakeLists.txt
deleted file mode 100644
index 5d91d1e..0000000
--- a/MOST_UNICENS/CMakeLists.txt
+++ /dev/null
@@ -1,45 +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_unicens.c wrap_volume.c)
-
-    # Binder exposes a unique public entry point
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	PREFIX "afb-"
-        LABELS "BINDING"
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    # Library dependencies (include updates automatically)
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        hal-utilities-4a
-        afb-helpers
-        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/MOST_UNICENS/README.md b/MOST_UNICENS/README.md
deleted file mode 100644
index 4ce4261..0000000
--- a/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/MOST_UNICENS/hal_most_unicens.c b/MOST_UNICENS/hal_most_unicens.c
deleted file mode 100644
index d106d6e..0000000
--- a/MOST_UNICENS/hal_most_unicens.c
+++ /dev/null
@@ -1,240 +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 "wrap-json.h"
-#include "wrap_unicens.h"
-#include "wrap_volume.h"
-
-#define ALSA_CARD_NAME    "ep016ch"
-#define ALSA_DEVICE_ID    "hw:ep016ch"
-#define PCM_MAX_CHANNELS  6
-
-/* Define few private tag for not standard functions */
-#define PCM_Volume_Multimedia 1000
-#define PCM_Volume_Navigation 1001
-#define PCM_Volume_Emergency  1002
-
-static int master_volume = 80;
-static json_bool master_switch;
-static int pcm_volume[PCM_MAX_CHANNELS] = {100,100,100,100,100,100};
-
-static void unicens_apply_card_value(void *closure, struct json_object *j_obj){
-
-    int num_id = 0;
-    int values[6];
-
-    /* apply master volume */
-    if (wrap_json_unpack(j_obj, "{s:i, s:[i!]}", "id", &num_id, "val",
-            &values[0])
-            == 0) {
-        if (num_id == 1) {
-            AFB_NOTICE("unicens_apply_card_value: num_id: %d, value: %d",
-                    num_id,
-                    values[0]);
-            wrap_volume_master(values[0]);
-            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) {
-        if (num_id == 2) {
-            AFB_NOTICE("unicens_apply_card_value: success, num_id: %d", num_id);
-            wrap_volume_pcm(&values[0], 6);
-            return;
-        }
-    }
-
-    AFB_ERROR("unicens_apply_card_value: no card value applied");
-}
-
-
-static void unicens_request_card_values_cb(void *closure, int status, struct json_object *j_response) {
-
-    json_object *j_obj;
-
-    AFB_INFO("unicens_request_card_values_cb: closure=%p status=%d, res=%s", closure, status, json_object_to_json_string(j_response));
-
-    if (json_object_object_get_ex(j_response, "response", &j_obj)) {
-
-        wrap_json_optarray_for_all(j_obj, &unicens_apply_card_value, NULL);
-    }
-}
-
-static __attribute__((unused)) 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);
-
-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=80, .name="Master Playback Volume"}
-  },
-#if 0
-  /*{ .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"}
-  },
-#endif  
-  { .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;
-    AFB_NOTICE("Initializing HAL-MOST-UNICENS-BINDING");
-
-    err = wrap_volume_init();
-    if (err) {
-        AFB_ERROR("Failed to initialize wrapper for volume library");
-        goto OnErrorExit;
-    }
-
-    /* Step 1: Set output volume to pre-defined level */
-    /* in order to avoid muted volume to be persistent after boot. */
-    wrap_volume_master(80);
-    wrap_volume_pcm(pcm_volume, PCM_MAX_CHANNELS/*array size*/);
-
-    /* Step 2: risk to have influence on mixer controls init */
-    /* request of initial card values */
-    /* unicens_request_card_values(ALSA_DEVICE_ID); */
-
-    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_subscribe_sync();
-    if (err) {
-        AFB_ERROR("Failed to subscribe to UNICENS binding");
-        goto OnErrorExit;
-    }
-
-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/MOST_UNICENS/ucs2-vol/CMakeLists.txt b/MOST_UNICENS/ucs2-vol/CMakeLists.txt
deleted file mode 100644
index c734639..0000000
--- a/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/MOST_UNICENS/ucs2-vol/inc/device_container.h b/MOST_UNICENS/ucs2-vol/inc/device_container.h
deleted file mode 100644
index 9fabdb5..0000000
--- a/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/MOST_UNICENS/ucs2-vol/inc/device_value.h b/MOST_UNICENS/ucs2-vol/inc/device_value.h
deleted file mode 100644
index c2fe0b1..0000000
--- a/MOST_UNICENS/ucs2-vol/inc/device_value.h
+++ /dev/null
@@ -1,104 +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,
-    DEVICE_VAL_FIBERDYNE_MASTER = 3
-
-};
-
-class CDeviceValue {
-public:
-    CDeviceValue(uint16_t address, DeviceValueType type, uint16_t key, bool is_i2c);
-    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
-    bool FireControlMessage(lib_most_volume_sendmessage_cb_t sendmsg_fptr);
-    
-    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
-    bool     _is_i2c;
-    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/MOST_UNICENS/ucs2-vol/inc/libmostvolume.h b/MOST_UNICENS/ucs2-vol/inc/libmostvolume.h
deleted file mode 100644
index 5335754..0000000
--- a/MOST_UNICENS/ucs2-vol/inc/libmostvolume.h
+++ /dev/null
@@ -1,114 +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 int (*lib_most_volume_sendmessage_cb_t)(uint16_t node, uint16_t msgid, uint8_t *data_ptr, uint8_t data_sz);
-
-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_sendmessage_cb_t sendmsg_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/MOST_UNICENS/ucs2-vol/inc/setup.h b/MOST_UNICENS/ucs2-vol/inc/setup.h
deleted file mode 100644
index 3be8bf4..0000000
--- a/MOST_UNICENS/ucs2-vol/inc/setup.h
+++ /dev/null
@@ -1,73 +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;
-    
-    CDeviceValue _volume_amp_510_m;
-
-    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/MOST_UNICENS/ucs2-vol/src/CMakeLists.txt b/MOST_UNICENS/ucs2-vol/src/CMakeLists.txt
deleted file mode 100644
index 1be7184..0000000
--- a/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/MOST_UNICENS/ucs2-vol/src/device_container.cpp b/MOST_UNICENS/ucs2-vol/src/device_container.cpp
deleted file mode 100644
index 3448a23..0000000
--- a/MOST_UNICENS/ucs2-vol/src/device_container.cpp
+++ /dev/null
@@ -1,194 +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]->GetType() == DEVICE_VAL_FIBERDYNE_MASTER)
-            {
-                _values_pptr[_idx_processing]->FireControlMessage(this->_init_ptr->sendmsg_cb);
-            }
-            else
-            {
-                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/MOST_UNICENS/ucs2-vol/src/device_value.cpp b/MOST_UNICENS/ucs2-vol/src/device_value.cpp
deleted file mode 100644
index 22b8dfb..0000000
--- a/MOST_UNICENS/ucs2-vol/src/device_value.cpp
+++ /dev/null
@@ -1,175 +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, bool is_i2c)
-{
-    this->_is_available = false;
-    this->_is_busy = false;
-    this->_address = address;
-    this->_is_i2c = is_i2c;
-    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
-
-    if (type == DEVICE_VAL_FIBERDYNE_MASTER)
-        _tx_payload_sz = 2u;
-    else
-        _tx_payload_sz = 3u;
-}
-
-CDeviceValue::~CDeviceValue()
-{
-}
-
-void CDeviceValue::ApplyMostValue(uint8_t value, DeviceValueType type, uint8_t tx_payload[])
-{
-    uint16_t tmp = MUTE_VALUE;
-
-    if (type == DEVICE_VAL_FIBERDYNE_MASTER)
-    {
-        tx_payload[0] = 0x00U;
-        tx_payload[1] = value;
-        
-        return;
-    }   
-
-    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::FireControlMessage(lib_most_volume_sendmessage_cb_t sendmsg_fptr)
-{
-    ApplyMostValue(this->_target_value, _type, _tx_payload);
-
-    if (this->_is_available && !this->_is_busy)
-    {
-        sendmsg_fptr(this->_address, 0x100U, _tx_payload, _tx_payload_sz);
-        
-        this->_actual_value = this->_target_value;
-    }
-
-    return true;
-}
-
-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/MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp b/MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp
deleted file mode 100644
index 35f769f..0000000
--- a/MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp
+++ /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.
- *
- */
-
-#include "libmostvolume.h"
-#include "setup.h"
-#include <afb/afb-binding.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;*/
-    AFB_NOTICE("lib_most_volume_set");
-
-    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/MOST_UNICENS/ucs2-vol/src/setup.cpp b/MOST_UNICENS/ucs2-vol/src/setup.cpp
deleted file mode 100644
index ad841ab..0000000
--- a/MOST_UNICENS/ucs2-vol/src/setup.cpp
+++ /dev/null
@@ -1,96 +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, true),
-        _volume_amp_270_l(0x270U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_FRONT_LEFT, true),
-        _volume_amp_270_r(0x270U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_FRONT_RIGHT, true),
-        _volume_amp_271_m(0x271U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER, true),
-        _volume_amp_271_l(0x271U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_REAR_LEFT, true),
-        _volume_amp_271_r(0x271U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_REAR_RIGHT, true),
-        _volume_amp_272_m(0x272U, DEVICE_VAL_MASTER, LIB_MOST_VOLUME_MASTER, true),
-        _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER, true),
-        _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB, true),
-        _volume_amp_510_m(0x510U, DEVICE_VAL_FIBERDYNE_MASTER, LIB_MOST_VOLUME_MASTER, false),
-        _value_container()
-{
-    static CDeviceValue* value_list[10] = {  &_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,
-                                            &_volume_amp_510_m};
-
-    _value_container.RegisterValues(value_list, 10U);
-}
-
-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/MOST_UNICENS/wrap_unicens.c b/MOST_UNICENS/wrap_unicens.c
deleted file mode 100644
index 4b75780..0000000
--- a/MOST_UNICENS/wrap_unicens.c
+++ /dev/null
@@ -1,368 +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;
-}
-
-extern int wrap_ucs_sendmessage(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint8_t data_sz) {
-
-    json_object *j_query, *j_response = NULL;
-    int err;
-    int node = (int)src_addr;
-    int msgid = (int)msg_id;
-    size_t data_size = (size_t)data_sz;
-
-    /* skip data attribute if possible, wrap_json_unpack may fail to deal with
-     * an empty Base64 string */
-    if (data_size > 0)
-        wrap_json_pack(&j_query, "{s:i, s:i, s:Y}", "node", node, "msgid", msgid, "data", data_ptr, data_size);
-    else
-        wrap_json_pack(&j_query, "{s:i, s:i}", "node", node, "msgid", msgid);
-
-    err = afb_service_call_sync("UNICENS", "sendmessage", j_query, &j_response);
-
-    if (err) {
-        AFB_ERROR("Failed to call wrap_ucs_sendmessage");
-        goto OnErrorExit;
-    }
-    else {
-        AFB_INFO("Called wrap_ucs_sendmessage, res=%s", json_object_to_json_string(j_response));
-        json_object_put(j_response);
-    }
-
-    j_query = NULL;
-
-OnErrorExit:
-    return err;
-}
diff --git a/MOST_UNICENS/wrap_unicens.h b/MOST_UNICENS/wrap_unicens.h
deleted file mode 100644
index 734ea5d..0000000
--- a/MOST_UNICENS/wrap_unicens.h
+++ /dev/null
@@ -1,35 +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);

-extern int wrap_ucs_sendmessage(uint16_t src_addr, uint16_t msg_id, uint8_t *data_ptr, uint8_t data_sz);

diff --git a/MOST_UNICENS/wrap_volume.c b/MOST_UNICENS/wrap_volume.c
deleted file mode 100644
index 9f9ceff..0000000
--- a/MOST_UNICENS/wrap_volume.c
+++ /dev/null
@@ -1,133 +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;
-    mv_init.sendmsg_cb = &wrap_ucs_sendmessage;
-
-    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/MOST_UNICENS/wrap_volume.h b/MOST_UNICENS/wrap_volume.h
deleted file mode 100644
index 099b70c..0000000
--- a/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);