diff --git a/MPSoC/mutekh/examples/avatar/#config# b/MPSoC/mutekh/examples/avatar/#config#
deleted file mode 100644
index 38129acb495bee65588a72f7705a0e338a053881..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/#config#
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-  %set OUTPUT_NAME avatar
-
-  # New source code module to be compiled
-  %append MODULES $(OUTPUT_NAME):$(CONFIGPATH)
-
-  # Application license
-  CONFIG_LICENSE_APP_LGPL
-
-# Libs
-  CONFIG_PTHREAD
-  CONFIG_PTHREAD_MAIN
-  CONFIG_PTHREAD_TIME
-
-  CONFIG_PTHREAD_ATTRIBUTES
-
-  CONFIG_PTHREAD_STACK_SIZE 32768
-  CONFIG_LIBC_STREAM_STD
-
-  CONFIG_LIBAVATAR
-  CONFIG_HEXO_INTTYPES_DEPRECATED undefined
-  CONFIG_LIBM
-  CONFIG_LIBC_STREAM
-  CONFIG_VFS
-  CONFIG_MWMR
-  CONFIG_MWMR_SOCLIB
-  CONFIG_MUTEK_SCHEDULER_STATIC
-
-%include $(SRC_DIR)/examples/common/build_options.conf
-%include $(SRC_DIR)/examples/common/platforms.conf
-
-# inter-processor interrupts
-  CONFIG_HEXO_IPI
-
-  CONFIG_ARCH_SMP
-CONFIG_CPU_MAXCOUNT 2
diff --git a/MPSoC/mutekh/examples/avatar/#main.c-2-6# b/MPSoC/mutekh/examples/avatar/#main.c-2-6#
deleted file mode 100644
index b26ac4f636cba892dc202f9728b8e00c1119fe85..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/#main.c-2-6#
+++ /dev/null
@@ -1,1004 +0,0 @@
-#include <stdio.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "myerrors.h"
-#include "message.h"
-#include "syncchannel.h"
-#include "asyncchannel.h"
-#include "mytimelib.h"
-#include "request_manager.h"
-#include "defs.h"
-#include "debug.h"
-#include "random.h"
-#include "tracemanager.h" 
-#include "mwmr.h" 
- 
-
-#define NB_PROC 2
-#define WIDTH 4
-#define DEPTH 16
-
-void __user_init() {
-}
-
-#include "InterfaceDevice.h"
-#include "SmartCard.h"
-#include "SmartCardController.h"
-#include "Application.h"
-#include "TCPPacketManager.h"
-#include "TCPIP.h"
-
-/* Main mutex */
-pthread_barrier_t barrier ;
-pthread_attr_t *attr_t;
-pthread_mutex_t __mainMutex;
-
-#define CHANNEL0 __attribute__((section("section_channel0")))
-#define LOCK0 __attribute__((section("section_lock0")))
-#define CHANNEL1 __attribute__((section("section_channel1")))
-#define LOCK1 __attribute__((section("section_lock1")))
-#define CHANNEL2 __attribute__((section("section_channel2")))
-#define LOCK2 __attribute__((section("section_lock2")))
-#define CHANNEL3 __attribute__((section("section_channel3")))
-#define LOCK3 __attribute__((section("section_lock3")))
-#define CHANNEL4 __attribute__((section("section_channel4")))
-#define LOCK4 __attribute__((section("section_lock4")))
-#define CHANNEL5 __attribute__((section("section_channel5")))
-#define LOCK5 __attribute__((section("section_lock5")))
-#define CHANNEL6 __attribute__((section("section_channel6")))
-#define LOCK6 __attribute__((section("section_lock6")))
-#define base(arg) arg
-
-typedef struct mwmr_s mwmr_t;
-
-/* Synchronous channels */
-syncchannel __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-uint32_t const TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_lock LOCK0;
-struct mwmr_status_s TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status CHANNEL0;
-uint8_t TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_data[32] CHANNEL0;
-struct mwmr_s TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket CHANNEL0;
-
-syncchannel __TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-uint32_t const TCPIP_emptyListOfPackets__TCPPacketManager_empty_lock LOCK0;
-struct mwmr_status_s TCPIP_emptyListOfPackets__TCPPacketManager_empty_status CHANNEL0;
-uint8_t TCPIP_emptyListOfPackets__TCPPacketManager_empty_data[32] CHANNEL0;
-struct mwmr_s TCPIP_emptyListOfPackets__TCPPacketManager_empty CHANNEL0;
-
-syncchannel __TCPIP_addPacket__TCPPacketManager_addPacket;
-uint32_t const TCPIP_addPacket__TCPPacketManager_addPacket_lock LOCK0;
-struct mwmr_status_s TCPIP_addPacket__TCPPacketManager_addPacket_status CHANNEL0;
-uint8_t TCPIP_addPacket__TCPPacketManager_addPacket_data[32] CHANNEL0;
-struct mwmr_s TCPIP_addPacket__TCPPacketManager_addPacket CHANNEL0;
-
-syncchannel __TCPIP_ackPacket__TCPPacketManager_ackPacket;
-uint32_t const TCPIP_ackPacket__TCPPacketManager_ackPacket_lock LOCK0;
-struct mwmr_status_s TCPIP_ackPacket__TCPPacketManager_ackPacket_status CHANNEL0;
-uint8_t TCPIP_ackPacket__TCPPacketManager_ackPacket_data[32] CHANNEL0;
-struct mwmr_s TCPIP_ackPacket__TCPPacketManager_ackPacket CHANNEL0;
-
-syncchannel __Application_open__TCPIP_open;
-uint32_t const Application_open__TCPIP_open_lock LOCK1;
-struct mwmr_status_s Application_open__TCPIP_open_status CHANNEL1;
-uint8_t Application_open__TCPIP_open_data[32] CHANNEL1;
-struct mwmr_s Application_open__TCPIP_open CHANNEL1;
-
-syncchannel __Application_close__TCPIP_close;
-uint32_t const Application_close__TCPIP_close_lock LOCK1;
-struct mwmr_status_s Application_close__TCPIP_close_status CHANNEL1;
-uint8_t Application_close__TCPIP_close_data[32] CHANNEL1;
-struct mwmr_s Application_close__TCPIP_close CHANNEL1;
-
-syncchannel __Application_abort__TCPIP_abort;
-uint32_t const Application_abort__TCPIP_abort_lock LOCK1;
-struct mwmr_status_s Application_abort__TCPIP_abort_status CHANNEL1;
-uint8_t Application_abort__TCPIP_abort_data[32] CHANNEL1;
-struct mwmr_s Application_abort__TCPIP_abort CHANNEL1;
-
-syncchannel __Application_sendTCP__TCPIP_send_TCP;
-uint32_t const Application_sendTCP__TCPIP_send_TCP_lock LOCK1;
-struct mwmr_status_s Application_sendTCP__TCPIP_send_TCP_status CHANNEL1;
-uint8_t Application_sendTCP__TCPIP_send_TCP_data[32] CHANNEL1;
-struct mwmr_s Application_sendTCP__TCPIP_send_TCP CHANNEL1;
-
-syncchannel __SmartCardController_fromTtoP__TCPIP_fromTtoP;
-uint32_t const SmartCardController_fromTtoP__TCPIP_fromTtoP_lock LOCK2;
-struct mwmr_status_s SmartCardController_fromTtoP__TCPIP_fromTtoP_status CHANNEL2;
-uint8_t SmartCardController_fromTtoP__TCPIP_fromTtoP_data[32] CHANNEL2;
-struct mwmr_s SmartCardController_fromTtoP__TCPIP_fromTtoP CHANNEL2;
-
-syncchannel __SmartCardController_fromPtoT__TCPIP_fromPtoT;
-uint32_t const SmartCardController_fromPtoT__TCPIP_fromPtoT_lock LOCK2;
-struct mwmr_status_s SmartCardController_fromPtoT__TCPIP_fromPtoT_status CHANNEL2;
-uint8_t SmartCardController_fromPtoT__TCPIP_fromPtoT_data[32] CHANNEL2;
-struct mwmr_s SmartCardController_fromPtoT__TCPIP_fromPtoT CHANNEL2;
-
-
-syncchannel __SmartCardController_start_TCPIP__TCPIP_start;
-uint32_t const SmartCardController_start_TCPIP__TCPIP_start_lock LOCK2;
-struct mwmr_status_s SmartCardController_start_TCPIP__TCPIP_start_status CHANNEL2;
-uint8_t SmartCardController_start_TCPIP__TCPIP_start_data[32] CHANNEL2;
-struct mwmr_s SmartCardController_start_TCPIP__TCPIP_start CHANNEL2;
-
-syncchannel __SmartCardController_reset__InterfaceDevice_reset;
-uint32_t const SmartCardController_reset__InterfaceDevice_reset_lock LOCK3;
-struct mwmr_status_s SmartCardController_reset__InterfaceDevice_reset_status CHANNEL3;
-uint8_t SmartCardController_reset__InterfaceDevice_reset_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_reset__InterfaceDevice_reset CHANNEL3;
-
-syncchannel __SmartCardController_pTS__InterfaceDevice_pTS;
-uint32_t const SmartCardController_pTS__InterfaceDevice_pTS_lock LOCK3;
-struct mwmr_status_s SmartCardController_pTS__InterfaceDevice_pTS_status CHANNEL3;
-uint8_t SmartCardController_pTS__InterfaceDevice_pTS_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_pTS__InterfaceDevice_pTS CHANNEL3;
-
-syncchannel __SmartCardController_dataReady__InterfaceDevice_data_Ready;
-uint32_t const SmartCardController_dataReady__InterfaceDevice_data_Ready_lock LOCK3;
-struct mwmr_status_s SmartCardController_dataReady__InterfaceDevice_data_Ready_status CHANNEL3;
-uint8_t SmartCardController_dataReady__InterfaceDevice_data_Ready_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_dataReady__InterfaceDevice_data_Ready CHANNEL3;
-
-syncchannel __SmartCardController_activation__InterfaceDevice_activation;
-uint32_t const SmartCardController_activation__InterfaceDevice_activation_lock LOCK3;
-struct mwmr_status_s SmartCardController_activation__InterfaceDevice_activation_status CHANNEL3;
-uint8_t SmartCardController_activation__InterfaceDevice_activation_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_activation__InterfaceDevice_activation CHANNEL3;
-
-syncchannel __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-uint32_t const SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_lock LOCK3;
-struct mwmr_status_s SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status CHANNEL3;
-uint8_t SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC CHANNEL3;
-
-syncchannel __SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-uint32_t const SmartCardController_answerToReset__InterfaceDevice_answerToReset_lock LOCK3;
-struct mwmr_status_s SmartCardController_answerToReset__InterfaceDevice_answerToReset_status CHANNEL3;
-uint8_t SmartCardController_answerToReset__InterfaceDevice_answerToReset_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_answerToReset__InterfaceDevice_answerToReset CHANNEL3;
-
-syncchannel __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-uint32_t const SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_lock LOCK3;
-struct mwmr_status_s SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status CHANNEL3;
-uint8_t SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm CHANNEL3;
-
-syncchannel __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-uint32_t const SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_lock LOCK3;
-struct mwmr_status_s SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status CHANNEL3;
-uint8_t SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD CHANNEL3;
-
-syncchannel __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-uint32_t const SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_lock LOCK3;
-struct mwmr_status_s SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status CHANNEL3;
-uint8_t SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_data_Ready_SC__InterfaceDevice_dataReady CHANNEL3;
-
-syncchannel __SmartCardController_start_Application__Application_startApplication;
-uint32_t const SmartCardController_start_Application__Application_startApplication_lock LOCK4;
-struct mwmr_status_s SmartCardController_start_Application__Application_startApplication_status CHANNEL4;
-uint8_t SmartCardController_start_Application__Application_startApplication_data[32] CHANNEL4;
-struct mwmr_s SmartCardController_start_Application__Application_startApplication CHANNEL4;
-
-syncchannel __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-uint32_t const TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_lock LOCK5;
-struct mwmr_status_s TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status CHANNEL5;
-uint8_t TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_data[32] CHANNEL5;
-struct mwmr_s TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set CHANNEL5;
-
-syncchannel __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-uint32_t const TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_lock LOCK5;
-struct mwmr_status_s TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status CHANNEL5;
-uint8_t TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_data[32] CHANNEL5;
-struct mwmr_s TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset CHANNEL5;
-
-syncchannel __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-uint32_t const TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_lock LOCK5;
-struct mwmr_status_s TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status CHANNEL5;
-uint8_t TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_data[32] CHANNEL5;
-struct mwmr_s TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire CHANNEL5;
-
-syncchannel __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-uint32_t const TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_lock LOCK6;
-struct mwmr_status_s TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status CHANNEL6;
-uint8_t TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_data[32] CHANNEL6;
-struct mwmr_s TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set CHANNEL6;
-
-syncchannel __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-uint32_t const TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_lock LOCK6;
-struct mwmr_status_s TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status CHANNEL6;
-uint8_t TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_data[32] CHANNEL6;
-struct mwmr_s TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset CHANNEL6;
-
-syncchannel __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-uint32_t const TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_lock LOCK6;
-struct mwmr_status_s TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status CHANNEL6;
-uint8_t TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_data[32] CHANNEL6;
-struct mwmr_s TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire CHANNEL6;
-
-/* Asynchronous channels */
-asyncchannel __TCPIP_receiveTCP__Application_receiveTCP;
-uint32_t const TCPIP_receiveTCP__Application_receiveTCP_lock LOCK0;
-struct mwmr_status_s TCPIP_receiveTCP__Application_receiveTCP_status CHANNEL0;
-uint8_t TCPIP_receiveTCP__Application_receiveTCP_data[32] CHANNEL0;
-struct mwmr_s TCPIP_receiveTCP__Application_receiveTCP CHANNEL0;
-
-asyncchannel __TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-uint32_t const TCPPacketManager_storePacket__TCPPacketManager_retrieve_lock LOCK1;
-struct mwmr_status_s TCPPacketManager_storePacket__TCPPacketManager_retrieve_status CHANNEL1;
-uint8_t TCPPacketManager_storePacket__TCPPacketManager_retrieve_data[32] CHANNEL1;
-struct mwmr_s TCPPacketManager_storePacket__TCPPacketManager_retrieve CHANNEL1;
-
-
-int main(int argc, char *argv[]) {
-  
-  
-  void *ptr;
-  pthread_barrier_init(&barrier,NULL, NB_PROC);
-  pthread_attr_t *attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_init(attr_t);
-  pthread_mutex_init(&__mainMutex, NULL);
-  
-  /* Synchronous channels */
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.rptr = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.wptr = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.usage = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.lock = 0;
-  
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.width = 32;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.depth = 100;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.gdepth = TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.depth;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.buffer = TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_data;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status = &TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status;
-  
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.inname ="timeoutPacket";
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.outname ="timeoutPacket";
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.mwmr_fifo = &TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.ok = 1;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.ok2 = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status =&TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->lock=0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->rptr=0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->usage=0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->wptr =0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.rptr = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.wptr = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.usage = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.lock = 0;
-  
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.width = 32;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.depth = 100;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.gdepth = TCPIP_emptyListOfPackets__TCPPacketManager_empty.depth;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.buffer = TCPIP_emptyListOfPackets__TCPPacketManager_empty_data;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status = &TCPIP_emptyListOfPackets__TCPPacketManager_empty_status;
-  
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.inname ="empty";
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.outname ="emptyListOfPackets";
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.mwmr_fifo = &TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.ok = 1;
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.ok2 = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status =&TCPIP_emptyListOfPackets__TCPPacketManager_empty_status;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->lock=0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->rptr=0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->usage=0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->wptr =0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.rptr = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.wptr = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.usage = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.lock = 0;
-  
-  TCPIP_addPacket__TCPPacketManager_addPacket.width = 32;
-  TCPIP_addPacket__TCPPacketManager_addPacket.depth = 100;
-  TCPIP_addPacket__TCPPacketManager_addPacket.gdepth = TCPIP_addPacket__TCPPacketManager_addPacket.depth;
-  TCPIP_addPacket__TCPPacketManager_addPacket.buffer = TCPIP_addPacket__TCPPacketManager_addPacket_data;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status = &TCPIP_addPacket__TCPPacketManager_addPacket_status;
-  
-  __TCPIP_addPacket__TCPPacketManager_addPacket.inname ="addPacket";
-  __TCPIP_addPacket__TCPPacketManager_addPacket.outname ="addPacket";
-  __TCPIP_addPacket__TCPPacketManager_addPacket.mwmr_fifo = &TCPIP_addPacket__TCPPacketManager_addPacket;
-  __TCPIP_addPacket__TCPPacketManager_addPacket.ok = 1;
-  __TCPIP_addPacket__TCPPacketManager_addPacket.ok2 = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status =&TCPIP_addPacket__TCPPacketManager_addPacket_status;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->lock=0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->rptr=0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->usage=0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->wptr =0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.rptr = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.wptr = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.usage = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.lock = 0;
-  
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.width = 32;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.depth = 100;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.gdepth = TCPIP_ackPacket__TCPPacketManager_ackPacket.depth;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.buffer = TCPIP_ackPacket__TCPPacketManager_ackPacket_data;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status = &TCPIP_ackPacket__TCPPacketManager_ackPacket_status;
-  
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.inname ="ackPacket";
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.outname ="ackPacket";
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.mwmr_fifo = &TCPIP_ackPacket__TCPPacketManager_ackPacket;
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.ok = 1;
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.ok2 = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status =&TCPIP_ackPacket__TCPPacketManager_ackPacket_status;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->lock=0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->rptr=0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->usage=0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->wptr =0;
-  Application_open__TCPIP_open_status.rptr = 0;
-  Application_open__TCPIP_open_status.wptr = 0;
-  Application_open__TCPIP_open_status.usage = 0;
-  Application_open__TCPIP_open_status.lock = 0;
-  
-  Application_open__TCPIP_open.width = 4;
-  Application_open__TCPIP_open.depth = 100;
-  Application_open__TCPIP_open.gdepth = Application_open__TCPIP_open.depth;
-  Application_open__TCPIP_open.buffer = Application_open__TCPIP_open_data;
-  Application_open__TCPIP_open.status = &Application_open__TCPIP_open_status;
-  
-  __Application_open__TCPIP_open.inname ="open";
-  __Application_open__TCPIP_open.outname ="open";
-  __Application_open__TCPIP_open.mwmr_fifo = &Application_open__TCPIP_open;
-  __Application_open__TCPIP_open.ok = 1;
-  __Application_open__TCPIP_open.ok2 = 0;
-  Application_open__TCPIP_open.status =&Application_open__TCPIP_open_status;
-  Application_open__TCPIP_open.status->lock=0;
-  Application_open__TCPIP_open.status->rptr=0;
-  Application_open__TCPIP_open.status->usage=0;
-  Application_open__TCPIP_open.status->wptr =0;
-  Application_close__TCPIP_close_status.rptr = 0;
-  Application_close__TCPIP_close_status.wptr = 0;
-  Application_close__TCPIP_close_status.usage = 0;
-  Application_close__TCPIP_close_status.lock = 0;
-  
-  Application_close__TCPIP_close.width = 4;
-  Application_close__TCPIP_close.depth = 100;
-  Application_close__TCPIP_close.gdepth = Application_close__TCPIP_close.depth;
-  Application_close__TCPIP_close.buffer = Application_close__TCPIP_close_data;
-  Application_close__TCPIP_close.status = &Application_close__TCPIP_close_status;
-  
-  __Application_close__TCPIP_close.inname ="close";
-  __Application_close__TCPIP_close.outname ="close";
-  __Application_close__TCPIP_close.mwmr_fifo = &Application_close__TCPIP_close;
-  __Application_close__TCPIP_close.ok = 1;
-  __Application_close__TCPIP_close.ok2 = 0;
-  Application_close__TCPIP_close.status =&Application_close__TCPIP_close_status;
-  Application_close__TCPIP_close.status->lock=0;
-  Application_close__TCPIP_close.status->rptr=0;
-  Application_close__TCPIP_close.status->usage=0;
-  Application_close__TCPIP_close.status->wptr =0;
-  Application_abort__TCPIP_abort_status.rptr = 0;
-  Application_abort__TCPIP_abort_status.wptr = 0;
-  Application_abort__TCPIP_abort_status.usage = 0;
-  Application_abort__TCPIP_abort_status.lock = 0;
-  
-  Application_abort__TCPIP_abort.width = 4;
-  Application_abort__TCPIP_abort.depth = 100;
-  Application_abort__TCPIP_abort.gdepth = Application_abort__TCPIP_abort.depth;
-  Application_abort__TCPIP_abort.buffer = Application_abort__TCPIP_abort_data;
-  Application_abort__TCPIP_abort.status = &Application_abort__TCPIP_abort_status;
-  
-  __Application_abort__TCPIP_abort.inname ="abort";
-  __Application_abort__TCPIP_abort.outname ="abort";
-  __Application_abort__TCPIP_abort.mwmr_fifo = &Application_abort__TCPIP_abort;
-  __Application_abort__TCPIP_abort.ok = 1;
-  __Application_abort__TCPIP_abort.ok2 = 0;
-  Application_abort__TCPIP_abort.status =&Application_abort__TCPIP_abort_status;
-  Application_abort__TCPIP_abort.status->lock=0;
-  Application_abort__TCPIP_abort.status->rptr=0;
-  Application_abort__TCPIP_abort.status->usage=0;
-  Application_abort__TCPIP_abort.status->wptr =0;
-  Application_sendTCP__TCPIP_send_TCP_status.rptr = 0;
-  Application_sendTCP__TCPIP_send_TCP_status.wptr = 0;
-  Application_sendTCP__TCPIP_send_TCP_status.usage = 0;
-  Application_sendTCP__TCPIP_send_TCP_status.lock = 0;
-  
-  Application_sendTCP__TCPIP_send_TCP.width = 4;
-  Application_sendTCP__TCPIP_send_TCP.depth = 100;
-  Application_sendTCP__TCPIP_send_TCP.gdepth = Application_sendTCP__TCPIP_send_TCP.depth;
-  Application_sendTCP__TCPIP_send_TCP.buffer = Application_sendTCP__TCPIP_send_TCP_data;
-  Application_sendTCP__TCPIP_send_TCP.status = &Application_sendTCP__TCPIP_send_TCP_status;
-  
-  __Application_sendTCP__TCPIP_send_TCP.inname ="send_TCP";
-  __Application_sendTCP__TCPIP_send_TCP.outname ="sendTCP";
-  __Application_sendTCP__TCPIP_send_TCP.mwmr_fifo = &Application_sendTCP__TCPIP_send_TCP;
-  __Application_sendTCP__TCPIP_send_TCP.ok = 1;
-  __Application_sendTCP__TCPIP_send_TCP.ok2 = 0;
-  Application_sendTCP__TCPIP_send_TCP.status =&Application_sendTCP__TCPIP_send_TCP_status;
-  Application_sendTCP__TCPIP_send_TCP.status->lock=0;
-  Application_sendTCP__TCPIP_send_TCP.status->rptr=0;
-  Application_sendTCP__TCPIP_send_TCP.status->usage=0;
-  Application_sendTCP__TCPIP_send_TCP.status->wptr =0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.rptr = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.wptr = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.usage = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.lock = 0;
-  
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.width = 32;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.depth = 100;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.gdepth = SmartCardController_fromTtoP__TCPIP_fromTtoP.depth;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.buffer = SmartCardController_fromTtoP__TCPIP_fromTtoP_data;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status = &SmartCardController_fromTtoP__TCPIP_fromTtoP_status;
-  
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.inname ="fromTtoP";
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.outname ="fromTtoP";
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.mwmr_fifo = &SmartCardController_fromTtoP__TCPIP_fromTtoP;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.ok = 1;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.ok2 = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status =&SmartCardController_fromTtoP__TCPIP_fromTtoP_status;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->lock=0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->rptr=0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->usage=0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->wptr =0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.rptr = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.wptr = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.usage = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.lock = 0;
-  
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.width = 32;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.depth = 100;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.gdepth = SmartCardController_fromPtoT__TCPIP_fromPtoT.depth;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.buffer = SmartCardController_fromPtoT__TCPIP_fromPtoT_data;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status = &SmartCardController_fromPtoT__TCPIP_fromPtoT_status;
-  
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.inname ="fromPtoT";
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.outname ="fromPtoT";
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.mwmr_fifo = &SmartCardController_fromPtoT__TCPIP_fromPtoT;
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.ok = 1;
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.ok2 = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status =&SmartCardController_fromPtoT__TCPIP_fromPtoT_status;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->lock=0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->rptr=0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->usage=0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->wptr =0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.rptr = 0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.wptr = 0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.usage = 0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.lock = 0;
-  
-  SmartCardController_start_TCPIP__TCPIP_start.width = 32;
-  SmartCardController_start_TCPIP__TCPIP_start.depth = 100;
-  SmartCardController_start_TCPIP__TCPIP_start.gdepth = SmartCardController_start_TCPIP__TCPIP_start.depth;
-  SmartCardController_start_TCPIP__TCPIP_start.buffer = SmartCardController_start_TCPIP__TCPIP_start_data;
-  SmartCardController_start_TCPIP__TCPIP_start.status = &SmartCardController_start_TCPIP__TCPIP_start_status;
-  
-  __SmartCardController_start_TCPIP__TCPIP_start.inname ="start";
-  __SmartCardController_start_TCPIP__TCPIP_start.outname ="start_TCPIP";
-  __SmartCardController_start_TCPIP__TCPIP_start.mwmr_fifo = &SmartCardController_start_TCPIP__TCPIP_start;
-  __SmartCardController_start_TCPIP__TCPIP_start.ok = 1;
-  __SmartCardController_start_TCPIP__TCPIP_start.ok2 = 0;
-  SmartCardController_start_TCPIP__TCPIP_start.status =&SmartCardController_start_TCPIP__TCPIP_start_status;
-  SmartCardController_start_TCPIP__TCPIP_start.status->lock=0;
-  SmartCardController_start_TCPIP__TCPIP_start.status->rptr=0;
-  SmartCardController_start_TCPIP__TCPIP_start.status->usage=0;
-  SmartCardController_start_TCPIP__TCPIP_start.status->wptr =0;
-  SmartCardController_reset__InterfaceDevice_reset_status.rptr = 0;
-  SmartCardController_reset__InterfaceDevice_reset_status.wptr = 0;
-  SmartCardController_reset__InterfaceDevice_reset_status.usage = 0;
-  SmartCardController_reset__InterfaceDevice_reset_status.lock = 0;
-  
-  SmartCardController_reset__InterfaceDevice_reset.width = 4;
-  SmartCardController_reset__InterfaceDevice_reset.depth = 100;
-  SmartCardController_reset__InterfaceDevice_reset.gdepth = SmartCardController_reset__InterfaceDevice_reset.depth;
-  SmartCardController_reset__InterfaceDevice_reset.buffer = SmartCardController_reset__InterfaceDevice_reset_data;
-  SmartCardController_reset__InterfaceDevice_reset.status = &SmartCardController_reset__InterfaceDevice_reset_status;
-  
-  __SmartCardController_reset__InterfaceDevice_reset.inname ="reset";
-  __SmartCardController_reset__InterfaceDevice_reset.outname ="reset";
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &SmartCardController_reset__InterfaceDevice_reset;
-  __SmartCardController_reset__InterfaceDevice_reset.ok = 1;
-  __SmartCardController_reset__InterfaceDevice_reset.ok2 = 0;
-  SmartCardController_reset__InterfaceDevice_reset.status =&SmartCardController_reset__InterfaceDevice_reset_status;
-  SmartCardController_reset__InterfaceDevice_reset.status->lock=0;
-  SmartCardController_reset__InterfaceDevice_reset.status->rptr=0;
-  SmartCardController_reset__InterfaceDevice_reset.status->usage=0;
-  SmartCardController_reset__InterfaceDevice_reset.status->wptr =0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.rptr = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.wptr = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.usage = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.lock = 0;
-  
-  SmartCardController_pTS__InterfaceDevice_pTS.width = 4;
-  SmartCardController_pTS__InterfaceDevice_pTS.depth = 100;
-  SmartCardController_pTS__InterfaceDevice_pTS.gdepth = SmartCardController_pTS__InterfaceDevice_pTS.depth;
-  SmartCardController_pTS__InterfaceDevice_pTS.buffer = SmartCardController_pTS__InterfaceDevice_pTS_data;
-  SmartCardController_pTS__InterfaceDevice_pTS.status = &SmartCardController_pTS__InterfaceDevice_pTS_status;
-  
-  __SmartCardController_pTS__InterfaceDevice_pTS.inname ="pTS";
-  __SmartCardController_pTS__InterfaceDevice_pTS.outname ="pTS";
-  __SmartCardController_pTS__InterfaceDevice_pTS.mwmr_fifo = &SmartCardController_pTS__InterfaceDevice_pTS;
-  __SmartCardController_pTS__InterfaceDevice_pTS.ok = 1;
-  __SmartCardController_pTS__InterfaceDevice_pTS.ok2 = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status =&SmartCardController_pTS__InterfaceDevice_pTS_status;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->lock=0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->rptr=0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->usage=0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->wptr =0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.rptr = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.wptr = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.usage = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.lock = 0;
-  
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.width = 4;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.depth = 100;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.gdepth = SmartCardController_dataReady__InterfaceDevice_data_Ready.depth;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.buffer = SmartCardController_dataReady__InterfaceDevice_data_Ready_data;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status = &SmartCardController_dataReady__InterfaceDevice_data_Ready_status;
-  
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.inname ="dataReady";
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.outname ="data_Ready";
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.mwmr_fifo = &SmartCardController_dataReady__InterfaceDevice_data_Ready;
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.ok = 1;
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.ok2 = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status =&SmartCardController_dataReady__InterfaceDevice_data_Ready_status;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->lock=0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->rptr=0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->usage=0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->wptr =0;
-  SmartCardController_activation__InterfaceDevice_activation_status.rptr = 0;
-  SmartCardController_activation__InterfaceDevice_activation_status.wptr = 0;
-  SmartCardController_activation__InterfaceDevice_activation_status.usage = 0;
-  SmartCardController_activation__InterfaceDevice_activation_status.lock = 0;
-  
-  SmartCardController_activation__InterfaceDevice_activation.width = 4;
-  SmartCardController_activation__InterfaceDevice_activation.depth = 100;
-  SmartCardController_activation__InterfaceDevice_activation.gdepth = SmartCardController_activation__InterfaceDevice_activation.depth;
-  SmartCardController_activation__InterfaceDevice_activation.buffer = SmartCardController_activation__InterfaceDevice_activation_data;
-  SmartCardController_activation__InterfaceDevice_activation.status = &SmartCardController_activation__InterfaceDevice_activation_status;
-  
-  __SmartCardController_activation__InterfaceDevice_activation.inname ="activation";
-  __SmartCardController_activation__InterfaceDevice_activation.outname ="activation";
-  __SmartCardController_activation__InterfaceDevice_activation.mwmr_fifo = &SmartCardController_activation__InterfaceDevice_activation;
-  __SmartCardController_activation__InterfaceDevice_activation.ok = 1;
-  __SmartCardController_activation__InterfaceDevice_activation.ok2 = 0;
-  SmartCardController_activation__InterfaceDevice_activation.status =&SmartCardController_activation__InterfaceDevice_activation_status;
-  SmartCardController_activation__InterfaceDevice_activation.status->lock=0;
-  SmartCardController_activation__InterfaceDevice_activation.status->rptr=0;
-  SmartCardController_activation__InterfaceDevice_activation.status->usage=0;
-  SmartCardController_activation__InterfaceDevice_activation.status->wptr =0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.rptr = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.wptr = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.usage = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.lock = 0;
-  
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.width = 4;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.depth = 100;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.gdepth = SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.depth;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.buffer = SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_data;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status = &SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status;
-  
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.inname ="fromDtoSC";
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.outname ="fromDtoSC";
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.mwmr_fifo = &SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.ok = 1;
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.ok2 = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status =&SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->lock=0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->rptr=0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->usage=0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->wptr =0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.rptr = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.wptr = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.usage = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.lock = 0;
-  
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.width = 4;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.depth = 100;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.gdepth = SmartCardController_answerToReset__InterfaceDevice_answerToReset.depth;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.buffer = SmartCardController_answerToReset__InterfaceDevice_answerToReset_data;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status = &SmartCardController_answerToReset__InterfaceDevice_answerToReset_status;
-  
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.inname ="answerToReset";
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.outname ="answerToReset";
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.mwmr_fifo = &SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.ok = 1;
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.ok2 = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status =&SmartCardController_answerToReset__InterfaceDevice_answerToReset_status;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->lock=0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->rptr=0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->usage=0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->wptr =0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.rptr = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.wptr = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.usage = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.lock = 0;
-  
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.width = 4;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.depth = 100;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.gdepth = SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.depth;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.buffer = SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_data;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status = &SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status;
-  
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.inname ="pTSConfirm";
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.outname ="pTSCConfirm";
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.mwmr_fifo = &SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.ok = 1;
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.ok2 = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status =&SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->lock=0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->rptr=0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->usage=0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->wptr =0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.rptr = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.wptr = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.usage = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.lock = 0;
-  
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.width = 4;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.depth = 100;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.gdepth = SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.depth;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.buffer = SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_data;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status = &SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status;
-  
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.inname ="fromSCtoD";
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.outname ="fromSCtoD";
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.mwmr_fifo = &SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.ok = 1;
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.ok2 = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status =&SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->lock=0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->rptr=0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->usage=0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->wptr =0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.rptr = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.wptr = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.usage = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.lock = 0;
-  
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.width = 4;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.depth = 100;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.gdepth = SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.depth;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.buffer = SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_data;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status = &SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status;
-  
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.inname ="dataReady";
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.outname ="data_Ready_SC";
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.mwmr_fifo = &SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.ok = 1;
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.ok2 = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status =&SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->lock=0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->rptr=0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->usage=0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->wptr =0;
-  SmartCardController_start_Application__Application_startApplication_status.rptr = 0;
-  SmartCardController_start_Application__Application_startApplication_status.wptr = 0;
-  SmartCardController_start_Application__Application_startApplication_status.usage = 0;
-  SmartCardController_start_Application__Application_startApplication_status.lock = 0;
-  
-  SmartCardController_start_Application__Application_startApplication.width = 4;
-  SmartCardController_start_Application__Application_startApplication.depth = 100;
-  SmartCardController_start_Application__Application_startApplication.gdepth = SmartCardController_start_Application__Application_startApplication.depth;
-  SmartCardController_start_Application__Application_startApplication.buffer = SmartCardController_start_Application__Application_startApplication_data;
-  SmartCardController_start_Application__Application_startApplication.status = &SmartCardController_start_Application__Application_startApplication_status;
-  
-  __SmartCardController_start_Application__Application_startApplication.inname ="startApplication";
-  __SmartCardController_start_Application__Application_startApplication.outname ="start_Application";
-  __SmartCardController_start_Application__Application_startApplication.mwmr_fifo = &SmartCardController_start_Application__Application_startApplication;
-  __SmartCardController_start_Application__Application_startApplication.ok = 1;
-  __SmartCardController_start_Application__Application_startApplication.ok2 = 0;
-  SmartCardController_start_Application__Application_startApplication.status =&SmartCardController_start_Application__Application_startApplication_status;
-  SmartCardController_start_Application__Application_startApplication.status->lock=0;
-  SmartCardController_start_Application__Application_startApplication.status->rptr=0;
-  SmartCardController_start_Application__Application_startApplication.status->usage=0;
-  SmartCardController_start_Application__Application_startApplication.status->wptr =0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.rptr = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.wptr = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.usage = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.lock = 0;
-  
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.width = 4;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.depth = 100;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.gdepth = TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.depth;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.buffer = TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_data;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status = &TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status;
-  
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.inname ="set";
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.outname ="set__timerP";
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.mwmr_fifo = &TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.ok = 1;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.ok2 = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status =&TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->lock=0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->rptr=0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->usage=0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->wptr =0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.rptr = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.wptr = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.usage = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.lock = 0;
-  
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.width = 4;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.depth = 100;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.gdepth = TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.depth;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.buffer = TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_data;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status = &TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status;
-  
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.inname ="reset";
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.outname ="reset__timerP";
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.mwmr_fifo = &TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.ok = 1;
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.ok2 = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status =&TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->lock=0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->rptr=0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->usage=0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->wptr =0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.rptr = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.wptr = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.usage = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.lock = 0;
-  
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.width = 4;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.depth = 100;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.gdepth = TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.depth;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.buffer = TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_data;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status = &TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status;
-  
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.inname ="expire__timerP";
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.outname ="expire";
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.mwmr_fifo = &TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.ok = 1;
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.ok2 = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status =&TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->lock=0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->rptr=0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->usage=0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->wptr =0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.rptr = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.wptr = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.usage = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.lock = 0;
-  
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.width = 4;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.depth = 100;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.gdepth = TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.depth;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.buffer = TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_data;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status = &TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status;
-  
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.inname ="set";
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.outname ="set__mainTimer";
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.mwmr_fifo = &TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.ok = 1;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.ok2 = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status =&TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->lock=0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->rptr=0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->usage=0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->wptr =0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.rptr = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.wptr = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.usage = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.lock = 0;
-  
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.width = 4;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.depth = 100;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.gdepth = TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.depth;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.buffer = TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_data;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status = &TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status;
-  
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.inname ="reset";
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.outname ="reset__mainTimer";
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.mwmr_fifo = &TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.ok = 1;
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.ok2 = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status =&TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->lock=0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->rptr=0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->usage=0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->wptr =0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.rptr = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.wptr = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.usage = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.lock = 0;
-  
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.width = 4;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.depth = 100;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.gdepth = TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.depth;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.buffer = TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_data;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status = &TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status;
-  
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.inname ="expire__mainTimer";
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.outname ="expire";
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.mwmr_fifo = &TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.ok = 1;
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.ok2 = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status =&TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->lock=0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->rptr=0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->usage=0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->wptr =0;
-  /* Asynchronous channels */
-  TCPIP_receiveTCP__Application_receiveTCP_status.rptr = 0;
-  TCPIP_receiveTCP__Application_receiveTCP_status.wptr = 0;
-  TCPIP_receiveTCP__Application_receiveTCP_status.usage = 0;
-  TCPIP_receiveTCP__Application_receiveTCP_status.lock = 0;
-  
-  TCPIP_receiveTCP__Application_receiveTCP.width = 4;
-  TCPIP_receiveTCP__Application_receiveTCP.depth = 5;
-  TCPIP_receiveTCP__Application_receiveTCP.gdepth = TCPIP_receiveTCP__Application_receiveTCP.depth;
-  TCPIP_receiveTCP__Application_receiveTCP.buffer = TCPIP_receiveTCP__Application_receiveTCP_data;
-  TCPIP_receiveTCP__Application_receiveTCP.status = &TCPIP_receiveTCP__Application_receiveTCP_status;
-  __TCPIP_receiveTCP__Application_receiveTCP.inname ="receiveTCP";
-  __TCPIP_receiveTCP__Application_receiveTCP.outname ="receiveTCP";
-  __TCPIP_receiveTCP__Application_receiveTCP.isBlocking = 0;
-  __TCPIP_receiveTCP__Application_receiveTCP.maxNbOfMessages = 5;
-  __TCPIP_receiveTCP__Application_receiveTCP.mwmr_fifo = &TCPIP_receiveTCP__Application_receiveTCP;
-  TCPIP_receiveTCP__Application_receiveTCP.status =&TCPIP_receiveTCP__Application_receiveTCP_status;
-  TCPIP_receiveTCP__Application_receiveTCP.status->lock=0;
-  TCPIP_receiveTCP__Application_receiveTCP.status->rptr=0;
-  TCPIP_receiveTCP__Application_receiveTCP.status->usage=0;
-  TCPIP_receiveTCP__Application_receiveTCP.status->wptr=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.rptr = 0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.wptr = 0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.usage = 0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.lock = 0;
-  
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.width = 32;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.depth = 5;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.gdepth = TCPPacketManager_storePacket__TCPPacketManager_retrieve.depth;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.buffer = TCPPacketManager_storePacket__TCPPacketManager_retrieve_data;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status = &TCPPacketManager_storePacket__TCPPacketManager_retrieve_status;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.inname ="retrieve";
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.outname ="storePacket";
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.isBlocking = 0;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.maxNbOfMessages = 5;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.mwmr_fifo = &TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status =&TCPPacketManager_storePacket__TCPPacketManager_retrieve_status;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->lock=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->rptr=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->usage=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->wptr=0;
-  
-  /* Threads of tasks */
-  pthread_t thread__InterfaceDevice;
-  pthread_t thread__SmartCard;
-  pthread_t thread__SmartCardController;
-  pthread_t thread__Application;
-  pthread_t thread__TCPPacketManager;
-  pthread_t thread__TCPIP;
-  /* Activating tracing  */
-  /* Activating debug messages */
-  activeDebug();
-  /* Activating randomness */
-  initRandom();
-  /* Initializing the main mutex */
-if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
-  
-  /* User initialization */
-  __user_init();
-  
-  
-  debugMsg("Starting tasks");
-  struct mwmr_s *channels_array_InterfaceDevice[9];
-  channels_array_InterfaceDevice[0]=&SmartCardController_reset__InterfaceDevice_reset;
-  channels_array_InterfaceDevice[1]=&SmartCardController_pTS__InterfaceDevice_pTS;
-  channels_array_InterfaceDevice[2]=&SmartCardController_dataReady__InterfaceDevice_data_Ready;
-  channels_array_InterfaceDevice[3]=&SmartCardController_activation__InterfaceDevice_activation;
-  channels_array_InterfaceDevice[4]=&SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-  channels_array_InterfaceDevice[5]=&SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-  channels_array_InterfaceDevice[6]=&SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-  channels_array_InterfaceDevice[7]=&SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-  channels_array_InterfaceDevice[8]=&SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__InterfaceDevice= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 1);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__InterfaceDevice, attr_t, mainFunc__InterfaceDevice, (void *)channels_array_InterfaceDevice);
-  
-  struct mwmr_s *channels_array_SmartCard;
-  ptr =malloc(sizeof(pthread_t));
-  thread__SmartCard= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__SmartCard, attr_t, mainFunc__SmartCard, (void *)channels_array_SmartCard);
-  
-  struct mwmr_s *channels_array_SmartCardController[13];
-  channels_array_SmartCardController[0]=&SmartCardController_fromTtoP__TCPIP_fromTtoP;
-  channels_array_SmartCardController[1]=&SmartCardController_fromPtoT__TCPIP_fromPtoT;
-  channels_array_SmartCardController[2]=&SmartCardController_start_TCPIP__TCPIP_start;
-  channels_array_SmartCardController[3]=&SmartCardController_reset__InterfaceDevice_reset;
-  channels_array_SmartCardController[4]=&SmartCardController_pTS__InterfaceDevice_pTS;
-  channels_array_SmartCardController[5]=&SmartCardController_dataReady__InterfaceDevice_data_Ready;
-  channels_array_SmartCardController[6]=&SmartCardController_activation__InterfaceDevice_activation;
-  channels_array_SmartCardController[7]=&SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-  channels_array_SmartCardController[8]=&SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-  channels_array_SmartCardController[9]=&SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-  channels_array_SmartCardController[10]=&SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-  channels_array_SmartCardController[11]=&SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-  channels_array_SmartCardController[12]=&SmartCardController_start_Application__Application_startApplication;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__SmartCardController= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__SmartCardController, attr_t, mainFunc__SmartCardController, (void *)channels_array_SmartCardController);
-  
-  struct mwmr_s *channels_array_Application[6];
-  channels_array_Application[0]=&TCPIP_receiveTCP__Application_receiveTCP;
-  channels_array_Application[1]=&Application_open__TCPIP_open;
-  channels_array_Application[2]=&Application_close__TCPIP_close;
-  channels_array_Application[3]=&Application_abort__TCPIP_abort;
-  channels_array_Application[4]=&Application_sendTCP__TCPIP_send_TCP;
-  channels_array_Application[5]=&SmartCardController_start_Application__Application_startApplication;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Application= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__Application, attr_t, mainFunc__Application, (void *)channels_array_Application);
-  
-  struct mwmr_s *channels_array_TCPPacketManager[8];
-  channels_array_TCPPacketManager[0]=&TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-  channels_array_TCPPacketManager[1]=&TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-  channels_array_TCPPacketManager[2]=&TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-  channels_array_TCPPacketManager[3]=&TCPIP_addPacket__TCPPacketManager_addPacket;
-  channels_array_TCPPacketManager[4]=&TCPIP_ackPacket__TCPPacketManager_ackPacket;
-  channels_array_TCPPacketManager[5]=&TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-  channels_array_TCPPacketManager[6]=&TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-  channels_array_TCPPacketManager[7]=&TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__TCPPacketManager= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__TCPPacketManager, attr_t, mainFunc__TCPPacketManager, (void *)channels_array_TCPPacketManager);
-  
-  struct mwmr_s *channels_array_TCPIP[15];
-  channels_array_TCPIP[0]=&TCPIP_receiveTCP__Application_receiveTCP;
-  channels_array_TCPIP[1]=&TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-  channels_array_TCPIP[2]=&TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-  channels_array_TCPIP[3]=&TCPIP_addPacket__TCPPacketManager_addPacket;
-  channels_array_TCPIP[4]=&TCPIP_ackPacket__TCPPacketManager_ackPacket;
-  channels_array_TCPIP[5]=&Application_open__TCPIP_open;
-  channels_array_TCPIP[6]=&Application_close__TCPIP_close;
-  channels_array_TCPIP[7]=&Application_abort__TCPIP_abort;
-  channels_array_TCPIP[8]=&Application_sendTCP__TCPIP_send_TCP;
-  channels_array_TCPIP[9]=&SmartCardController_fromTtoP__TCPIP_fromTtoP;
-  channels_array_TCPIP[10]=&SmartCardController_fromPtoT__TCPIP_fromPtoT;
-  channels_array_TCPIP[11]=&SmartCardController_start_TCPIP__TCPIP_start;
-  channels_array_TCPIP[12]=&TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-  channels_array_TCPIP[13]=&TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-  channels_array_TCPIP[14]=&TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__TCPIP= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__TCPIP, attr_t, mainFunc__TCPIP, (void *)channels_array_TCPIP);
-  
-  
-  
-  debugMsg("Joining tasks");
-  pthread_join(thread__InterfaceDevice, NULL);
-  pthread_join(thread__SmartCard, NULL);
-  pthread_join(thread__SmartCardController, NULL);
-  pthread_join(thread__Application, NULL);
-  pthread_join(thread__TCPPacketManager, NULL);
-  pthread_join(thread__TCPIP, NULL);
-  
-  
-  debugMsg("Application terminated");
-  return 0;
-  
-}
diff --git a/MPSoC/mutekh/examples/avatar/Application.c b/MPSoC/mutekh/examples/avatar/Application.c
deleted file mode 100644
index 9f2252e34ec7628f19f2c69e2aef9dccf4ea1bc6..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Application.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "Application.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _open;
-static uint32_t _sendTCP;
-static uint32_t _close;
-static uint32_t _abort;
-static uint32_t _startApplication;
-static uint32_t _receiveTCP;
-
-#define STATE__START__STATE 0
-#define STATE__ReadingPackets 1
-#define STATE__ClosingOrAborting 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Application(struct mwmr_s *channels_Application[]){
-  
-  struct mwmr_s *TCPIP_receiveTCP__Application_receiveTCP= channels_Application[0];
-  struct mwmr_s *SmartCardController_start_Application__Application_startApplication= channels_Application[1];
-  struct mwmr_s *Application_abort__TCPIP_abort= channels_Application[2];
-  struct mwmr_s *Application_close__TCPIP_close= channels_Application[3];
-  struct mwmr_s *Application_sendTCP__TCPIP_send_TCP= channels_Application[4];
-  struct mwmr_s *Application_open__TCPIP_open= channels_Application[5];
-  int val = 7;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Application";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) test SmartCardController_start_Application__Application_startApplication");
-      makeNewRequest(&__req0, 505, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_Application__Application_startApplication;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Application_open__TCPIP_open");
-      makeNewRequest(&__req0, 509, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Application_open__TCPIP_open;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __params0[0] = &val;
-      debug2Msg(__myname, "-> (=====) test Application_sendTCP__TCPIP_send_TCP");
-      makeNewRequest(&__req0, 508, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__Application_sendTCP__TCPIP_send_TCP;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      waitFor((5)*1000, (5)*1000);
-      debug2Msg(__myname, "-> (=====) Entering state + ClosingOrAborting");
-      __currentState = STATE__ClosingOrAborting;
-      break;
-      
-      case STATE__ReadingPackets: 
-      __params0[0] = &val;
-      makeNewRequest(&__req0, 502, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.asyncChannel = &__TCPIP_receiveTCP__Application_receiveTCP;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + ReadingPackets");
-      __currentState = STATE__ReadingPackets;
-      break;
-      
-      case STATE__ClosingOrAborting: 
-      debug2Msg(__myname, "-> (=====) test Application_close__TCPIP_close");
-      makeNewRequest(&__req0, 507, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Application_close__TCPIP_close;
-      addRequestToList(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====) test Application_abort__TCPIP_abort");
-      makeNewRequest(&__req1, 506, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__Application_abort__TCPIP_abort;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + ReadingPackets");
-        __currentState = STATE__ReadingPackets;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + ReadingPackets");
-        __currentState = STATE__ReadingPackets;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Application.h b/MPSoC/mutekh/examples/avatar/Application.h
deleted file mode 100644
index 71b02278f1a72032c1d5b4182fe300325107ab41..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Application.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Application_H
-#define Application_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Application(struct mwmr_s *channels_Application[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/B.c b/MPSoC/mutekh/examples/avatar/B.c
deleted file mode 100644
index a0e6f5c1fc5c32e77b3dfc7bdce20e439352c8a2..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "B.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _sendReq;
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__B(struct mwmr_s *channels_B[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "B";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/B.h b/MPSoC/mutekh/examples/avatar/B.h
deleted file mode 100644
index c4170d24dc27f43ef56cd7d5b734b6116b182430..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef B_H
-#define B_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__B(struct mwmr_s *channels_B[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/B0.c b/MPSoC/mutekh/examples/avatar/B0.c
deleted file mode 100644
index be644570422db0e72ea79628b08c80bfdb255df0..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B0.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "B0.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__state0 1
-#define STATE__state1 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__B0(struct mwmr_s *channels_B0[]){
-  
-  struct mwmr_s *B_sendReq__B2_receiveReq= channels_B0[0];
-  int val0 = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "B0";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + state0");
-      __currentState = STATE__state0;
-      break;
-      
-      case STATE__state0: 
-      __params0[0] = &val0;
-      makeNewRequest(&__req0, 310, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__B_sendReq__B2_receiveReq;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + state1");
-      __currentState = STATE__state1;
-      break;
-      
-      case STATE__state1: 
-      debug2Msg(__myname, "-> (=====) Entering state + state0");
-      __currentState = STATE__state0;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/B0.h b/MPSoC/mutekh/examples/avatar/B0.h
deleted file mode 100644
index 60c4a8583d83a40db12d80561cc50829f3667906..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B0.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef B0_H
-#define B0_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__B0(struct mwmr_s *channels_B0[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/B1.c b/MPSoC/mutekh/examples/avatar/B1.c
deleted file mode 100644
index 661f6ad65fe43fd4b1db7821ecc9ca7352e150c5..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B1.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "B1.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__state1 1
-#define STATE__state0 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__B1(struct mwmr_s *channels_B1[]){
-  
-  struct mwmr_s *B_sendReq__B2_receiveReq= channels_B1[0];
-  int val1 = 1;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "B1";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + state0");
-      __currentState = STATE__state0;
-      break;
-      
-      case STATE__state1: 
-      debug2Msg(__myname, "-> (=====) Entering state + state0");
-      __currentState = STATE__state0;
-      break;
-      
-      case STATE__state0: 
-      __params0[0] = &val1;
-      makeNewRequest(&__req0, 320, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__B_sendReq__B2_receiveReq;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + state1");
-      __currentState = STATE__state1;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/B1.h b/MPSoC/mutekh/examples/avatar/B1.h
deleted file mode 100644
index 933cc8e69d8d9faec4d026a802b910b7b6838e9a..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef B1_H
-#define B1_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__B1(struct mwmr_s *channels_B1[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/B2.c b/MPSoC/mutekh/examples/avatar/B2.c
deleted file mode 100644
index 7f99853c14a7de1e9715133285c9d950352e22be..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B2.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "B2.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _receiveReq;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingForReqs 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__B2(struct mwmr_s *channels_B2[]){
-  
-  struct mwmr_s *B_sendReq__B2_receiveReq= channels_B2[0];
-  int val = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "B2";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      waitFor((10)*1000, (10)*1000);
-      debug2Msg(__myname, "-> (=====) Entering state + WaitingForReqs");
-      __currentState = STATE__WaitingForReqs;
-      break;
-      
-      case STATE__WaitingForReqs: 
-      __params0[0] = &val;
-      makeNewRequest(&__req0, 300, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__B_sendReq__B2_receiveReq;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + WaitingForReqs");
-      __currentState = STATE__WaitingForReqs;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/B2.h b/MPSoC/mutekh/examples/avatar/B2.h
deleted file mode 100644
index 4790ace98d258922eee01d5785d94c38bbdb8e25..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/B2.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef B2_H
-#define B2_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__B2(struct mwmr_s *channels_B2[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/BCU.c b/MPSoC/mutekh/examples/avatar/BCU.c
deleted file mode 100644
index 4e050abb639a49810302ec8219fbb25cbd5d6997..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/BCU.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "BCU.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__BCU(struct mwmr_s *channels_BCU[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "BCU";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/BCU.h b/MPSoC/mutekh/examples/avatar/BCU.h
deleted file mode 100644
index a5e8c1879ba42159f557decbee25c050da396496..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/BCU.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef BCU_H
-#define BCU_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__BCU(struct mwmr_s *channels_BCU[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Bell.c b/MPSoC/mutekh/examples/avatar/Bell.c
deleted file mode 100644
index 6853a5a0bb6dc8c3c52bb8f95ad7f5046abe2d22..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Bell.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "Bell.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _ring;
-
-#define STATE__START__STATE 0
-#define STATE__Active 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__Bell(struct mwmr_s *channels_Bell[]){
-  
-  struct mwmr_s *Controller_ringBell__Bell_ring= channels_Bell[0];
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Bell";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + Active");
-      __currentState = STATE__Active;
-      break;
-      
-      case STATE__Active: 
-      debug2Msg(__myname, "-> (=====) test Controller_ringBell__Bell_ring");
-      makeNewRequest(&__req0, 133, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Controller_ringBell__Bell_ring;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + Active");
-      __currentState = STATE__Active;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Bell.h b/MPSoC/mutekh/examples/avatar/Bell.h
deleted file mode 100644
index 8a0277fc0a721281cd6b071123e104f2b4566cd1..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Bell.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Bell_H
-#define Bell_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Bell(struct mwmr_s *channels_Bell[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Block0.c b/MPSoC/mutekh/examples/avatar/Block0.c
deleted file mode 100644
index 6ed5e4631c356f3542a1fc581cf94eac1c7a7b78..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Block0.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "Block0.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _val;
-
-#define STATE__START__STATE 0
-#define STATE__state0 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__Block0(struct mwmr_s *channels_Block0[]){
-  
-  struct mwmr_s *Block0_val__Block1_val= channels_Block0[0];
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Block0";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__state0;
-      break;
-      
-      case STATE__state0: 
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 18, SEND_ASYNC_REQUEST, 0, 0, 0, 0, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Block0_val__Block1_val;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Block0.h b/MPSoC/mutekh/examples/avatar/Block0.h
deleted file mode 100644
index 99780fe51a7bc954c58f639de17cc64b0414e6b5..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Block0.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Block0_H
-#define Block0_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Block0(struct mwmr_s *channels_Block0[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Block1.c b/MPSoC/mutekh/examples/avatar/Block1.c
deleted file mode 100644
index 20deb8afb497f0d0339b277dc5639993be8ad074..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Block1.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "Block1.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _val;
-
-#define STATE__START__STATE 0
-#define STATE__state0 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__Block1(struct mwmr_s *channels_Block1[]){
-  
-  struct mwmr_s *Block0_val__Block1_val= channels_Block1[0];
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Block1";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__state0;
-      break;
-      
-      case STATE__state0: 
-      makeNewRequest(&__req0, 11, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.asyncChannel = &__Block0_val__Block1_val;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Block1.c-1-6 b/MPSoC/mutekh/examples/avatar/Block1.c-1-6
deleted file mode 100644
index ba19e40bc08920ea545bed860d739306abb4e52e..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Block1.c-1-6
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "Block1.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _val;
-static uint32_t _retour;
-
-#define STATE__START__STATE 0
-#define STATE__state0 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__Block1(struct mwmr_s *channels_Block1[]){
-  
-  struct mwmr_s *Block0_retour__Block1_retour= channels_Block1[0];
-  struct mwmr_s *Block0_val__Block1_val= channels_Block1[1];
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Block1";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + state0");
-      __currentState = STATE__state0;
-      break;
-      
-      case STATE__state0: 
-      debug2Msg(__myname, "-> (=====) test Block0_val__Block1_val");
-      makeNewRequest(&__req0, 14, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Block0_val__Block1_val;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-     debug2Msg(__myname, "-> (####)");
-     debugInt(__myname, &__returnRequest);
-     debug2Msg(__myname, "-> (####)");
-     debug2Msg(__myname, __returnRequest->syncChannel->inname);
-     debug2Msg(__myname, __returnRequest->syncChannel->outname);
-    
-      debugInt(__myname, &__Block0_val__Block1_val);
-
-      debugInt(__myname, &(__Block0_val__Block1_val.mwmr_fifo));
-      debugInt(__myname, &(Block0_val__Block1_val));
-
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Block0_retour__Block1_retour");
-      makeNewRequest(&__req0, 13, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Block0_retour__Block1_retour;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (#####)after executeOneRequest");
-      debugInt(__myname, &__Block0_retour__Block1_retour);
-debug2Msg(__myname, "-> (####)");
-      debugInt(__myname, &(__Block0_retour__Block1_retour.mwmr_fifo));
-debug2Msg(__myname, "-> (####)");
-      debugInt(__myname, &(Block0_retour__Block1_retour));
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + state0");
-      __currentState = STATE__state0;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Block1.h b/MPSoC/mutekh/examples/avatar/Block1.h
deleted file mode 100644
index 78d4ddb4f4c20ab10d50759b66c28a89d527fe7a..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Block1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Block1_H
-#define Block1_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Block1(struct mwmr_s *channels_Block1[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Bootstrap.c b/MPSoC/mutekh/examples/avatar/Bootstrap.c
deleted file mode 100644
index 6758cbb2951ca02f8563c8e2c56c0fa0b23ba942..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Bootstrap.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "Bootstrap.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _address;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__bootstrap 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Bootstrap(struct mwmr_s *channels_Bootstrap[]){
-  
-  struct mwmr_s *Bootstrap_address__InputEngine_bootstrap= channels_Bootstrap[0];
-  int address = 0;
-  int counter = 16;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Bootstrap";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__bootstrap;
-      break;
-      
-      case STATE__choice__0: 
-      if (counter>0) {
-        makeNewRequest(&__req0, 725, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (counter == 0) {
-        makeNewRequest(&__req1, 729, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__bootstrap;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__STOP__STATE;
-        
-      }
-      break;
-      
-      case STATE__bootstrap: 
-      __params0[0] = &address;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 720, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Bootstrap_address__InputEngine_bootstrap;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      counter = counter-1;
-      __currentState = STATE__choice__0;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Bootstrap.h b/MPSoC/mutekh/examples/avatar/Bootstrap.h
deleted file mode 100644
index 13826f9dfc55b7696f7e4045f315c8a78be85d89..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Bootstrap.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Bootstrap_H
-#define Bootstrap_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Bootstrap(struct mwmr_s *channels_Bootstrap[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/BrakeManagement.c b/MPSoC/mutekh/examples/avatar/BrakeManagement.c
deleted file mode 100644
index 3f10179d93f7f5371294eba4f79c2074572efd7d..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/BrakeManagement.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "BrakeManagement.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _brake;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingforBrakingToBeCompleted 1
-#define STATE__WaitForBrakingOrder 2
-#define STATE__STOP__STATE 3
-
-void BrakeManagement__applyBraking(int value) {
-  char my__attr[CHAR_ALLOC_SIZE];
-  sprintf(my__attr, "%d",value);
-  traceFunctionCall("BrakeManagement", "applyBraking", my__attr);
-}
-
-
-void BrakeManagement__brakingDone() {
-  traceFunctionCall("BrakeManagement", "brakingDone", "-");
-}
-
-
-void *mainFunc__BrakeManagement(struct mwmr_s *channels_BrakeManagement[]){
-  
-  struct mwmr_s *DangerAvoidanceStrategy_brakePower__BrakeManagement_brake= channels_BrakeManagement[0];
-  int value = 0;
-  int deltaBrake = 0;
-  int brakeMaxDuration = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "BrakeManagement";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitForBrakingOrder;
-      break;
-      
-      case STATE__WaitingforBrakingToBeCompleted: 
-      waitFor((value)*1000, (brakeMaxDuration)*1000);
-      BrakeManagement__brakingDone ();
-      __currentState = STATE__WaitForBrakingOrder;
-      break;
-      
-      case STATE__WaitForBrakingOrder: 
-      __params0[0] = &value;
-      makeNewRequest(&__req0, 635, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      BrakeManagement__applyBraking (value);
-      value = value * 10;
-      traceVariableModification("BrakeManagement", "value", value,0);
-      brakeMaxDuration = value+deltaBrake;
-      traceVariableModification("BrakeManagement", "brakeMaxDuration", brakeMaxDuration,0);
-      __currentState = STATE__WaitingforBrakingToBeCompleted;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/BrakeManagement.h b/MPSoC/mutekh/examples/avatar/BrakeManagement.h
deleted file mode 100644
index 17fde76bf60e898a46a492034683c9f42bd9821b..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/BrakeManagement.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef BrakeManagement_H
-#define BrakeManagement_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__BrakeManagement(struct mwmr_s *channels_BrakeManagement[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/CSCU.c b/MPSoC/mutekh/examples/avatar/CSCU.c
deleted file mode 100644
index 6a8fea7944110f77208ef5b45f61e095a69107e3..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/CSCU.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "CSCU.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__CSCU(struct mwmr_s *channels_CSCU[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "CSCU";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/CSCU.h b/MPSoC/mutekh/examples/avatar/CSCU.h
deleted file mode 100644
index 7a8b6a25e79c759f282d7f649a5424d5ffe65445..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/CSCU.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CSCU_H
-#define CSCU_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__CSCU(struct mwmr_s *channels_CSCU[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/CarPositionSimulator.c b/MPSoC/mutekh/examples/avatar/CarPositionSimulator.c
deleted file mode 100644
index 31ccabdd4351c5b025f4097f80d010a79dbe4d2a..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/CarPositionSimulator.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "CarPositionSimulator.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _carPosition;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingforNewCarPosition 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__CarPositionSimulator(struct mwmr_s *channels_CarPositionSimulator[]){
-  
-  struct mwmr_s *CarPositionSimulator_carPosition__DSRSC_Management_carPosition= channels_CarPositionSimulator[0];
-  int carid__minID = 1;
-  int carid__maxID = 5;
-  int carid__minPosition = 3;
-  int carid__maxPosition = 10;
-  int carid__minSpeed = 1;
-  int carid__maxSpeed = 10;
-  int carid__myID = 11;
-  int minCarPositionInterval = 200;
-  int maxCarPositionInterval = 250;
-  int id = 0;
-  int position = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "CarPositionSimulator";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingforNewCarPosition;
-      break;
-      
-      case STATE__WaitingforNewCarPosition: 
-      waitFor((minCarPositionInterval)*1000, (maxCarPositionInterval)*1000);
-      id = computeRandom(carid__minID, carid__maxID);
-      position = computeRandom(carid__minPosition, carid__maxPosition);
-      __params0[0] = &id;
-      __params0[1] = &position;
-      makeNewRequest(&__req0, 295, SEND_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.syncChannel = &__CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingforNewCarPosition;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/CarPositionSimulator.h b/MPSoC/mutekh/examples/avatar/CarPositionSimulator.h
deleted file mode 100644
index 9f0b29f526dc21faf8a84044aa76def729b19a61..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/CarPositionSimulator.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CarPositionSimulator_H
-#define CarPositionSimulator_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__CarPositionSimulator(struct mwmr_s *channels_CarPositionSimulator[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Classif0.c b/MPSoC/mutekh/examples/avatar/Classif0.c
deleted file mode 100644
index 5d7f3446347bae67cd43beb0af200ea1843b0d56..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classif0.c
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "Classif0.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _to_queue_low;
-static uint32_t _to_queue_medium;
-static uint32_t _to_queue_high;
-static uint32_t _from_classif;
-
-#define STATE__START__STATE 0
-#define STATE__Waiting 1
-#define STATE__Classify 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Classif0(struct mwmr_s *channels_Classif0[]){
-  
-  struct mwmr_s *Classif0_from_classif__Classification_to_c0= channels_Classif0[0];
-  struct mwmr_s *Classif0_to_queue_high__Classification_c0_to_queue_high= channels_Classif0[1];
-  struct mwmr_s *Classif0_to_queue_medium__Classification_c0_to_queue_medium= channels_Classif0[2];
-  struct mwmr_s *Classif0_to_queue_low__Classification_c0_to_queue_low= channels_Classif0[3];
-  int packet__address = 0;
-  int packet__date = 0;
-  int nbPackets = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Classif0";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 914, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Classif0_from_classif__Classification_to_c0;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Classify;
-      break;
-      
-      case STATE__Classify: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 915, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Classif0_to_queue_high__Classification_c0_to_queue_high;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 917, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Classif0_to_queue_low__Classification_c0_to_queue_low;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &packet__address;
-      __params2[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req2);
-      makeNewRequest(&__req2, 916, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params2);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req2.asyncChannel = &__Classif0_to_queue_medium__Classification_c0_to_queue_medium;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Classif0.h b/MPSoC/mutekh/examples/avatar/Classif0.h
deleted file mode 100644
index 2b84619f0d1a8dc8b2872fc3c904d2faeab57209..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classif0.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Classif0_H
-#define Classif0_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Classif0(struct mwmr_s *channels_Classif0[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Classif1.c b/MPSoC/mutekh/examples/avatar/Classif1.c
deleted file mode 100644
index ecf77fc0dc4151af61f1c3eda1885c8103c887b6..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classif1.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "Classif1.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _to_queue_low;
-static uint32_t _to_queue_medium;
-static uint32_t _to_queue_high;
-static uint32_t _from_classif;
-
-#define STATE__START__STATE 0
-#define STATE__Waiting 1
-#define STATE__Classify 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Classif1(struct mwmr_s *channels_Classif1[]){
-  
-  struct mwmr_s *Classif1_from_classif__Classification_to_c1= channels_Classif1[0];
-  struct mwmr_s *Classif1_to_queue_high__Classification_c1_to_queue_high= channels_Classif1[1];
-  struct mwmr_s *Classif1_to_queue_medium__Classification_c1_to_queue_medium= channels_Classif1[2];
-  struct mwmr_s *Classif1_to_queue_low__Classification_c1_to_queue_low= channels_Classif1[3];
-  int packet__address = 0;
-  int packet__date = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Classif1";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 930, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Classif1_from_classif__Classification_to_c1;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Classify;
-      break;
-      
-      case STATE__Classify: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 932, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Classif1_to_queue_medium__Classification_c1_to_queue_medium;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 933, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Classif1_to_queue_low__Classification_c1_to_queue_low;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &packet__address;
-      __params2[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req2);
-      makeNewRequest(&__req2, 931, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params2);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req2.asyncChannel = &__Classif1_to_queue_high__Classification_c1_to_queue_high;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Classif1.h b/MPSoC/mutekh/examples/avatar/Classif1.h
deleted file mode 100644
index 287ca52ba756ce4a2103d4937e88b50104afd6c4..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classif1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Classif1_H
-#define Classif1_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Classif1(struct mwmr_s *channels_Classif1[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Classif2.c b/MPSoC/mutekh/examples/avatar/Classif2.c
deleted file mode 100644
index d6e2a29a7c7bf27acc06c6ede100c9ede44ec6f4..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classif2.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "Classif2.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _to_queue_low;
-static uint32_t _to_queue_medium;
-static uint32_t _to_queue_high;
-static uint32_t _from_classif;
-
-#define STATE__START__STATE 0
-#define STATE__Waiting 1
-#define STATE__Classify 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Classif2(struct mwmr_s *channels_Classif2[]){
-  
-  struct mwmr_s *Classif2_from_classif__Classification_to_c2= channels_Classif2[0];
-  struct mwmr_s *Classif2_to_queue_high__Classification_c2_to_queue_high= channels_Classif2[1];
-  struct mwmr_s *Classif2_to_queue_medium__Classification_c2_to_queue_medium= channels_Classif2[2];
-  struct mwmr_s *Classif2_to_queue_low__Classification_c2_to_queue_low= channels_Classif2[3];
-  int packet__address = 0;
-  int packet__date = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Classif2";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 946, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Classif2_from_classif__Classification_to_c2;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Classify;
-      break;
-      
-      case STATE__Classify: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 948, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Classif2_to_queue_medium__Classification_c2_to_queue_medium;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 949, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Classif2_to_queue_low__Classification_c2_to_queue_low;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &packet__address;
-      __params2[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req2);
-      makeNewRequest(&__req2, 947, SEND_ASYNC_REQUEST, 1, (50)*1000, (100)*1000, 2, __params2);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req2.asyncChannel = &__Classif2_to_queue_high__Classification_c2_to_queue_high;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Classif2.h b/MPSoC/mutekh/examples/avatar/Classif2.h
deleted file mode 100644
index d393b4ffb7f511592b62a21ace5adfd60e71e19c..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classif2.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Classif2_H
-#define Classif2_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Classif2(struct mwmr_s *channels_Classif2[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Classification.c b/MPSoC/mutekh/examples/avatar/Classification.c
deleted file mode 100644
index 3f5069eb78fb81c328ed365ef5015fbaad38298c..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classification.c
+++ /dev/null
@@ -1,501 +0,0 @@
-#include "Classification.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _queue_low;
-static uint32_t _queue_medium;
-static uint32_t _queue_high;
-static uint32_t _c0_to_queue_low;
-static uint32_t _c1_to_queue_low;
-static uint32_t _c2_to_queue_low;
-static uint32_t _c0_to_queue_medium;
-static uint32_t _c1_to_queue_medium;
-static uint32_t _c2_to_queue_medium;
-static uint32_t _c0_to_queue_high;
-static uint32_t _c1_to_queue_high;
-static uint32_t _c2_to_queue_high;
-static uint32_t _from_IE;
-static uint32_t _to_c0;
-static uint32_t _to_c1;
-static uint32_t _to_c2;
-
-#define STATE__START__STATE 0
-#define STATE__recQueue 1
-#define STATE__sendPacket 2
-#define STATE__state1 3
-#define STATE__WaitForPacket 4
-#define STATE__High 5
-#define STATE__Medium 6
-#define STATE__Waiting 7
-#define STATE__Low 8
-#define STATE__STOP__STATE 9
-
-void *mainFunc__Classification(struct mwmr_s *channels_Classification[]){
-  
-  struct mwmr_s *Classif2_from_classif__Classification_to_c2= channels_Classification[0];
-  struct mwmr_s *Classif1_from_classif__Classification_to_c1= channels_Classification[1];
-  struct mwmr_s *Classif0_from_classif__Classification_to_c0= channels_Classification[2];
-  struct mwmr_s *InputEngine_packet__Classification_from_IE= channels_Classification[3];
-  struct mwmr_s *Classification_queue_low__Scheduling_from_queue_low= channels_Classification[4];
-  struct mwmr_s *Classif2_to_queue_high__Classification_c2_to_queue_high= channels_Classification[5];
-  struct mwmr_s *Classif1_to_queue_high__Classification_c1_to_queue_high= channels_Classification[6];
-  struct mwmr_s *Classif0_to_queue_high__Classification_c0_to_queue_high= channels_Classification[7];
-  struct mwmr_s *Classif1_to_queue_medium__Classification_c1_to_queue_medium= channels_Classification[8];
-  struct mwmr_s *Classif2_to_queue_medium__Classification_c2_to_queue_medium= channels_Classification[9];
-  struct mwmr_s *Classif0_to_queue_medium__Classification_c0_to_queue_medium= channels_Classification[10];
-  struct mwmr_s *Classification_queue_high__Scheduling_from_queue_high= channels_Classification[11];
-  struct mwmr_s *Classif0_to_queue_low__Classification_c0_to_queue_low= channels_Classification[12];
-  struct mwmr_s *Classification_queue_medium__Scheduling_from_queue_medium= channels_Classification[13];
-  struct mwmr_s *Classif1_to_queue_low__Classification_c1_to_queue_low= channels_Classification[14];
-  struct mwmr_s *Classif2_to_queue_low__Classification_c2_to_queue_low= channels_Classification[15];
-  int packet__address = 0;
-  int packet__date = 0;
-  bool f1 = true;
-  bool f0 = true;
-  bool f2 = true;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[2];
-  __attribute__((unused)) request __req4;
-  __attribute__((unused))int *__params4[2];
-  __attribute__((unused)) request __req5;
-  __attribute__((unused))int *__params5[2];
-  __attribute__((unused)) request __req6;
-  __attribute__((unused))int *__params6[2];
-  __attribute__((unused)) request __req7;
-  __attribute__((unused))int *__params7[2];
-  __attribute__((unused)) request __req8;
-  __attribute__((unused))int *__params8[2];
-  __attribute__((unused)) request __req9;
-  __attribute__((unused))int *__params9[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Classification";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__recQueue: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 777, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Classif2_to_queue_high__Classification_c2_to_queue_high;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      makeNewRequest(&__req1, 778, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      __req1.asyncChannel = &__Classif1_to_queue_high__Classification_c1_to_queue_high;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &packet__address;
-      __params2[1] = &packet__date;
-      makeNewRequest(&__req2, 779, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params2);
-      __req2.asyncChannel = &__Classif0_to_queue_high__Classification_c0_to_queue_high;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet__address;
-      __params3[1] = &packet__date;
-      makeNewRequest(&__req3, 782, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params3);
-      __req3.asyncChannel = &__Classif0_to_queue_medium__Classification_c0_to_queue_medium;
-      addRequestToList(&__list, &__req3);
-      __params4[0] = &packet__address;
-      __params4[1] = &packet__date;
-      makeNewRequest(&__req4, 789, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params4);
-      __req4.asyncChannel = &__Classif0_to_queue_low__Classification_c0_to_queue_low;
-      addRequestToList(&__list, &__req4);
-      __params5[0] = &packet__address;
-      __params5[1] = &packet__date;
-      makeNewRequest(&__req5, 781, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params5);
-      __req5.asyncChannel = &__Classif2_to_queue_medium__Classification_c2_to_queue_medium;
-      addRequestToList(&__list, &__req5);
-      __params6[0] = &packet__address;
-      __params6[1] = &packet__date;
-      makeNewRequest(&__req6, 787, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params6);
-      __req6.asyncChannel = &__Classif2_to_queue_low__Classification_c2_to_queue_low;
-      addRequestToList(&__list, &__req6);
-      __params7[0] = &packet__address;
-      __params7[1] = &packet__date;
-      makeNewRequest(&__req7, 780, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params7);
-      __req7.asyncChannel = &__Classif1_to_queue_medium__Classification_c1_to_queue_medium;
-      addRequestToList(&__list, &__req7);
-      __params8[0] = &packet__address;
-      __params8[1] = &packet__date;
-      makeNewRequest(&__req8, 788, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params8);
-      __req8.asyncChannel = &__Classif1_to_queue_low__Classification_c1_to_queue_low;
-      addRequestToList(&__list, &__req8);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        f2 = true;
-        __currentState = STATE__High;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        f1 = true;
-        __currentState = STATE__High;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        f0 = true;
-        __currentState = STATE__High;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        f0 = true;
-        __currentState = STATE__Medium;
-        
-      }
-      else  if (__returnRequest == &__req4) {
-        f0 = true;
-        __currentState = STATE__Low;
-        
-      }
-      else  if (__returnRequest == &__req5) {
-        f2 = true;
-        __currentState = STATE__Medium;
-        
-      }
-      else  if (__returnRequest == &__req6) {
-        f2 = true;
-        __currentState = STATE__Low;
-        
-      }
-      else  if (__returnRequest == &__req7) {
-        f1 = true;
-        __currentState = STATE__Medium;
-        
-      }
-      else  if (__returnRequest == &__req8) {
-        f1 = true;
-        __currentState = STATE__Low;
-        
-      }
-      break;
-      
-      case STATE__sendPacket: 
-      if (f0) {
-        __params0[0] = &packet__address;
-        __params0[1] = &packet__date;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 773, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__Classif0_from_classif__Classification_to_c0;
-        addRequestToList(&__list, &__req0);
-      }
-      if (f2) {
-        __params1[0] = &packet__address;
-        __params1[1] = &packet__date;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req1);
-        makeNewRequest(&__req1, 770, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req1.asyncChannel = &__Classif2_from_classif__Classification_to_c2;
-        addRequestToList(&__list, &__req1);
-      }
-      if (f1) {
-        __params2[0] = &packet__address;
-        __params2[1] = &packet__date;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req2);
-        makeNewRequest(&__req2, 772, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params2);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req2.asyncChannel = &__Classif1_from_classif__Classification_to_c1;
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        f0 = false;
-        __currentState = STATE__state1;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        f2 = false;
-        __currentState = STATE__state1;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        f1 = false;
-        __currentState = STATE__state1;
-        
-      }
-      break;
-      
-      case STATE__state1: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__WaitForPacket: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 793, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Classif2_to_queue_high__Classification_c2_to_queue_high;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      makeNewRequest(&__req1, 794, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      __req1.asyncChannel = &__Classif1_to_queue_high__Classification_c1_to_queue_high;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &packet__address;
-      __params2[1] = &packet__date;
-      makeNewRequest(&__req2, 795, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params2);
-      __req2.asyncChannel = &__Classif0_to_queue_high__Classification_c0_to_queue_high;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet__address;
-      __params3[1] = &packet__date;
-      makeNewRequest(&__req3, 797, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params3);
-      __req3.asyncChannel = &__Classif2_to_queue_medium__Classification_c2_to_queue_medium;
-      addRequestToList(&__list, &__req3);
-      __params4[0] = &packet__address;
-      __params4[1] = &packet__date;
-      makeNewRequest(&__req4, 796, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params4);
-      __req4.asyncChannel = &__Classif1_to_queue_medium__Classification_c1_to_queue_medium;
-      addRequestToList(&__list, &__req4);
-      __params5[0] = &packet__address;
-      __params5[1] = &packet__date;
-      makeNewRequest(&__req5, 798, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params5);
-      __req5.asyncChannel = &__Classif0_to_queue_medium__Classification_c0_to_queue_medium;
-      addRequestToList(&__list, &__req5);
-      __params6[0] = &packet__address;
-      __params6[1] = &packet__date;
-      makeNewRequest(&__req6, 801, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params6);
-      __req6.asyncChannel = &__Classif2_to_queue_low__Classification_c2_to_queue_low;
-      addRequestToList(&__list, &__req6);
-      __params7[0] = &packet__address;
-      __params7[1] = &packet__date;
-      makeNewRequest(&__req7, 802, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params7);
-      __req7.asyncChannel = &__Classif1_to_queue_low__Classification_c1_to_queue_low;
-      addRequestToList(&__list, &__req7);
-      __params8[0] = &packet__address;
-      __params8[1] = &packet__date;
-      makeNewRequest(&__req8, 803, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params8);
-      __req8.asyncChannel = &__Classif0_to_queue_low__Classification_c0_to_queue_low;
-      addRequestToList(&__list, &__req8);
-      __params9[0] = &packet__address;
-      __params9[1] = &packet__date;
-      makeNewRequest(&__req9, 775, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params9);
-      __req9.asyncChannel = &__InputEngine_packet__Classification_from_IE;
-      addRequestToList(&__list, &__req9);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        f2 = true;
-        __currentState = STATE__High;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        f1 = true;
-        __currentState = STATE__High;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        f0 = true;
-        __currentState = STATE__High;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        f2 = true;
-        __currentState = STATE__Medium;
-        
-      }
-      else  if (__returnRequest == &__req4) {
-        f1 = true;
-        __currentState = STATE__Medium;
-        
-      }
-      else  if (__returnRequest == &__req5) {
-        f0 = true;
-        __currentState = STATE__Medium;
-        
-      }
-      else  if (__returnRequest == &__req6) {
-        f2 = true;
-        __currentState = STATE__Low;
-        
-      }
-      else  if (__returnRequest == &__req7) {
-        f1 = true;
-        __currentState = STATE__Low;
-        
-      }
-      else  if (__returnRequest == &__req8) {
-        f0 = true;
-        __currentState = STATE__Low;
-        
-      }
-      else  if (__returnRequest == &__req9) {
-        waitFor((10)*1000, (20)*1000);
-        __currentState = STATE__sendPacket;
-        
-      }
-      break;
-      
-      case STATE__High: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 799, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Classification_queue_high__Scheduling_from_queue_high;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 783, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Classification_queue_high__Scheduling_from_queue_high;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-      case STATE__Medium: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 800, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Classification_queue_medium__Scheduling_from_queue_medium;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 785, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Classification_queue_medium__Scheduling_from_queue_medium;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-      case STATE__Waiting: 
-      if (!(f0||f1||f2)) {
-        makeNewRequest(&__req0, 847, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (f0||f1||f2) {
-        makeNewRequest(&__req1, 869, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__recQueue;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__WaitForPacket;
-        
-      }
-      break;
-      
-      case STATE__Low: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 804, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Classification_queue_low__Scheduling_from_queue_low;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 791, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Classification_queue_low__Scheduling_from_queue_low;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Classification.h b/MPSoC/mutekh/examples/avatar/Classification.h
deleted file mode 100644
index aceabbadaa50534fddeeb3641199a48c6985af7f..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Classification.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Classification_H
-#define Classification_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Classification(struct mwmr_s *channels_Classification[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Communication.c b/MPSoC/mutekh/examples/avatar/Communication.c
deleted file mode 100644
index 5c28622d54ea96d9dbc50876a02fd0cc319faefb..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Communication.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "Communication.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__Communication(struct mwmr_s *channels_Communication[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Communication";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Communication.h b/MPSoC/mutekh/examples/avatar/Communication.h
deleted file mode 100644
index b65d5d33597a01dd4a32947fa31850559e6d3a1f..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Communication.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Communication_H
-#define Communication_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Communication(struct mwmr_s *channels_Communication[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/ControlPanel.c b/MPSoC/mutekh/examples/avatar/ControlPanel.c
deleted file mode 100644
index aee5b222755690a29a26407c5a7d31117f8a06ea..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/ControlPanel.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "ControlPanel.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _LEDOn;
-static uint32_t _LEDoff;
-static uint32_t _startButton;
-
-#define STATE__START__STATE 0
-#define STATE__Active 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__ControlPanel(struct mwmr_s *channels_ControlPanel[]){
-  
-  struct mwmr_s *ControlPanel_startButton__Controller_start= channels_ControlPanel[0];
-  int duration = 5;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "ControlPanel";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + Active");
-      __currentState = STATE__Active;
-      break;
-      
-      case STATE__Active: 
-      __params0[0] = &duration;
-      debug2Msg(__myname, "-> (=====) test ControlPanel_startButton__Controller_start");
-      makeNewRequest(&__req0, 128, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__ControlPanel_startButton__Controller_start;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + Active");
-      __currentState = STATE__Active;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/ControlPanel.h b/MPSoC/mutekh/examples/avatar/ControlPanel.h
deleted file mode 100644
index 3dd8263b75b31978e87fad08d3ac707738044eab..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/ControlPanel.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef ControlPanel_H
-#define ControlPanel_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__ControlPanel(struct mwmr_s *channels_ControlPanel[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Controller.c b/MPSoC/mutekh/examples/avatar/Controller.c
deleted file mode 100644
index cc8fe76251ce9df93383c281aa30723bd805d17a..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Controller.c
+++ /dev/null
@@ -1,224 +0,0 @@
-#include "Controller.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _start;
-static uint32_t _closed;
-static uint32_t _open;
-static uint32_t _ringBell;
-static uint32_t _startMagnetron;
-static uint32_t _stopMagnetron;
-static uint32_t _startCooking;
-static uint32_t _stopCooking;
-static uint32_t _okDoor;
-
-#define STATE__START__STATE 0
-#define STATE__Starting 1
-#define STATE__Heating 2
-#define STATE__Idle 3
-#define STATE__DoorOpened 4
-#define STATE__DoorOpenedWhileHeating 5
-#define STATE__STOP__STATE 6
-
-void *mainFunc__Controller(struct mwmr_s *channels_Controller[]){
-  
-  struct mwmr_s *Door_okDoor__Controller_okDoor= channels_Controller[0];
-  struct mwmr_s *Door_open__Controller_open= channels_Controller[1];
-  struct mwmr_s *Controller_ringBell__Bell_ring= channels_Controller[2];
-  struct mwmr_s *ControlPanel_startButton__Controller_start= channels_Controller[3];
-  struct mwmr_s *Controller_stopMagnetron__Magnetron_stopM= channels_Controller[4];
-  struct mwmr_s *Controller_startMagnetron__Magnetron_startM= channels_Controller[5];
-  struct mwmr_s *Door_closed__Controller_closed= channels_Controller[6];
-  int duration = 5;
-  int remainingTime = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Controller";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + Idle");
-      __currentState = STATE__Idle;
-      break;
-      
-      case STATE__Starting: 
-      debug2Msg(__myname, "-> (=====) test Controller_startMagnetron__Magnetron_startM");
-      makeNewRequest(&__req0, 86, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Controller_startMagnetron__Magnetron_startM;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      remainingTime = duration;
-      debug2Msg(__myname, "-> (=====) Entering state + Heating");
-      __currentState = STATE__Heating;
-      break;
-      
-      case STATE__Heating: 
-      if (remainingTime>0) {
-        makeNewRequest(&__req0, 101, IMMEDIATE, 1, (1)*1000, (1)*1000, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      debug2Msg(__myname, "-> (=====) test Door_open__Controller_open");
-      makeNewRequest(&__req1, 76, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__Door_open__Controller_open;
-      addRequestToList(&__list, &__req1);
-      if (remainingTime == 0) {
-        debug2Msg(__myname, "-> (=====) test Controller_stopMagnetron__Magnetron_stopM");
-        makeNewRequest(&__req2, 84, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-        __req2.syncChannel = &__Controller_stopMagnetron__Magnetron_stopM;
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        remainingTime = remainingTime-1;
-        debug2Msg(__myname, "-> (=====) Entering state + Heating");
-        __currentState = STATE__Heating;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) test Controller_stopMagnetron__Magnetron_stopM");
-        makeNewRequest(&__req0, 83, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__Controller_stopMagnetron__Magnetron_stopM;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) test Door_okDoor__Controller_okDoor");
-        makeNewRequest(&__req0, 72, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__Door_okDoor__Controller_okDoor;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + DoorOpenedWhileHeating");
-        __currentState = STATE__DoorOpenedWhileHeating;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        debug2Msg(__myname, "-> (=====) test Controller_ringBell__Bell_ring");
-        makeNewRequest(&__req0, 78, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__Controller_ringBell__Bell_ring;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + Idle");
-        __currentState = STATE__Idle;
-        
-      }
-      break;
-      
-      case STATE__Idle: 
-      debug2Msg(__myname, "-> (=====) test Door_open__Controller_open");
-      makeNewRequest(&__req0, 79, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_open__Controller_open;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &duration;
-      debug2Msg(__myname, "-> (=====) test ControlPanel_startButton__Controller_start");
-      makeNewRequest(&__req1, 81, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params1);
-      __req1.syncChannel = &__ControlPanel_startButton__Controller_start;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) test Door_okDoor__Controller_okDoor");
-        makeNewRequest(&__req0, 74, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__Door_okDoor__Controller_okDoor;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + DoorOpened");
-        __currentState = STATE__DoorOpened;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + Starting");
-        __currentState = STATE__Starting;
-        
-      }
-      break;
-      
-      case STATE__DoorOpened: 
-      debug2Msg(__myname, "-> (=====) test Door_closed__Controller_closed");
-      makeNewRequest(&__req0, 88, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_closed__Controller_closed;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Door_okDoor__Controller_okDoor");
-      makeNewRequest(&__req0, 73, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_okDoor__Controller_okDoor;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + Idle");
-      __currentState = STATE__Idle;
-      break;
-      
-      case STATE__DoorOpenedWhileHeating: 
-      debug2Msg(__myname, "-> (=====) test Door_closed__Controller_closed");
-      makeNewRequest(&__req0, 87, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_closed__Controller_closed;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Door_okDoor__Controller_okDoor");
-      makeNewRequest(&__req0, 71, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_okDoor__Controller_okDoor;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Controller_startMagnetron__Magnetron_startM");
-      makeNewRequest(&__req0, 85, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Controller_startMagnetron__Magnetron_startM;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + Heating");
-      __currentState = STATE__Heating;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Controller.h b/MPSoC/mutekh/examples/avatar/Controller.h
deleted file mode 100644
index e13550fd89a76604606997fc254d21448a37b75d..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Controller.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Controller_H
-#define Controller_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Controller(struct mwmr_s *channels_Controller[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/CorrectnessChecking.c b/MPSoC/mutekh/examples/avatar/CorrectnessChecking.c
deleted file mode 100644
index 206c560ac19d60a0efe70d49bd4da76b4653d584..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/CorrectnessChecking.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "CorrectnessChecking.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _getEmergencyBrakingMessage;
-static uint32_t _toPlausibityCheckMessage;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__WaitingForMessageToAnalyze 2
-#define STATE__STOP__STATE 3
-
-void CorrectnessChecking__checkingMessage() {
-  traceFunctionCall("CorrectnessChecking", "checkingMessage", "-");
-}
-
-
-void CorrectnessChecking__invalidMessage() {
-  traceFunctionCall("CorrectnessChecking", "invalidMessage", "-");
-}
-
-
-void CorrectnessChecking__validMessage() {
-  traceFunctionCall("CorrectnessChecking", "validMessage", "-");
-}
-
-
-void *mainFunc__CorrectnessChecking(struct mwmr_s *channels_CorrectnessChecking[]){
-  
-  struct mwmr_s *CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify= channels_CorrectnessChecking[0];
-  struct mwmr_s *DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage= channels_CorrectnessChecking[1];
-  int id = 0;
-  int position = 0;
-  bool canHaveInvalid = false;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "CorrectnessChecking";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForMessageToAnalyze;
-      break;
-      
-      case STATE__choice__0: 
-      if (canHaveInvalid) {
-        makeNewRequest(&__req0, 568, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      makeNewRequest(&__req1, 578, IMMEDIATE, 0, 0, 0, 0, __params1);
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        CorrectnessChecking__invalidMessage ();
-        __currentState = STATE__WaitingForMessageToAnalyze;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        CorrectnessChecking__validMessage ();
-        __params0[0] = &id;
-        __params0[1] = &position;
-        makeNewRequest(&__req0, 563, SEND_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-        __req0.syncChannel = &__CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        __currentState = STATE__WaitingForMessageToAnalyze;
-        
-      }
-      break;
-      
-      case STATE__WaitingForMessageToAnalyze: 
-      __params0[0] = &id;
-      __params0[1] = &position;
-      makeNewRequest(&__req0, 565, RECEIVE_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.syncChannel = &__DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      CorrectnessChecking__checkingMessage ();
-      __currentState = STATE__choice__0;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/CorrectnessChecking.h b/MPSoC/mutekh/examples/avatar/CorrectnessChecking.h
deleted file mode 100644
index 811016c19812ebbf5669635115dd493a8536ee33..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/CorrectnessChecking.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CorrectnessChecking_H
-#define CorrectnessChecking_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__CorrectnessChecking(struct mwmr_s *channels_CorrectnessChecking[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/DSRSC_Management.c b/MPSoC/mutekh/examples/avatar/DSRSC_Management.c
deleted file mode 100644
index 8bad5403059f48bbadac96ae7168dad424436c12..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DSRSC_Management.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "DSRSC_Management.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _obstacleDetected;
-static uint32_t _carPosition;
-static uint32_t _setCarPosition;
-static uint32_t _forwardEmergencyBrakingMessage;
-static uint32_t _broadcastEmergencyBrakingMessage;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingForEnvironmentInput 1
-#define STATE__STOP__STATE 2
-
-void DSRSC_Management__sendMessage(int id, int position) {
-  char my__attr[CHAR_ALLOC_SIZE];
-  sprintf(my__attr, "%d,%d",id,position);
-  traceFunctionCall("DSRSC_Management", "sendMessage", my__attr);
-}
-
-
-void *mainFunc__DSRSC_Management(struct mwmr_s *channels_DSRSC_Management[]){
-  
-  struct mwmr_s *DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage= channels_DSRSC_Management[0];
-  struct mwmr_s *DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency= channels_DSRSC_Management[1];
-  struct mwmr_s *EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected= channels_DSRSC_Management[2];
-  struct mwmr_s *DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode= channels_DSRSC_Management[3];
-  struct mwmr_s *CarPositionSimulator_carPosition__DSRSC_Management_carPosition= channels_DSRSC_Management[4];
-  int id = 0;
-  int position = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "DSRSC_Management";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForEnvironmentInput;
-      break;
-      
-      case STATE__WaitingForEnvironmentInput: 
-      __params0[0] = &id;
-      __params0[1] = &position;
-      makeNewRequest(&__req0, 317, RECEIVE_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.syncChannel = &__DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &id;
-      __params1[1] = &position;
-      makeNewRequest(&__req1, 320, RECEIVE_SYNC_REQUEST, 0, 0, 0, 2, __params1);
-      __req1.syncChannel = &__CarPositionSimulator_carPosition__DSRSC_Management_carPosition;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &id;
-      __params2[1] = &position;
-      makeNewRequest(&__req2, 318, RECEIVE_SYNC_REQUEST, 0, 0, 0, 2, __params2);
-      __req2.syncChannel = &__EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        DSRSC_Management__sendMessage (id, position);
-        __currentState = STATE__WaitingForEnvironmentInput;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __params0[0] = &id;
-        __params0[1] = &position;
-        makeNewRequest(&__req0, 319, SEND_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-        __req0.syncChannel = &__DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        __currentState = STATE__WaitingForEnvironmentInput;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __params0[0] = &id;
-        __params0[1] = &position;
-        makeNewRequest(&__req0, 316, SEND_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-        __req0.syncChannel = &__DSRSC_Management_forwardEmergencyBrakingMessage__CorrectnessChecking_getEmergencyBrakingMessage;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        __currentState = STATE__WaitingForEnvironmentInput;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/DSRSC_Management.h b/MPSoC/mutekh/examples/avatar/DSRSC_Management.h
deleted file mode 100644
index b61098b2e7bdc23e707f3494d0987d1e3d937942..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DSRSC_Management.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef DSRSC_Management_H
-#define DSRSC_Management_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__DSRSC_Management(struct mwmr_s *channels_DSRSC_Management[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/DangerAvoidanceStrategy.c b/MPSoC/mutekh/examples/avatar/DangerAvoidanceStrategy.c
deleted file mode 100644
index 7e2a585b4cf0733bec31ec4a7960fa5b3edac3d6..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DangerAvoidanceStrategy.c
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "DangerAvoidanceStrategy.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _brake;
-static uint32_t _reducePower;
-static uint32_t _brakePower;
-static uint32_t _forwardEmergency;
-
-#define STATE__START__STATE 0
-#define STATE__ForwardManagement 1
-#define STATE__BrakingManagement 2
-#define STATE__choice__0 3
-#define STATE__WaitingForActionsToTake 4
-#define STATE__STOP__STATE 5
-
-void *mainFunc__DangerAvoidanceStrategy(struct mwmr_s *channels_DangerAvoidanceStrategy[]){
-  
-  struct mwmr_s *DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency= channels_DangerAvoidanceStrategy[0];
-  struct mwmr_s *DangerAvoidanceStrategy_brakePower__BrakeManagement_brake= channels_DangerAvoidanceStrategy[1];
-  struct mwmr_s *DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder= channels_DangerAvoidanceStrategy[2];
-  struct mwmr_s *DangerAvoidanceStrategy_brake__PlausibilityCheck_brake= channels_DangerAvoidanceStrategy[3];
-  int speed = 0;
-  int position = 0;
-  int currentPosition = 0;
-  int carinfo__minID = 1;
-  int carinfo__maxID = 5;
-  int carinfo__minPosition = 3;
-  int carinfo__maxPosition = 10;
-  int carinfo__minSpeed = 1;
-  int carinfo__maxSpeed = 10;
-  int carinfo__myID = 11;
-  int value = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[3];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[3];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "DangerAvoidanceStrategy";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForActionsToTake;
-      break;
-      
-      case STATE__ForwardManagement: 
-      value = carinfo__myID;
-      traceVariableModification("DangerAvoidanceStrategy", "value", value,0);
-      __params0[0] = &value;
-      __params0[1] = &currentPosition;
-      makeNewRequest(&__req0, 600, SEND_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.syncChannel = &__DSRSC_Management_broadcastEmergencyBrakingMessage__DangerAvoidanceStrategy_forwardEmergency;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingForActionsToTake;
-      break;
-      
-      case STATE__BrakingManagement: 
-      value = (position-currentPosition);
-      traceVariableModification("DangerAvoidanceStrategy", "value", value,0);
-      __params0[0] = &value;
-      makeNewRequest(&__req0, 601, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__DangerAvoidanceStrategy_brakePower__BrakeManagement_brake;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__ForwardManagement;
-      break;
-      
-      case STATE__choice__0: 
-      if (!(speed>5)) {
-        makeNewRequest(&__req0, 623, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (speed>5) {
-        __params1[0] = &value;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req1);
-        makeNewRequest(&__req1, 604, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params1);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req1.asyncChannel = &__DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__BrakingManagement;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__BrakingManagement;
-        
-      }
-      break;
-      
-      case STATE__WaitingForActionsToTake: 
-      __params0[0] = &speed;
-      __params0[1] = &currentPosition;
-      __params0[2] = &position;
-      makeNewRequest(&__req0, 606, RECEIVE_SYNC_REQUEST, 0, 0, 0, 3, __params0);
-      __req0.syncChannel = &__DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__choice__0;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/DangerAvoidanceStrategy.h b/MPSoC/mutekh/examples/avatar/DangerAvoidanceStrategy.h
deleted file mode 100644
index ba51d6ef4c15b25963f848b8ddbd31a730cc8245..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DangerAvoidanceStrategy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef DangerAvoidanceStrategy_H
-#define DangerAvoidanceStrategy_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__DangerAvoidanceStrategy(struct mwmr_s *channels_DangerAvoidanceStrategy[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/DistanceSensor.c b/MPSoC/mutekh/examples/avatar/DistanceSensor.c
deleted file mode 100644
index 0854b483a88518d7b67d73e27603690353b96211..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DistanceSensor.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "DistanceSensor.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _sensorData;
-static uint32_t _changeRate;
-
-#define STATE__START__STATE 0
-#define STATE__startSensor 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__DistanceSensor(struct mwmr_s *channels_DistanceSensor[]){
-  
-  struct mwmr_s *MainControl_sensorData__DistanceSensor_sensorData= channels_DistanceSensor[0];
-  struct mwmr_s *MainControl_changeRate__DistanceSensor_changeRate= channels_DistanceSensor[1];
-  int samplingRate = 10;
-  int distance = 0;
-  int distanceFront = 0;
-  int distanceLeft = 0;
-  int distanceRight = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[3];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[3];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "DistanceSensor";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__startSensor;
-      break;
-      
-      case STATE__startSensor: 
-      makeNewRequest(&__req0, 91, IMMEDIATE, 1, (samplingRate)*1000, (samplingRate)*1000, 0, __params0);
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &samplingRate;
-      makeNewRequest(&__req1, 85, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params1);
-      __req1.asyncChannel = &__MainControl_changeRate__DistanceSensor_changeRate;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        distanceLeft = computeRandom(0, 10);
-        waitFor((1)*1000, (2)*1000);
-        distanceFront = computeRandom(0, 10);
-        waitFor((1)*1000, (2)*1000);
-        distanceRight = computeRandom(0, 10);
-        waitFor((1)*1000, (2)*1000);
-        __params0[0] = &distanceLeft;
-        __params0[1] = &distanceFront;
-        __params0[2] = &distanceRight;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 84, SEND_ASYNC_REQUEST, 0, 0, 0, 3, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__MainControl_sensorData__DistanceSensor_sensorData;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __currentState = STATE__startSensor;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__startSensor;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/DistanceSensor.h b/MPSoC/mutekh/examples/avatar/DistanceSensor.h
deleted file mode 100644
index c54e0f5af47c832affac025090fb6440b1dcdea3..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DistanceSensor.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef DistanceSensor_H
-#define DistanceSensor_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__DistanceSensor(struct mwmr_s *channels_DistanceSensor[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Door.c b/MPSoC/mutekh/examples/avatar/Door.c
deleted file mode 100644
index 11b9434b2151e33a950a1d7e06a047ee595bb8b6..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Door.c
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "Door.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _closed;
-static uint32_t _open;
-static uint32_t _okDoor;
-
-#define STATE__START__STATE 0
-#define STATE__DoorIsOpened 1
-#define STATE__IDLE 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Door(struct mwmr_s *channels_Door[]){
-  
-  struct mwmr_s *Door_okDoor__Controller_okDoor= channels_Door[0];
-  struct mwmr_s *Door_closed__Controller_closed= channels_Door[1];
-  struct mwmr_s *Door_open__Controller_open= channels_Door[2];
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Door";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + IDLE");
-      __currentState = STATE__IDLE;
-      break;
-      
-      case STATE__DoorIsOpened: 
-      waitFor((2)*1000, (4)*1000);
-      debug2Msg(__myname, "-> (=====) test Door_closed__Controller_closed");
-      makeNewRequest(&__req0, 50, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_closed__Controller_closed;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Door_okDoor__Controller_okDoor");
-      makeNewRequest(&__req0, 47, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_okDoor__Controller_okDoor;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      waitFor((2)*1000, (4)*1000);
-      debug2Msg(__myname, "-> (=====) Entering state + IDLE");
-      __currentState = STATE__IDLE;
-      break;
-      
-      case STATE__IDLE: 
-      debug2Msg(__myname, "-> (=====) test Door_open__Controller_open");
-      makeNewRequest(&__req0, 51, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_open__Controller_open;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test Door_okDoor__Controller_okDoor");
-      makeNewRequest(&__req0, 48, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Door_okDoor__Controller_okDoor;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + DoorIsOpened");
-      __currentState = STATE__DoorIsOpened;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Door.h b/MPSoC/mutekh/examples/avatar/Door.h
deleted file mode 100644
index d23d11c4be46d649c271ba7be5ecce7892f7d671..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Door.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Door_H
-#define Door_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Door(struct mwmr_s *channels_Door[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/DrivingPowerReductionStrategy.c b/MPSoC/mutekh/examples/avatar/DrivingPowerReductionStrategy.c
deleted file mode 100644
index f5c7eef5d564fed94207eb6d9619696362cc5efb..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DrivingPowerReductionStrategy.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "DrivingPowerReductionStrategy.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _getReducePowerOrder;
-
-#define STATE__START__STATE 0
-#define STATE__WaitForReducePowerToBePerformed 1
-#define STATE__WaitForReducePowerOrder 2
-#define STATE__STOP__STATE 3
-
-void DrivingPowerReductionStrategy__applyReducePower(int value) {
-  char my__attr[CHAR_ALLOC_SIZE];
-  sprintf(my__attr, "%d",value);
-  traceFunctionCall("DrivingPowerReductionStrategy", "applyReducePower", my__attr);
-}
-
-
-void DrivingPowerReductionStrategy__reducePowerDone() {
-  traceFunctionCall("DrivingPowerReductionStrategy", "reducePowerDone", "-");
-}
-
-
-void *mainFunc__DrivingPowerReductionStrategy(struct mwmr_s *channels_DrivingPowerReductionStrategy[]){
-  
-  struct mwmr_s *DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder= channels_DrivingPowerReductionStrategy[0];
-  int value = 0;
-  int minReducePowerTime = 10;
-  int maxReducePowerTime = 20;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "DrivingPowerReductionStrategy";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitForReducePowerOrder;
-      break;
-      
-      case STATE__WaitForReducePowerToBePerformed: 
-      waitFor((minReducePowerTime)*1000, (maxReducePowerTime)*1000);
-      DrivingPowerReductionStrategy__reducePowerDone ();
-      __currentState = STATE__WaitForReducePowerOrder;
-      break;
-      
-      case STATE__WaitForReducePowerOrder: 
-      __params0[0] = &value;
-      makeNewRequest(&__req0, 585, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.asyncChannel = &__DangerAvoidanceStrategy_reducePower__DrivingPowerReductionStrategy_getReducePowerOrder;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      DrivingPowerReductionStrategy__applyReducePower (value);
-      __currentState = STATE__WaitForReducePowerToBePerformed;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/DrivingPowerReductionStrategy.h b/MPSoC/mutekh/examples/avatar/DrivingPowerReductionStrategy.h
deleted file mode 100644
index 86cbc1c47811559790af42b78eb7c41f26704d53..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/DrivingPowerReductionStrategy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef DrivingPowerReductionStrategy_H
-#define DrivingPowerReductionStrategy_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__DrivingPowerReductionStrategy(struct mwmr_s *channels_DrivingPowerReductionStrategy[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/EmergencySimulator.c b/MPSoC/mutekh/examples/avatar/EmergencySimulator.c
deleted file mode 100644
index 9e6548c373ba8d822d07cbbdaf40be4282947b27..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/EmergencySimulator.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "EmergencySimulator.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _obstacleDetected;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingforEmergency 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__EmergencySimulator(struct mwmr_s *channels_EmergencySimulator[]){
-  
-  struct mwmr_s *EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected= channels_EmergencySimulator[0];
-  int minEmergencyInterval = 1000;
-  int maxEmergencyInterval = 1000;
-  int carid__minID = 1;
-  int carid__maxID = 5;
-  int carid__minPosition = 3;
-  int carid__maxPosition = 10;
-  int carid__minSpeed = 1;
-  int carid__maxSpeed = 10;
-  int carid__myID = 11;
-  int id = 0;
-  int position = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "EmergencySimulator";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingforEmergency;
-      break;
-      
-      case STATE__WaitingforEmergency: 
-      waitFor((minEmergencyInterval)*1000, (maxEmergencyInterval)*1000);
-      id = computeRandom(carid__minID, carid__maxID);
-      position = computeRandom(carid__minPosition, carid__maxPosition);
-      __params0[0] = &id;
-      __params0[1] = &position;
-      makeNewRequest(&__req0, 303, SEND_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.syncChannel = &__EmergencySimulator_obstacleDetected__DSRSC_Management_obstacleDetected;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingforEmergency;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/EmergencySimulator.h b/MPSoC/mutekh/examples/avatar/EmergencySimulator.h
deleted file mode 100644
index b0ba8f8b012f91c0a3ef33b4969b3e6c179dd549..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/EmergencySimulator.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef EmergencySimulator_H
-#define EmergencySimulator_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__EmergencySimulator(struct mwmr_s *channels_EmergencySimulator[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/GPSSensor.c b/MPSoC/mutekh/examples/avatar/GPSSensor.c
deleted file mode 100644
index 34659f191fd8a4516b481fbd02c4542a51deb83b..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/GPSSensor.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "GPSSensor.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _setPosition;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingForGPSInfo 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__GPSSensor(struct mwmr_s *channels_GPSSensor[]){
-  
-  struct mwmr_s *GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition= channels_GPSSensor[0];
-  int minGPSUpdate = 100;
-  int maxGPSUpdate = 100;
-  int position = 0;
-  int carinfo__minID = 1;
-  int carinfo__maxID = 5;
-  int carinfo__minPosition = 3;
-  int carinfo__maxPosition = 10;
-  int carinfo__minSpeed = 1;
-  int carinfo__maxSpeed = 10;
-  int carinfo__myID = 11;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "GPSSensor";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForGPSInfo;
-      break;
-      
-      case STATE__WaitingForGPSInfo: 
-      waitFor((minGPSUpdate)*1000, (maxGPSUpdate)*1000);
-      position = computeRandom(carinfo__minPosition, carinfo__maxPosition);
-      __params0[0] = &position;
-      makeNewRequest(&__req0, 286, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingForGPSInfo;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/GPSSensor.h b/MPSoC/mutekh/examples/avatar/GPSSensor.h
deleted file mode 100644
index c05f20e1b1fbcee9398eb0bd0e740bcf4b908b2f..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/GPSSensor.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef GPSSensor_H
-#define GPSSensor_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__GPSSensor(struct mwmr_s *channels_GPSSensor[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/InputEngine.c b/MPSoC/mutekh/examples/avatar/InputEngine.c
deleted file mode 100644
index b6283be13a2e90b650e7f5c2e2e95c41c8cc7a08..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/InputEngine.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "InputEngine.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _packet;
-static uint32_t _address;
-static uint32_t _bootstrap;
-
-#define STATE__START__STATE 0
-#define STATE__Waiting 1
-#define STATE__ProcessPacket 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__InputEngine(struct mwmr_s *channels_InputEngine[]){
-  
-  struct mwmr_s *OutputEngine_address__InputEngine_address= channels_InputEngine[0];
-  struct mwmr_s *Bootstrap_address__InputEngine_bootstrap= channels_InputEngine[1];
-  struct mwmr_s *InputEngine_packet__Classification_from_IE= channels_InputEngine[2];
-  int packet__address = 0;
-  int packet__date = 0;
-  int address = 0;
-  int frequency = 24;
-  int priority = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "InputEngine";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &address;
-      makeNewRequest(&__req0, 753, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.asyncChannel = &__Bootstrap_address__InputEngine_bootstrap;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &address;
-      makeNewRequest(&__req1, 752, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params1);
-      __req1.asyncChannel = &__OutputEngine_address__InputEngine_address;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__ProcessPacket;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__ProcessPacket;
-        
-      }
-      break;
-      
-      case STATE__ProcessPacket: 
-      waitFor((100)*1000, (100)*1000);
-      priority = computeRandom(0, 2);
-      packet__date = priority;
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 757, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__InputEngine_packet__Classification_from_IE;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/InputEngine.h b/MPSoC/mutekh/examples/avatar/InputEngine.h
deleted file mode 100644
index c169bd2e6e954c88c08f2568e40c87ec5cafd4b1..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/InputEngine.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef InputEngine_H
-#define InputEngine_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__InputEngine(struct mwmr_s *channels_InputEngine[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/InterfaceDevice.c b/MPSoC/mutekh/examples/avatar/InterfaceDevice.c
deleted file mode 100644
index d6b56e5c5bfb96b4585de60207153f94de40f553..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/InterfaceDevice.c
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "InterfaceDevice.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _activation;
-static uint32_t _reset;
-static uint32_t _pTS;
-static uint32_t _fromDtoSC;
-static uint32_t _data_Ready;
-static uint32_t _answerToReset;
-static uint32_t _pTSConfirm;
-static uint32_t _fromSCtoD;
-static uint32_t _dataReady;
-
-#define STATE__START__STATE 0
-#define STATE__ChoiceBetweenInputOutput 1
-#define STATE__DataTransferLoop 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__InterfaceDevice(struct mwmr_s *channels_InterfaceDevice[]){
-  
-  struct mwmr_s *SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD= channels_InterfaceDevice[0];
-  struct mwmr_s *SmartCardController_data_Ready_SC__InterfaceDevice_dataReady= channels_InterfaceDevice[1];
-  struct mwmr_s *SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC= channels_InterfaceDevice[2];
-  struct mwmr_s *SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm= channels_InterfaceDevice[3];
-  struct mwmr_s *SmartCardController_pTS__InterfaceDevice_pTS= channels_InterfaceDevice[4];
-  struct mwmr_s *SmartCardController_answerToReset__InterfaceDevice_answerToReset= channels_InterfaceDevice[5];
-  struct mwmr_s *SmartCardController_reset__InterfaceDevice_reset= channels_InterfaceDevice[6];
-  struct mwmr_s *SmartCardController_activation__InterfaceDevice_activation= channels_InterfaceDevice[7];
-  int val = 5;
-  int cpt = 0;
-  int nbOfComputedPackets = 1;
-  int packet__srcdest = 0;
-  int packet__seqNum = 0;
-  int packet__ackNum = 0;
-  int packet__control = 0;
-  int packet__management = 0;
-  int packet__checksum = 0;
-  int packet__othersAndPadding = 0;
-  int packet__data = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "InterfaceDevice";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) test SmartCardController_activation__InterfaceDevice_activation");
-      makeNewRequest(&__req0, 284, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_activation__InterfaceDevice_activation;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_reset__InterfaceDevice_reset");
-      makeNewRequest(&__req0, 283, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_reset__InterfaceDevice_reset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_answerToReset__InterfaceDevice_answerToReset");
-      makeNewRequest(&__req0, 282, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_pTS__InterfaceDevice_pTS");
-      makeNewRequest(&__req0, 281, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTS__InterfaceDevice_pTS;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm");
-      makeNewRequest(&__req0, 280, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      cpt = 0;
-      debug2Msg(__myname, "-> (=====) Entering state + DataTransferLoop");
-      __currentState = STATE__DataTransferLoop;
-      break;
-      
-      case STATE__ChoiceBetweenInputOutput: 
-      debug2Msg(__myname, "-> (=====) test SmartCardController_data_Ready_SC__InterfaceDevice_dataReady");
-      makeNewRequest(&__req0, 277, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-      addRequestToList(&__list, &__req0);
-      makeNewRequest(&__req1, 307, IMMEDIATE, 0, 0, 0, 0, __params1);
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD");
-        makeNewRequest(&__req0, 276, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + DataTransferLoop");
-        __currentState = STATE__DataTransferLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        packet__seqNum = cpt;
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC");
-        makeNewRequest(&__req0, 278, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + DataTransferLoop");
-        __currentState = STATE__DataTransferLoop;
-        
-      }
-      break;
-      
-      case STATE__DataTransferLoop: 
-      if (!(cpt<nbOfComputedPackets)) {
-        makeNewRequest(&__req0, 297, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (cpt<nbOfComputedPackets) {
-        makeNewRequest(&__req1, 298, IMMEDIATE, 1, (3)*1000, (3)*1000, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__STOP__STATE;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        debug2Msg(__myname, "-> (=====) Entering state + ChoiceBetweenInputOutput");
-        __currentState = STATE__ChoiceBetweenInputOutput;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/InterfaceDevice.h b/MPSoC/mutekh/examples/avatar/InterfaceDevice.h
deleted file mode 100644
index 9031094d3b38822ce1a5dcf24066c87b04597998..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/InterfaceDevice.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef InterfaceDevice_H
-#define InterfaceDevice_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__InterfaceDevice(struct mwmr_s *channels_InterfaceDevice[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Magnetron.c b/MPSoC/mutekh/examples/avatar/Magnetron.c
deleted file mode 100644
index 1825e7c550ef213734f05584f5b4d7600604e6d4..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Magnetron.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "Magnetron.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _startM;
-static uint32_t _stopM;
-
-#define STATE__START__STATE 0
-#define STATE__Running 1
-#define STATE__WaitForStart 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Magnetron(struct mwmr_s *channels_Magnetron[]){
-  
-  struct mwmr_s *Controller_startMagnetron__Magnetron_startM= channels_Magnetron[0];
-  struct mwmr_s *Controller_stopMagnetron__Magnetron_stopM= channels_Magnetron[1];
-  int power = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Magnetron";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + WaitForStart");
-      __currentState = STATE__WaitForStart;
-      break;
-      
-      case STATE__Running: 
-      debug2Msg(__myname, "-> (=====) test Controller_stopMagnetron__Magnetron_stopM");
-      makeNewRequest(&__req0, 62, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Controller_stopMagnetron__Magnetron_stopM;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + WaitForStart");
-      __currentState = STATE__WaitForStart;
-      break;
-      
-      case STATE__WaitForStart: 
-      debug2Msg(__myname, "-> (=====) test Controller_startMagnetron__Magnetron_startM");
-      makeNewRequest(&__req0, 61, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__Controller_startMagnetron__Magnetron_startM;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + Running");
-      __currentState = STATE__Running;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Magnetron.h b/MPSoC/mutekh/examples/avatar/Magnetron.h
deleted file mode 100644
index f4bca3141f013fb14398f78720b64ec850a6a4fb..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Magnetron.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Magnetron_H
-#define Magnetron_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Magnetron(struct mwmr_s *channels_Magnetron[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/MainControl.c b/MPSoC/mutekh/examples/avatar/MainControl.c
deleted file mode 100644
index 06fdb64c2e12c30df6a34f706df2ba2b31db1687..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/MainControl.c
+++ /dev/null
@@ -1,381 +0,0 @@
-#include "MainControl.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _motorCommand;
-static uint32_t _control;
-static uint32_t _tempData;
-static uint32_t _sensorData;
-static uint32_t _changeRate;
-
-#define STATE__START__STATE 0
-#define STATE__turnRight 1
-#define STATE__turnLeft 2
-#define STATE__choice__0 3
-#define STATE__sendMotorCommand 4
-#define STATE__dodgeObstacle 5
-#define STATE__choice__1 6
-#define STATE__setVelocity 7
-#define STATE__choice__2 8
-#define STATE__controlTempSensor 9
-#define STATE__choice__3 10
-#define STATE__changeRate 11
-#define STATE__calculateDistance 12
-#define STATE__choice__4 13
-#define STATE__measureTemp 14
-#define STATE__state1 15
-#define STATE__state2 16
-#define STATE__state0 17
-#define STATE__choice__5 18
-#define STATE__startController 19
-#define STATE__STOP__STATE 20
-
-void *mainFunc__MainControl(struct mwmr_s *channels_MainControl[]){
-  
-  struct mwmr_s *MainControl_motorCommand__MotorControl_motorCommand= channels_MainControl[0];
-  struct mwmr_s *MainControl_changeRate__DistanceSensor_changeRate= channels_MainControl[1];
-  struct mwmr_s *MainControl_tempData__TemperatureSensor_tempData= channels_MainControl[2];
-  struct mwmr_s *MainControl_sensorData__DistanceSensor_sensorData= channels_MainControl[3];
-  struct mwmr_s *MainControl_control__TemperatureSensor_control= channels_MainControl[4];
-  int state = 0;
-  bool sensorOn = false;
-  int newRate = 0;
-  int samplingRate = 1;
-  int rateLow = 10;
-  int rateMed = 4;
-  int rateHigh = 1;
-  int temp = 0;
-  int leftVelocity = 0;
-  int rightVelocity = 0;
-  int distanceLeft = 0;
-  int distanceRight = 0;
-  int distanceFront = 0;
-  int speedLow = 2;
-  int speedNormal = 5;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[3];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[3];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[3];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "MainControl";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      waitFor((20)*1000, (30)*1000);
-      __currentState = STATE__startController;
-      break;
-      
-      case STATE__turnRight: 
-      rightVelocity = 1;
-      leftVelocity = speedLow;
-      __currentState = STATE__sendMotorCommand;
-      break;
-      
-      case STATE__turnLeft: 
-      leftVelocity = 1;
-      rightVelocity = speedLow;
-      __currentState = STATE__sendMotorCommand;
-      break;
-      
-      case STATE__choice__0: 
-      if (distanceLeft>distanceRight) {
-        makeNewRequest(&__req0, 196, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (!(distanceLeft>distanceRight)) {
-        makeNewRequest(&__req1, 199, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__turnLeft;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__turnRight;
-        
-      }
-      break;
-      
-      case STATE__sendMotorCommand: 
-      __params0[0] = &leftVelocity;
-      __params0[1] = &rightVelocity;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 105, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__MainControl_motorCommand__MotorControl_motorCommand;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      waitFor((2)*1000, (10)*1000);
-      __currentState = STATE__startController;
-      break;
-      
-      case STATE__dodgeObstacle: 
-      __currentState = STATE__choice__0;
-      break;
-      
-      case STATE__choice__1: 
-      if (state != 2) {
-        makeNewRequest(&__req0, 190, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (!(state != 2)) {
-        makeNewRequest(&__req1, 194, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__sendMotorCommand;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__dodgeObstacle;
-        
-      }
-      break;
-      
-      case STATE__setVelocity: 
-      __currentState = STATE__choice__1;
-      break;
-      
-      case STATE__choice__2: 
-      if ((!(state<2))&&(!(state == 2))) {
-        makeNewRequest(&__req0, 127, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (state<2) {
-        makeNewRequest(&__req1, 129, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (state == 2) {
-        makeNewRequest(&__req2, 184, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__setVelocity;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        sensorOn = false;
-        __params0[0] = &sensorOn;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 123, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__MainControl_control__TemperatureSensor_control;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __currentState = STATE__setVelocity;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        sensorOn = true;
-        __params0[0] = &sensorOn;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 124, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__MainControl_control__TemperatureSensor_control;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __currentState = STATE__setVelocity;
-        
-      }
-      break;
-      
-      case STATE__controlTempSensor: 
-      waitFor((1)*1000, (5)*1000);
-      __currentState = STATE__choice__2;
-      break;
-      
-      case STATE__choice__3: 
-      makeNewRequest(&__req0, 135, IMMEDIATE, 0, 0, 0, 0, __params0);
-      addRequestToList(&__list, &__req0);
-      if (samplingRate != newRate) {
-        __params1[0] = &samplingRate;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req1);
-        makeNewRequest(&__req1, 109, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params1);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req1.asyncChannel = &__MainControl_changeRate__DistanceSensor_changeRate;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__controlTempSensor;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__controlTempSensor;
-        
-      }
-      break;
-      
-      case STATE__changeRate: 
-      waitFor((10)*1000, (20)*1000);
-      __currentState = STATE__choice__3;
-      break;
-      
-      case STATE__calculateDistance: 
-      __currentState = STATE__choice__5;
-      break;
-      
-      case STATE__choice__4: 
-      makeNewRequest(&__req0, 158, IMMEDIATE, 0, 0, 0, 0, __params0);
-      addRequestToList(&__list, &__req0);
-      if (state == 2) {
-        makeNewRequest(&__req1, 159, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__calculateDistance;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__measureTemp;
-        
-      }
-      break;
-      
-      case STATE__measureTemp: 
-      __params0[0] = &temp;
-      makeNewRequest(&__req0, 115, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.asyncChannel = &__MainControl_tempData__TemperatureSensor_tempData;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__calculateDistance;
-      break;
-      
-      case STATE__state1: 
-      state = 1;
-      newRate = rateMed;
-      leftVelocity = speedLow;
-      rightVelocity = speedLow;
-      __currentState = STATE__changeRate;
-      break;
-      
-      case STATE__state2: 
-      state = 2;
-      newRate = rateHigh;
-      __currentState = STATE__changeRate;
-      break;
-      
-      case STATE__state0: 
-      state = 0;
-      newRate = rateLow;
-      leftVelocity = speedNormal;
-      rightVelocity = speedNormal;
-      __currentState = STATE__changeRate;
-      break;
-      
-      case STATE__choice__5: 
-      if (distanceFront>8) {
-        makeNewRequest(&__req0, 165, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (distanceFront<3) {
-        makeNewRequest(&__req1, 168, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if ((!(distanceFront>8))&&(!(distanceFront<3))) {
-        makeNewRequest(&__req2, 171, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__state0;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__state2;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__state1;
-        
-      }
-      break;
-      
-      case STATE__startController: 
-      __params0[0] = &distanceLeft;
-      __params0[1] = &distanceFront;
-      __params0[2] = &distanceLeft;
-      makeNewRequest(&__req0, 120, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 3, __params0);
-      __req0.asyncChannel = &__MainControl_sensorData__DistanceSensor_sensorData;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__choice__4;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/MainControl.h b/MPSoC/mutekh/examples/avatar/MainControl.h
deleted file mode 100644
index 991ee857c5e45d1d19264892077498bdff64a7d0..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/MainControl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef MainControl_H
-#define MainControl_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__MainControl(struct mwmr_s *channels_MainControl[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Makefile b/MPSoC/mutekh/examples/avatar/Makefile
deleted file mode 100644
index 3a1f27137b06cfd9366de549b3bab44200c42ccf..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-objs = main.o Block1.o Block0.o 
\ No newline at end of file
diff --git a/MPSoC/mutekh/examples/avatar/MicroWaveOven.c b/MPSoC/mutekh/examples/avatar/MicroWaveOven.c
deleted file mode 100644
index 1a1b355d1101121fc2d4a5c6044ae0ae92d1e563..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/MicroWaveOven.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "MicroWaveOven.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__Running 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__MicroWaveOven(struct mwmr_s *channels_MicroWaveOven[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "MicroWaveOven";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + Running");
-      __currentState = STATE__Running;
-      break;
-      
-      case STATE__Running: 
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/MicroWaveOven.h b/MPSoC/mutekh/examples/avatar/MicroWaveOven.h
deleted file mode 100644
index 14a47b91db5e4a78fceadc2527bac530a8dc6558..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/MicroWaveOven.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef MicroWaveOven_H
-#define MicroWaveOven_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__MicroWaveOven(struct mwmr_s *channels_MicroWaveOven[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/MotorControl.c b/MPSoC/mutekh/examples/avatar/MotorControl.c
deleted file mode 100644
index 3f95ba1615a9b07879d944fcd80c7b2442c4e113..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/MotorControl.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "MotorControl.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _motorCommand;
-
-#define STATE__START__STATE 0
-#define STATE__startMotor 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__MotorControl(struct mwmr_s *channels_MotorControl[]){
-  
-  struct mwmr_s *MainControl_motorCommand__MotorControl_motorCommand= channels_MotorControl[0];
-  int rightVelocity = 0;
-  int leftVelocity = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "MotorControl";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__startMotor;
-      break;
-      
-      case STATE__startMotor: 
-      waitFor((5)*1000, (10)*1000);
-      __params0[0] = &leftVelocity;
-      __params0[1] = &rightVelocity;
-      makeNewRequest(&__req0, 66, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__MainControl_motorCommand__MotorControl_motorCommand;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      waitFor((10)*1000, (20)*1000);
-      __currentState = STATE__startMotor;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/MotorControl.h b/MPSoC/mutekh/examples/avatar/MotorControl.h
deleted file mode 100644
index b6eca410062a7aab96601f40b5bd0403f13429c7..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/MotorControl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef MotorControl_H
-#define MotorControl_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__MotorControl(struct mwmr_s *channels_MotorControl[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/NeighbourhoodTableManagement.c b/MPSoC/mutekh/examples/avatar/NeighbourhoodTableManagement.c
deleted file mode 100644
index 3c6963b571a52948cdebfcf280815bd97ca013ce..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/NeighbourhoodTableManagement.c
+++ /dev/null
@@ -1,404 +0,0 @@
-#include "NeighbourhoodTableManagement.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _addANode;
-static uint32_t _setPosition;
-static uint32_t _sendTable;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__choice__1 2
-#define STATE__choice__2 3
-#define STATE__IDAdded 4
-#define STATE__PositionUpdated 5
-#define STATE__choice__3 6
-#define STATE__UpdatingPosition 7
-#define STATE__IsKnownID 8
-#define STATE__choice__4 9
-#define STATE__AddingNewID 10
-#define STATE__RemovingOldIDs 11
-#define STATE__WaitingForNewNodesOrPosition 12
-#define STATE__STOP__STATE 13
-
-void *mainFunc__NeighbourhoodTableManagement(struct mwmr_s *channels_NeighbourhoodTableManagement[]){
-  
-  struct mwmr_s *NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList= channels_NeighbourhoodTableManagement[0];
-  struct mwmr_s *GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition= channels_NeighbourhoodTableManagement[1];
-  struct mwmr_s *DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode= channels_NeighbourhoodTableManagement[2];
-  int id = 0;
-  int position = 0;
-  int time_id = 0;
-  int listOfNodes__id0 = 0;
-  int listOfNodes__id1 = 0;
-  int listOfNodes__id2 = 0;
-  int listOfNodes__position0 = 0;
-  int listOfNodes__position1 = 0;
-  int listOfNodes__position2 = 0;
-  int currentPosition = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[7];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[7];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[7];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "NeighbourhoodTableManagement";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      listOfNodes__id0 = 0;
-      traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id0", listOfNodes__id0,0);
-      listOfNodes__id1 = 0;
-      traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id1", listOfNodes__id1,0);
-      listOfNodes__id2 = 0;
-      traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id2", listOfNodes__id2,0);
-      __currentState = STATE__WaitingForNewNodesOrPosition;
-      break;
-      
-      case STATE__choice__0: 
-      if (!(listOfNodes__id1 == id)) {
-        makeNewRequest(&__req0, 455, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (listOfNodes__id1 == id) {
-        makeNewRequest(&__req1, 556, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        listOfNodes__position2 = position;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__position2", listOfNodes__position2,0);
-        __currentState = STATE__PositionUpdated;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        listOfNodes__position1 = position;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__position1", listOfNodes__position1,0);
-        __currentState = STATE__PositionUpdated;
-        
-      }
-      break;
-      
-      case STATE__choice__1: 
-      if ((listOfNodes__position2>=listOfNodes__position1)&&(listOfNodes__position2>=listOfNodes__position1)) {
-        makeNewRequest(&__req0, 353, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if ((listOfNodes__position1>=listOfNodes__position0)&&(listOfNodes__position1>=listOfNodes__position2)) {
-        makeNewRequest(&__req1, 372, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if ((listOfNodes__position0>=listOfNodes__position1)&&(listOfNodes__position0>=listOfNodes__position2)) {
-        makeNewRequest(&__req2, 390, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        listOfNodes__id2 = 0;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id2", listOfNodes__id2,0);
-        __currentState = STATE__AddingNewID;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        listOfNodes__id1 = 0;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id1", listOfNodes__id1,0);
-        __currentState = STATE__AddingNewID;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        listOfNodes__id0 = 0;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id0", listOfNodes__id0,0);
-        __currentState = STATE__AddingNewID;
-        
-      }
-      break;
-      
-      case STATE__choice__2: 
-      if ((listOfNodes__position2<currentPosition)) {
-        makeNewRequest(&__req0, 408, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if ((listOfNodes__position1<currentPosition)) {
-        makeNewRequest(&__req1, 416, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if ((listOfNodes__position0<currentPosition)) {
-        makeNewRequest(&__req2, 424, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        listOfNodes__id2 = 0;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id2", listOfNodes__id2,0);
-        __currentState = STATE__AddingNewID;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        listOfNodes__id1 = 0;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id1", listOfNodes__id1,0);
-        __currentState = STATE__AddingNewID;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        listOfNodes__id0 = 0;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id0", listOfNodes__id0,0);
-        __currentState = STATE__AddingNewID;
-        
-      }
-      break;
-      
-      case STATE__IDAdded: 
-      __currentState = STATE__WaitingForNewNodesOrPosition;
-      break;
-      
-      case STATE__PositionUpdated: 
-      __currentState = STATE__WaitingForNewNodesOrPosition;
-      break;
-      
-      case STATE__choice__3: 
-      if (listOfNodes__id0 == id) {
-        makeNewRequest(&__req0, 458, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (!(listOfNodes__id0 == id)) {
-        makeNewRequest(&__req1, 562, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        listOfNodes__position0 = position;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__position0", listOfNodes__position0,0);
-        __currentState = STATE__PositionUpdated;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__choice__0;
-        
-      }
-      break;
-      
-      case STATE__UpdatingPosition: 
-      __currentState = STATE__choice__3;
-      break;
-      
-      case STATE__IsKnownID: 
-      if (!((listOfNodes__id0 == id)||(listOfNodes__id1 == id)||(listOfNodes__id2 == id))) {
-        makeNewRequest(&__req0, 464, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if ((listOfNodes__id0 == id)||(listOfNodes__id1 == id)||(listOfNodes__id2 == id)) {
-        makeNewRequest(&__req1, 529, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__RemovingOldIDs;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__UpdatingPosition;
-        
-      }
-      break;
-      
-      case STATE__choice__4: 
-      if (!((listOfNodes__position0<currentPosition)||(listOfNodes__position1<currentPosition)||(listOfNodes__position2<currentPosition))) {
-        makeNewRequest(&__req0, 432, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if ((listOfNodes__position0<currentPosition)||(listOfNodes__position1<currentPosition)||(listOfNodes__position2<currentPosition)) {
-        makeNewRequest(&__req1, 503, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__choice__1;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__choice__2;
-        
-      }
-      break;
-      
-      case STATE__AddingNewID: 
-      if (listOfNodes__id2 == 0) {
-        makeNewRequest(&__req0, 433, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (listOfNodes__id1 == 0) {
-        makeNewRequest(&__req1, 440, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (listOfNodes__id0 == 0) {
-        makeNewRequest(&__req2, 447, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        listOfNodes__id2 = id;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id2", listOfNodes__id2,0);
-        listOfNodes__position2 = position;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__position2", listOfNodes__position2,0);
-        __currentState = STATE__IDAdded;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        listOfNodes__id1 = id;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id1", listOfNodes__id1,0);
-        listOfNodes__position1 = position;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__position1", listOfNodes__position1,0);
-        __currentState = STATE__IDAdded;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        listOfNodes__id0 = id;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__id0", listOfNodes__id0,0);
-        listOfNodes__position0 = position;
-        traceVariableModification("NeighbourhoodTableManagement", "listOfNodes__position0", listOfNodes__position0,0);
-        __currentState = STATE__IDAdded;
-        
-      }
-      break;
-      
-      case STATE__RemovingOldIDs: 
-      if (!((listOfNodes__id0>0)&&(listOfNodes__id1>0)&&(listOfNodes__id2>0))) {
-        makeNewRequest(&__req0, 467, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if ((listOfNodes__id0>0)&&(listOfNodes__id1>0)&&(listOfNodes__id2>0)) {
-        makeNewRequest(&__req1, 477, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__AddingNewID;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__choice__4;
-        
-      }
-      break;
-      
-      case STATE__WaitingForNewNodesOrPosition: 
-      __params0[0] = &currentPosition;
-      makeNewRequest(&__req0, 345, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__GPSSensor_setPosition__NeighbourhoodTableManagement_setPosition;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &id;
-      __params1[1] = &position;
-      makeNewRequest(&__req1, 350, RECEIVE_SYNC_REQUEST, 0, 0, 0, 2, __params1);
-      __req1.syncChannel = &__DSRSC_Management_setCarPosition__NeighbourhoodTableManagement_addANode;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &currentPosition;
-      __params2[1] = &listOfNodes__id0;
-      __params2[2] = &listOfNodes__id1;
-      __params2[3] = &listOfNodes__id2;
-      __params2[4] = &listOfNodes__position0;
-      __params2[5] = &listOfNodes__position1;
-      __params2[6] = &listOfNodes__position2;
-      makeNewRequest(&__req2, 337, SEND_SYNC_REQUEST, 0, 0, 0, 7, __params2);
-      __req2.syncChannel = &__NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__WaitingForNewNodesOrPosition;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__IsKnownID;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__WaitingForNewNodesOrPosition;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/NeighbourhoodTableManagement.h b/MPSoC/mutekh/examples/avatar/NeighbourhoodTableManagement.h
deleted file mode 100644
index 826c09b39b8b3fdcf83c38f4fe746047a586701d..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/NeighbourhoodTableManagement.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef NeighbourhoodTableManagement_H
-#define NeighbourhoodTableManagement_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__NeighbourhoodTableManagement(struct mwmr_s *channels_NeighbourhoodTableManagement[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/ObjectListManagement.c b/MPSoC/mutekh/examples/avatar/ObjectListManagement.c
deleted file mode 100644
index 618d6b1b89a85fcb855359ec7efb3c548f7b547b..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/ObjectListManagement.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "ObjectListManagement.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _isObstacleAhead;
-static uint32_t _getInfoOnObstacle;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingForUpdateOrRequestOnObstacle 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__ObjectListManagement(struct mwmr_s *channels_ObjectListManagement[]){
-  
-  struct mwmr_s *PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle= channels_ObjectListManagement[0];
-  struct mwmr_s *RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead= channels_ObjectListManagement[1];
-  int obstacle = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "ObjectListManagement";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForUpdateOrRequestOnObstacle;
-      break;
-      
-      case STATE__WaitingForUpdateOrRequestOnObstacle: 
-      __params0[0] = &obstacle;
-      makeNewRequest(&__req0, 659, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &obstacle;
-      makeNewRequest(&__req1, 658, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params1);
-      __req1.syncChannel = &__PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__WaitingForUpdateOrRequestOnObstacle;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__WaitingForUpdateOrRequestOnObstacle;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/ObjectListManagement.h b/MPSoC/mutekh/examples/avatar/ObjectListManagement.h
deleted file mode 100644
index ea9a63747d5bfbdbe038655ae200f46fbcf4fe52..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/ObjectListManagement.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef ObjectListManagement_H
-#define ObjectListManagement_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__ObjectListManagement(struct mwmr_s *channels_ObjectListManagement[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/OutputEngine.c b/MPSoC/mutekh/examples/avatar/OutputEngine.c
deleted file mode 100644
index 0d55394b8c42276893982c587e6974c9664c9022..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/OutputEngine.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "OutputEngine.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _address;
-static uint32_t _packet;
-
-#define STATE__START__STATE 0
-#define STATE__FreePacket 1
-#define STATE__Waiting 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__OutputEngine(struct mwmr_s *channels_OutputEngine[]){
-  
-  struct mwmr_s *OutputEngine_address__InputEngine_address= channels_OutputEngine[0];
-  struct mwmr_s *Scheduling_packet__OutputEngine_packet= channels_OutputEngine[1];
-  int packet__address = 0;
-  int packet__date = 0;
-  int address = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "OutputEngine";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__FreePacket: 
-      waitFor((10)*1000, (10)*1000);
-      __params0[0] = &address;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 742, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__OutputEngine_address__InputEngine_address;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Waiting: 
-      waitFor((50)*1000, (50)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 745, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Scheduling_packet__OutputEngine_packet;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__FreePacket;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/OutputEngine.h b/MPSoC/mutekh/examples/avatar/OutputEngine.h
deleted file mode 100644
index 4ad74878ec5f75496a300847ad9ff5b9970078de..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/OutputEngine.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef OutputEngine_H
-#define OutputEngine_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__OutputEngine(struct mwmr_s *channels_OutputEngine[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/PTC.c b/MPSoC/mutekh/examples/avatar/PTC.c
deleted file mode 100644
index 78eeb1dfaab68b3270e8730a3410800b67cd0e97..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/PTC.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "PTC.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__PTC(struct mwmr_s *channels_PTC[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "PTC";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/PTC.h b/MPSoC/mutekh/examples/avatar/PTC.h
deleted file mode 100644
index 2e191a4d3bfb4e8dccc0230da7f30f5bd7bf61f5..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/PTC.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef PTC_H
-#define PTC_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__PTC(struct mwmr_s *channels_PTC[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/PlausibilityCheck.c b/MPSoC/mutekh/examples/avatar/PlausibilityCheck.c
deleted file mode 100644
index d6e1fa5ba24d2b7eea5a7d47bfd13763102670ca..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/PlausibilityCheck.c
+++ /dev/null
@@ -1,259 +0,0 @@
-#include "PlausibilityCheck.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _getEmergencyMessageToVerify;
-static uint32_t _getInfoOnObstacle;
-static uint32_t _getInfoOnSpeed;
-static uint32_t _brake;
-static uint32_t _getNodeList;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__choice__1 2
-#define STATE__EmergencyTakenIntoAccount 3
-#define STATE__choice__2 4
-#define STATE__EmergencyIgnored 5
-#define STATE__choice__3 6
-#define STATE__WaitingForEmergencyMessage 7
-#define STATE__STOP__STATE 8
-
-void PlausibilityCheck__emergencyIgnored() {
-  traceFunctionCall("PlausibilityCheck", "emergencyIgnored", "-");
-}
-
-
-void PlausibilityCheck__emergencyTakenIntoAccount() {
-  traceFunctionCall("PlausibilityCheck", "emergencyTakenIntoAccount", "-");
-}
-
-
-void PlausibilityCheck__getNodeList(int currentPosition, int list__id0, int list__id1, int list__id2, int list__position0, int list__position1, int list__position2) {
-  char my__attr[CHAR_ALLOC_SIZE];
-  sprintf(my__attr, "%d,%d,%d,%d,%d,%d,%d",currentPosition,list__id0,list__id1,list__id2,list__position0,list__position1,list__position2);
-  traceFunctionCall("PlausibilityCheck", "getNodeList", my__attr);
-}
-
-
-void *mainFunc__PlausibilityCheck(struct mwmr_s *channels_PlausibilityCheck[]){
-  
-  struct mwmr_s *NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList= channels_PlausibilityCheck[0];
-  struct mwmr_s *DangerAvoidanceStrategy_brake__PlausibilityCheck_brake= channels_PlausibilityCheck[1];
-  struct mwmr_s *PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle= channels_PlausibilityCheck[2];
-  struct mwmr_s *PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed= channels_PlausibilityCheck[3];
-  struct mwmr_s *CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify= channels_PlausibilityCheck[4];
-  int id = 0;
-  int position = 0;
-  int speed = 0;
-  int obstacle = 0;
-  int list__id0 = 0;
-  int list__id1 = 0;
-  int list__id2 = 0;
-  int list__position0 = 0;
-  int list__position1 = 0;
-  int list__position2 = 0;
-  int currentPosition = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[6];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[6];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "PlausibilityCheck";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForEmergencyMessage;
-      break;
-      
-      case STATE__choice__0: 
-      if (!(position>currentPosition)) {
-        makeNewRequest(&__req0, 681, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (position>currentPosition) {
-        makeNewRequest(&__req1, 729, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__EmergencyIgnored;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        PlausibilityCheck__emergencyTakenIntoAccount ();
-        __currentState = STATE__EmergencyTakenIntoAccount;
-        
-      }
-      break;
-      
-      case STATE__choice__1: 
-      if (!((list__id0 == id)||(list__id1 == id)||(list__id2 == id))) {
-        makeNewRequest(&__req0, 682, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if ((list__id0 == id)||(list__id1 == id)||(list__id2 == id)) {
-        makeNewRequest(&__req1, 703, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__EmergencyIgnored;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__choice__0;
-        
-      }
-      break;
-      
-      case STATE__EmergencyTakenIntoAccount: 
-      __params0[0] = &speed;
-      __params0[1] = &currentPosition;
-      __params0[2] = &position;
-      makeNewRequest(&__req0, 669, SEND_SYNC_REQUEST, 0, 0, 0, 3, __params0);
-      __req0.syncChannel = &__DangerAvoidanceStrategy_brake__PlausibilityCheck_brake;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingForEmergencyMessage;
-      break;
-      
-      case STATE__choice__2: 
-      if (!(speed<3)) {
-        makeNewRequest(&__req0, 684, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (speed<3) {
-        makeNewRequest(&__req1, 685, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__choice__1;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__EmergencyIgnored;
-        
-      }
-      break;
-      
-      case STATE__EmergencyIgnored: 
-      PlausibilityCheck__emergencyIgnored ();
-      __currentState = STATE__WaitingForEmergencyMessage;
-      break;
-      
-      case STATE__choice__3: 
-      if (obstacle>0) {
-        makeNewRequest(&__req0, 688, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (obstacle == 0) {
-        makeNewRequest(&__req1, 694, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__choice__2;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__EmergencyIgnored;
-        
-      }
-      break;
-      
-      case STATE__WaitingForEmergencyMessage: 
-      __params0[0] = &id;
-      __params0[1] = &position;
-      makeNewRequest(&__req0, 677, RECEIVE_SYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.syncChannel = &__CorrectnessChecking_toPlausibityCheckMessage__PlausibilityCheck_getEmergencyMessageToVerify;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __params0[0] = &speed;
-      makeNewRequest(&__req0, 676, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __params0[0] = &obstacle;
-      makeNewRequest(&__req0, 675, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__PlausibilityCheck_getInfoOnObstacle__ObjectListManagement_getInfoOnObstacle;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __params0[0] = &list__id0;
-      __params0[1] = &list__id1;
-      __params0[2] = &list__id2;
-      __params0[3] = &list__position0;
-      __params0[4] = &list__position1;
-      __params0[5] = &list__position2;
-      makeNewRequest(&__req0, 667, RECEIVE_SYNC_REQUEST, 0, 0, 0, 6, __params0);
-      __req0.syncChannel = &__NeighbourhoodTableManagement_sendTable__PlausibilityCheck_getNodeList;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__choice__3;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/PlausibilityCheck.h b/MPSoC/mutekh/examples/avatar/PlausibilityCheck.h
deleted file mode 100644
index a3badac240efdb595277887a74397d0aee63074d..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/PlausibilityCheck.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef PlausibilityCheck_H
-#define PlausibilityCheck_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__PlausibilityCheck(struct mwmr_s *channels_PlausibilityCheck[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/README b/MPSoC/mutekh/examples/avatar/README
deleted file mode 100644
index d274fe577921101f8158c64ab520b72c133a8230..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory is meant to contain the code generated by TTool from AVATAR design models
diff --git a/MPSoC/mutekh/examples/avatar/RadarSensor.c b/MPSoC/mutekh/examples/avatar/RadarSensor.c
deleted file mode 100644
index c579786a21f65968345d34ab770d7ecc467c934f..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/RadarSensor.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "RadarSensor.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _obstacleAhead;
-
-#define STATE__START__STATE 0
-#define STATE__sendingUpdate 1
-#define STATE__choice__0 2
-#define STATE__WaitingForRadarInfo 3
-#define STATE__STOP__STATE 4
-
-void *mainFunc__RadarSensor(struct mwmr_s *channels_RadarSensor[]){
-  
-  struct mwmr_s *RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead= channels_RadarSensor[0];
-  int minRadarUpdate = 100;
-  int maxRadarUpdate = 150;
-  int obstacleAhead = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "RadarSensor";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForRadarInfo;
-      break;
-      
-      case STATE__sendingUpdate: 
-      __params0[0] = &obstacleAhead;
-      makeNewRequest(&__req0, 271, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__RadarSensor_obstacleAhead__ObjectListManagement_isObstacleAhead;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingForRadarInfo;
-      break;
-      
-      case STATE__choice__0: 
-      makeNewRequest(&__req0, 274, IMMEDIATE, 0, 0, 0, 0, __params0);
-      addRequestToList(&__list, &__req0);
-      makeNewRequest(&__req1, 281, IMMEDIATE, 0, 0, 0, 0, __params1);
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        obstacleAhead = 1;
-        traceVariableModification("RadarSensor", "obstacleAhead", obstacleAhead,0);
-        __currentState = STATE__sendingUpdate;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        obstacleAhead = 1;
-        traceVariableModification("RadarSensor", "obstacleAhead", obstacleAhead,0);
-        __currentState = STATE__sendingUpdate;
-        
-      }
-      break;
-      
-      case STATE__WaitingForRadarInfo: 
-      waitFor((minRadarUpdate)*1000, (maxRadarUpdate)*1000);
-      __currentState = STATE__choice__0;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/RadarSensor.h b/MPSoC/mutekh/examples/avatar/RadarSensor.h
deleted file mode 100644
index 53fdeeb30dd16c6c4df40420509bdffc8899e927..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/RadarSensor.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef RadarSensor_H
-#define RadarSensor_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__RadarSensor(struct mwmr_s *channels_RadarSensor[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Sched0.c b/MPSoC/mutekh/examples/avatar/Sched0.c
deleted file mode 100644
index 4afc1ef26aed2956903abf815cfbc1f5b389dcea..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Sched0.c
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "Sched0.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _scheduledPacket0;
-static uint32_t _toScheduler0;
-
-#define STATE__START__STATE 0
-#define STATE__PriorityLow 1
-#define STATE__PriorityMedium 2
-#define STATE__PriorityHigh 3
-#define STATE__choice__0 4
-#define STATE__Enqueue 5
-#define STATE__Waiting 6
-#define STATE__STOP__STATE 7
-
-void *mainFunc__Sched0(struct mwmr_s *channels_Sched0[]){
-  
-  struct mwmr_s *Sched0_toScheduler0__Scheduling_to_scheduler0= channels_Sched0[0];
-  struct mwmr_s *Sched0_scheduledPacket0__Scheduling_scheduledPacket0= channels_Sched0[1];
-  int packet__address = 0;
-  int packet__date = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Sched0";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__PriorityLow: 
-      waitFor((100)*1000, (100)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 1031, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched0_scheduledPacket0__Scheduling_scheduledPacket0;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__PriorityMedium: 
-      waitFor((50)*1000, (50)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 1030, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched0_scheduledPacket0__Scheduling_scheduledPacket0;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__PriorityHigh: 
-      waitFor((10)*1000, (10)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 1029, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched0_scheduledPacket0__Scheduling_scheduledPacket0;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__choice__0: 
-      if (packet__date == 2) {
-        makeNewRequest(&__req0, 1038, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (packet__date == 1) {
-        makeNewRequest(&__req1, 1045, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (packet__date == 0) {
-        makeNewRequest(&__req2, 1048, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__PriorityHigh;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__PriorityMedium;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__PriorityLow;
-        
-      }
-      break;
-      
-      case STATE__Enqueue: 
-      __currentState = STATE__choice__0;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 1028, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Sched0_toScheduler0__Scheduling_to_scheduler0;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Enqueue;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Sched0.h b/MPSoC/mutekh/examples/avatar/Sched0.h
deleted file mode 100644
index b69c5bc9c01d22d7795521f18945de4dc359a0cd..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Sched0.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Sched0_H
-#define Sched0_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Sched0(struct mwmr_s *channels_Sched0[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Sched1.c b/MPSoC/mutekh/examples/avatar/Sched1.c
deleted file mode 100644
index f13953008e927af2be1ce6c8925a4dc96ac26604..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Sched1.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include "Sched1.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _scheduledPacket1;
-static uint32_t _toScheduler1;
-
-#define STATE__START__STATE 0
-#define STATE__PriorityLow 1
-#define STATE__PriorityMedium 2
-#define STATE__PriorityHigh 3
-#define STATE__choice__0 4
-#define STATE__Enqueue 5
-#define STATE__Waiting 6
-#define STATE__STOP__STATE 7
-
-void *mainFunc__Sched1(struct mwmr_s *channels_Sched1[]){
-  
-  struct mwmr_s *Sched1_toScheduler1__Scheduling_to_scheduler1= channels_Sched1[0];
-  struct mwmr_s *Sched1_scheduledPacket1__Scheduling_scheduledPacket1= channels_Sched1[1];
-  int packet__address = 0;
-  int packet__date = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Sched1";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__PriorityLow: 
-      waitFor((100)*1000, (100)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 1001, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched1_scheduledPacket1__Scheduling_scheduledPacket1;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__PriorityMedium: 
-      waitFor((50)*1000, (50)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 1000, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched1_scheduledPacket1__Scheduling_scheduledPacket1;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__PriorityHigh: 
-      waitFor((10)*1000, (10)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 999, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched1_scheduledPacket1__Scheduling_scheduledPacket1;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      break;
-      
-      case STATE__choice__0: 
-      if (packet__date == 0) {
-        makeNewRequest(&__req0, 1002, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (packet__date == 1) {
-        makeNewRequest(&__req1, 1005, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (packet__date == 2) {
-        makeNewRequest(&__req2, 1012, IMMEDIATE, 0, 0, 0, 0, __params2);
-        addRequestToList(&__list, &__req2);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__PriorityLow;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__PriorityMedium;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__PriorityHigh;
-        
-      }
-      break;
-      
-      case STATE__Enqueue: 
-      __currentState = STATE__choice__0;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 998, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Sched1_toScheduler1__Scheduling_to_scheduler1;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Enqueue;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Sched1.h b/MPSoC/mutekh/examples/avatar/Sched1.h
deleted file mode 100644
index c0bdfb0fab3cece38ecfeca81669b84b332df566..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Sched1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Sched1_H
-#define Sched1_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Sched1(struct mwmr_s *channels_Sched1[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Scheduling.c b/MPSoC/mutekh/examples/avatar/Scheduling.c
deleted file mode 100644
index 77e887e9dbe9223c70c67fab9831670f4c2ecaa5..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Scheduling.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#include "Scheduling.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _from_queue_low;
-static uint32_t _from_queue_medium;
-static uint32_t _from_queue_high;
-static uint32_t _to_scheduler0;
-static uint32_t _to_scheduler1;
-static uint32_t _packet;
-static uint32_t _scheduledPacket0;
-static uint32_t _scheduledPacket1;
-
-#define STATE__START__STATE 0
-#define STATE__Dispatch 1
-#define STATE__SendToOutput 2
-#define STATE__Waiting 3
-#define STATE__Read 4
-#define STATE__STOP__STATE 5
-
-void *mainFunc__Scheduling(struct mwmr_s *channels_Scheduling[]){
-  
-  struct mwmr_s *Scheduling_packet__OutputEngine_packet= channels_Scheduling[0];
-  struct mwmr_s *Sched0_scheduledPacket0__Scheduling_scheduledPacket0= channels_Scheduling[1];
-  struct mwmr_s *Sched1_scheduledPacket1__Scheduling_scheduledPacket1= channels_Scheduling[2];
-  struct mwmr_s *Classification_queue_high__Scheduling_from_queue_high= channels_Scheduling[3];
-  struct mwmr_s *Classification_queue_medium__Scheduling_from_queue_medium= channels_Scheduling[4];
-  struct mwmr_s *Classification_queue_low__Scheduling_from_queue_low= channels_Scheduling[5];
-  struct mwmr_s *Sched0_toScheduler0__Scheduling_to_scheduler0= channels_Scheduling[6];
-  struct mwmr_s *Sched1_toScheduler1__Scheduling_to_scheduler1= channels_Scheduling[7];
-  int packet__address = 0;
-  int packet__date = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[2];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[2];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[2];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[2];
-  __attribute__((unused)) request __req4;
-  __attribute__((unused))int *__params4[2];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Scheduling";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Dispatch: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 971, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Sched1_toScheduler1__Scheduling_to_scheduler1;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req1);
-      makeNewRequest(&__req1, 970, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req1.asyncChannel = &__Sched0_toScheduler0__Scheduling_to_scheduler0;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__Waiting;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__Waiting;
-        
-      }
-      break;
-      
-      case STATE__SendToOutput: 
-      waitFor((50)*1000, (50)*1000);
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-      debugInt("channel address", &__req0);
-      makeNewRequest(&__req0, 962, SEND_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-      __req0.asyncChannel = &__Scheduling_packet__OutputEngine_packet;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      __currentState = STATE__Waiting;
-      break;
-      
-      case STATE__Waiting: 
-      __params0[0] = &packet__address;
-      __params0[1] = &packet__date;
-      makeNewRequest(&__req0, 964, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params0);
-      __req0.asyncChannel = &__Sched1_scheduledPacket1__Scheduling_scheduledPacket1;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &packet__address;
-      __params1[1] = &packet__date;
-      makeNewRequest(&__req1, 963, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params1);
-      __req1.asyncChannel = &__Sched0_scheduledPacket0__Scheduling_scheduledPacket0;
-      addRequestToList(&__list, &__req1);
-      __params2[0] = &packet__address;
-      __params2[1] = &packet__date;
-      makeNewRequest(&__req2, 966, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params2);
-      __req2.asyncChannel = &__Classification_queue_high__Scheduling_from_queue_high;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet__address;
-      __params3[1] = &packet__date;
-      makeNewRequest(&__req3, 968, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params3);
-      __req3.asyncChannel = &__Classification_queue_low__Scheduling_from_queue_low;
-      addRequestToList(&__list, &__req3);
-      __params4[0] = &packet__address;
-      __params4[1] = &packet__date;
-      makeNewRequest(&__req4, 967, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 2, __params4);
-      __req4.asyncChannel = &__Classification_queue_medium__Scheduling_from_queue_medium;
-      addRequestToList(&__list, &__req4);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__SendToOutput;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__SendToOutput;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        __currentState = STATE__Read;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        __currentState = STATE__Read;
-        
-      }
-      else  if (__returnRequest == &__req4) {
-        __currentState = STATE__Read;
-        
-      }
-      break;
-      
-      case STATE__Read: 
-      waitFor((50)*1000, (50)*1000);
-      __currentState = STATE__Dispatch;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Scheduling.h b/MPSoC/mutekh/examples/avatar/Scheduling.h
deleted file mode 100644
index ecae3f5e5e02bf3e47e54c8e4ef34be1bd44490b..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Scheduling.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Scheduling_H
-#define Scheduling_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Scheduling(struct mwmr_s *channels_Scheduling[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/SmartCard.c b/MPSoC/mutekh/examples/avatar/SmartCard.c
deleted file mode 100644
index f24862e3e9e24923127acf1bcee79bd73e20107f..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SmartCard.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "SmartCard.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__SmartCard(struct mwmr_s *channels_SmartCard[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "SmartCard";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/SmartCard.h b/MPSoC/mutekh/examples/avatar/SmartCard.h
deleted file mode 100644
index a87b78a893acd41f6d1523ef1ed52fcfa3c63c51..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SmartCard.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SmartCard_H
-#define SmartCard_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__SmartCard(struct mwmr_s *channels_SmartCard[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/SmartCardController.c b/MPSoC/mutekh/examples/avatar/SmartCardController.c
deleted file mode 100644
index 721d27804853c911a3806b228242c165bf475a63..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SmartCardController.c
+++ /dev/null
@@ -1,236 +0,0 @@
-#include "SmartCardController.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _reset;
-static uint32_t _pTS;
-static uint32_t _fromTtoP;
-static uint32_t _dataReady;
-static uint32_t _fromDtoSC;
-static uint32_t _answerToReset;
-static uint32_t _pTSCConfirm;
-static uint32_t _start_Application;
-static uint32_t _data_Ready_SC;
-static uint32_t _fromSCtoD;
-static uint32_t _receive;
-static uint32_t _fromPtoT;
-static uint32_t _send;
-static uint32_t _activation;
-static uint32_t _start_TCPIP;
-
-#define STATE__START__STATE 0
-#define STATE__MainLoop 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__SmartCardController(struct mwmr_s *channels_SmartCardController[]){
-  
-  struct mwmr_s *SmartCardController_reset__InterfaceDevice_reset= channels_SmartCardController[0];
-  struct mwmr_s *SmartCardController_activation__InterfaceDevice_activation= channels_SmartCardController[1];
-  struct mwmr_s *SmartCardController_fromPtoT__TCPIP_fromPtoT= channels_SmartCardController[2];
-  struct mwmr_s *SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD= channels_SmartCardController[3];
-  struct mwmr_s *SmartCardController_data_Ready_SC__InterfaceDevice_dataReady= channels_SmartCardController[4];
-  struct mwmr_s *SmartCardController_fromTtoP__TCPIP_fromTtoP= channels_SmartCardController[5];
-  struct mwmr_s *SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC= channels_SmartCardController[6];
-  struct mwmr_s *SmartCardController_start_Application__Application_startApplication= channels_SmartCardController[7];
-  struct mwmr_s *SmartCardController_start_TCPIP__TCPIP_start= channels_SmartCardController[8];
-  struct mwmr_s *SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm= channels_SmartCardController[9];
-  struct mwmr_s *SmartCardController_pTS__InterfaceDevice_pTS= channels_SmartCardController[10];
-  struct mwmr_s *SmartCardController_answerToReset__InterfaceDevice_answerToReset= channels_SmartCardController[11];
-  bool packetIn = false;
-  bool packetOut = false;
-  int packet1__srcdest = 0;
-  int packet1__seqNum = 0;
-  int packet1__ackNum = 0;
-  int packet1__control = 0;
-  int packet1__management = 0;
-  int packet1__checksum = 0;
-  int packet1__othersAndPadding = 0;
-  int packet1__data = 0;
-  int packet2__srcdest = 0;
-  int packet2__seqNum = 0;
-  int packet2__ackNum = 0;
-  int packet2__control = 0;
-  int packet2__management = 0;
-  int packet2__checksum = 0;
-  int packet2__othersAndPadding = 0;
-  int packet2__data = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[8];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "SmartCardController";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) test SmartCardController_activation__InterfaceDevice_activation");
-      makeNewRequest(&__req0, 522, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_activation__InterfaceDevice_activation;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_reset__InterfaceDevice_reset");
-      makeNewRequest(&__req0, 521, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_reset__InterfaceDevice_reset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_answerToReset__InterfaceDevice_answerToReset");
-      makeNewRequest(&__req0, 533, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_pTS__InterfaceDevice_pTS");
-      makeNewRequest(&__req0, 532, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTS__InterfaceDevice_pTS;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm");
-      makeNewRequest(&__req0, 531, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_start_TCPIP__TCPIP_start");
-      makeNewRequest(&__req0, 530, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_TCPIP__TCPIP_start;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) test SmartCardController_start_Application__Application_startApplication");
-      makeNewRequest(&__req0, 529, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_Application__Application_startApplication;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-      __currentState = STATE__MainLoop;
-      break;
-      
-      case STATE__MainLoop: 
-      if (packetOut) {
-        debug2Msg(__myname, "-> (=====) test SmartCardController_data_Ready_SC__InterfaceDevice_dataReady");
-        makeNewRequest(&__req0, 526, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-        addRequestToList(&__list, &__req0);
-      }
-      if (packetIn) {
-        __params1[0] = &packet1__srcdest;
-        __params1[1] = &packet1__seqNum;
-        __params1[2] = &packet1__ackNum;
-        __params1[3] = &packet1__control;
-        __params1[4] = &packet1__management;
-        __params1[5] = &packet1__checksum;
-        __params1[6] = &packet1__othersAndPadding;
-        __params1[7] = &packet1__data;
-        debug2Msg(__myname, "-> (=====) test SmartCardController_fromPtoT__TCPIP_fromPtoT");
-        makeNewRequest(&__req1, 524, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.syncChannel = &__SmartCardController_fromPtoT__TCPIP_fromPtoT;
-        addRequestToList(&__list, &__req1);
-      }
-      __params2[0] = &packet2__srcdest;
-      __params2[1] = &packet2__seqNum;
-      __params2[2] = &packet2__ackNum;
-      __params2[3] = &packet2__control;
-      __params2[4] = &packet2__management;
-      __params2[5] = &packet2__checksum;
-      __params2[6] = &packet2__othersAndPadding;
-      __params2[7] = &packet2__data;
-      debug2Msg(__myname, "-> (=====) test SmartCardController_fromTtoP__TCPIP_fromTtoP");
-      makeNewRequest(&__req2, 527, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params2);
-      __req2.syncChannel = &__SmartCardController_fromTtoP__TCPIP_fromTtoP;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet1__srcdest;
-      __params3[1] = &packet1__seqNum;
-      __params3[2] = &packet1__ackNum;
-      __params3[3] = &packet1__control;
-      __params3[4] = &packet1__management;
-      __params3[5] = &packet1__checksum;
-      __params3[6] = &packet1__othersAndPadding;
-      __params3[7] = &packet1__data;
-      debug2Msg(__myname, "-> (=====) test SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC");
-      makeNewRequest(&__req3, 528, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params3);
-      __req3.syncChannel = &__SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-      addRequestToList(&__list, &__req3);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        __params0[0] = &packet2__srcdest;
-        __params0[1] = &packet2__seqNum;
-        __params0[2] = &packet2__ackNum;
-        __params0[3] = &packet2__control;
-        __params0[4] = &packet2__management;
-        __params0[5] = &packet2__checksum;
-        __params0[6] = &packet2__othersAndPadding;
-        __params0[7] = &packet2__data;
-        debug2Msg(__myname, "-> (=====) test SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD");
-        makeNewRequest(&__req0, 525, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        packetOut = false;
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        packetIn = false;
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        packetOut = true;
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        packetIn = true;
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/SmartCardController.c-hack b/MPSoC/mutekh/examples/avatar/SmartCardController.c-hack
deleted file mode 100644
index d3fb1052a17a594a9ccd9366a0c97dad4b1eb2af..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SmartCardController.c-hack
+++ /dev/null
@@ -1,240 +0,0 @@
-#include "SmartCardController.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _reset;
-static uint32_t _pTS;
-static uint32_t _fromTtoP;
-static uint32_t _dataReady;
-static uint32_t _fromDtoSC;
-static uint32_t _answerToReset;
-static uint32_t _pTSCConfirm;
-static uint32_t _start_Application;
-static uint32_t _data_Ready_SC;
-static uint32_t _fromSCtoD;
-static uint32_t _receive;
-static uint32_t _fromPtoT;
-static uint32_t _send;
-static uint32_t _activation;
-static uint32_t _start_TCPIP;
-
-#define STATE__START__STATE 0
-#define STATE__MainLoop 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__SmartCardController(struct mwmr_s *channels_SmartCardController[]){
-  
-  struct mwmr_s *SmartCardController_reset__InterfaceDevice_reset= channels_SmartCardController[0];
-  struct mwmr_s *SmartCardController_activation__InterfaceDevice_activation= channels_SmartCardController[1];
-  struct mwmr_s *SmartCardController_fromPtoT__TCPIP_fromPtoT= channels_SmartCardController[2];
-  struct mwmr_s *SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD= channels_SmartCardController[3];
-  struct mwmr_s *SmartCardController_data_Ready_SC__InterfaceDevice_dataReady= channels_SmartCardController[4];
-  struct mwmr_s *SmartCardController_fromTtoP__TCPIP_fromTtoP= channels_SmartCardController[5];
-  struct mwmr_s *SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC= channels_SmartCardController[6];
-  struct mwmr_s *SmartCardController_start_Application__Application_startApplication= channels_SmartCardController[7];
-  struct mwmr_s *SmartCardController_start_TCPIP__TCPIP_start= channels_SmartCardController[8];
-  struct mwmr_s *SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm= channels_SmartCardController[9];
-  struct mwmr_s *SmartCardController_pTS__InterfaceDevice_pTS= channels_SmartCardController[10];
-  struct mwmr_s *SmartCardController_answerToReset__InterfaceDevice_answerToReset= channels_SmartCardController[11];
-  bool packetIn = false;
-  bool packetOut = false;
-  int packet1__srcdest = 0;
-  int packet1__seqNum = 0;
-  int packet1__ackNum = 0;
-  int packet1__control = 0;
-  int packet1__management = 0;
-  int packet1__checksum = 0;
-  int packet1__othersAndPadding = 0;
-  int packet1__data = 0;
-  int packet2__srcdest = 0;
-  int packet2__seqNum = 0;
-  int packet2__ackNum = 0;
-  int packet2__control = 0;
-  int packet2__management = 0;
-  int packet2__checksum = 0;
-  int packet2__othersAndPadding = 0;
-  int packet2__data = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[8];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "SmartCardController";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      /*makeNewRequest(&__req0, 6810, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_activation__InterfaceDevice_activation;
-      debug2Msg(__myname, "-> (***)before executeOneRequest");
-      traceRequest(__myname,"-> (***)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (***)after executeOneRequest");
-      traceRequest(__myname,"-> (***)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);*/
-      makeNewRequest(&__req0, 6809, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_reset__InterfaceDevice_reset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6821, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6820, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTS__InterfaceDevice_pTS;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6819, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6818, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_TCPIP__TCPIP_start;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6817, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_Application__Application_startApplication;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-      __currentState = STATE__MainLoop;
-      break;
-      
-      case STATE__MainLoop: 
-      if (packetOut) {
-        makeNewRequest(&__req0, 6814, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-        addRequestToList(&__list, &__req0);
-      }
-      if (packetIn) {
-        __params1[0] = &packet1__srcdest;
-        __params1[1] = &packet1__seqNum;
-        __params1[2] = &packet1__ackNum;
-        __params1[3] = &packet1__control;
-        __params1[4] = &packet1__management;
-        __params1[5] = &packet1__checksum;
-        __params1[6] = &packet1__othersAndPadding;
-        __params1[7] = &packet1__data;
-        makeNewRequest(&__req1, 6812, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.syncChannel = &__SmartCardController_fromPtoT__TCPIP_fromPtoT;
-        addRequestToList(&__list, &__req1);
-      }
-      __params2[0] = &packet2__srcdest;
-      __params2[1] = &packet2__seqNum;
-      __params2[2] = &packet2__ackNum;
-      __params2[3] = &packet2__control;
-      __params2[4] = &packet2__management;
-      __params2[5] = &packet2__checksum;
-      __params2[6] = &packet2__othersAndPadding;
-      __params2[7] = &packet2__data;
-      makeNewRequest(&__req2, 6815, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params2);
-      __req2.syncChannel = &__SmartCardController_fromTtoP__TCPIP_fromTtoP;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet1__srcdest;
-      __params3[1] = &packet1__seqNum;
-      __params3[2] = &packet1__ackNum;
-      __params3[3] = &packet1__control;
-      __params3[4] = &packet1__management;
-      __params3[5] = &packet1__checksum;
-      __params3[6] = &packet1__othersAndPadding;
-      __params3[7] = &packet1__data;
-      makeNewRequest(&__req3, 6816, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params3);
-      __req3.syncChannel = &__SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-      addRequestToList(&__list, &__req3);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __params0[0] = &packet2__srcdest;
-        __params0[1] = &packet2__seqNum;
-        __params0[2] = &packet2__ackNum;
-        __params0[3] = &packet2__control;
-        __params0[4] = &packet2__management;
-        __params0[5] = &packet2__checksum;
-        __params0[6] = &packet2__othersAndPadding;
-        __params0[7] = &packet2__data;
-        makeNewRequest(&__req0, 6813, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        packetOut = false;
-        traceVariableModification("SmartCardController", "packetOut", packetOut,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        packetIn = false;
-        traceVariableModification("SmartCardController", "packetIn", packetIn,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        packetOut = true;
-        traceVariableModification("SmartCardController", "packetOut", packetOut,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        packetIn = true;
-        traceVariableModification("SmartCardController", "packetIn", packetIn,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/SmartCardController.c-orig b/MPSoC/mutekh/examples/avatar/SmartCardController.c-orig
deleted file mode 100644
index 3d9b385a1b3840272993d4e0b4cf6520e0c5fab8..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SmartCardController.c-orig
+++ /dev/null
@@ -1,238 +0,0 @@
-#include "SmartCardController.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _reset;
-static uint32_t _pTS;
-static uint32_t _fromTtoP;
-static uint32_t _dataReady;
-static uint32_t _fromDtoSC;
-static uint32_t _answerToReset;
-static uint32_t _pTSCConfirm;
-static uint32_t _start_Application;
-static uint32_t _data_Ready_SC;
-static uint32_t _fromSCtoD;
-static uint32_t _receive;
-static uint32_t _fromPtoT;
-static uint32_t _send;
-static uint32_t _activation;
-static uint32_t _start_TCPIP;
-
-#define STATE__START__STATE 0
-#define STATE__MainLoop 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__SmartCardController(struct mwmr_s *channels_SmartCardController[]){
-  
-  struct mwmr_s *SmartCardController_reset__InterfaceDevice_reset= channels_SmartCardController[0];
-  struct mwmr_s *SmartCardController_activation__InterfaceDevice_activation= channels_SmartCardController[1];
-  struct mwmr_s *SmartCardController_fromPtoT__TCPIP_fromPtoT= channels_SmartCardController[2];
-  struct mwmr_s *SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD= channels_SmartCardController[3];
-  struct mwmr_s *SmartCardController_data_Ready_SC__InterfaceDevice_dataReady= channels_SmartCardController[4];
-  struct mwmr_s *SmartCardController_fromTtoP__TCPIP_fromTtoP= channels_SmartCardController[5];
-  struct mwmr_s *SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC= channels_SmartCardController[6];
-  struct mwmr_s *SmartCardController_start_Application__Application_startApplication= channels_SmartCardController[7];
-  struct mwmr_s *SmartCardController_start_TCPIP__TCPIP_start= channels_SmartCardController[8];
-  struct mwmr_s *SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm= channels_SmartCardController[9];
-  struct mwmr_s *SmartCardController_pTS__InterfaceDevice_pTS= channels_SmartCardController[10];
-  struct mwmr_s *SmartCardController_answerToReset__InterfaceDevice_answerToReset= channels_SmartCardController[11];
-  bool packetIn = false;
-  bool packetOut = false;
-  int packet1__srcdest = 0;
-  int packet1__seqNum = 0;
-  int packet1__ackNum = 0;
-  int packet1__control = 0;
-  int packet1__management = 0;
-  int packet1__checksum = 0;
-  int packet1__othersAndPadding = 0;
-  int packet1__data = 0;
-  int packet2__srcdest = 0;
-  int packet2__seqNum = 0;
-  int packet2__ackNum = 0;
-  int packet2__control = 0;
-  int packet2__management = 0;
-  int packet2__checksum = 0;
-  int packet2__othersAndPadding = 0;
-  int packet2__data = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[8];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "SmartCardController";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      makeNewRequest(&__req0, 6810, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_activation__InterfaceDevice_activation;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6809, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_reset__InterfaceDevice_reset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6821, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6820, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTS__InterfaceDevice_pTS;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6819, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6818, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_TCPIP__TCPIP_start;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      makeNewRequest(&__req0, 6817, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_Application__Application_startApplication;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-      __currentState = STATE__MainLoop;
-      break;
-      
-      case STATE__MainLoop: 
-      if (packetOut) {
-        makeNewRequest(&__req0, 6814, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-        addRequestToList(&__list, &__req0);
-      }
-      if (packetIn) {
-        __params1[0] = &packet1__srcdest;
-        __params1[1] = &packet1__seqNum;
-        __params1[2] = &packet1__ackNum;
-        __params1[3] = &packet1__control;
-        __params1[4] = &packet1__management;
-        __params1[5] = &packet1__checksum;
-        __params1[6] = &packet1__othersAndPadding;
-        __params1[7] = &packet1__data;
-        makeNewRequest(&__req1, 6812, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.syncChannel = &__SmartCardController_fromPtoT__TCPIP_fromPtoT;
-        addRequestToList(&__list, &__req1);
-      }
-      __params2[0] = &packet2__srcdest;
-      __params2[1] = &packet2__seqNum;
-      __params2[2] = &packet2__ackNum;
-      __params2[3] = &packet2__control;
-      __params2[4] = &packet2__management;
-      __params2[5] = &packet2__checksum;
-      __params2[6] = &packet2__othersAndPadding;
-      __params2[7] = &packet2__data;
-      makeNewRequest(&__req2, 6815, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params2);
-      __req2.syncChannel = &__SmartCardController_fromTtoP__TCPIP_fromTtoP;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet1__srcdest;
-      __params3[1] = &packet1__seqNum;
-      __params3[2] = &packet1__ackNum;
-      __params3[3] = &packet1__control;
-      __params3[4] = &packet1__management;
-      __params3[5] = &packet1__checksum;
-      __params3[6] = &packet1__othersAndPadding;
-      __params3[7] = &packet1__data;
-      makeNewRequest(&__req3, 6816, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params3);
-      __req3.syncChannel = &__SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-      addRequestToList(&__list, &__req3);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __params0[0] = &packet2__srcdest;
-        __params0[1] = &packet2__seqNum;
-        __params0[2] = &packet2__ackNum;
-        __params0[3] = &packet2__control;
-        __params0[4] = &packet2__management;
-        __params0[5] = &packet2__checksum;
-        __params0[6] = &packet2__othersAndPadding;
-        __params0[7] = &packet2__data;
-        makeNewRequest(&__req0, 6813, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        packetOut = false;
-        traceVariableModification("SmartCardController", "packetOut", packetOut,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        packetIn = false;
-        traceVariableModification("SmartCardController", "packetIn", packetIn,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        packetOut = true;
-        traceVariableModification("SmartCardController", "packetOut", packetOut,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        packetIn = true;
-        traceVariableModification("SmartCardController", "packetIn", packetIn,1);
-        debug2Msg(__myname, "-> (=====) Entering state + MainLoop");
-        __currentState = STATE__MainLoop;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/SmartCardController.h b/MPSoC/mutekh/examples/avatar/SmartCardController.h
deleted file mode 100644
index 81880593b15bd4f03f467408ad30f5bbaf787d96..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SmartCardController.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SmartCardController_H
-#define SmartCardController_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__SmartCardController(struct mwmr_s *channels_SmartCardController[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/SpeedSensor.c b/MPSoC/mutekh/examples/avatar/SpeedSensor.c
deleted file mode 100644
index cca0edd00c45beb1ec0b104e13fc1acefedd41f9..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SpeedSensor.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "SpeedSensor.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _updateOnSpeed;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingForSpeedUpdate 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__SpeedSensor(struct mwmr_s *channels_SpeedSensor[]){
-  
-  struct mwmr_s *SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed= channels_SpeedSensor[0];
-  int minSpeedUpdate = 150;
-  int maxSpeedUpdate = 150;
-  int speed = 0;
-  int carinfo__minID = 1;
-  int carinfo__maxID = 5;
-  int carinfo__minPosition = 3;
-  int carinfo__maxPosition = 10;
-  int carinfo__minSpeed = 1;
-  int carinfo__maxSpeed = 10;
-  int carinfo__myID = 11;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "SpeedSensor";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForSpeedUpdate;
-      break;
-      
-      case STATE__WaitingForSpeedUpdate: 
-      waitFor((minSpeedUpdate)*1000, (maxSpeedUpdate)*1000);
-      speed = computeRandom(carinfo__minSpeed, carinfo__maxSpeed);
-      speed = carinfo__maxSpeed;
-      traceVariableModification("SpeedSensor", "speed", speed,0);
-      __params0[0] = &speed;
-      makeNewRequest(&__req0, 260, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-      __currentState = STATE__WaitingForSpeedUpdate;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/SpeedSensor.h b/MPSoC/mutekh/examples/avatar/SpeedSensor.h
deleted file mode 100644
index 8d369f3eeefdbf443aac837d7aac1f4a655958b5..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/SpeedSensor.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SpeedSensor_H
-#define SpeedSensor_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__SpeedSensor(struct mwmr_s *channels_SpeedSensor[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/TCPIP.c b/MPSoC/mutekh/examples/avatar/TCPIP.c
deleted file mode 100644
index 8f10ea9cc3f926082a00a018ac1750dd8ffa7ced..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TCPIP.c
+++ /dev/null
@@ -1,345 +0,0 @@
-#include "TCPIP.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _start;
-static uint32_t _abort;
-static uint32_t _open;
-static uint32_t _close;
-static uint32_t _send_TCP;
-static uint32_t _receiveTCP;
-static uint32_t _fromPtoT;
-static uint32_t _fromTtoP;
-static uint32_t _addPacket;
-static uint32_t _timeoutPacket;
-static uint32_t _emptyListOfPackets;
-static uint32_t _ackPacket;
-static uint32_t _set__mainTimer;
-static uint32_t _reset__mainTimer;
-static uint32_t _expire__mainTimer;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__OpenStateUpdated 2
-#define STATE__MainLoop 3
-#define STATE__WaitingForEvent 4
-#define STATE__STOP__STATE 5
-
-void *mainFunc__TCPIP(struct mwmr_s *channels_TCPIP[]){
-  
-  struct mwmr_s *TCPIP_ackPacket__TCPPacketManager_ackPacket= channels_TCPIP[0];
-  struct mwmr_s *TCPIP_receiveTCP__Application_receiveTCP= channels_TCPIP[1];
-  struct mwmr_s *SmartCardController_fromPtoT__TCPIP_fromPtoT= channels_TCPIP[2];
-  struct mwmr_s *TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket= channels_TCPIP[3];
-  struct mwmr_s *Application_close__TCPIP_close= channels_TCPIP[4];
-  struct mwmr_s *TCPIP_addPacket__TCPPacketManager_addPacket= channels_TCPIP[5];
-  struct mwmr_s *Application_sendTCP__TCPIP_send_TCP= channels_TCPIP[6];
-  struct mwmr_s *Application_open__TCPIP_open= channels_TCPIP[7];
-  struct mwmr_s *Application_abort__TCPIP_abort= channels_TCPIP[8];
-  struct mwmr_s *SmartCardController_start_TCPIP__TCPIP_start= channels_TCPIP[9];
-  struct mwmr_s *SmartCardController_fromTtoP__TCPIP_fromTtoP= channels_TCPIP[10];
-  struct mwmr_s *TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset= channels_TCPIP[11];
-  struct mwmr_s *TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set= channels_TCPIP[12];
-  int tcp__state = 0;
-  int tcp__seqNum = 1;
-  int tcp__wind = 1;
-  int timerValue = 2;
-  int val = 0;
-  int STATES__CLOSED = 0;
-  int STATES__OPENED = 1;
-  int STATES__FOUR = 4;
-  int STATES__NINE = 0;
-  int computation = 3;
-  int packet__srcdest = 0;
-  int packet__seqNum = 0;
-  int packet__ackNum = 0;
-  int packet__control = 0;
-  int packet__management = 0;
-  int packet__checksum = 0;
-  int packet__othersAndPadding = 0;
-  int packet__data = 0;
-  int __timerValue = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[8];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[8];
-  __attribute__((unused)) request __req4;
-  __attribute__((unused))int *__params4[8];
-  __attribute__((unused)) request __req5;
-  __attribute__((unused))int *__params5[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "TCPIP";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) test SmartCardController_start_TCPIP__TCPIP_start");
-      makeNewRequest(&__req0, 329, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-      __req0.syncChannel = &__SmartCardController_start_TCPIP__TCPIP_start;
-      debug2Msg(__myname, "-> (=====)before executeOneRequest");
-      __returnRequest = executeOneRequest(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====)after executeOneRequest");
-      clearListOfRequests(&__list);
-      debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-      __currentState = STATE__WaitingForEvent;
-      break;
-      
-      case STATE__choice__0: 
-      if (packet__control == 0) {
-        __params0[0] = &val;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 317, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__TCPIP_receiveTCP__Application_receiveTCP;
-        addRequestToList(&__list, &__req0);
-      }
-      if (!(packet__control == 0)) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test TCPIP_ackPacket__TCPPacketManager_ackPacket");
-        makeNewRequest(&__req1, 315, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.syncChannel = &__TCPIP_ackPacket__TCPPacketManager_ackPacket;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-        __currentState = STATE__WaitingForEvent;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-        __currentState = STATE__WaitingForEvent;
-        
-      }
-      break;
-      
-      case STATE__OpenStateUpdated: 
-      debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-      __currentState = STATE__WaitingForEvent;
-      break;
-      
-      case STATE__MainLoop: 
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-      case STATE__WaitingForEvent: 
-      __params0[0] = &packet__srcdest;
-      __params0[1] = &packet__seqNum;
-      __params0[2] = &packet__ackNum;
-      __params0[3] = &packet__control;
-      __params0[4] = &packet__management;
-      __params0[5] = &packet__checksum;
-      __params0[6] = &packet__othersAndPadding;
-      __params0[7] = &packet__data;
-      debug2Msg(__myname, "-> (=====) test SmartCardController_fromPtoT__TCPIP_fromPtoT");
-      makeNewRequest(&__req0, 318, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-      __req0.syncChannel = &__SmartCardController_fromPtoT__TCPIP_fromPtoT;
-      addRequestToList(&__list, &__req0);
-      if (tcp__state == STATES__OPENED) {
-        __params1[0] = &val;
-        debug2Msg(__myname, "-> (=====) test Application_sendTCP__TCPIP_send_TCP");
-        makeNewRequest(&__req1, 324, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params1);
-        __req1.syncChannel = &__Application_sendTCP__TCPIP_send_TCP;
-        addRequestToList(&__list, &__req1);
-      }
-      debug2Msg(__myname, "-> (=====) test Application_abort__TCPIP_abort");
-      makeNewRequest(&__req2, 327, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-      __req2.syncChannel = &__Application_abort__TCPIP_abort;
-      addRequestToList(&__list, &__req2);
-      if (tcp__state == STATES__CLOSED) {
-        debug2Msg(__myname, "-> (=====) test Application_open__TCPIP_open");
-        makeNewRequest(&__req3, 326, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params3);
-        __req3.syncChannel = &__Application_open__TCPIP_open;
-        addRequestToList(&__list, &__req3);
-      }
-      debug2Msg(__myname, "-> (=====) test Application_close__TCPIP_close");
-      makeNewRequest(&__req4, 321, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params4);
-      __req4.syncChannel = &__Application_close__TCPIP_close;
-      addRequestToList(&__list, &__req4);
-      __params5[0] = &packet__srcdest;
-      __params5[1] = &packet__seqNum;
-      __params5[2] = &packet__ackNum;
-      __params5[3] = &packet__control;
-      __params5[4] = &packet__management;
-      __params5[5] = &packet__checksum;
-      __params5[6] = &packet__othersAndPadding;
-      __params5[7] = &packet__data;
-      debug2Msg(__myname, "-> (=====) test TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket");
-      makeNewRequest(&__req5, 319, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params5);
-      __req5.syncChannel = &__TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-      addRequestToList(&__list, &__req5);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + choice__0");
-        __currentState = STATE__choice__0;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        waitFor((computation)*1000, (computation)*1000);
-        packet__seqNum = tcp__seqNum;
-        tcp__seqNum = tcp__seqNum+tcp__wind;
-        packet__data = val;
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test SmartCardController_fromTtoP__TCPIP_fromTtoP");
-        makeNewRequest(&__req0, 333, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromTtoP__TCPIP_fromTtoP;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test TCPIP_addPacket__TCPPacketManager_addPacket");
-        makeNewRequest(&__req0, 323, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__TCPIP_addPacket__TCPPacketManager_addPacket;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __timerValue = timerValue;
-        __params0[0] = &__timerValue;
-        debug2Msg(__myname, "-> (=====) test TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set");
-        makeNewRequest(&__req0, 595, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-        __req0.syncChannel = &__TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-        __currentState = STATE__WaitingForEvent;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        tcp__state = STATES__CLOSED;
-        debug2Msg(__myname, "-> (=====) test TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset");
-        makeNewRequest(&__req0, 594, SEND_SYNC_REQUEST, 0, 0, 0, 0, __params0);
-        __req0.syncChannel = &__TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-        __currentState = STATE__WaitingForEvent;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        if (!tcp__state == STATES__CLOSED) {
-          debug2Msg(__myname, "Guard failed: tcp__state == STATES__CLOSED");
-          __currentState = STATE__STOP__STATE;
-          break;
-        }
-        tcp__state = STATES__OPENED;
-        tcp__seqNum = 0;
-        debug2Msg(__myname, "-> (=====) Entering state + OpenStateUpdated");
-        __currentState = STATE__OpenStateUpdated;
-        
-      }
-      else  if (__returnRequest == &__req4) {
-        tcp__state = STATES__CLOSED;
-        debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-        __currentState = STATE__WaitingForEvent;
-        
-      }
-      else  if (__returnRequest == &__req5) {
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test SmartCardController_fromTtoP__TCPIP_fromTtoP");
-        makeNewRequest(&__req0, 332, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__SmartCardController_fromTtoP__TCPIP_fromTtoP;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test TCPIP_addPacket__TCPPacketManager_addPacket");
-        makeNewRequest(&__req0, 335, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.syncChannel = &__TCPIP_addPacket__TCPPacketManager_addPacket;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __timerValue = timerValue;
-        __params0[0] = &__timerValue;
-        debug2Msg(__myname, "-> (=====) test TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set");
-        makeNewRequest(&__req0, 598, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-        __req0.syncChannel = &__TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + WaitingForEvent");
-        __currentState = STATE__WaitingForEvent;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/TCPIP.h b/MPSoC/mutekh/examples/avatar/TCPIP.h
deleted file mode 100644
index 832d2014484b281c89fc54534d6aac94084a3914..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TCPIP.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TCPIP_H
-#define TCPIP_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__TCPIP(struct mwmr_s *channels_TCPIP[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/TCPPacketManager.c b/MPSoC/mutekh/examples/avatar/TCPPacketManager.c
deleted file mode 100644
index db471e02623ac37036d292830ab8c9e05ac67059..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TCPPacketManager.c
+++ /dev/null
@@ -1,400 +0,0 @@
-#include "TCPPacketManager.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _empty;
-static uint32_t _addPacket;
-static uint32_t _ackPacket;
-static uint32_t _timeoutPacket;
-static uint32_t _retrieve;
-static uint32_t _storePacket;
-static uint32_t _set__timerP;
-static uint32_t _reset__timerP;
-static uint32_t _expire__timerP;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__ackPacketLoop 2
-#define STATE__choice__1 3
-#define STATE__PacketExpirationLoop 4
-#define STATE__Main 5
-#define STATE__RemovingPacketsLoop 6
-#define STATE__STOP__STATE 7
-
-void *mainFunc__TCPPacketManager(struct mwmr_s *channels_TCPPacketManager[]){
-  
-  struct mwmr_s *TCPPacketManager_storePacket__TCPPacketManager_retrieve= channels_TCPPacketManager[0];
-  struct mwmr_s *TCPIP_ackPacket__TCPPacketManager_ackPacket= channels_TCPPacketManager[1];
-  struct mwmr_s *TCPIP_addPacket__TCPPacketManager_addPacket= channels_TCPPacketManager[2];
-  struct mwmr_s *TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket= channels_TCPPacketManager[3];
-  struct mwmr_s *TCPIP_emptyListOfPackets__TCPPacketManager_empty= channels_TCPPacketManager[4];
-  struct mwmr_s *TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire= channels_TCPPacketManager[5];
-  int nbOfPackets = 0;
-  int packet__srcdest = 0;
-  int packet__seqNum = 0;
-  int packet__ackNum = 0;
-  int packet__control = 0;
-  int packet__management = 0;
-  int packet__checksum = 0;
-  int packet__othersAndPadding = 0;
-  int packet__data = 0;
-  int cpt = 0;
-  bool timerSet = false;
-  int tmp = 0;
-  int packetA__srcdest = 0;
-  int packetA__seqNum = 0;
-  int packetA__ackNum = 0;
-  int packetA__control = 0;
-  int packetA__management = 0;
-  int packetA__checksum = 0;
-  int packetA__othersAndPadding = 0;
-  int packetA__data = 0;
-  int elapsedTime = 0;
-  int __timerValue = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[8];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "TCPPacketManager";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + Main");
-      __currentState = STATE__Main;
-      break;
-      
-      case STATE__choice__0: 
-      if (!(packet__seqNum != packetA__seqNum)) {
-        makeNewRequest(&__req0, 405, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (packet__seqNum != packetA__seqNum) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req1);
-        makeNewRequest(&__req1, 387, SEND_ASYNC_REQUEST, 0, 0, 0, 8, __params1);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req1.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        nbOfPackets = nbOfPackets-1;
-        cpt = nbOfPackets;
-        debug2Msg(__myname, "-> (=====) Entering state + ackPacketLoop");
-        __currentState = STATE__ackPacketLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + ackPacketLoop");
-        __currentState = STATE__ackPacketLoop;
-        
-      }
-      break;
-      
-      case STATE__ackPacketLoop: 
-      if (cpt == nbOfPackets) {
-        makeNewRequest(&__req0, 414, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      makeNewRequest(&__req1, 492, IMMEDIATE, 0, 0, 0, 0, __params1);
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        makeNewRequest(&__req0, 389, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + choice__0");
-        __currentState = STATE__choice__0;
-        
-      }
-      break;
-      
-      case STATE__choice__1: 
-      if (packet__management<elapsedTime) {
-        makeNewRequest(&__req0, 421, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (!(packet__management<elapsedTime)) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====) test TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket");
-        makeNewRequest(&__req1, 394, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.syncChannel = &__TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        tmp = tmp+1;
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 395, SEND_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + PacketExpirationLoop");
-        __currentState = STATE__PacketExpirationLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + PacketExpirationLoop");
-        __currentState = STATE__PacketExpirationLoop;
-        
-      }
-      break;
-      
-      case STATE__PacketExpirationLoop: 
-      if (cpt == nbOfPackets) {
-        makeNewRequest(&__req0, 429, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (cpt<nbOfPackets) {
-        makeNewRequest(&__req1, 470, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        nbOfPackets = tmp;
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        makeNewRequest(&__req0, 397, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + choice__1");
-        __currentState = STATE__choice__1;
-        
-      }
-      break;
-      
-      case STATE__Main: 
-      __params0[0] = &packetA__srcdest;
-      __params0[1] = &packetA__seqNum;
-      __params0[2] = &packetA__ackNum;
-      __params0[3] = &packetA__control;
-      __params0[4] = &packetA__management;
-      __params0[5] = &packetA__checksum;
-      __params0[6] = &packetA__othersAndPadding;
-      __params0[7] = &packetA__data;
-      debug2Msg(__myname, "-> (=====) test TCPIP_ackPacket__TCPPacketManager_ackPacket");
-      makeNewRequest(&__req0, 391, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-      __req0.syncChannel = &__TCPIP_ackPacket__TCPPacketManager_ackPacket;
-      addRequestToList(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====) test TCPIP_emptyListOfPackets__TCPPacketManager_empty");
-      makeNewRequest(&__req1, 403, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-      addRequestToList(&__list, &__req1);
-      debug2Msg(__myname, "-> (=====) test TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire");
-      makeNewRequest(&__req2, 633, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-      __req2.syncChannel = &__TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet__srcdest;
-      __params3[1] = &packet__seqNum;
-      __params3[2] = &packet__ackNum;
-      __params3[3] = &packet__control;
-      __params3[4] = &packet__management;
-      __params3[5] = &packet__checksum;
-      __params3[6] = &packet__othersAndPadding;
-      __params3[7] = &packet__data;
-      debug2Msg(__myname, "-> (=====) test TCPIP_addPacket__TCPPacketManager_addPacket");
-      makeNewRequest(&__req3, 393, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params3);
-      __req3.syncChannel = &__TCPIP_addPacket__TCPPacketManager_addPacket;
-      addRequestToList(&__list, &__req3);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        cpt = 0;
-        debug2Msg(__myname, "-> (=====) Entering state + ackPacketLoop");
-        __currentState = STATE__ackPacketLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = 0;
-        debug2Msg(__myname, "-> (=====) Entering state + RemovingPacketsLoop");
-        __currentState = STATE__RemovingPacketsLoop;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        cpt = 0;
-        tmp = 0;
-        elapsedTime = elapsedTime+2;
-        debug2Msg(__myname, "-> (=====) Entering state + PacketExpirationLoop");
-        __currentState = STATE__PacketExpirationLoop;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        packet__management = elapsedTime;
-        nbOfPackets = nbOfPackets+1;
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 392, SEND_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      break;
-      
-      case STATE__RemovingPacketsLoop: 
-      if ((cpt == nbOfPackets)) {
-        makeNewRequest(&__req0, 440, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (cpt<nbOfPackets) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        makeNewRequest(&__req1, 400, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        nbOfPackets = 0;
-        elapsedTime = 0;
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        debug2Msg(__myname, "-> (=====) Entering state + RemovingPacketsLoop");
-        __currentState = STATE__RemovingPacketsLoop;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/TCPPacketManager.c-hack b/MPSoC/mutekh/examples/avatar/TCPPacketManager.c-hack
deleted file mode 100644
index f36f7d432894f4cd96e437ebd4792d995008fbcb..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TCPPacketManager.c-hack
+++ /dev/null
@@ -1,422 +0,0 @@
-#include "TCPPacketManager.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _empty;
-static uint32_t _addPacket;
-static uint32_t _ackPacket;
-static uint32_t _timeoutPacket;
-static uint32_t _retrieve;
-static uint32_t _storePacket;
-static uint32_t _set__timerP;
-static uint32_t _reset__timerP;
-static uint32_t _expire__timerP;
-
-#define STATE__START__STATE 0
-#define STATE__choice__0 1
-#define STATE__ackPacketLoop 2
-#define STATE__choice__1 3
-#define STATE__PacketExpirationLoop 4
-#define STATE__Main 5
-#define STATE__RemovingPacketsLoop 6
-#define STATE__STOP__STATE 7
-
-void *mainFunc__TCPPacketManager(struct mwmr_s *channels_TCPPacketManager[]){
-  
-  struct mwmr_s *TCPPacketManager_storePacket__TCPPacketManager_retrieve= channels_TCPPacketManager[0];
-  struct mwmr_s *TCPIP_ackPacket__TCPPacketManager_ackPacket= channels_TCPPacketManager[1];
-  struct mwmr_s *TCPIP_addPacket__TCPPacketManager_addPacket= channels_TCPPacketManager[2];
-  struct mwmr_s *TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket= channels_TCPPacketManager[3];
-  struct mwmr_s *TCPIP_emptyListOfPackets__TCPPacketManager_empty= channels_TCPPacketManager[4];
-  struct mwmr_s *TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire= channels_TCPPacketManager[5];
-  int nbOfPackets = 0;
-  int packet__srcdest = 0;
-  int packet__seqNum = 0;
-  int packet__ackNum = 0;
-  int packet__control = 0;
-  int packet__management = 0;
-  int packet__checksum = 0;
-  int packet__othersAndPadding = 0;
-  int packet__data = 0;
-  int cpt = 0;
-  bool timerSet = false;
-  int tmp = 0;
-  int packetA__srcdest = 0;
-  int packetA__seqNum = 0;
-  int packetA__ackNum = 0;
-  int packetA__control = 0;
-  int packetA__management = 0;
-  int packetA__checksum = 0;
-  int packetA__othersAndPadding = 0;
-  int packetA__data = 0;
-  int elapsedTime = 0;
-  int __timerValue = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[8];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[8];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[8];
-  __attribute__((unused)) request __req3;
-  __attribute__((unused))int *__params3[8];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "TCPPacketManager";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      debug2Msg(__myname, "-> (=====) Entering state + Main");
-      __currentState = STATE__Main;
-      break;
-      
-      case STATE__choice__0: 
-      if (!(packet__seqNum != packetA__seqNum)) {
-        makeNewRequest(&__req0, 6692, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (packet__seqNum != packetA__seqNum) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req1);
-        makeNewRequest(&__req1, 6674, SEND_ASYNC_REQUEST, 0, 0, 0, 8, __params1);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req1.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        nbOfPackets = nbOfPackets-1;
-        traceVariableModification("TCPPacketManager", "nbOfPackets", nbOfPackets,0);
-        cpt = nbOfPackets;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        debug2Msg(__myname, "-> (=====) Entering state + ackPacketLoop");
-        __currentState = STATE__ackPacketLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + ackPacketLoop");
-        __currentState = STATE__ackPacketLoop;
-        
-      }
-      break;
-      
-      case STATE__ackPacketLoop: 
-      if (cpt == nbOfPackets) {
-        makeNewRequest(&__req0, 6701, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      makeNewRequest(&__req1, 6779, IMMEDIATE, 0, 0, 0, 0, __params1);
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        makeNewRequest(&__req0, 6676, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        debug2Msg(__myname, "-> (=====) Entering state + choice__0");
-        __currentState = STATE__choice__0;
-        
-      }
-      break;
-      
-      case STATE__choice__1: 
-      if (packet__management<elapsedTime) {
-        makeNewRequest(&__req0, 6708, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (!(packet__management<elapsedTime)) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        makeNewRequest(&__req1, 6681, SEND_SYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.syncChannel = &__TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        tmp = tmp+1;
-        traceVariableModification("TCPPacketManager", "tmp", tmp,0);
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 6682, SEND_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        debug2Msg(__myname, "-> (=====) Entering state + PacketExpirationLoop");
-        __currentState = STATE__PacketExpirationLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + PacketExpirationLoop");
-        __currentState = STATE__PacketExpirationLoop;
-        
-      }
-      break;
-      
-      case STATE__PacketExpirationLoop: 
-      if (cpt == nbOfPackets) {
-        makeNewRequest(&__req0, 6716, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (cpt<nbOfPackets) {
-        makeNewRequest(&__req1, 6757, IMMEDIATE, 0, 0, 0, 0, __params1);
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        nbOfPackets = tmp;
-        traceVariableModification("TCPPacketManager", "nbOfPackets", nbOfPackets,0);
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        makeNewRequest(&__req0, 6684, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        debug2Msg(__myname, "-> (=====) Entering state + choice__1");
-        __currentState = STATE__choice__1;
-        
-      }
-      break;
-      
-      case STATE__Main: 
-      __params0[0] = &packetA__srcdest;
-      __params0[1] = &packetA__seqNum;
-      __params0[2] = &packetA__ackNum;
-      __params0[3] = &packetA__control;
-      __params0[4] = &packetA__management;
-      __params0[5] = &packetA__checksum;
-      __params0[6] = &packetA__othersAndPadding;
-      __params0[7] = &packetA__data;
-      /*   makeNewRequest(&__req0, 6678, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params0);
-      __req0.syncChannel = &__TCPIP_ackPacket__TCPPacketManager_ackPacket;
-      addRequestToList(&__list, &__req0);
-      makeNewRequest(&__req1, 6690, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-      addRequestToList(&__list, &__req1);
-      makeNewRequest(&__req2, 6921, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-      __req2.syncChannel = &__TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-      addRequestToList(&__list, &__req2);
-      __params3[0] = &packet__srcdest;
-      __params3[1] = &packet__seqNum;
-      __params3[2] = &packet__ackNum;
-      __params3[3] = &packet__control;
-      __params3[4] = &packet__management;
-      __params3[5] = &packet__checksum;
-      __params3[6] = &packet__othersAndPadding;
-      __params3[7] = &packet__data;
-      makeNewRequest(&__req3, 6680, RECEIVE_SYNC_REQUEST, 0, 0, 0, 8, __params3);
-      __req3.syncChannel = &__TCPIP_addPacket__TCPPacketManager_addPacket;
-      addRequestToList(&__list, &__req3);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);*/
-       if (__returnRequest == &__req0) {
-        cpt = 0;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        debug2Msg(__myname, "-> (=====) Entering state + ackPacketLoop");
-        __currentState = STATE__ackPacketLoop;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = 0;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        debug2Msg(__myname, "-> (=====) Entering state + RemovingPacketsLoop");
-        __currentState = STATE__RemovingPacketsLoop;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        cpt = 0;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        tmp = 0;
-        traceVariableModification("TCPPacketManager", "tmp", tmp,0);
-        elapsedTime = elapsedTime+2;
-        traceVariableModification("TCPPacketManager", "elapsedTime", elapsedTime,0);
-        debug2Msg(__myname, "-> (=====) Entering state + PacketExpirationLoop");
-        __currentState = STATE__PacketExpirationLoop;
-        
-      }
-      else  if (__returnRequest == &__req3) {
-        packet__management = elapsedTime;
-        traceVariableModification("TCPPacketManager", "packet__management", packet__management,0);
-        nbOfPackets = nbOfPackets+1;
-        traceVariableModification("TCPPacketManager", "nbOfPackets", nbOfPackets,0);
-        __params0[0] = &packet__srcdest;
-        __params0[1] = &packet__seqNum;
-        __params0[2] = &packet__ackNum;
-        __params0[3] = &packet__control;
-        __params0[4] = &packet__management;
-        __params0[5] = &packet__checksum;
-        __params0[6] = &packet__othersAndPadding;
-        __params0[7] = &packet__data;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 6679, SEND_ASYNC_REQUEST, 0, 0, 0, 8, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        traceRequest(__myname, __returnRequest);
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      break;
-      
-      case STATE__RemovingPacketsLoop: 
-      if ((cpt == nbOfPackets)) {
-        makeNewRequest(&__req0, 6727, IMMEDIATE, 0, 0, 0, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      if (cpt<nbOfPackets) {
-        __params1[0] = &packet__srcdest;
-        __params1[1] = &packet__seqNum;
-        __params1[2] = &packet__ackNum;
-        __params1[3] = &packet__control;
-        __params1[4] = &packet__management;
-        __params1[5] = &packet__checksum;
-        __params1[6] = &packet__othersAndPadding;
-        __params1[7] = &packet__data;
-        makeNewRequest(&__req1, 6687, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 8, __params1);
-        __req1.asyncChannel = &__TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-        addRequestToList(&__list, &__req1);
-      }
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        nbOfPackets = 0;
-        traceVariableModification("TCPPacketManager", "nbOfPackets", nbOfPackets,0);
-        elapsedTime = 0;
-        traceVariableModification("TCPPacketManager", "elapsedTime", elapsedTime,0);
-        debug2Msg(__myname, "-> (=====) Entering state + Main");
-        __currentState = STATE__Main;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        cpt = cpt+1;
-        traceVariableModification("TCPPacketManager", "cpt", cpt,0);
-        debug2Msg(__myname, "-> (=====) Entering state + RemovingPacketsLoop");
-        __currentState = STATE__RemovingPacketsLoop;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/TCPPacketManager.h b/MPSoC/mutekh/examples/avatar/TCPPacketManager.h
deleted file mode 100644
index 67ccb6642c246d1229395d6373650ae4bc336686..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TCPPacketManager.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TCPPacketManager_H
-#define TCPPacketManager_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__TCPPacketManager(struct mwmr_s *channels_TCPPacketManager[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/TemperatureSensor.c b/MPSoC/mutekh/examples/avatar/TemperatureSensor.c
deleted file mode 100644
index 768a3b50f0000345175c3a59ed0f883d19c87089..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TemperatureSensor.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "TemperatureSensor.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _control;
-static uint32_t _tempData;
-
-#define STATE__START__STATE 0
-#define STATE__start 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__TemperatureSensor(struct mwmr_s *channels_TemperatureSensor[]){
-  
-  struct mwmr_s *MainControl_control__TemperatureSensor_control= channels_TemperatureSensor[0];
-  struct mwmr_s *MainControl_tempData__TemperatureSensor_tempData= channels_TemperatureSensor[1];
-  bool sensorOn = false;
-  int temp = 0;
-  int samplingRate = 5;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "TemperatureSensor";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      __currentState = STATE__start;
-      break;
-      
-      case STATE__start: 
-      if (sensorOn) {
-        makeNewRequest(&__req0, 79, IMMEDIATE, 1, (samplingRate)*1000, (samplingRate)*1000, 0, __params0);
-        addRequestToList(&__list, &__req0);
-      }
-      __params1[0] = &sensorOn;
-      makeNewRequest(&__req1, 73, RECEIVE_ASYNC_REQUEST, 0, 0, 0, 1, __params1);
-      __req1.asyncChannel = &__MainControl_control__TemperatureSensor_control;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        temp = computeRandom(0, 10);
-        __params0[0] = &temp;
-        debug2Msg(__myname, "-> (=====)before MakeNewRequest");
-        debugInt("channel address", &__req0);
-        makeNewRequest(&__req0, 74, SEND_ASYNC_REQUEST, 0, 0, 0, 1, __params0);
-        debug2Msg(__myname, "-> (=====)after MakeNewRequest");
-        __req0.asyncChannel = &__MainControl_tempData__TemperatureSensor_tempData;
-        debug2Msg(__myname, "-> (=====)before executeOneRequest");
-        __returnRequest = executeOneRequest(&__list, &__req0);
-        debug2Msg(__myname, "-> (=====)after executeOneRequest");
-        clearListOfRequests(&__list);
-        __currentState = STATE__start;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__start;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/TemperatureSensor.h b/MPSoC/mutekh/examples/avatar/TemperatureSensor.h
deleted file mode 100644
index 9083dbe8a3e085bf7677b3a11e6887fc6c5f7a05..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TemperatureSensor.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TemperatureSensor_H
-#define TemperatureSensor_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__TemperatureSensor(struct mwmr_s *channels_TemperatureSensor[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/TestBench.c b/MPSoC/mutekh/examples/avatar/TestBench.c
deleted file mode 100644
index 53a6b4fa4fb0f8c8089ed595fe64addf842b0802..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TestBench.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "TestBench.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-
-#define STATE__START__STATE 0
-#define STATE__STOP__STATE 1
-
-void *mainFunc__TestBench(struct mwmr_s *channels_TestBench[]){
-  
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[0];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "TestBench";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__STOP__STATE;
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/TestBench.h b/MPSoC/mutekh/examples/avatar/TestBench.h
deleted file mode 100644
index cdb7478def268f096c81c6a2d83dabe7eb05c3d4..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/TestBench.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef TestBench_H
-#define TestBench_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__TestBench(struct mwmr_s *channels_TestBench[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Timer__mainTimer__TCPIP.c b/MPSoC/mutekh/examples/avatar/Timer__mainTimer__TCPIP.c
deleted file mode 100644
index f3b57692b667374cfee827de5557f6c0f4b1666c..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Timer__mainTimer__TCPIP.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "Timer__mainTimer__TCPIP.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _set;
-static uint32_t _reset;
-static uint32_t _expire;
-
-#define STATE__START__STATE 0
-#define STATE__wait4set 1
-#define STATE__wait4expire 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Timer__mainTimer__TCPIP(struct mwmr_s *channels_Timer__mainTimer__TCPIP[]){
-  
-  struct mwmr_s *TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set= channels_Timer__mainTimer__TCPIP[0];
-  struct mwmr_s *TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset= channels_Timer__mainTimer__TCPIP[1];
-  struct mwmr_s *TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire= channels_Timer__mainTimer__TCPIP[2];
-  int value = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Timer__mainTimer__TCPIP";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-      __currentState = STATE__wait4set;
-      break;
-      
-      case STATE__wait4set: 
-      __params0[0] = &value;
-      debug2Msg(__myname, "-> (=====) test TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set");
-      makeNewRequest(&__req0, 576, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-      addRequestToList(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====) test TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset");
-      makeNewRequest(&__req1, 578, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4expire");
-        __currentState = STATE__wait4expire;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      break;
-      
-      case STATE__wait4expire: 
-      __params0[0] = &value;
-      debug2Msg(__myname, "-> (=====) test TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set");
-      makeNewRequest(&__req0, 577, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-      addRequestToList(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====) test TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire");
-      makeNewRequest(&__req1, 580, SEND_SYNC_REQUEST, 1, (value)*1000, (value)*1000, 0, __params1);
-      __req1.syncChannel = &__TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-      addRequestToList(&__list, &__req1);
-      debug2Msg(__myname, "-> (=====) test TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset");
-      makeNewRequest(&__req2, 579, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-      __req2.syncChannel = &__TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4expire");
-        __currentState = STATE__wait4expire;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Timer__mainTimer__TCPIP.h b/MPSoC/mutekh/examples/avatar/Timer__mainTimer__TCPIP.h
deleted file mode 100644
index fd51c4a7d8b44e8574c32bac2ac631ac7c7a39d9..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Timer__mainTimer__TCPIP.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Timer__mainTimer__TCPIP_H
-#define Timer__mainTimer__TCPIP_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Timer__mainTimer__TCPIP(struct mwmr_s *channels_Timer__mainTimer__TCPIP[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.c b/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.c
deleted file mode 100644
index 485a254e4abe6bf688fced91d226c6ba0e02fe17..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "Timer__timerP__TCPPacketManager.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _set;
-static uint32_t _reset;
-static uint32_t _expire;
-
-#define STATE__START__STATE 0
-#define STATE__wait4set 1
-#define STATE__wait4expire 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Timer__timerP__TCPPacketManager(struct mwmr_s *channels_Timer__timerP__TCPPacketManager[]){
-  
-  struct mwmr_s *TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set= channels_Timer__timerP__TCPPacketManager[0];
-  struct mwmr_s *TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset= channels_Timer__timerP__TCPPacketManager[1];
-  struct mwmr_s *TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire= channels_Timer__timerP__TCPPacketManager[2];
-  int value = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Timer__timerP__TCPPacketManager";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-      __currentState = STATE__wait4set;
-      break;
-      
-      case STATE__wait4set: 
-      __params0[0] = &value;
-      debug2Msg(__myname, "-> (=====) test TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set");
-      makeNewRequest(&__req0, 615, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-      addRequestToList(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====) test TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset");
-      makeNewRequest(&__req1, 617, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4expire");
-        __currentState = STATE__wait4expire;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      break;
-      
-      case STATE__wait4expire: 
-      __params0[0] = &value;
-      debug2Msg(__myname, "-> (=====) test TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set");
-      makeNewRequest(&__req0, 616, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-      addRequestToList(&__list, &__req0);
-      debug2Msg(__myname, "-> (=====) test TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire");
-      makeNewRequest(&__req1, 619, SEND_SYNC_REQUEST, 1, (value)*1000, (value)*1000, 0, __params1);
-      __req1.syncChannel = &__TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-      addRequestToList(&__list, &__req1);
-      debug2Msg(__myname, "-> (=====) test TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset");
-      makeNewRequest(&__req2, 618, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-      __req2.syncChannel = &__TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4expire");
-        __currentState = STATE__wait4expire;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.c-hack b/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.c-hack
deleted file mode 100644
index 305139b175112afca6a70eb5cbe3f7addf5127d6..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.c-hack
+++ /dev/null
@@ -1,120 +0,0 @@
-#include "Timer__timerP__TCPPacketManager.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _set;
-static uint32_t _reset;
-static uint32_t _expire;
-
-#define STATE__START__STATE 0
-#define STATE__wait4set 1
-#define STATE__wait4expire 2
-#define STATE__STOP__STATE 3
-
-void *mainFunc__Timer__timerP__TCPPacketManager(struct mwmr_s *channels_Timer__timerP__TCPPacketManager[]){
-  
-  struct mwmr_s *TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set= channels_Timer__timerP__TCPPacketManager[0];
-  struct mwmr_s *TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset= channels_Timer__timerP__TCPPacketManager[1];
-  struct mwmr_s *TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire= channels_Timer__timerP__TCPPacketManager[2];
-  int value = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused)) request __req2;
-  __attribute__((unused))int *__params2[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "Timer__timerP__TCPPacketManager";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-      __currentState = STATE__wait4set;
-      break;
-      
-      case STATE__wait4set: 
-      __params0[0] = &value;
-      /* makeNewRequest(&__req0, 6903, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-      addRequestToList(&__list, &__req0);*/
-      /* makeNewRequest(&__req1, 6905, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params1);
-      __req1.syncChannel = &__TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4expire");
-        __currentState = STATE__wait4expire;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-        }*/
-      break;
-      
-      case STATE__wait4expire: 
-      __params0[0] = &value;
-      makeNewRequest(&__req0, 6904, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-      addRequestToList(&__list, &__req0);
-      makeNewRequest(&__req1, 6907, SEND_SYNC_REQUEST, 1, (value)*1000, (value)*1000, 0, __params1);
-      __req1.syncChannel = &__TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-      addRequestToList(&__list, &__req1);
-      makeNewRequest(&__req2, 6906, RECEIVE_SYNC_REQUEST, 0, 0, 0, 0, __params2);
-      __req2.syncChannel = &__TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-      addRequestToList(&__list, &__req2);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4expire");
-        __currentState = STATE__wait4expire;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      else  if (__returnRequest == &__req2) {
-        debug2Msg(__myname, "-> (=====) Entering state + wait4set");
-        __currentState = STATE__wait4set;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.h b/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.h
deleted file mode 100644
index 36690ab9f39a432d066d69c9d3ac468f7f00e6f1..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/Timer__timerP__TCPPacketManager.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef Timer__timerP__TCPPacketManager_H
-#define Timer__timerP__TCPPacketManager_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__Timer__timerP__TCPPacketManager(struct mwmr_s *channels_Timer__timerP__TCPPacketManager[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/VehiculeDynamicsManagement.c b/MPSoC/mutekh/examples/avatar/VehiculeDynamicsManagement.c
deleted file mode 100644
index 23b846cd36a0da68315655914ddb0807f158ca89..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/VehiculeDynamicsManagement.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "VehiculeDynamicsManagement.h"
-
-
-// Header code defined in the model
-
-// End of header code defined in the model
-
-static uint32_t _updateOnSpeed;
-static uint32_t _getInfoOnSpeed;
-
-#define STATE__START__STATE 0
-#define STATE__WaitingForUpdateOrRequestOnObstacle 1
-#define STATE__STOP__STATE 2
-
-void *mainFunc__VehiculeDynamicsManagement(struct mwmr_s *channels_VehiculeDynamicsManagement[]){
-  
-  struct mwmr_s *PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed= channels_VehiculeDynamicsManagement[0];
-  struct mwmr_s *SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed= channels_VehiculeDynamicsManagement[1];
-  int speed = 0;
-  
-  int __currentState = STATE__START__STATE;
-  __attribute__((unused)) request __req0;
-  __attribute__((unused))int *__params0[1];
-  __attribute__((unused)) request __req1;
-  __attribute__((unused))int *__params1[1];
-  __attribute__((unused))setOfRequests __list;
-  __attribute__((unused))pthread_cond_t __myCond;
-  __attribute__((unused))request *__returnRequest;
-  
-  char * __myname = "VehiculeDynamicsManagement";
-  
-  pthread_cond_init(&__myCond, NULL);
-  
-  fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);
-  //printf("my name = %s\n", __myname);
-  
-  /* Main loop on states */
-  while(__currentState != STATE__STOP__STATE) {
-    switch(__currentState) {
-      case STATE__START__STATE: 
-      traceStateEntering(__myname, "__StartState");
-      __currentState = STATE__WaitingForUpdateOrRequestOnObstacle;
-      break;
-      
-      case STATE__WaitingForUpdateOrRequestOnObstacle: 
-      __params0[0] = &speed;
-      makeNewRequest(&__req0, 734, SEND_SYNC_REQUEST, 0, 0, 0, 1, __params0);
-      __req0.syncChannel = &__PlausibilityCheck_getInfoOnSpeed__VehiculeDynamicsManagement_getInfoOnSpeed;
-      addRequestToList(&__list, &__req0);
-      __params1[0] = &speed;
-      makeNewRequest(&__req1, 735, RECEIVE_SYNC_REQUEST, 0, 0, 0, 1, __params1);
-      __req1.syncChannel = &__SpeedSensor_updateOnSpeed__VehiculeDynamicsManagement_updateOnSpeed;
-      addRequestToList(&__list, &__req1);
-      if (nbOfRequests(&__list) == 0) {
-        debug2Msg(__myname, "No possible request");
-        __currentState = STATE__STOP__STATE;
-        break;
-      }
-      __returnRequest = executeListOfRequests(&__list);
-      clearListOfRequests(&__list);
-      traceRequest(__myname, __returnRequest);
-       if (__returnRequest == &__req0) {
-        __currentState = STATE__WaitingForUpdateOrRequestOnObstacle;
-        
-      }
-      else  if (__returnRequest == &__req1) {
-        __currentState = STATE__WaitingForUpdateOrRequestOnObstacle;
-        
-      }
-      break;
-      
-    }
-  }
-  //printf("Exiting = %s\n", __myname);
-  return NULL;
-}
-
diff --git a/MPSoC/mutekh/examples/avatar/VehiculeDynamicsManagement.h b/MPSoC/mutekh/examples/avatar/VehiculeDynamicsManagement.h
deleted file mode 100644
index eb5ee11786913abcd6a6ad67a7461dfba6810a58..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/VehiculeDynamicsManagement.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef VehiculeDynamicsManagement_H
-#define VehiculeDynamicsManagement_H
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "syncchannel.h"
-#include "request_manager.h"
-#include "debug.h"
-#include "defs.h"
-#include "mytimelib.h"
-#include "random.h"
-#include "tracemanager.h"
-#include "main.h"
-#include "mwmr.h"
- 
-
-extern void *mainFunc__VehiculeDynamicsManagement(struct mwmr_s *channels_VehiculeDynamicsManagement[]);
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/config b/MPSoC/mutekh/examples/avatar/config
deleted file mode 100644
index 38129acb495bee65588a72f7705a0e338a053881..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/config
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-  %set OUTPUT_NAME avatar
-
-  # New source code module to be compiled
-  %append MODULES $(OUTPUT_NAME):$(CONFIGPATH)
-
-  # Application license
-  CONFIG_LICENSE_APP_LGPL
-
-# Libs
-  CONFIG_PTHREAD
-  CONFIG_PTHREAD_MAIN
-  CONFIG_PTHREAD_TIME
-
-  CONFIG_PTHREAD_ATTRIBUTES
-
-  CONFIG_PTHREAD_STACK_SIZE 32768
-  CONFIG_LIBC_STREAM_STD
-
-  CONFIG_LIBAVATAR
-  CONFIG_HEXO_INTTYPES_DEPRECATED undefined
-  CONFIG_LIBM
-  CONFIG_LIBC_STREAM
-  CONFIG_VFS
-  CONFIG_MWMR
-  CONFIG_MWMR_SOCLIB
-  CONFIG_MUTEK_SCHEDULER_STATIC
-
-%include $(SRC_DIR)/examples/common/build_options.conf
-%include $(SRC_DIR)/examples/common/platforms.conf
-
-# inter-processor interrupts
-  CONFIG_HEXO_IPI
-
-  CONFIG_ARCH_SMP
-CONFIG_CPU_MAXCOUNT 2
diff --git a/MPSoC/mutekh/examples/avatar/main-correct-19-01.c b/MPSoC/mutekh/examples/avatar/main-correct-19-01.c
deleted file mode 100644
index 29fa4a7960cbbf86db082c4ddfa843d269e42987..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/main-correct-19-01.c
+++ /dev/null
@@ -1,988 +0,0 @@
-#include <stdio.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "myerrors.h"
-#include "message.h"
-#include "syncchannel.h"
-#include "asyncchannel.h"
-#include "mytimelib.h"
-#include "request_manager.h"
-#include "defs.h"
-#include "debug.h"
-#include "random.h"
-#include "tracemanager.h" 
-#include "mwmr.h" 
- 
-
-#define NB_PROC 2
-#define WIDTH 4
-#define DEPTH 16
-
-void __user_init() {
-}
-
-#include "InterfaceDevice.h"
-#include "SmartCard.h"
-#include "TCPIP.h"
-#include "TCPPacketManager.h"
-#include "Application.h"
-#include "SmartCardController.h"
-#include "Timer__mainTimer__TCPIP.h"
-#include "Timer__timerP__TCPPacketManager.h"
-
-/* Main mutex */
-pthread_barrier_t barrier ;
-pthread_attr_t *attr_t;
-pthread_mutex_t __mainMutex;
-
-#define CHANNEL0 __attribute__((section("section_channel0")))
-#define LOCK0 __attribute__((section("section_lock0")))
-#define CHANNEL1 __attribute__((section("section_channel1")))
-#define LOCK1 __attribute__((section("section_lock1")))
-#define CHANNEL2 __attribute__((section("section_channel2")))
-#define LOCK2 __attribute__((section("section_lock2")))
-#define CHANNEL3 __attribute__((section("section_channel3")))
-#define LOCK3 __attribute__((section("section_lock3")))
-#define CHANNEL4 __attribute__((section("section_channel4")))
-#define LOCK4 __attribute__((section("section_lock4")))
-#define CHANNEL5 __attribute__((section("section_channel5")))
-#define LOCK5 __attribute__((section("section_lock5")))
-#define CHANNEL6 __attribute__((section("section_channel6")))
-#define LOCK6 __attribute__((section("section_lock6")))
-#define base(arg) arg
-
-typedef struct mwmr_s mwmr_t;
-
-/* Synchronous channels */
-syncchannel __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-uint32_t const TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_lock LOCK0;
-struct mwmr_status_s TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status CHANNEL0;
-uint8_t TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_data[32] CHANNEL0;
-struct mwmr_s TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket CHANNEL0;
-
-syncchannel __TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-uint32_t const TCPIP_emptyListOfPackets__TCPPacketManager_empty_lock LOCK1;
-struct mwmr_status_s TCPIP_emptyListOfPackets__TCPPacketManager_empty_status CHANNEL1;
-uint8_t TCPIP_emptyListOfPackets__TCPPacketManager_empty_data[32] CHANNEL1;
-struct mwmr_s TCPIP_emptyListOfPackets__TCPPacketManager_empty CHANNEL1;
-
-syncchannel __TCPIP_addPacket__TCPPacketManager_addPacket;
-uint32_t const TCPIP_addPacket__TCPPacketManager_addPacket_lock LOCK2;
-struct mwmr_status_s TCPIP_addPacket__TCPPacketManager_addPacket_status CHANNEL2;
-uint8_t TCPIP_addPacket__TCPPacketManager_addPacket_data[32] CHANNEL2;
-struct mwmr_s TCPIP_addPacket__TCPPacketManager_addPacket CHANNEL2;
-
-syncchannel __TCPIP_ackPacket__TCPPacketManager_ackPacket;
-uint32_t const TCPIP_ackPacket__TCPPacketManager_ackPacket_lock LOCK3;
-struct mwmr_status_s TCPIP_ackPacket__TCPPacketManager_ackPacket_status CHANNEL3;
-uint8_t TCPIP_ackPacket__TCPPacketManager_ackPacket_data[32] CHANNEL3;
-struct mwmr_s TCPIP_ackPacket__TCPPacketManager_ackPacket CHANNEL3;
-
-syncchannel __Application_open__TCPIP_open;
-uint32_t const Application_open__TCPIP_open_lock LOCK0;
-struct mwmr_status_s Application_open__TCPIP_open_status CHANNEL0;
-uint8_t Application_open__TCPIP_open_data[32] CHANNEL0;
-struct mwmr_s Application_open__TCPIP_open CHANNEL0;
-
-syncchannel __Application_close__TCPIP_close;
-uint32_t const Application_close__TCPIP_close_lock LOCK1;
-struct mwmr_status_s Application_close__TCPIP_close_status CHANNEL1;
-uint8_t Application_close__TCPIP_close_data[32] CHANNEL1;
-struct mwmr_s Application_close__TCPIP_close CHANNEL1;
-
-syncchannel __Application_abort__TCPIP_abort;
-uint32_t const Application_abort__TCPIP_abort_lock LOCK2;
-struct mwmr_status_s Application_abort__TCPIP_abort_status CHANNEL2;
-uint8_t Application_abort__TCPIP_abort_data[32] CHANNEL2;
-struct mwmr_s Application_abort__TCPIP_abort CHANNEL2;
-
-syncchannel __Application_sendTCP__TCPIP_send_TCP;
-uint32_t const Application_sendTCP__TCPIP_send_TCP_lock LOCK3;
-struct mwmr_status_s Application_sendTCP__TCPIP_send_TCP_status CHANNEL3;
-uint8_t Application_sendTCP__TCPIP_send_TCP_data[32] CHANNEL3;
-struct mwmr_s Application_sendTCP__TCPIP_send_TCP CHANNEL3;
-
-syncchannel __SmartCardController_fromTtoP__TCPIP_fromTtoP;
-uint32_t const SmartCardController_fromTtoP__TCPIP_fromTtoP_lock LOCK0;
-struct mwmr_status_s SmartCardController_fromTtoP__TCPIP_fromTtoP_status CHANNEL0;
-uint8_t SmartCardController_fromTtoP__TCPIP_fromTtoP_data[32] CHANNEL0;
-struct mwmr_s SmartCardController_fromTtoP__TCPIP_fromTtoP CHANNEL0;
-
-syncchannel __SmartCardController_fromPtoT__TCPIP_fromPtoT;
-uint32_t const SmartCardController_fromPtoT__TCPIP_fromPtoT_lock LOCK1;
-struct mwmr_status_s SmartCardController_fromPtoT__TCPIP_fromPtoT_status CHANNEL1;
-uint8_t SmartCardController_fromPtoT__TCPIP_fromPtoT_data[32] CHANNEL1;
-struct mwmr_s SmartCardController_fromPtoT__TCPIP_fromPtoT CHANNEL1;
-
-syncchannel __SmartCardController_start_TCPIP__TCPIP_start;
-uint32_t const SmartCardController_start_TCPIP__TCPIP_start_lock LOCK2;
-struct mwmr_status_s SmartCardController_start_TCPIP__TCPIP_start_status CHANNEL2;
-uint8_t SmartCardController_start_TCPIP__TCPIP_start_data[32] CHANNEL2;
-struct mwmr_s SmartCardController_start_TCPIP__TCPIP_start CHANNEL2;
-
-syncchannel __SmartCardController_reset__InterfaceDevice_reset;
-uint32_t const SmartCardController_reset__InterfaceDevice_reset_lock LOCK0;
-struct mwmr_status_s SmartCardController_reset__InterfaceDevice_reset_status CHANNEL0;
-uint8_t SmartCardController_reset__InterfaceDevice_reset_data[32] CHANNEL0;
-struct mwmr_s SmartCardController_reset__InterfaceDevice_reset CHANNEL0;
-
-syncchannel __SmartCardController_pTS__InterfaceDevice_pTS;
-uint32_t const SmartCardController_pTS__InterfaceDevice_pTS_lock LOCK1;
-struct mwmr_status_s SmartCardController_pTS__InterfaceDevice_pTS_status CHANNEL1;
-uint8_t SmartCardController_pTS__InterfaceDevice_pTS_data[32] CHANNEL1;
-struct mwmr_s SmartCardController_pTS__InterfaceDevice_pTS CHANNEL1;
-
-syncchannel __SmartCardController_dataReady__InterfaceDevice_data_Ready;
-uint32_t const SmartCardController_dataReady__InterfaceDevice_data_Ready_lock LOCK2;
-struct mwmr_status_s SmartCardController_dataReady__InterfaceDevice_data_Ready_status CHANNEL2;
-uint8_t SmartCardController_dataReady__InterfaceDevice_data_Ready_data[32] CHANNEL2;
-struct mwmr_s SmartCardController_dataReady__InterfaceDevice_data_Ready CHANNEL2;
-
-syncchannel __SmartCardController_activation__InterfaceDevice_activation;
-uint32_t const SmartCardController_activation__InterfaceDevice_activation_lock LOCK3;
-struct mwmr_status_s SmartCardController_activation__InterfaceDevice_activation_status CHANNEL3;
-uint8_t SmartCardController_activation__InterfaceDevice_activation_data[32] CHANNEL3;
-struct mwmr_s SmartCardController_activation__InterfaceDevice_activation CHANNEL3;
-
-syncchannel __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-uint32_t const SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_lock LOCK4;
-struct mwmr_status_s SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status CHANNEL4;
-uint8_t SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_data[32] CHANNEL4;
-struct mwmr_s SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC CHANNEL4;
-
-syncchannel __SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-uint32_t const SmartCardController_answerToReset__InterfaceDevice_answerToReset_lock LOCK5;
-struct mwmr_status_s SmartCardController_answerToReset__InterfaceDevice_answerToReset_status CHANNEL5;
-uint8_t SmartCardController_answerToReset__InterfaceDevice_answerToReset_data[32] CHANNEL5;
-struct mwmr_s SmartCardController_answerToReset__InterfaceDevice_answerToReset CHANNEL5;
-
-syncchannel __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-uint32_t const SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_lock LOCK6;
-struct mwmr_status_s SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status CHANNEL6;
-uint8_t SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_data[32] CHANNEL6;
-struct mwmr_s SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm CHANNEL6;
-
-syncchannel __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-uint32_t const SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_lock LOCK5;
-struct mwmr_status_s SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status CHANNEL5;
-uint8_t SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_data[32] CHANNEL5;
-struct mwmr_s SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD CHANNEL5;
-
-syncchannel __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-uint32_t const SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_lock LOCK6;
-struct mwmr_status_s SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status CHANNEL6;
-uint8_t SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_data[32] CHANNEL6;
-struct mwmr_s SmartCardController_data_Ready_SC__InterfaceDevice_dataReady CHANNEL6;
-
-syncchannel __SmartCardController_start_Application__Application_startApplication;
-uint32_t const SmartCardController_start_Application__Application_startApplication_lock LOCK0;
-struct mwmr_status_s SmartCardController_start_Application__Application_startApplication_status CHANNEL0;
-uint8_t SmartCardController_start_Application__Application_startApplication_data[32] CHANNEL0;
-struct mwmr_s SmartCardController_start_Application__Application_startApplication CHANNEL0;
-
-syncchannel __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-uint32_t const TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_lock LOCK0;
-struct mwmr_status_s TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status CHANNEL0;
-uint8_t TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_data[32] CHANNEL0;
-struct mwmr_s TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set CHANNEL0;
-
-syncchannel __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-uint32_t const TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_lock LOCK1;
-struct mwmr_status_s TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status CHANNEL1;
-uint8_t TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_data[32] CHANNEL1;
-struct mwmr_s TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset CHANNEL1;
-
-syncchannel __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-uint32_t const TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_lock LOCK2;
-struct mwmr_status_s TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status CHANNEL2;
-uint8_t TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_data[32] CHANNEL2;
-struct mwmr_s TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire CHANNEL2;
-
-syncchannel __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-uint32_t const TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_lock LOCK0;
-struct mwmr_status_s TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status CHANNEL0;
-uint8_t TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_data[32] CHANNEL0;
-struct mwmr_s TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set CHANNEL0;
-
-syncchannel __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-uint32_t const TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_lock LOCK1;
-struct mwmr_status_s TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status CHANNEL1;
-uint8_t TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_data[32] CHANNEL1;
-struct mwmr_s TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset CHANNEL1;
-
-syncchannel __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-uint32_t const TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_lock LOCK2;
-struct mwmr_status_s TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status CHANNEL2;
-uint8_t TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_data[32] CHANNEL2;
-struct mwmr_s TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire CHANNEL2;
-
-/* Asynchronous channels */
-asyncchannel __TCPIP_receiveTCP__Application_receiveTCP;
-uint32_t const TCPIP_receiveTCP__Application_receiveTCP_lock LOCK0;
-struct mwmr_status_s TCPIP_receiveTCP__Application_receiveTCP_status CHANNEL0;
-uint8_t TCPIP_receiveTCP__Application_receiveTCP_data[32] CHANNEL0;
-struct mwmr_s TCPIP_receiveTCP__Application_receiveTCP CHANNEL0;
-
-asyncchannel __TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-uint32_t const TCPPacketManager_storePacket__TCPPacketManager_retrieve_lock LOCK0;
-struct mwmr_status_s TCPPacketManager_storePacket__TCPPacketManager_retrieve_status CHANNEL0;
-uint8_t TCPPacketManager_storePacket__TCPPacketManager_retrieve_data[32] CHANNEL0;
-struct mwmr_s TCPPacketManager_storePacket__TCPPacketManager_retrieve CHANNEL0;
-
-
-int main(int argc, char *argv[]) {
-  
-  
-  void *ptr;
-  pthread_barrier_init(&barrier,NULL, NB_PROC);
-  pthread_attr_t *attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_init(attr_t);
-  pthread_mutex_init(&__mainMutex, NULL);
-  
-  /* Synchronous channels */
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.rptr = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.wptr = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.usage = 0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status.lock = 0;
-  
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.width = 1;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.depth = 1;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.gdepth = 1;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.buffer = TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_data;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status = &TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status;
-  
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.inname ="timeoutPacket";
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.outname ="timeoutPacket";
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.mwmr_fifo = &TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status =&TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket_status;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->lock=0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->rptr=0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->usage=0;
-  TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.status->wptr =0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.rptr = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.wptr = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.usage = 0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty_status.lock = 0;
-  
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.width = 1;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.depth = 1;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.gdepth = 1;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.buffer = TCPIP_emptyListOfPackets__TCPPacketManager_empty_data;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status = &TCPIP_emptyListOfPackets__TCPPacketManager_empty_status;
-  
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.inname ="empty";
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.outname ="emptyListOfPackets";
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.mwmr_fifo = &TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status =&TCPIP_emptyListOfPackets__TCPPacketManager_empty_status;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->lock=0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->rptr=0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->usage=0;
-  TCPIP_emptyListOfPackets__TCPPacketManager_empty.status->wptr =0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.rptr = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.wptr = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.usage = 0;
-  TCPIP_addPacket__TCPPacketManager_addPacket_status.lock = 0;
-  
-  TCPIP_addPacket__TCPPacketManager_addPacket.width = 1;
-  TCPIP_addPacket__TCPPacketManager_addPacket.depth = 1;
-  TCPIP_addPacket__TCPPacketManager_addPacket.gdepth = 1;
-  TCPIP_addPacket__TCPPacketManager_addPacket.buffer = TCPIP_addPacket__TCPPacketManager_addPacket_data;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status = &TCPIP_addPacket__TCPPacketManager_addPacket_status;
-  
-  __TCPIP_addPacket__TCPPacketManager_addPacket.inname ="addPacket";
-  __TCPIP_addPacket__TCPPacketManager_addPacket.outname ="addPacket";
-  __TCPIP_addPacket__TCPPacketManager_addPacket.mwmr_fifo = &TCPIP_addPacket__TCPPacketManager_addPacket;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status =&TCPIP_addPacket__TCPPacketManager_addPacket_status;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->lock=0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->rptr=0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->usage=0;
-  TCPIP_addPacket__TCPPacketManager_addPacket.status->wptr =0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.rptr = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.wptr = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.usage = 0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket_status.lock = 0;
-  
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.width = 1;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.depth = 1;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.gdepth = 1;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.buffer = TCPIP_ackPacket__TCPPacketManager_ackPacket_data;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status = &TCPIP_ackPacket__TCPPacketManager_ackPacket_status;
-  
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.inname ="ackPacket";
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.outname ="ackPacket";
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.mwmr_fifo = &TCPIP_ackPacket__TCPPacketManager_ackPacket;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status =&TCPIP_ackPacket__TCPPacketManager_ackPacket_status;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->lock=0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->rptr=0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->usage=0;
-  TCPIP_ackPacket__TCPPacketManager_ackPacket.status->wptr =0;
-  Application_open__TCPIP_open_status.rptr = 0;
-  Application_open__TCPIP_open_status.wptr = 0;
-  Application_open__TCPIP_open_status.usage = 0;
-  Application_open__TCPIP_open_status.lock = 0;
-  
-  Application_open__TCPIP_open.width = 1;
-  Application_open__TCPIP_open.depth = 1;
-  Application_open__TCPIP_open.gdepth = 1;
-  Application_open__TCPIP_open.buffer = Application_open__TCPIP_open_data;
-  Application_open__TCPIP_open.status = &Application_open__TCPIP_open_status;
-  
-  __Application_open__TCPIP_open.inname ="open";
-  __Application_open__TCPIP_open.outname ="open";
-  __Application_open__TCPIP_open.mwmr_fifo = &Application_open__TCPIP_open;
-  Application_open__TCPIP_open.status =&Application_open__TCPIP_open_status;
-  Application_open__TCPIP_open.status->lock=0;
-  Application_open__TCPIP_open.status->rptr=0;
-  Application_open__TCPIP_open.status->usage=0;
-  Application_open__TCPIP_open.status->wptr =0;
-  Application_close__TCPIP_close_status.rptr = 0;
-  Application_close__TCPIP_close_status.wptr = 0;
-  Application_close__TCPIP_close_status.usage = 0;
-  Application_close__TCPIP_close_status.lock = 0;
-  
-  Application_close__TCPIP_close.width = 1;
-  Application_close__TCPIP_close.depth = 1;
-  Application_close__TCPIP_close.gdepth = 1;
-  Application_close__TCPIP_close.buffer = Application_close__TCPIP_close_data;
-  Application_close__TCPIP_close.status = &Application_close__TCPIP_close_status;
-  
-  __Application_close__TCPIP_close.inname ="close";
-  __Application_close__TCPIP_close.outname ="close";
-  __Application_close__TCPIP_close.mwmr_fifo = &Application_close__TCPIP_close;
-  Application_close__TCPIP_close.status =&Application_close__TCPIP_close_status;
-  Application_close__TCPIP_close.status->lock=0;
-  Application_close__TCPIP_close.status->rptr=0;
-  Application_close__TCPIP_close.status->usage=0;
-  Application_close__TCPIP_close.status->wptr =0;
-  Application_abort__TCPIP_abort_status.rptr = 0;
-  Application_abort__TCPIP_abort_status.wptr = 0;
-  Application_abort__TCPIP_abort_status.usage = 0;
-  Application_abort__TCPIP_abort_status.lock = 0;
-  
-  Application_abort__TCPIP_abort.width = 1;
-  Application_abort__TCPIP_abort.depth = 1;
-  Application_abort__TCPIP_abort.gdepth = 1;
-  Application_abort__TCPIP_abort.buffer = Application_abort__TCPIP_abort_data;
-  Application_abort__TCPIP_abort.status = &Application_abort__TCPIP_abort_status;
-  
-  __Application_abort__TCPIP_abort.inname ="abort";
-  __Application_abort__TCPIP_abort.outname ="abort";
-  __Application_abort__TCPIP_abort.mwmr_fifo = &Application_abort__TCPIP_abort;
-  Application_abort__TCPIP_abort.status =&Application_abort__TCPIP_abort_status;
-  Application_abort__TCPIP_abort.status->lock=0;
-  Application_abort__TCPIP_abort.status->rptr=0;
-  Application_abort__TCPIP_abort.status->usage=0;
-  Application_abort__TCPIP_abort.status->wptr =0;
-  Application_sendTCP__TCPIP_send_TCP_status.rptr = 0;
-  Application_sendTCP__TCPIP_send_TCP_status.wptr = 0;
-  Application_sendTCP__TCPIP_send_TCP_status.usage = 0;
-  Application_sendTCP__TCPIP_send_TCP_status.lock = 0;
-  
-  Application_sendTCP__TCPIP_send_TCP.width = 1;
-  Application_sendTCP__TCPIP_send_TCP.depth = 1;
-  Application_sendTCP__TCPIP_send_TCP.gdepth = 1;
-  Application_sendTCP__TCPIP_send_TCP.buffer = Application_sendTCP__TCPIP_send_TCP_data;
-  Application_sendTCP__TCPIP_send_TCP.status = &Application_sendTCP__TCPIP_send_TCP_status;
-  
-  __Application_sendTCP__TCPIP_send_TCP.inname ="send_TCP";
-  __Application_sendTCP__TCPIP_send_TCP.outname ="sendTCP";
-  __Application_sendTCP__TCPIP_send_TCP.mwmr_fifo = &Application_sendTCP__TCPIP_send_TCP;
-  Application_sendTCP__TCPIP_send_TCP.status =&Application_sendTCP__TCPIP_send_TCP_status;
-  Application_sendTCP__TCPIP_send_TCP.status->lock=0;
-  Application_sendTCP__TCPIP_send_TCP.status->rptr=0;
-  Application_sendTCP__TCPIP_send_TCP.status->usage=0;
-  Application_sendTCP__TCPIP_send_TCP.status->wptr =0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.rptr = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.wptr = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.usage = 0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP_status.lock = 0;
-  
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.width = 1;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.depth = 1;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.gdepth = 1;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.buffer = SmartCardController_fromTtoP__TCPIP_fromTtoP_data;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status = &SmartCardController_fromTtoP__TCPIP_fromTtoP_status;
-  
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.inname ="fromTtoP";
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.outname ="fromTtoP";
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.mwmr_fifo = &SmartCardController_fromTtoP__TCPIP_fromTtoP;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status =&SmartCardController_fromTtoP__TCPIP_fromTtoP_status;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->lock=0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->rptr=0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->usage=0;
-  SmartCardController_fromTtoP__TCPIP_fromTtoP.status->wptr =0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.rptr = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.wptr = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.usage = 0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT_status.lock = 0;
-  
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.width = 1;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.depth = 1;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.gdepth = 1;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.buffer = SmartCardController_fromPtoT__TCPIP_fromPtoT_data;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status = &SmartCardController_fromPtoT__TCPIP_fromPtoT_status;
-  
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.inname ="fromPtoT";
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.outname ="fromPtoT";
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.mwmr_fifo = &SmartCardController_fromPtoT__TCPIP_fromPtoT;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status =&SmartCardController_fromPtoT__TCPIP_fromPtoT_status;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->lock=0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->rptr=0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->usage=0;
-  SmartCardController_fromPtoT__TCPIP_fromPtoT.status->wptr =0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.rptr = 0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.wptr = 0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.usage = 0;
-  SmartCardController_start_TCPIP__TCPIP_start_status.lock = 0;
-  
-  SmartCardController_start_TCPIP__TCPIP_start.width = 1;
-  SmartCardController_start_TCPIP__TCPIP_start.depth = 1;
-  SmartCardController_start_TCPIP__TCPIP_start.gdepth = 1;
-  SmartCardController_start_TCPIP__TCPIP_start.buffer = SmartCardController_start_TCPIP__TCPIP_start_data;
-  SmartCardController_start_TCPIP__TCPIP_start.status = &SmartCardController_start_TCPIP__TCPIP_start_status;
-  
-  __SmartCardController_start_TCPIP__TCPIP_start.inname ="start";
-  __SmartCardController_start_TCPIP__TCPIP_start.outname ="start_TCPIP";
-  __SmartCardController_start_TCPIP__TCPIP_start.mwmr_fifo = &SmartCardController_start_TCPIP__TCPIP_start;
-  SmartCardController_start_TCPIP__TCPIP_start.status =&SmartCardController_start_TCPIP__TCPIP_start_status;
-  SmartCardController_start_TCPIP__TCPIP_start.status->lock=0;
-  SmartCardController_start_TCPIP__TCPIP_start.status->rptr=0;
-  SmartCardController_start_TCPIP__TCPIP_start.status->usage=0;
-  SmartCardController_start_TCPIP__TCPIP_start.status->wptr =0;
-  SmartCardController_reset__InterfaceDevice_reset_status.rptr = 0;
-  SmartCardController_reset__InterfaceDevice_reset_status.wptr = 0;
-  SmartCardController_reset__InterfaceDevice_reset_status.usage = 0;
-  SmartCardController_reset__InterfaceDevice_reset_status.lock = 0;
-  
-  SmartCardController_reset__InterfaceDevice_reset.width = 1;
-  SmartCardController_reset__InterfaceDevice_reset.depth = 1;
-  SmartCardController_reset__InterfaceDevice_reset.gdepth = 1;
-  SmartCardController_reset__InterfaceDevice_reset.buffer = SmartCardController_reset__InterfaceDevice_reset_data;
-  SmartCardController_reset__InterfaceDevice_reset.status = &SmartCardController_reset__InterfaceDevice_reset_status;
-  
-  __SmartCardController_reset__InterfaceDevice_reset.inname ="reset";
-  __SmartCardController_reset__InterfaceDevice_reset.outname ="reset";
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &SmartCardController_reset__InterfaceDevice_reset;
-  SmartCardController_reset__InterfaceDevice_reset.status =&SmartCardController_reset__InterfaceDevice_reset_status;
-  SmartCardController_reset__InterfaceDevice_reset.status->lock=0;
-  SmartCardController_reset__InterfaceDevice_reset.status->rptr=0;
-  SmartCardController_reset__InterfaceDevice_reset.status->usage=0;
-  SmartCardController_reset__InterfaceDevice_reset.status->wptr =0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.rptr = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.wptr = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.usage = 0;
-  SmartCardController_pTS__InterfaceDevice_pTS_status.lock = 0;
-  
-  SmartCardController_pTS__InterfaceDevice_pTS.width = 1;
-  SmartCardController_pTS__InterfaceDevice_pTS.depth = 1;
-  SmartCardController_pTS__InterfaceDevice_pTS.gdepth = 1;
-  SmartCardController_pTS__InterfaceDevice_pTS.buffer = SmartCardController_pTS__InterfaceDevice_pTS_data;
-  SmartCardController_pTS__InterfaceDevice_pTS.status = &SmartCardController_pTS__InterfaceDevice_pTS_status;
-  
-  __SmartCardController_pTS__InterfaceDevice_pTS.inname ="pTS";
-  __SmartCardController_pTS__InterfaceDevice_pTS.outname ="pTS";
-  __SmartCardController_pTS__InterfaceDevice_pTS.mwmr_fifo = &SmartCardController_pTS__InterfaceDevice_pTS;
-  SmartCardController_pTS__InterfaceDevice_pTS.status =&SmartCardController_pTS__InterfaceDevice_pTS_status;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->lock=0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->rptr=0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->usage=0;
-  SmartCardController_pTS__InterfaceDevice_pTS.status->wptr =0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.rptr = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.wptr = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.usage = 0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready_status.lock = 0;
-  
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.width = 1;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.depth = 1;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.gdepth = 1;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.buffer = SmartCardController_dataReady__InterfaceDevice_data_Ready_data;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status = &SmartCardController_dataReady__InterfaceDevice_data_Ready_status;
-  
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.inname ="dataReady";
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.outname ="data_Ready";
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.mwmr_fifo = &SmartCardController_dataReady__InterfaceDevice_data_Ready;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status =&SmartCardController_dataReady__InterfaceDevice_data_Ready_status;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->lock=0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->rptr=0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->usage=0;
-  SmartCardController_dataReady__InterfaceDevice_data_Ready.status->wptr =0;
-  SmartCardController_activation__InterfaceDevice_activation_status.rptr = 0;
-  SmartCardController_activation__InterfaceDevice_activation_status.wptr = 0;
-  SmartCardController_activation__InterfaceDevice_activation_status.usage = 0;
-  SmartCardController_activation__InterfaceDevice_activation_status.lock = 0;
-  
-  SmartCardController_activation__InterfaceDevice_activation.width = 1;
-  SmartCardController_activation__InterfaceDevice_activation.depth = 1;
-  SmartCardController_activation__InterfaceDevice_activation.gdepth = 1;
-  SmartCardController_activation__InterfaceDevice_activation.buffer = SmartCardController_activation__InterfaceDevice_activation_data;
-  SmartCardController_activation__InterfaceDevice_activation.status = &SmartCardController_activation__InterfaceDevice_activation_status;
-  
-  __SmartCardController_activation__InterfaceDevice_activation.inname ="activation";
-  __SmartCardController_activation__InterfaceDevice_activation.outname ="activation";
-  __SmartCardController_activation__InterfaceDevice_activation.mwmr_fifo = &SmartCardController_activation__InterfaceDevice_activation;
-  SmartCardController_activation__InterfaceDevice_activation.status =&SmartCardController_activation__InterfaceDevice_activation_status;
-  SmartCardController_activation__InterfaceDevice_activation.status->lock=0;
-  SmartCardController_activation__InterfaceDevice_activation.status->rptr=0;
-  SmartCardController_activation__InterfaceDevice_activation.status->usage=0;
-  SmartCardController_activation__InterfaceDevice_activation.status->wptr =0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.rptr = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.wptr = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.usage = 0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status.lock = 0;
-  
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.width = 1;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.depth = 1;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.gdepth = 1;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.buffer = SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_data;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status = &SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status;
-  
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.inname ="fromDtoSC";
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.outname ="fromDtoSC";
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.mwmr_fifo = &SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status =&SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC_status;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->lock=0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->rptr=0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->usage=0;
-  SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.status->wptr =0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.rptr = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.wptr = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.usage = 0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset_status.lock = 0;
-  
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.width = 1;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.depth = 1;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.gdepth = 1;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.buffer = SmartCardController_answerToReset__InterfaceDevice_answerToReset_data;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status = &SmartCardController_answerToReset__InterfaceDevice_answerToReset_status;
-  
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.inname ="answerToReset";
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.outname ="answerToReset";
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.mwmr_fifo = &SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status =&SmartCardController_answerToReset__InterfaceDevice_answerToReset_status;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->lock=0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->rptr=0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->usage=0;
-  SmartCardController_answerToReset__InterfaceDevice_answerToReset.status->wptr =0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.rptr = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.wptr = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.usage = 0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status.lock = 0;
-  
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.width = 1;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.depth = 1;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.gdepth = 1;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.buffer = SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_data;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status = &SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status;
-  
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.inname ="pTSConfirm";
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.outname ="pTSCConfirm";
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.mwmr_fifo = &SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status =&SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm_status;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->lock=0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->rptr=0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->usage=0;
-  SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.status->wptr =0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.rptr = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.wptr = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.usage = 0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status.lock = 0;
-  
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.width = 1;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.depth = 1;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.gdepth = 1;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.buffer = SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_data;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status = &SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status;
-  
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.inname ="fromSCtoD";
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.outname ="fromSCtoD";
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.mwmr_fifo = &SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status =&SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD_status;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->lock=0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->rptr=0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->usage=0;
-  SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.status->wptr =0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.rptr = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.wptr = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.usage = 0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status.lock = 0;
-  
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.width = 1;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.depth = 1;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.gdepth = 1;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.buffer = SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_data;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status = &SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status;
-  
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.inname ="dataReady";
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.outname ="data_Ready_SC";
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.mwmr_fifo = &SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status =&SmartCardController_data_Ready_SC__InterfaceDevice_dataReady_status;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->lock=0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->rptr=0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->usage=0;
-  SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.status->wptr =0;
-  SmartCardController_start_Application__Application_startApplication_status.rptr = 0;
-  SmartCardController_start_Application__Application_startApplication_status.wptr = 0;
-  SmartCardController_start_Application__Application_startApplication_status.usage = 0;
-  SmartCardController_start_Application__Application_startApplication_status.lock = 0;
-  
-  SmartCardController_start_Application__Application_startApplication.width = 1;
-  SmartCardController_start_Application__Application_startApplication.depth = 1;
-  SmartCardController_start_Application__Application_startApplication.gdepth = 1;
-  SmartCardController_start_Application__Application_startApplication.buffer = SmartCardController_start_Application__Application_startApplication_data;
-  SmartCardController_start_Application__Application_startApplication.status = &SmartCardController_start_Application__Application_startApplication_status;
-  
-  __SmartCardController_start_Application__Application_startApplication.inname ="startApplication";
-  __SmartCardController_start_Application__Application_startApplication.outname ="start_Application";
-  __SmartCardController_start_Application__Application_startApplication.mwmr_fifo = &SmartCardController_start_Application__Application_startApplication;
-  SmartCardController_start_Application__Application_startApplication.status =&SmartCardController_start_Application__Application_startApplication_status;
-  SmartCardController_start_Application__Application_startApplication.status->lock=0;
-  SmartCardController_start_Application__Application_startApplication.status->rptr=0;
-  SmartCardController_start_Application__Application_startApplication.status->usage=0;
-  SmartCardController_start_Application__Application_startApplication.status->wptr =0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.rptr = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.wptr = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.usage = 0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status.lock = 0;
-  
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.width = 1;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.depth = 1;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.gdepth = 1;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.buffer = TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_data;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status = &TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status;
-  
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.inname ="set";
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.outname ="set__mainTimer";
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.mwmr_fifo = &TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status =&TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set_status;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->lock=0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->rptr=0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->usage=0;
-  TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.status->wptr =0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.rptr = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.wptr = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.usage = 0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status.lock = 0;
-  
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.width = 1;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.depth = 1;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.gdepth = 1;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.buffer = TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_data;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status = &TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status;
-  
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.inname ="reset";
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.outname ="reset__mainTimer";
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.mwmr_fifo = &TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status =&TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset_status;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->lock=0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->rptr=0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->usage=0;
-  TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.status->wptr =0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.rptr = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.wptr = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.usage = 0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status.lock = 0;
-  
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.width = 1;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.depth = 1;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.gdepth = 1;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.buffer = TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_data;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status = &TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status;
-  
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.inname ="expire__mainTimer";
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.outname ="expire";
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.mwmr_fifo = &TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status =&TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire_status;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->lock=0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->rptr=0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->usage=0;
-  TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.status->wptr =0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.rptr = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.wptr = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.usage = 0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status.lock = 0;
-  
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.width = 1;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.depth = 1;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.gdepth = 1;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.buffer = TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_data;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status = &TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status;
-  
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.inname ="set";
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.outname ="set__timerP";
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.mwmr_fifo = &TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status =&TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set_status;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->lock=0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->rptr=0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->usage=0;
-  TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.status->wptr =0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.rptr = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.wptr = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.usage = 0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status.lock = 0;
-  
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.width = 1;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.depth = 1;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.gdepth = 1;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.buffer = TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_data;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status = &TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status;
-  
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.inname ="reset";
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.outname ="reset__timerP";
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.mwmr_fifo = &TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status =&TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset_status;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->lock=0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->rptr=0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->usage=0;
-  TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.status->wptr =0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.rptr = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.wptr = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.usage = 0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status.lock = 0;
-  
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.width = 1;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.depth = 1;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.gdepth = 1;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.buffer = TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_data;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status = &TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status;
-  
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.inname ="expire__timerP";
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.outname ="expire";
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.mwmr_fifo = &TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status =&TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire_status;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->lock=0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->rptr=0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->usage=0;
-  TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.status->wptr =0;
-  /* Asynchronous channels */
-  TCPIP_receiveTCP__Application_receiveTCP_status.rptr = 0;
-  TCPIP_receiveTCP__Application_receiveTCP_status.wptr = 0;
-  TCPIP_receiveTCP__Application_receiveTCP_status.usage = 0;
-  TCPIP_receiveTCP__Application_receiveTCP_status.lock = 0;
-  
-  TCPIP_receiveTCP__Application_receiveTCP.width = 1;
-  TCPIP_receiveTCP__Application_receiveTCP.depth = 51;
-  TCPIP_receiveTCP__Application_receiveTCP.gdepth = TCPIP_receiveTCP__Application_receiveTCP.depth;
-  TCPIP_receiveTCP__Application_receiveTCP.buffer = TCPIP_receiveTCP__Application_receiveTCP_data;
-  TCPIP_receiveTCP__Application_receiveTCP.status = &TCPIP_receiveTCP__Application_receiveTCP_status;
-  __TCPIP_receiveTCP__Application_receiveTCP.inname ="receiveTCP";
-  __TCPIP_receiveTCP__Application_receiveTCP.outname ="receiveTCP";
-  __TCPIP_receiveTCP__Application_receiveTCP.isBlocking = 0;
-  __TCPIP_receiveTCP__Application_receiveTCP.maxNbOfMessages = 5;
-  __TCPIP_receiveTCP__Application_receiveTCP.mwmr_fifo = &TCPIP_receiveTCP__Application_receiveTCP;
-  TCPIP_receiveTCP__Application_receiveTCP.status =&TCPIP_receiveTCP__Application_receiveTCP_status;
-  TCPIP_receiveTCP__Application_receiveTCP.status->lock=0;
-  TCPIP_receiveTCP__Application_receiveTCP.status->rptr=0;
-  TCPIP_receiveTCP__Application_receiveTCP.status->usage=0;
-  TCPIP_receiveTCP__Application_receiveTCP.status->wptr=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.rptr = 0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.wptr = 0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.usage = 0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve_status.lock = 0;
-  
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.width = 1;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.depth = 51;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.gdepth = TCPPacketManager_storePacket__TCPPacketManager_retrieve.depth;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.buffer = TCPPacketManager_storePacket__TCPPacketManager_retrieve_data;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status = &TCPPacketManager_storePacket__TCPPacketManager_retrieve_status;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.inname ="retrieve";
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.outname ="storePacket";
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.isBlocking = 0;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.maxNbOfMessages = 5;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.mwmr_fifo = &TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status =&TCPPacketManager_storePacket__TCPPacketManager_retrieve_status;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->lock=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->rptr=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->usage=0;
-  TCPPacketManager_storePacket__TCPPacketManager_retrieve.status->wptr=0;
-  
-  /* Threads of tasks */
-  pthread_t thread__InterfaceDevice;
-  pthread_t thread__SmartCard;
-  pthread_t thread__TCPIP;
-  pthread_t thread__TCPPacketManager;
-  pthread_t thread__Application;
-  pthread_t thread__SmartCardController;
-  pthread_t thread__Timer__mainTimer__TCPIP;
-  pthread_t thread__Timer__timerP__TCPPacketManager;
-  /* Activating tracing  */
-  if (argc>1){
-    activeTracingInFile(argv[1]);
-  } else {
-    activeTracingInConsole();
-  }
-  /* Activating debug messages */
-  activeDebug();
-  /* Activating randomness */
-  initRandom();
-  /* Initializing the main mutex */
-if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
-  
-  /* User initialization */
-  __user_init();
-  
-  
-  debugMsg("Starting tasks");
-  struct mwmr_s *channels_array_InterfaceDevice[9];
-  channels_array_InterfaceDevice[0]=&SmartCardController_reset__InterfaceDevice_reset;
-  channels_array_InterfaceDevice[1]=&SmartCardController_pTS__InterfaceDevice_pTS;
-  channels_array_InterfaceDevice[2]=&SmartCardController_dataReady__InterfaceDevice_data_Ready;
-  channels_array_InterfaceDevice[3]=&SmartCardController_activation__InterfaceDevice_activation;
-  channels_array_InterfaceDevice[4]=&SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-  channels_array_InterfaceDevice[5]=&SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-  channels_array_InterfaceDevice[6]=&SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-  channels_array_InterfaceDevice[7]=&SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-  channels_array_InterfaceDevice[8]=&SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__InterfaceDevice= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 1);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__InterfaceDevice, attr_t, mainFunc__InterfaceDevice, (void *)channels_array_InterfaceDevice);
-  
-  struct mwmr_s *channels_array_SmartCard;
-  ptr =malloc(sizeof(pthread_t));
-  thread__SmartCard= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__SmartCard, attr_t, mainFunc__SmartCard, (void *)channels_array_SmartCard);
-  
-  struct mwmr_s *channels_array_TCPIP[15];
-  channels_array_TCPIP[0]=&TCPIP_receiveTCP__Application_receiveTCP;
-  channels_array_TCPIP[1]=&TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-  channels_array_TCPIP[2]=&TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-  channels_array_TCPIP[3]=&TCPIP_addPacket__TCPPacketManager_addPacket;
-  channels_array_TCPIP[4]=&TCPIP_ackPacket__TCPPacketManager_ackPacket;
-  channels_array_TCPIP[5]=&Application_open__TCPIP_open;
-  channels_array_TCPIP[6]=&Application_close__TCPIP_close;
-  channels_array_TCPIP[7]=&Application_abort__TCPIP_abort;
-  channels_array_TCPIP[8]=&Application_sendTCP__TCPIP_send_TCP;
-  channels_array_TCPIP[9]=&SmartCardController_fromTtoP__TCPIP_fromTtoP;
-  channels_array_TCPIP[10]=&SmartCardController_fromPtoT__TCPIP_fromPtoT;
-  channels_array_TCPIP[11]=&SmartCardController_start_TCPIP__TCPIP_start;
-  channels_array_TCPIP[12]=&TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-  channels_array_TCPIP[13]=&TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-  channels_array_TCPIP[14]=&TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__TCPIP= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__TCPIP, attr_t, mainFunc__TCPIP, (void *)channels_array_TCPIP);
-  
-  struct mwmr_s *channels_array_TCPPacketManager[8];
-  channels_array_TCPPacketManager[0]=&TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-  channels_array_TCPPacketManager[1]=&TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-  channels_array_TCPPacketManager[2]=&TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-  channels_array_TCPPacketManager[3]=&TCPIP_addPacket__TCPPacketManager_addPacket;
-  channels_array_TCPPacketManager[4]=&TCPIP_ackPacket__TCPPacketManager_ackPacket;
-  channels_array_TCPPacketManager[5]=&TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-  channels_array_TCPPacketManager[6]=&TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-  channels_array_TCPPacketManager[7]=&TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__TCPPacketManager= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__TCPPacketManager, attr_t, mainFunc__TCPPacketManager, (void *)channels_array_TCPPacketManager);
-  
-  struct mwmr_s *channels_array_Application[6];
-  channels_array_Application[0]=&TCPIP_receiveTCP__Application_receiveTCP;
-  channels_array_Application[1]=&Application_open__TCPIP_open;
-  channels_array_Application[2]=&Application_close__TCPIP_close;
-  channels_array_Application[3]=&Application_abort__TCPIP_abort;
-  channels_array_Application[4]=&Application_sendTCP__TCPIP_send_TCP;
-  channels_array_Application[5]=&SmartCardController_start_Application__Application_startApplication;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Application= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__Application, attr_t, mainFunc__Application, (void *)channels_array_Application);
-  
-  struct mwmr_s *channels_array_SmartCardController[13];
-  channels_array_SmartCardController[0]=&SmartCardController_fromTtoP__TCPIP_fromTtoP;
-  channels_array_SmartCardController[1]=&SmartCardController_fromPtoT__TCPIP_fromPtoT;
-  channels_array_SmartCardController[2]=&SmartCardController_start_TCPIP__TCPIP_start;
-  channels_array_SmartCardController[3]=&SmartCardController_reset__InterfaceDevice_reset;
-  channels_array_SmartCardController[4]=&SmartCardController_pTS__InterfaceDevice_pTS;
-  channels_array_SmartCardController[5]=&SmartCardController_dataReady__InterfaceDevice_data_Ready;
-  channels_array_SmartCardController[6]=&SmartCardController_activation__InterfaceDevice_activation;
-  channels_array_SmartCardController[7]=&SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-  channels_array_SmartCardController[8]=&SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-  channels_array_SmartCardController[9]=&SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-  channels_array_SmartCardController[10]=&SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-  channels_array_SmartCardController[11]=&SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-  channels_array_SmartCardController[12]=&SmartCardController_start_Application__Application_startApplication;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__SmartCardController= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__SmartCardController, attr_t, mainFunc__SmartCardController, (void *)channels_array_SmartCardController);
-  
-  struct mwmr_s *channels_array_Timer__mainTimer__TCPIP[3];
-  channels_array_Timer__mainTimer__TCPIP[0]=&TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-  channels_array_Timer__mainTimer__TCPIP[1]=&TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-  channels_array_Timer__mainTimer__TCPIP[2]=&TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Timer__mainTimer__TCPIP= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__Timer__mainTimer__TCPIP, attr_t, mainFunc__Timer__mainTimer__TCPIP, (void *)channels_array_Timer__mainTimer__TCPIP);
-  
-  struct mwmr_s *channels_array_Timer__timerP__TCPPacketManager[3];
-  channels_array_Timer__timerP__TCPPacketManager[0]=&TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-  channels_array_Timer__timerP__TCPPacketManager[1]=&TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-  channels_array_Timer__timerP__TCPPacketManager[2]=&TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Timer__timerP__TCPPacketManager= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  debugMsg("Starting tasks");
-  pthread_create(&thread__Timer__timerP__TCPPacketManager, attr_t, mainFunc__Timer__timerP__TCPPacketManager, (void *)channels_array_Timer__timerP__TCPPacketManager);
-  
-  
-  
-  debugMsg("Joining tasks");
-  pthread_join(thread__InterfaceDevice, NULL);
-  pthread_join(thread__SmartCard, NULL);
-  pthread_join(thread__TCPIP, NULL);
-  pthread_join(thread__TCPPacketManager, NULL);
-  pthread_join(thread__Application, NULL);
-  pthread_join(thread__SmartCardController, NULL);
-  pthread_join(thread__Timer__mainTimer__TCPIP, NULL);
-  pthread_join(thread__Timer__timerP__TCPPacketManager, NULL);
-  
-  
-  debugMsg("Application terminated");
-  return 0;
-  
-}
diff --git a/MPSoC/mutekh/examples/avatar/main.c b/MPSoC/mutekh/examples/avatar/main.c
deleted file mode 100644
index 854c81f3d1729d0daf0b2fd18ed0dddb4dd490c8..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/main.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include <stdio.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "myerrors.h"
-#include "message.h"
-#include "syncchannel.h"
-#include "asyncchannel.h"
-#include "mytimelib.h"
-#include "request_manager.h"
-#include "defs.h"
-#include "debug.h"
-#include "random.h"
-#include "tracemanager.h" 
-#include "mwmr.h" 
- 
-
-#define NB_PROC 2
-#define WIDTH 4
-#define DEPTH 16
-
-void __user_init() {
-}
-
-#include "Block1.h"
-#include "Block0.h"
-
-/* Main mutex */
-pthread_barrier_t barrier ;
-pthread_attr_t *attr_t;
-pthread_mutex_t __mainMutex;
-
-#define CHANNEL0 __attribute__((section("section_channel0")))
-#define LOCK0 __attribute__((section("section_lock0")))
-#define base(arg) arg
-
-typedef struct mwmr_s mwmr_t;
-
-/* Synchronous channels */
-/* Asynchronous channels */
-asyncchannel __Block0_val__Block1_val;
-uint32_t const Block0_val__Block1_val_lock LOCK0;
-struct mwmr_status_s Block0_val__Block1_val_status CHANNEL0;
-uint8_t Block0_val__Block1_val_data[32] CHANNEL0;
-struct mwmr_s Block0_val__Block1_val CHANNEL0;
-
-
-int main(int argc, char *argv[]) {
-  
-  
-  void *ptr;
-  pthread_barrier_init(&barrier,NULL, NB_PROC);
-  pthread_attr_t *attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_init(attr_t);
-  pthread_mutex_init(&__mainMutex, NULL);
-  
-  int sizeParams;
-  
-  /* Synchronous channels */
-  /* Asynchronous channels */
-  Block0_val__Block1_val_status.rptr = 0;
-  Block0_val__Block1_val_status.wptr = 0;
-  Block0_val__Block1_val_status.usage = 0;
-  Block0_val__Block1_val_status.lock = 0;
-  
-  Block0_val__Block1_val.width = 4;
-  Block0_val__Block1_val.depth = 4;
-  Block0_val__Block1_val.gdepth = Block0_val__Block1_val.depth;
-  Block0_val__Block1_val.buffer = Block0_val__Block1_val_data;
-  Block0_val__Block1_val.status = &Block0_val__Block1_val_status;
-  __Block0_val__Block1_val.inname ="val";
-  __Block0_val__Block1_val.outname ="val";
-  __Block0_val__Block1_val.isBlocking = 0;
-  __Block0_val__Block1_val.maxNbOfMessages = 4;
-  __Block0_val__Block1_val.mwmr_fifo = &Block0_val__Block1_val;
-  Block0_val__Block1_val.status =&Block0_val__Block1_val_status;
-  Block0_val__Block1_val.status->lock=0;
-  Block0_val__Block1_val.status->rptr=0;
-  Block0_val__Block1_val.status->usage=0;
-  Block0_val__Block1_val.status->wptr=0;
-  
-  /* Threads of tasks */
-  pthread_t thread__Block1;
-  pthread_t thread__Block0;
-  /* Activating tracing  */
-  /* Activating randomness */
-  initRandom();
-  /* Initializing the main mutex */
-if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
-  
-  /* User initialization */
-  __user_init();
-  
-  
-  struct mwmr_s *channels_array_Block1[1];
-  channels_array_Block1[0]=&Block0_val__Block1_val;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Block1= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__Block1, attr_t, mainFunc__Block1, (void *)channels_array_Block1);
-  
-  struct mwmr_s *channels_array_Block0[1];
-  channels_array_Block0[0]=&Block0_val__Block1_val;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Block0= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__Block0, attr_t, mainFunc__Block0, (void *)channels_array_Block0);
-  
-  
-  
-  pthread_join(thread__Block1, NULL);
-  pthread_join(thread__Block0, NULL);
-  
-  
-  return 0;
-  
-}
diff --git a/MPSoC/mutekh/examples/avatar/main.c-17-05fewchannels b/MPSoC/mutekh/examples/avatar/main.c-17-05fewchannels
deleted file mode 100644
index d17809152cbc057b9e8c1be5ec830e8c9fc4bccd..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/main.c-17-05fewchannels
+++ /dev/null
@@ -1,574 +0,0 @@
-#include <stdio.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "myerrors.h"
-#include "message.h"
-#include "syncchannel.h"
-#include "asyncchannel.h"
-#include "mytimelib.h"
-#include "request_manager.h"
-#include "defs.h"
-#include "debug.h"
-#include "random.h"
-#include "tracemanager.h" 
-#include "mwmr.h" 
- 
-
-#define NB_PROC 2
-#define WIDTH 4
-#define DEPTH 16
-
-void __user_init() {
-}
-
-#include "InterfaceDevice.h"
-#include "SmartCard.h"
-#include "TCPIP.h"
-#include "TCPPacketManager.h"
-#include "Application.h"
-#include "SmartCardController.h"
-
-/* Main mutex */
-pthread_barrier_t barrier ;
-pthread_attr_t *attr_t;
-pthread_mutex_t __mainMutex;
-
-#define CHANNEL0 __attribute__((section("section_channel0")))
-#define LOCK0 __attribute__((section("section_lock0")))
-#define CHANNEL1 __attribute__((section("section_channel1")))
-#define LOCK1 __attribute__((section("section_lock1")))
-#define CHANNEL2 __attribute__((section("section_channel2")))
-#define LOCK2 __attribute__((section("section_lock2")))
-#define CHANNEL3 __attribute__((section("section_channel3")))
-#define LOCK3 __attribute__((section("section_lock3")))
-#define CHANNEL4 __attribute__((section("section_channel4")))
-#define LOCK4 __attribute__((section("section_lock4")))
-#define CHANNEL5 __attribute__((section("section_channel5")))
-#define LOCK5 __attribute__((section("section_lock5")))
-#define CHANNEL6 __attribute__((section("section_channel6")))
-#define LOCK6 __attribute__((section("section_lock6")))
-#define base(arg) arg
-
-typedef struct mwmr_s mwmr_t;
-
-/* Synchronous channels */
-syncchannel __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket;
-syncchannel __TCPIP_emptyListOfPackets__TCPPacketManager_empty;
-syncchannel __TCPIP_addPacket__TCPPacketManager_addPacket;
-syncchannel __TCPIP_ackPacket__TCPPacketManager_ackPacket;
-uint32_t const mwmr_fifo0_lock LOCK0;
-struct mwmr_status_s mwmr_fifo0_status CHANNEL0;
-uint8_t mwmr_fifo0_data[32] CHANNEL0;
-struct mwmr_s mwmr_fifo0 CHANNEL0;
-
-syncchannel __Application_open__TCPIP_open;
-syncchannel __Application_close__TCPIP_close;
-syncchannel __Application_abort__TCPIP_abort;
-syncchannel __Application_sendTCP__TCPIP_send_TCP;
-uint32_t const mwmr_fifo1_lock LOCK1;
-struct mwmr_status_s mwmr_fifo1_status CHANNEL1;
-uint8_t mwmr_fifo1_data[32] CHANNEL1;
-struct mwmr_s mwmr_fifo1 CHANNEL1;
-
-syncchannel __SmartCardController_fromTtoP__TCPIP_fromTtoP;
-syncchannel __SmartCardController_fromPtoT__TCPIP_fromPtoT;
-syncchannel __SmartCardController_start_TCPIP__TCPIP_start;
-uint32_t const mwmr_fifo2_lock LOCK2;
-struct mwmr_status_s mwmr_fifo2_status CHANNEL2;
-uint8_t mwmr_fifo2_data[32] CHANNEL2;
-struct mwmr_s mwmr_fifo2 CHANNEL2;
-
-syncchannel __SmartCardController_reset__InterfaceDevice_reset;
-syncchannel __SmartCardController_pTS__InterfaceDevice_pTS;
-syncchannel __SmartCardController_dataReady__InterfaceDevice_data_Ready;
-syncchannel __SmartCardController_activation__InterfaceDevice_activation;
-syncchannel __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC;
-syncchannel __SmartCardController_answerToReset__InterfaceDevice_answerToReset;
-syncchannel __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm;
-syncchannel __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD;
-syncchannel __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady;
-uint32_t const mwmr_fifo3_lock LOCK3;
-struct mwmr_status_s mwmr_fifo3_status CHANNEL3;
-uint8_t mwmr_fifo3_data[32] CHANNEL3;
-struct mwmr_s mwmr_fifo3 CHANNEL3;
-
-syncchannel __SmartCardController_start_Application__Application_startApplication;
-uint32_t const mwmr_fifo4_lock LOCK4;
-struct mwmr_status_s mwmr_fifo4_status CHANNEL4;
-uint8_t mwmr_fifo4_data[32] CHANNEL4;
-struct mwmr_s mwmr_fifo4 CHANNEL4;
-
-syncchannel __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set;
-syncchannel __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset;
-syncchannel __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire;
-uint32_t const mwmr_fifo5_lock LOCK5;
-struct mwmr_status_s mwmr_fifo5_status CHANNEL5;
-uint8_t mwmr_fifo5_data[32] CHANNEL5;
-struct mwmr_s mwmr_fifo5 CHANNEL5;
-
-syncchannel __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set;
-syncchannel __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset;
-syncchannel __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire;
-uint32_t const mwmr_fifo6_lock LOCK6;
-struct mwmr_status_s mwmr_fifo6_status CHANNEL6;
-uint8_t mwmr_fifo6_data[32] CHANNEL6;
-struct mwmr_s mwmr_fifo6 CHANNEL6;
-
-/* Asynchronous channels */
-asyncchannel __TCPIP_receiveTCP__Application_receiveTCP;
-uint32_t const mwmr_fifo9_lock LOCK9;
-struct mwmr_status_s mwmr_fifo9_status CHANNEL9;
-uint8_t  mwmr_fifo9_data[32] CHANNEL9;
-struct mwmr_s mwmr_fifo9 CHANNEL9;
-
-asyncchannel __TCPPacketManager_storePacket__TCPPacketManager_retrieve;
-uint32_t const mwmr_fifo9_lock LOCK9;
-struct mwmr_status_s mwmr_fifo9_status CHANNEL9;
-uint8_t  mwmr_fifo9_data[32] CHANNEL9;
-struct mwmr_s mwmr_fifo9 CHANNEL9;
-
-
-int main(int argc, char *argv[]) {
-  
-  
-  void *ptr;
-  pthread_barrier_init(&barrier,NULL, NB_PROC);
-  pthread_attr_t *attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_init(attr_t);
-  pthread_mutex_init(&__mainMutex, NULL);
-  
-  /* Synchronous channels */
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.inname ="timeoutPacket";
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.outname ="timeoutPacket";
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.ok = 1;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.ok2 = 0;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.mwmr_fifo = &mwmr_fifo0;
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.inname ="empty";
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.outname ="emptyListOfPackets";
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.ok = 1;
-  __TCPIP_emptyListOfPackets__TCPPacketManager_empty.ok2 = 0;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.mwmr_fifo = &mwmr_fifo0;
-  __TCPIP_addPacket__TCPPacketManager_addPacket.inname ="addPacket";
-  __TCPIP_addPacket__TCPPacketManager_addPacket.outname ="addPacket";
-  __TCPIP_addPacket__TCPPacketManager_addPacket.ok = 1;
-  __TCPIP_addPacket__TCPPacketManager_addPacket.ok2 = 0;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.mwmr_fifo = &mwmr_fifo0;
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.inname ="ackPacket";
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.outname ="ackPacket";
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.ok = 1;
-  __TCPIP_ackPacket__TCPPacketManager_ackPacket.ok2 = 0;
-  __TCPIP_timeoutPacket__TCPPacketManager_timeoutPacket.mwmr_fifo = &mwmr_fifo0;
-  mwmr_fifo0.width = 32;
-  mwmr_fifo0.depth = 100;
-  mwmr_fifo0.gdepth = mwmr_fifo0.depth;
-  mwmr_fifo0.buffer = mwmr_fifo0_data;
-  mwmr_fifo0.status = &mwmr_fifo0_status;
-  
-  mwmr_fifo0_status.rptr = 0;
-  mwmr_fifo0_status.wptr = 0;
-  mwmr_fifo0_status.usage = 0;
-  mwmr_fifo0_status.lock = 0;
-  
-  mwmr_fifo0.status =&mwmr_fifo0_status;
-  mwmr_fifo0.status->lock=0;
-  mwmr_fifo0.status->rptr=0;
-  mwmr_fifo0.status->usage=0;
-  mwmr_fifo0.status->wptr =0;
-  __Application_open__TCPIP_open.inname ="open";
-  __Application_open__TCPIP_open.outname ="open";
-  __Application_open__TCPIP_open.ok = 1;
-  __Application_open__TCPIP_open.ok2 = 0;
-  __Application_open__TCPIP_open.mwmr_fifo = &mwmr_fifo1;
-  __Application_close__TCPIP_close.inname ="close";
-  __Application_close__TCPIP_close.outname ="close";
-  __Application_close__TCPIP_close.ok = 1;
-  __Application_close__TCPIP_close.ok2 = 0;
-  __Application_open__TCPIP_open.mwmr_fifo = &mwmr_fifo1;
-  __Application_abort__TCPIP_abort.inname ="abort";
-  __Application_abort__TCPIP_abort.outname ="abort";
-  __Application_abort__TCPIP_abort.ok = 1;
-  __Application_abort__TCPIP_abort.ok2 = 0;
-  __Application_open__TCPIP_open.mwmr_fifo = &mwmr_fifo1;
-  __Application_sendTCP__TCPIP_send_TCP.inname ="send_TCP";
-  __Application_sendTCP__TCPIP_send_TCP.outname ="sendTCP";
-  __Application_sendTCP__TCPIP_send_TCP.ok = 1;
-  __Application_sendTCP__TCPIP_send_TCP.ok2 = 0;
-  __Application_open__TCPIP_open.mwmr_fifo = &mwmr_fifo1;
-  mwmr_fifo1.width = 4;
-  mwmr_fifo1.depth = 100;
-  mwmr_fifo1.gdepth = mwmr_fifo1.depth;
-  mwmr_fifo1.buffer = mwmr_fifo1_data;
-  mwmr_fifo1.status = &mwmr_fifo1_status;
-  
-  mwmr_fifo1_status.rptr = 0;
-  mwmr_fifo1_status.wptr = 0;
-  mwmr_fifo1_status.usage = 0;
-  mwmr_fifo1_status.lock = 0;
-  
-  mwmr_fifo1.status =&mwmr_fifo1_status;
-  mwmr_fifo1.status->lock=0;
-  mwmr_fifo1.status->rptr=0;
-  mwmr_fifo1.status->usage=0;
-  mwmr_fifo1.status->wptr =0;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.inname ="fromTtoP";
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.outname ="fromTtoP";
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.ok = 1;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.ok2 = 0;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.mwmr_fifo = &mwmr_fifo2;
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.inname ="fromPtoT";
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.outname ="fromPtoT";
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.ok = 1;
-  __SmartCardController_fromPtoT__TCPIP_fromPtoT.ok2 = 0;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.mwmr_fifo = &mwmr_fifo2;
-  __SmartCardController_start_TCPIP__TCPIP_start.inname ="start";
-  __SmartCardController_start_TCPIP__TCPIP_start.outname ="start_TCPIP";
-  __SmartCardController_start_TCPIP__TCPIP_start.ok = 1;
-  __SmartCardController_start_TCPIP__TCPIP_start.ok2 = 0;
-  __SmartCardController_fromTtoP__TCPIP_fromTtoP.mwmr_fifo = &mwmr_fifo2;
-  mwmr_fifo2.width = 32;
-  mwmr_fifo2.depth = 100;
-  mwmr_fifo2.gdepth = mwmr_fifo2.depth;
-  mwmr_fifo2.buffer = mwmr_fifo2_data;
-  mwmr_fifo2.status = &mwmr_fifo2_status;
-  
-  mwmr_fifo2_status.rptr = 0;
-  mwmr_fifo2_status.wptr = 0;
-  mwmr_fifo2_status.usage = 0;
-  mwmr_fifo2_status.lock = 0;
-  
-  mwmr_fifo2.status =&mwmr_fifo2_status;
-  mwmr_fifo2.status->lock=0;
-  mwmr_fifo2.status->rptr=0;
-  mwmr_fifo2.status->usage=0;
-  mwmr_fifo2.status->wptr =0;
-  __SmartCardController_reset__InterfaceDevice_reset.inname ="reset";
-  __SmartCardController_reset__InterfaceDevice_reset.outname ="reset";
-  __SmartCardController_reset__InterfaceDevice_reset.ok = 1;
-  __SmartCardController_reset__InterfaceDevice_reset.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_pTS__InterfaceDevice_pTS.inname ="pTS";
-  __SmartCardController_pTS__InterfaceDevice_pTS.outname ="pTS";
-  __SmartCardController_pTS__InterfaceDevice_pTS.ok = 1;
-  __SmartCardController_pTS__InterfaceDevice_pTS.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.inname ="dataReady";
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.outname ="data_Ready";
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.ok = 1;
-  __SmartCardController_dataReady__InterfaceDevice_data_Ready.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_activation__InterfaceDevice_activation.inname ="activation";
-  __SmartCardController_activation__InterfaceDevice_activation.outname ="activation";
-  __SmartCardController_activation__InterfaceDevice_activation.ok = 1;
-  __SmartCardController_activation__InterfaceDevice_activation.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.inname ="fromDtoSC";
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.outname ="fromDtoSC";
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.ok = 1;
-  __SmartCardController_fromDtoSC__InterfaceDevice_fromDtoSC.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.inname ="answerToReset";
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.outname ="answerToReset";
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.ok = 1;
-  __SmartCardController_answerToReset__InterfaceDevice_answerToReset.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.inname ="pTSConfirm";
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.outname ="pTSCConfirm";
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.ok = 1;
-  __SmartCardController_pTSCConfirm__InterfaceDevice_pTSConfirm.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.inname ="fromSCtoD";
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.outname ="fromSCtoD";
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.ok = 1;
-  __SmartCardController_fromSCtoD__InterfaceDevice_fromSCtoD.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.inname ="dataReady";
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.outname ="data_Ready_SC";
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.ok = 1;
-  __SmartCardController_data_Ready_SC__InterfaceDevice_dataReady.ok2 = 0;
-  __SmartCardController_reset__InterfaceDevice_reset.mwmr_fifo = &mwmr_fifo3;
-  mwmr_fifo3.width = 4;
-  mwmr_fifo3.depth = 100;
-  mwmr_fifo3.gdepth = mwmr_fifo3.depth;
-  mwmr_fifo3.buffer = mwmr_fifo3_data;
-  mwmr_fifo3.status = &mwmr_fifo3_status;
-  
-  mwmr_fifo3_status.rptr = 0;
-  mwmr_fifo3_status.wptr = 0;
-  mwmr_fifo3_status.usage = 0;
-  mwmr_fifo3_status.lock = 0;
-  
-  mwmr_fifo3.status =&mwmr_fifo3_status;
-  mwmr_fifo3.status->lock=0;
-  mwmr_fifo3.status->rptr=0;
-  mwmr_fifo3.status->usage=0;
-  mwmr_fifo3.status->wptr =0;
-  __SmartCardController_start_Application__Application_startApplication.inname ="startApplication";
-  __SmartCardController_start_Application__Application_startApplication.outname ="start_Application";
-  __SmartCardController_start_Application__Application_startApplication.ok = 1;
-  __SmartCardController_start_Application__Application_startApplication.ok2 = 0;
-  __SmartCardController_start_Application__Application_startApplication.mwmr_fifo = &mwmr_fifo4;
-  mwmr_fifo4.width = 4;
-  mwmr_fifo4.depth = 100;
-  mwmr_fifo4.gdepth = mwmr_fifo4.depth;
-  mwmr_fifo4.buffer = mwmr_fifo4_data;
-  mwmr_fifo4.status = &mwmr_fifo4_status;
-  
-  mwmr_fifo4_status.rptr = 0;
-  mwmr_fifo4_status.wptr = 0;
-  mwmr_fifo4_status.usage = 0;
-  mwmr_fifo4_status.lock = 0;
-  
-  mwmr_fifo4.status =&mwmr_fifo4_status;
-  mwmr_fifo4.status->lock=0;
-  mwmr_fifo4.status->rptr=0;
-  mwmr_fifo4.status->usage=0;
-  mwmr_fifo4.status->wptr =0;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.inname ="set";
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.outname ="set__mainTimer";
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.ok = 1;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.ok2 = 0;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.mwmr_fifo = &mwmr_fifo5;
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.inname ="reset";
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.outname ="reset__mainTimer";
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.ok = 1;
-  __TCPIP_reset__mainTimer__Timer__mainTimer__TCPIP_reset.ok2 = 0;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.mwmr_fifo = &mwmr_fifo5;
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.inname ="expire__mainTimer";
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.outname ="expire";
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.ok = 1;
-  __TCPIP_expire__mainTimer__Timer__mainTimer__TCPIP_expire.ok2 = 0;
-  __TCPIP_set__mainTimer__Timer__mainTimer__TCPIP_set.mwmr_fifo = &mwmr_fifo5;
-  mwmr_fifo5.width = 4;
-  mwmr_fifo5.depth = 100;
-  mwmr_fifo5.gdepth = mwmr_fifo5.depth;
-  mwmr_fifo5.buffer = mwmr_fifo5_data;
-  mwmr_fifo5.status = &mwmr_fifo5_status;
-  
-  mwmr_fifo5_status.rptr = 0;
-  mwmr_fifo5_status.wptr = 0;
-  mwmr_fifo5_status.usage = 0;
-  mwmr_fifo5_status.lock = 0;
-  
-  mwmr_fifo5.status =&mwmr_fifo5_status;
-  mwmr_fifo5.status->lock=0;
-  mwmr_fifo5.status->rptr=0;
-  mwmr_fifo5.status->usage=0;
-  mwmr_fifo5.status->wptr =0;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.inname ="set";
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.outname ="set__timerP";
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.ok = 1;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.ok2 = 0;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.mwmr_fifo = &mwmr_fifo6;
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.inname ="reset";
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.outname ="reset__timerP";
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.ok = 1;
-  __TCPPacketManager_reset__timerP__Timer__timerP__TCPPacketManager_reset.ok2 = 0;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.mwmr_fifo = &mwmr_fifo6;
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.inname ="expire__timerP";
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.outname ="expire";
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.ok = 1;
-  __TCPPacketManager_expire__timerP__Timer__timerP__TCPPacketManager_expire.ok2 = 0;
-  __TCPPacketManager_set__timerP__Timer__timerP__TCPPacketManager_set.mwmr_fifo = &mwmr_fifo6;
-  mwmr_fifo6.width = 4;
-  mwmr_fifo6.depth = 100;
-  mwmr_fifo6.gdepth = mwmr_fifo6.depth;
-  mwmr_fifo6.buffer = mwmr_fifo6_data;
-  mwmr_fifo6.status = &mwmr_fifo6_status;
-  
-  mwmr_fifo6_status.rptr = 0;
-  mwmr_fifo6_status.wptr = 0;
-  mwmr_fifo6_status.usage = 0;
-  mwmr_fifo6_status.lock = 0;
-  
-  mwmr_fifo6.status =&mwmr_fifo6_status;
-  mwmr_fifo6.status->lock=0;
-  mwmr_fifo6.status->rptr=0;
-  mwmr_fifo6.status->usage=0;
-  mwmr_fifo6.status->wptr =0;
-  /* Asynchronous channels */
-  __TCPIP_receiveTCP__Application_receiveTCP.inname ="receiveTCP";
-  __TCPIP_receiveTCP__Application_receiveTCP.outname ="receiveTCP";
-  __TCPIP_receiveTCP__Application_receiveTCP.isBlocking = 0;
-  __TCPIP_receiveTCP__Application_receiveTCP.maxNbOfMessages = 5;
-  __TCPIP_receiveTCP__Application_receiveTCP.mwmr_fifo = &mwmr_fifo9;
-  mwmr_fifo9.width = 4;
-  mwmr_fifo9.depth = 5;
-  mwmr_fifo9.gdepth = mwmr_fifo9.depth;
-  mwmr_fifo9.buffer = mwmr_fifo9_data;
-  mwmr_fifo9.status = &mwmr_fifo9_status;
-  mwmr_fifo9.status->lock=0;
-  mwmr_fifo9.status->rptr=0;
-  mwmr_fifo9.status->usage=0;
-  mwmr_fifo9.status->wptr=0;
-  mwmr_fifo9_status.rptr = 0;
-  mwmr_fifo9_status.wptr = 0;
-  mwmr_fifo9_status.usage = 0;
-  mwmr_fifo9_status.lock = 0;
-  
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.inname ="retrieve";
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.outname ="storePacket";
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.isBlocking = 0;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.maxNbOfMessages = 5;
-  __TCPPacketManager_storePacket__TCPPacketManager_retrieve.mwmr_fifo = &mwmr_fifo9;
-  mwmr_fifo9.width = 32;
-  mwmr_fifo9.depth = 5;
-  mwmr_fifo9.gdepth = mwmr_fifo9.depth;
-  mwmr_fifo9.buffer = mwmr_fifo9_data;
-  mwmr_fifo9.status = &mwmr_fifo9_status;
-  mwmr_fifo9.status->lock=0;
-  mwmr_fifo9.status->rptr=0;
-  mwmr_fifo9.status->usage=0;
-  mwmr_fifo9.status->wptr=0;
-  mwmr_fifo9_status.rptr = 0;
-  mwmr_fifo9_status.wptr = 0;
-  mwmr_fifo9_status.usage = 0;
-  mwmr_fifo9_status.lock = 0;
-  
-  
-  /* Threads of tasks */
-  pthread_t thread__InterfaceDevice;
-  pthread_t thread__SmartCard;
-  pthread_t thread__TCPIP;
-  pthread_t thread__TCPPacketManager;
-  pthread_t thread__Application;
-  pthread_t thread__SmartCardController;
-  /* Activating tracing  */
-  /* Activating randomness */
-  initRandom();
-  /* Initializing the main mutex */
-if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
-  
-  /* User initialization */
-  __user_init();
-  
-  
-  struct mwmr_s *channels_array_InterfaceDevice[9];
-  channels_array_InterfaceDevice[0]=&mwmr_fifo9;
-  channels_array_InterfaceDevice[1]=&mwmr_fifo9;
-  channels_array_InterfaceDevice[2]=&mwmr_fifo9;
-  channels_array_InterfaceDevice[3]=&mwmr_fifo10;
-  channels_array_InterfaceDevice[4]=&mwmr_fifo11;
-  channels_array_InterfaceDevice[5]=&mwmr_fifo12;
-  channels_array_InterfaceDevice[6]=&mwmr_fifo13;
-  channels_array_InterfaceDevice[7]=&mwmr_fifo14;
-  channels_array_InterfaceDevice[8]=&mwmr_fifo15;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__InterfaceDevice= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 1);  
-  
-  
-  pthread_create(&thread__InterfaceDevice, attr_t, mainFunc__InterfaceDevice, (void *)channels_array_InterfaceDevice);
-  
-  struct mwmr_s *channels_array_SmartCard[9];
-  channels_array_SmartCard[0]=&mwmr_fifo9;
-  channels_array_SmartCard[1]=&mwmr_fifo9;
-  channels_array_SmartCard[2]=&mwmr_fifo9;
-  channels_array_SmartCard[3]=&mwmr_fifo10;
-  channels_array_SmartCard[4]=&mwmr_fifo11;
-  channels_array_SmartCard[5]=&mwmr_fifo12;
-  channels_array_SmartCard[6]=&mwmr_fifo13;
-  channels_array_SmartCard[7]=&mwmr_fifo14;
-  channels_array_SmartCard[8]=&mwmr_fifo15;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__SmartCard= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__SmartCard, attr_t, mainFunc__SmartCard, (void *)channels_array_SmartCard);
-  
-  struct mwmr_s *channels_array_TCPIP[9];
-  channels_array_TCPIP[0]=&mwmr_fifo9;
-  channels_array_TCPIP[1]=&mwmr_fifo9;
-  channels_array_TCPIP[2]=&mwmr_fifo9;
-  channels_array_TCPIP[3]=&mwmr_fifo10;
-  channels_array_TCPIP[4]=&mwmr_fifo11;
-  channels_array_TCPIP[5]=&mwmr_fifo12;
-  channels_array_TCPIP[6]=&mwmr_fifo13;
-  channels_array_TCPIP[7]=&mwmr_fifo14;
-  channels_array_TCPIP[8]=&mwmr_fifo15;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__TCPIP= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__TCPIP, attr_t, mainFunc__TCPIP, (void *)channels_array_TCPIP);
-  
-  struct mwmr_s *channels_array_TCPPacketManager[9];
-  channels_array_TCPPacketManager[0]=&mwmr_fifo9;
-  channels_array_TCPPacketManager[1]=&mwmr_fifo9;
-  channels_array_TCPPacketManager[2]=&mwmr_fifo9;
-  channels_array_TCPPacketManager[3]=&mwmr_fifo10;
-  channels_array_TCPPacketManager[4]=&mwmr_fifo11;
-  channels_array_TCPPacketManager[5]=&mwmr_fifo12;
-  channels_array_TCPPacketManager[6]=&mwmr_fifo13;
-  channels_array_TCPPacketManager[7]=&mwmr_fifo14;
-  channels_array_TCPPacketManager[8]=&mwmr_fifo15;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__TCPPacketManager= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__TCPPacketManager, attr_t, mainFunc__TCPPacketManager, (void *)channels_array_TCPPacketManager);
-  
-  struct mwmr_s *channels_array_Application[9];
-  channels_array_Application[0]=&mwmr_fifo9;
-  channels_array_Application[1]=&mwmr_fifo9;
-  channels_array_Application[2]=&mwmr_fifo9;
-  channels_array_Application[3]=&mwmr_fifo10;
-  channels_array_Application[4]=&mwmr_fifo11;
-  channels_array_Application[5]=&mwmr_fifo12;
-  channels_array_Application[6]=&mwmr_fifo13;
-  channels_array_Application[7]=&mwmr_fifo14;
-  channels_array_Application[8]=&mwmr_fifo15;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Application= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__Application, attr_t, mainFunc__Application, (void *)channels_array_Application);
-  
-  struct mwmr_s *channels_array_SmartCardController[9];
-  channels_array_SmartCardController[0]=&mwmr_fifo9;
-  channels_array_SmartCardController[1]=&mwmr_fifo9;
-  channels_array_SmartCardController[2]=&mwmr_fifo9;
-  channels_array_SmartCardController[3]=&mwmr_fifo10;
-  channels_array_SmartCardController[4]=&mwmr_fifo11;
-  channels_array_SmartCardController[5]=&mwmr_fifo12;
-  channels_array_SmartCardController[6]=&mwmr_fifo13;
-  channels_array_SmartCardController[7]=&mwmr_fifo14;
-  channels_array_SmartCardController[8]=&mwmr_fifo15;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__SmartCardController= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__SmartCardController, attr_t, mainFunc__SmartCardController, (void *)channels_array_SmartCardController);
-  
-  
-  
-  pthread_join(thread__InterfaceDevice, NULL);
-  pthread_join(thread__SmartCard, NULL);
-  pthread_join(thread__TCPIP, NULL);
-  pthread_join(thread__TCPPacketManager, NULL);
-  pthread_join(thread__Application, NULL);
-  pthread_join(thread__SmartCardController, NULL);
-  
-  
-  return 0;
-  
-}
diff --git a/MPSoC/mutekh/examples/avatar/main.c-2-6 b/MPSoC/mutekh/examples/avatar/main.c-2-6
deleted file mode 100644
index 0028562e60dd62f715e02045d549dd3d30cae2ef..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/main.c-2-6
+++ /dev/null
@@ -1,155 +0,0 @@
-#include <stdio.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "request.h"
-#include "myerrors.h"
-#include "message.h"
-#include "syncchannel.h"
-#include "asyncchannel.h"
-#include "mytimelib.h"
-#include "request_manager.h"
-#include "defs.h"
-#include "debug.h"
-#include "random.h"
-#include "tracemanager.h" 
-#include "mwmr.h" 
- 
-
-#define NB_PROC 2
-#define WIDTH 4
-#define DEPTH 16
-
-void __user_init() {
-}
-
-#include "Block1.h"
-#include "Block0.h"
-
-/* Main mutex */
-pthread_barrier_t barrier ;
-pthread_attr_t *attr_t;
-pthread_mutex_t __mainMutex;
-
-#define CHANNEL0 __attribute__((section("section_channel0")))
-#define LOCK0 __attribute__((section("section_lock0")))
-#define CHANNEL1 __attribute__((section("section_channel1")))
-#define LOCK1 __attribute__((section("section_lock1")))
-#define base(arg) arg
-
-typedef struct mwmr_s mwmr_t;
-
-/* Synchronous channels */
-syncchannel __Block0_retour__Block1_retour;
-uint32_t const Block0_retour__Block1_retour_lock LOCK1;
-struct mwmr_status_s Block0_retour__Block1_retour_status CHANNEL1;
-uint8_t Block0_retour__Block1_retour_data[32] CHANNEL1;
-struct mwmr_s Block0_retour__Block1_retour CHANNEL1;
-
-syncchannel __Block0_val__Block1_val;
-uint32_t const Block0_val__Block1_val_lock LOCK0;
-struct mwmr_status_s Block0_val__Block1_val_status CHANNEL0;
-uint8_t Block0_val__Block1_val_data[32] CHANNEL0;
-struct mwmr_s Block0_val__Block1_val CHANNEL0;
-
-
-int main(int argc, char *argv[]) {
-  
-  
-  void *ptr;
-  pthread_barrier_init(&barrier,NULL, NB_PROC);
-  pthread_attr_t *attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_init(attr_t);
-  pthread_mutex_init(&__mainMutex, NULL);
-  
-  /* Synchronous channels */
-  Block0_retour__Block1_retour_status.rptr = 0;
-  Block0_retour__Block1_retour_status.wptr = 0;
-  Block0_retour__Block1_retour_status.usage = 0;
-  Block0_retour__Block1_retour_status.lock = 0;
-  
-  Block0_retour__Block1_retour.width = 4;
-  Block0_retour__Block1_retour.depth = 100;
-  Block0_retour__Block1_retour.gdepth = Block0_retour__Block1_retour.depth;
-  Block0_retour__Block1_retour.buffer = Block0_retour__Block1_retour_data;
-  Block0_retour__Block1_retour.status = &Block0_retour__Block1_retour_status;
-  
-  __Block0_retour__Block1_retour.inname ="retour";
-  __Block0_retour__Block1_retour.outname ="retour";
-  __Block0_retour__Block1_retour.mwmr_fifo = &Block0_retour__Block1_retour;
-  __Block0_retour__Block1_retour.ok = 0;
-  __Block0_retour__Block1_retour.ok2 = 1;
-  Block0_retour__Block1_retour.status =&Block0_retour__Block1_retour_status;
-  Block0_retour__Block1_retour.status->lock=0;
-  Block0_retour__Block1_retour.status->rptr=0;
-  Block0_retour__Block1_retour.status->usage=0;
-  Block0_retour__Block1_retour.status->wptr =0;
-  Block0_val__Block1_val_status.rptr = 0;
-  Block0_val__Block1_val_status.wptr = 0;
-  Block0_val__Block1_val_status.usage = 0;
-  Block0_val__Block1_val_status.lock = 0;
-  
-  Block0_val__Block1_val.width = 4;
-  Block0_val__Block1_val.depth = 100;
-  Block0_val__Block1_val.gdepth = Block0_val__Block1_val.depth;
-  Block0_val__Block1_val.buffer = Block0_val__Block1_val_data;
-  Block0_val__Block1_val.status = &Block0_val__Block1_val_status;
-  
-  __Block0_val__Block1_val.inname ="val";
-  __Block0_val__Block1_val.outname ="val";
-  __Block0_val__Block1_val.mwmr_fifo = &Block0_val__Block1_val;
-  __Block0_val__Block1_val.ok = 1;
-  __Block0_val__Block1_val.ok2 = 0;
-  Block0_val__Block1_val.status =&Block0_val__Block1_val_status;
-  Block0_val__Block1_val.status->lock=0;
-  Block0_val__Block1_val.status->rptr=0;
-  Block0_val__Block1_val.status->usage=0;
-  Block0_val__Block1_val.status->wptr =0;
-  
-  /* Threads of tasks */
-  pthread_t thread__Block1;
-  pthread_t thread__Block0;
-  /* Activating tracing  */
-  /* Activating randomness */
-  initRandom();
-  /* Initializing the main mutex */
-if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}
-  
-  /* User initialization */
-  __user_init();
-  
-  
-  struct mwmr_s *channels_array_Block1[2];
-  channels_array_Block1[0]=&Block0_retour__Block1_retour;
-  channels_array_Block1[1]=&Block0_val__Block1_val;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Block1= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 1);  
-  
-  
-  pthread_create(&thread__Block1, attr_t, mainFunc__Block1, (void *)channels_array_Block1);
-  
-  struct mwmr_s *channels_array_Block0[2];
-  channels_array_Block0[0]=&Block0_retour__Block1_retour;
-  channels_array_Block0[1]=&Block0_val__Block1_val;
-  
-  ptr =malloc(sizeof(pthread_t));
-  thread__Block0= (pthread_t)ptr;
-  attr_t = malloc(sizeof(pthread_attr_t));
-  pthread_attr_affinity(attr_t, 0);  
-  
-  
-  pthread_create(&thread__Block0, attr_t, mainFunc__Block0, (void *)channels_array_Block0);
-  
-  
-  
-  pthread_join(thread__Block1, NULL);
-  pthread_join(thread__Block0, NULL);
-  
-  
-  return 0;
-  
-}
diff --git a/MPSoC/mutekh/examples/avatar/main.h b/MPSoC/mutekh/examples/avatar/main.h
deleted file mode 100644
index 5cbc02a213180798090241c3b77f0ff84d062d27..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/main.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MAIN_H
-#define MAIN_H
-extern pthread_mutex_t __mainMutex;
-
-/* Synchronous channels */
-/* Asynchronous channels */
-extern asyncchannel __Block0_val__Block1_val;
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/mwmr.h b/MPSoC/mutekh/examples/avatar/mwmr.h
deleted file mode 100644
index 3adc2add0ef574ca409a221b0bcf3f79196e4867..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/mwmr.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * This file is distributed under the terms of the GNU General Public
- * License.
- * 
- * Copyright (c) UPMC / Lip6
- *     2005-2008, Nicolas Pouillon, <nipo@ssji.net>
- */
-
-#ifndef MWMR_H_
-#define MWMR_H_
-
-/**
-   @file
-   @module{MWMR}
-   @short MWMR channels access
- */
-
-/**
-   @this is an abstract MWMR channel structure.
- */
-struct mwmr_s;
-
-#if defined(CONFIG_MWMR_PTHREAD)
-
-# include <pthread.h>
-
-/** @hidden */
-struct mwmr_status_s
-{
-	pthread_mutex_t lock;
-	pthread_cond_t nempty;
-	pthread_cond_t nfull;
-	size_t rptr, wptr;
-	size_t usage;
-};
-
-/** @hidden */
-struct mwmr_s {
-	struct mwmr_status_s *status;
-	size_t width;
-	size_t depth;
-	size_t gdepth;
-	uint8_t *buffer;
-	const char *const name;
-};
-
-/** @hidden */
-typedef struct {} srl_mwmr_lock_t;
-/** @hidden */
-# define MWMR_LOCK_INITIALIZER {}
-
-/** @hidden */
-# define MWMR_STATUS_INITIALIZER(x,y)							\
-	{															\
-		.lock = PTHREAD_MUTEX_INITIALIZER,						\
-		.nempty = PTHREAD_COND_INITIALIZER,						\
-		.nfull = PTHREAD_COND_INITIALIZER,						\
-		.rptr = 0,      										\
-		.wptr = 0,      										\
-		.usage = 0,												\
-	}
-
-/** @hidden */
-# define MWMR_INITIALIZER(w, d, b, st, n, l)					   \
-	{														   \
-		.width = w,											   \
-		.depth = d,											   \
-		.gdepth = (w)*(d),									   \
-		.status = st,									   	   \
-		.buffer = (void*)b,									   \
-		.name = n,											   \
-	}
-
-#elif defined CONFIG_MWMR_SOCLIB
-
-# ifdef CONFIG_MWMR_LOCKFREE
-
-/** @hidden */
-enum SoclibMwmrRegisters {
-    MWMR_IOREG_MAX = 16,
-    MWMR_RESET = MWMR_IOREG_MAX,
-    MWMR_CONFIG_FIFO_WAY,
-    MWMR_CONFIG_FIFO_NO,
-    MWMR_CONFIG_STATUS_ADDR,
-    MWMR_CONFIG_DEPTH, // bytes
-    MWMR_CONFIG_BUFFER_ADDR,
-    MWMR_CONFIG_RUNNING,
-    MWMR_CONFIG_WIDTH, // bytes
-    MWMR_CONFIG_ENDIANNESS, // Write 0x11223344 here
-    MWMR_FIFO_FILL_STATUS,
-};
-
-/** @hidden */
-enum SoclibMwmrWay {
-    MWMR_TO_COPROC,
-    MWMR_FROM_COPROC,
-};
-
-/** @hidden */
-struct mwmr_status_s
-{
-	uint32_t free_tail; // bytes
-	uint32_t free_head; // bytes
-	uint32_t free_size; // bytes
-
-	uint32_t data_tail; // bytes
-	uint32_t data_head; // bytes
-	uint32_t data_size; // bytes
-};
-
-/** @hidden */
-#  define MWMR_STATUS_INITIALIZER(w, d) {0,0,(w*d),0,0,0}
-
-# else /* not CONFIG_MWMR_LOCKFREE */
-
-/** @hidden */
-enum SoclibMwmrRegisters {
-    MWMR_IOREG_MAX = 16,
-    MWMR_RESET = MWMR_IOREG_MAX,
-    MWMR_CONFIG_FIFO_WAY,
-    MWMR_CONFIG_FIFO_NO,
-    MWMR_CONFIG_STATUS_ADDR,
-    MWMR_CONFIG_DEPTH,
-    MWMR_CONFIG_BUFFER_ADDR,
-    MWMR_CONFIG_LOCK_ADDR,
-    MWMR_CONFIG_RUNNING,
-    MWMR_CONFIG_WIDTH,
-    MWMR_FIFO_FILL_STATUS,
-};
-
-/** @hidden */
-struct mwmr_status_s
-{
-	uint32_t rptr;
-	uint32_t wptr;
-	uint32_t usage;
-	uint32_t lock;
-};
-
-/** @hidden */
-#  define MWMR_STATUS_INITIALIZER(w,d) {0,0,0,0}
-
-# endif /* CONFIG_MWMR_LOCKFREE */
-
-# ifdef CONFIG_MWMR_USE_RAMLOCKS
-/** @hidden */
-#  define MWMR_USE_SEPARATE_LOCKS
-/** @hidden */
-typedef uint32_t srl_mwmr_lock_t;
-/** @hidden */
-#  define MWMR_LOCK_INITIALIZER 0
-# endif
-
-/** @hidden */
-struct mwmr_s {
-	size_t width;
-	size_t depth;
-	size_t gdepth;
-	void *buffer;
-	struct mwmr_status_s *status;
-	const char *const name;
-# ifdef CONFIG_MWMR_INSTRUMENTATION
-	uint32_t n_read;
-	uint32_t n_write;
-	uint32_t time_read;
-	uint32_t time_write;
-# endif
-# ifdef CONFIG_MWMR_USE_RAMLOCKS
-/** @hidden */
-	srl_mwmr_lock_t *lock;
-# endif
-};
-
-# ifdef CONFIG_MWMR_USE_RAMLOCKS
-
-/** @hidden */
-#  define MWMR_INITIALIZER(w, d, b, st, n, l)				   \
-	{														   \
-		.width = w,											   \
-		.depth = d,											   \
-		.gdepth = (w)*(d),									   \
-		.buffer = (void*)b,									   \
-		.status = st,									   	   \
-		.name = n,											   \
-		.lock = l,											   \
-	}
-# else
-
-/** @hidden */
-typedef struct {} srl_mwmr_lock_t;
-/** @hidden */
-#  define MWMR_LOCK_INITIALIZER {}
-
-/** @hidden */
-#  define MWMR_INITIALIZER(w, d, b, st, n, l)				   \
-	{														   \
-		.width = w,											   \
-		.depth = d,											   \
-		.gdepth = (w)*(d),									   \
-		.buffer = (void*)b,									   \
-		.status = st,									   	   \
-		.name = n,											   \
-	}
-# endif
-
-#else
-# error No valid MWMR implementation
-#endif
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-
-/**
-   @this dumps statistics about usage of the channel to current
-   console.
-
-   @param channel The channel
-*/
-void mwmr_dump_stats( const struct mwmr_s *channel );
-
-/**
-   @this resets statistics about usage of the channel.
-
-   @param channel The channel
-*/
-void mwmr_clear_stats( struct mwmr_s *channel );
-#endif
-
-/**
-   @this is the way of the channel designated when configuring an
-   hardware MWMR controller
- */
-enum SoclibMwmrWay {
-    MWMR_TO_COPROC,
-    MWMR_FROM_COPROC,
-};
-
-/**
-   @this initializes an hardware MWMR controller for usage of a given
-   channel. Controller starts to use channel as soon as configured.
-
-   @param coproc Base address of controller
-   @param way Way of the channel
-   @param no Number of the channel. Channels are numbered from 0 in
-             each way.
-   @param mwmr Channel to use from coprocessor
- */
-void mwmr_hw_init( void *coproc, enum SoclibMwmrWay way,
-				   size_t no, const struct mwmr_s* mwmr );
-
-/**
-   @this resets the channel's internal state. All data inside it will
-   be lost.
-
-   @param channel The channel to reset
- */
-void mwmr_init( struct mwmr_s *channel );
-
-/**
-   @this reads a given size from a mwmr channel. If the size is not
-   available in the channel, the read will block.
-
-   @param channel The mwmr channel
-   @param buffer The buffer to retrieve data into
-   @param size The size (in bytes) of the requested transfer. This has
-   to be a multiple of the channel's width.
- */
-void mwmr_read( struct mwmr_s *channel, void *buffer, size_t size );
-
-/**
-   @this writes a given size from a mwmr channel. If the size is not
-   free in the channel, the write will block.
-
-   @param channel The mwmr channel
-   @param buffer The buffer to retrieve data from
-   @param size The size (in bytes) of the requested transfer. This has
-   to be a multiple of the channel's width.
- */
-void mwmr_write( struct mwmr_s *channel, const void *buffer, size_t size );
-
-/**
-   @this reads a given size from a mwmr channel. If the size is not
-   available in the channel, or if the lock is not available, @this will
-   return without transfering the whole buffer.
-
-   @param channel The mwmr channel
-   @param buffer The buffer to retrieve data into
-   @param size The size (in bytes) of the requested transfer. This has
-   to be a multiple of the channel's width.
-   @return the amount of bytes actually transfered
- */
-size_t mwmr_try_read( struct mwmr_s *channel, void *buffer, size_t size );
-
-/**
-   @this writes a given size from a mwmr channel. If the size is not
-   free in the channel, or if the lock is not available, @this will
-   return without transfering the whole buffer.
-
-   @param channel The mwmr channel
-   @param buffer The buffer to retrieve data from
-   @param size The size (in bytes) of the requested transfer. This has
-   to be a multiple of the channel's width.
-   @return the amount of bytes actually transfered
- */
-size_t mwmr_try_write( struct mwmr_s *channel, const void *buffer, size_t size );
-
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/mwmr_pthread.c b/MPSoC/mutekh/examples/avatar/mwmr_pthread.c
deleted file mode 100644
index 77af37926f11b57eb6307be25c057108fafde3bd..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/mwmr_pthread.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * This file is distributed under the terms of the GNU General Public
- * License.
- * 
- * Copyright (c) UPMC / Lip6
- *     2005-2008, Nicolas Pouillon, <nipo@ssji.net>
- */
-#include <pthread.h>
-#include <string.h>
-#include <assert.h>
-
-#include <hexo/types.h>
-#include <mwmr/mwmr.h>
-
-void mwmr_read( struct mwmr_s *fifo, void *mem, size_t len )
-{
-	struct mwmr_status_s *state = fifo->status;
-    size_t got = 0;
-    uint8_t *ptr = (uint8_t *)mem;
-
-//  mutek_instrument_trace(0);
-
-    assert ( len % fifo->width == 0 );
-
-    pthread_mutex_lock( &(state->lock) );
-    while ( got < len ) {
-        while ( ! state->usage ) {
-            pthread_cond_wait( &(state->nempty), &(state->lock) );
-        }
-        memcpy( ptr, fifo->buffer + state->rptr, fifo->width );
-        state->rptr += fifo->width;
-        if ( state->rptr == fifo->gdepth )
-            state->rptr = 0;
-        state->usage -= fifo->width;
-		assert( state->rptr < fifo->gdepth );
-		assert( state->usage <= fifo->gdepth );
-        pthread_cond_signal( &(state->nfull) );
-        got += fifo->width;
-        ptr += fifo->width;
-    }
-    pthread_mutex_unlock( &(state->lock) );
-    pthread_cond_signal( &(state->nfull) );
-    pthread_yield();
-
-//  mutek_instrument_trace(1);
-}
-
-void mwmr_write( struct mwmr_s *fifo, const void *mem, size_t len )
-{
-	struct mwmr_status_s *state = fifo->status;
-    size_t put = 0;
-    uint8_t *ptr = (uint8_t *)mem;
-
-//  mutek_instrument_trace(0);
-
-    assert ( len % fifo->width == 0 );
-
-    pthread_mutex_lock( &(state->lock) );
-    while ( put < len ) {
-        while ( state->usage == fifo->gdepth ) {
-            pthread_cond_wait( &(state->nfull), &(state->lock) );
-        }
-        memcpy( fifo->buffer + state->wptr, ptr, fifo->width );
-        state->wptr += fifo->width;
-        if ( state->wptr == fifo->gdepth )
-            state->wptr = 0;
-        state->usage += fifo->width;
-		assert( state->wptr < fifo->gdepth );
-		assert( state->usage <= fifo->gdepth );
-        pthread_cond_signal( &(state->nempty) );
-        put += fifo->width;
-        ptr += fifo->width;
-    }
-    pthread_mutex_unlock( &(state->lock) );
-    pthread_cond_signal( &(state->nempty) );
-
-    pthread_yield();
-//	mutek_instrument_trace(1);
-}
-
-size_t mwmr_try_read( struct mwmr_s *fifo, void *mem, size_t len )
-{
-	struct mwmr_status_s *state = fifo->status;
-    size_t got = 0;
-    uint8_t *ptr = (uint8_t *)mem;
-
-    assert ( len % fifo->width == 0 );
-
-    if ( pthread_mutex_trylock( &(state->lock) ) ) {
-        return 0;
-    }
-    
-    while ( got < len ) {
-        if ( ! state->usage ) {
-            pthread_mutex_unlock( &(state->lock) );
-            pthread_cond_signal( &(state->nfull) );
-            return got;
-        }
-        memcpy( ptr, fifo->buffer + state->rptr, fifo->width );
-        state->rptr += fifo->width;
-        if ( state->rptr == fifo->gdepth )
-            state->rptr = 0;
-        state->usage -= fifo->width;
-        got += fifo->width;
-        ptr += fifo->width;
-    }
-    pthread_mutex_unlock( &(state->lock) );
-    pthread_cond_signal( &(state->nfull) );
-
-    pthread_yield();
-
-    return got;
-}
-
-size_t mwmr_try_write( struct mwmr_s *fifo, const void *mem, size_t len )
-{
-	struct mwmr_status_s *state = fifo->status;
-    size_t put = 0;
-    uint8_t *ptr = (uint8_t *)mem;
-
-    assert( len % fifo->width == 0 );
-
-    if ( pthread_mutex_trylock( &(state->lock) ) ) {
-        return 0;
-    }
-
-    while ( put < len ) {
-        if ( state->usage == fifo->gdepth ) {
-            pthread_mutex_unlock( &(state->lock) );
-            pthread_cond_signal( &(state->nempty) );
-            return put;
-        }
-        memcpy( fifo->buffer + state->wptr, ptr, fifo->width );
-        state->wptr += fifo->width;
-        if ( state->wptr == fifo->gdepth )
-            state->wptr = 0;
-        state->usage += fifo->width;
-        put += fifo->width;
-        ptr += fifo->width;
-    }
-    pthread_mutex_unlock( &(state->lock) );
-    pthread_cond_signal( &(state->nempty) );
-
-    pthread_yield();
-
-    return put;
-}
-
-void mwmr_init( struct mwmr_s *fifo )
-{
-	struct mwmr_status_s *state = fifo->status;
-	pthread_cond_init(&state->nempty, NULL);
-	pthread_cond_init(&state->nfull, NULL);
-	pthread_mutex_init(&state->lock, NULL);
-}
diff --git a/MPSoC/mutekh/examples/avatar/mwmr_soclib.c b/MPSoC/mutekh/examples/avatar/mwmr_soclib.c
deleted file mode 100644
index cc24f79ee796b462000f661d56d81565f1f8aa50..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/mwmr_soclib.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * This file is part of MutekH.
- * 
- * MutekH is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 of the License.
- * 
- * MutekH 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with MutekH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * Copyright (c) UPMC, Lip6, SoC
- *         Nicolas Pouillon <nipo@ssji.net>, 2008
- */
-
-#include <mutek/scheduler.h>
-#include <hexo/types.h>
-#include <hexo/atomic.h>
-#include <hexo/iospace.h>
-#include <hexo/endian.h>
-#include <hexo/interrupt.h>
-#include <string.h>
-#include <mwmr/mwmr.h>
-
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-# include <srl/srl_sched_wait.h>
-# include <srl/srl_log.h>
-# ifndef SRL_VERBOSITY
-#  define SRL_VERBOSITY VERB_DEBUG
-# endif
-#elif defined(CONFIG_PTHREAD)
-# include <pthread.h>
-#endif
-
-static inline size_t min(size_t a, size_t b)
-{
-	if ( a < b )
-		return a;
-	else
-		return b;
-}
-
-void
-mwmr_hw_init( void *coproc, enum SoclibMwmrWay way,
-			  size_t no, const struct mwmr_s* mwmr )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_FIFO_WAY, endian_le32(way));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_FIFO_NO, endian_le32(no));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_STATUS_ADDR, endian_le32((uintptr_t)mwmr->status));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_DEPTH, endian_le32(mwmr->gdepth));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_BUFFER_ADDR, endian_le32((uintptr_t)mwmr->buffer));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_WIDTH, endian_le32((uintptr_t)mwmr->width));
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_LOCK_ADDR, endian_le32((uintptr_t)mwmr->lock));
-#endif
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_RUNNING, endian_le32(1));
-}
-
-void mwmr_config( void *coproc, size_t no, const uint32_t val )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	cpu_mem_write_32( c + sizeof(uint32_t) * no, val);
-}
-
-uint32_t mwmr_status( void *coproc, size_t no )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	return cpu_mem_read_32( c + sizeof(uint32_t) * no );
-}
-
-static inline void mwmr_lock( struct mwmr_s *fifo )
-{
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	while (*((uint32_t *)fifo->lock) != 0) {
-# if defined(CONFIG_PTHREAD)
-		pthread_yield();
-# else
-		cpu_interrupt_disable();
-		sched_context_switch();
-		cpu_interrupt_enable();
-# endif
-	}
-#else
-# if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-	while (cpu_atomic_bit_testset((atomic_int_t*)&fifo->status->lock, 0)) {
-/* 		cpu_interrupt_disable(); */
-/* 		sched_context_switch(); */
-/* 		cpu_interrupt_enable(); */
-		srl_sched_wait_eq_le(&fifo->status->lock, 0);
-	}
-# elif defined(CONFIG_PTHREAD)
-	while (cpu_atomic_bit_testset((atomic_int_t*)&fifo->status->lock, 0)) {
-		pthread_yield();
-	}
-# else
-	cpu_atomic_bit_waitset((atomic_int_t*)&fifo->status->lock, 0);
-# endif
-#endif
-}
-
-static inline uint32_t mwmr_try_lock( struct mwmr_s *fifo )
-{
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	return !!cpu_mem_read_32((uintptr_t)fifo->lock);
-#else
-	return cpu_atomic_bit_testset((atomic_int_t*)&fifo->status->lock, 0);
-#endif
-}
-
-static inline void mwmr_unlock( struct mwmr_s *fifo )
-{
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	cpu_mem_write_32((uintptr_t)fifo->lock, 0);
-#else
-    cpu_mem_write_32((uintptr_t)&fifo->status->lock, 0);
-#endif
-}
-
-typedef struct {
-	uint32_t usage, wptr, rptr, modified;
-} local_mwmr_status_t;
-
-static inline void rehash_status( struct mwmr_s *fifo, local_mwmr_status_t *status )
-{
-	struct mwmr_status_s *fstatus = fifo->status;
-	cpu_dcache_invld_buf((void*)fstatus, sizeof(*fstatus));
-	status->usage = endian_le32(cpu_mem_read_32( (uintptr_t)&fstatus->usage ));
-    status->wptr =  endian_le32(cpu_mem_read_32( (uintptr_t)&fstatus->wptr ));
-    status->rptr =  endian_le32(cpu_mem_read_32( (uintptr_t)&fstatus->rptr ));
-	status->modified = 0;
-
-}
-
-static inline void writeback_status( struct mwmr_s *fifo, local_mwmr_status_t *status )
-{
-    struct mwmr_status_s *fstatus = fifo->status;
-	if ( !status->modified )
-		return;
-	cpu_mem_write_32( (uintptr_t)&fstatus->usage, endian_le32(status->usage) );
-    cpu_mem_write_32( (uintptr_t)&fstatus->wptr, endian_le32(status->wptr) );
-	cpu_mem_write_32( (uintptr_t)&fstatus->rptr, endian_le32(status->rptr) );
-}
-
-void mwmr_read( struct mwmr_s *fifo, void *_ptr, size_t lensw )
-{
-	uint8_t *ptr = _ptr;
-	local_mwmr_status_t status;
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	size_t tot = lensw/fifo->width;
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	mwmr_lock( fifo );
-	rehash_status( fifo, &status );
-    while ( lensw ) {
-        size_t len;
-		while ( status.usage < fifo->width ) {
-			writeback_status( fifo, &status );
-            mwmr_unlock( fifo );
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-			srl_sched_wait_ge_le(&fifo->status->usage, fifo->width);
-#elif defined(CONFIG_PTHREAD)
-			pthread_yield();
-#else
-			cpu_interrupt_disable();
-			sched_context_switch();
-			cpu_interrupt_enable();
-#endif
-            mwmr_lock( fifo );
-			rehash_status( fifo, &status );
-        }
-        while ( lensw && status.usage >= fifo->width ) {
-			void *sptr;
-
-            if ( status.rptr < status.wptr )
-                len = status.usage;
-            else
-                len = (fifo->gdepth - status.rptr);
-            len = min(len, lensw);
-			sptr = &((uint8_t*)fifo->buffer)[status.rptr];
-			cpu_dcache_invld_buf(sptr, len);
-            memcpy( ptr, sptr, len );
-            status.rptr += len;
-            if ( status.rptr == fifo->gdepth )
-                status.rptr = 0;
-            ptr += len;
-            status.usage -= len;
-            lensw -= len;
-			status.modified = 1;
-        }
-    }
-	writeback_status( fifo, &status );
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_read += tot;
-	fifo->time_read += cpu_cycle_count()-access_begin;
-#endif
-
-	mwmr_unlock( fifo );
-}
-
-void mwmr_write( struct mwmr_s *fifo, const void *_ptr, size_t lensw )
-{
-	const uint8_t *ptr = _ptr;
-    local_mwmr_status_t status;
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	size_t tot = lensw/fifo->width;
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	mwmr_lock( fifo );
-	rehash_status( fifo, &status );
-    while ( lensw ) {
-        size_t len;
-        while (status.usage >= fifo->gdepth) {
-			writeback_status( fifo, &status );
-            mwmr_unlock( fifo );
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-			srl_sched_wait_le_le(&fifo->status->usage, fifo->gdepth-fifo->width);
-#elif defined(CONFIG_PTHREAD)
-			pthread_yield();
-#else
-			cpu_interrupt_disable();
-			sched_context_switch();
-			cpu_interrupt_enable();
-#endif
-            mwmr_lock( fifo );
-			rehash_status( fifo, &status );
-        }
-        while ( lensw && status.usage < fifo->gdepth ) {
-			void *dptr;
-
-            if ( status.rptr <= status.wptr )
-                len = (fifo->gdepth - status.wptr);
-            else
-                len = fifo->gdepth - status.usage;
-            len = min(len, lensw);
-			dptr = &((uint8_t*)fifo->buffer)[status.wptr];
-            memcpy( dptr, ptr, len );
-            status.wptr += len;
-            if ( status.wptr == fifo->gdepth )
-                status.wptr = 0;
-            ptr += len;
-            status.usage += len;
-            lensw -= len;
-			status.modified = 1;
-        }
-    }
-	writeback_status( fifo, &status );
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_write += tot;
-	fifo->time_write += cpu_cycle_count()-access_begin;
-#endif
-
-	mwmr_unlock( fifo );
-}
-
-size_t mwmr_try_read( struct mwmr_s *fifo, void *_ptr, size_t lensw )
-{
-	uint8_t *ptr = _ptr;
-	size_t done = 0;
-    local_mwmr_status_t status;
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	if ( mwmr_try_lock( fifo ) )
-		return done;
-	rehash_status( fifo, &status );
-	while ( lensw && status.usage >= fifo->width ) {
-        size_t len;
-		void *sptr;
-
-		if ( status.rptr < status.wptr )
-			len = status.usage;
-		else
-			len = (fifo->gdepth - status.rptr);
-		len = min(len, lensw);
-		sptr = &((uint8_t*)fifo->buffer)[status.rptr];
-		cpu_dcache_invld_buf(sptr, len);
-		memcpy( ptr, sptr, len );
-		status.rptr += len;
-		if ( status.rptr == fifo->gdepth )
-			status.rptr = 0;
-		ptr += len;
-		status.usage -= len;
-		lensw -= len;
-		done += len;
-		status.modified = 1;
-	}
-	writeback_status( fifo, &status );
-	mwmr_unlock( fifo );
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_read += done/fifo->width;
-	fifo->time_read += cpu_cycle_count()-access_begin;
-#endif
-	return done;
-}
-
-size_t mwmr_try_write( struct mwmr_s *fifo, const void *_ptr, size_t lensw )
-{
-	const uint8_t *ptr = _ptr;
-	size_t done = 0;
-    local_mwmr_status_t status;
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	if ( mwmr_try_lock( fifo ) )
-		return done;
-	rehash_status( fifo, &status );
-	while ( lensw && status.usage < fifo->gdepth ) {
-        size_t len;
-		void *dptr;
-
-		if ( status.rptr <= status.wptr )
-			len = (fifo->gdepth - status.wptr);
-		else
-			len = fifo->gdepth - status.usage;
-		len = min(len, lensw);
-		dptr = &((uint8_t*)fifo->buffer)[status.wptr];
-		memcpy( dptr, ptr, len );
-		status.wptr += len;
-		if ( status.wptr == fifo->gdepth )
-			status.wptr = 0;
-		ptr += len;
-		status.usage += len;
-		lensw -= len;
-		done += len;
-		status.modified = 1;
-    }
-	writeback_status( fifo, &status );
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_write += done/fifo->width;
-	fifo->time_write += cpu_cycle_count()-access_begin;
-#endif
-	mwmr_unlock( fifo );
-	return done;
-}
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-void mwmr_dump_stats( const struct mwmr_s *mwmr )
-{
-	cpu_dcache_invld_buf(mwmr, sizeof(*mwmr));
-	if ( mwmr->n_read )
-		srl_log_printf(NONE, "read,%s,%d,%d,%d\n",
-					   mwmr->name, cpu_cycle_count(),
-					   mwmr->time_read, mwmr->n_read );
-	if ( mwmr->n_write )
-		srl_log_printf(NONE, "write,%s,%d,%d,%d\n",
-					   mwmr->name, cpu_cycle_count(),
-					   mwmr->time_write, mwmr->n_write );
-}
-
-void mwmr_clear_stats( struct mwmr_s *mwmr )
-{
-	cpu_dcache_invld_buf(mwmr, sizeof(*mwmr));
-	mwmr->time_read =
-		mwmr->n_read =
-		mwmr->time_write =
-		mwmr->n_write = 0;
-}
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/mwmr_soclib_debug_15_12.c b/MPSoC/mutekh/examples/avatar/mwmr_soclib_debug_15_12.c
deleted file mode 100644
index 1531c4b40a61e2795fac418153d3b74e65dd50b4..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/mwmr_soclib_debug_15_12.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * This file is part of MutekH.
- * 
- * MutekH is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 of the License.
- * 
- * MutekH 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with MutekH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * Copyright (c) UPMC, Lip6, SoC
- *         Nicolas Pouillon <nipo@ssji.net>, 2008
- */
-
-#include <mutek/scheduler.h>
-#include <hexo/types.h>
-#include <hexo/atomic.h>
-#include <hexo/iospace.h>
-#include <hexo/endian.h>
-#include <hexo/interrupt.h>
-#include <string.h>
-#include <mwmr/mwmr.h>
-#include <stdio.h> //DG 08.12.
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-# include <srl/srl_sched_wait.h>
-# include <srl/srl_log.h>
-# ifndef SRL_VERBOSITY
-#  define SRL_VERBOSITY VERB_DEBUG
-# endif
-#elif defined(CONFIG_PTHREAD)
-# include <pthread.h>
-#endif
-
-static inline size_t min(size_t a, size_t b)
-{
-	if ( a < b )
-		return a;
-	else
-		return b;
-}
-
-void
-mwmr_hw_init( void *coproc, enum SoclibMwmrWay way,
-			  size_t no, const struct mwmr_s* mwmr )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_FIFO_WAY, endian_le32(way));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_FIFO_NO, endian_le32(no));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_STATUS_ADDR, endian_le32((uintptr_t)mwmr->status));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_DEPTH, endian_le32(mwmr->gdepth));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_BUFFER_ADDR, endian_le32((uintptr_t)mwmr->buffer));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_WIDTH, endian_le32((uintptr_t)mwmr->width));
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_LOCK_ADDR, endian_le32((uintptr_t)mwmr->lock));
-#endif
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_RUNNING, endian_le32(1));
-}
-
-void mwmr_config( void *coproc, size_t no, const uint32_t val )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	cpu_mem_write_32( c + sizeof(uint32_t) * no, val);
-}
-
-uint32_t mwmr_status( void *coproc, size_t no )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	return cpu_mem_read_32( c + sizeof(uint32_t) * no );
-}
-
-static inline void mwmr_lock( struct mwmr_s *fifo )
-{
- printf("##### MWMR LOCK ####");
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-  printf("##### MWMR USE RAMLOCKS ####");
-	while (*((uint32_t *)fifo->lock) != 0) {
-# if defined(CONFIG_PTHREAD)
-printf("##### MWMR CONFIG_PTHREAD ####");
-		pthread_yield();
-# else
-printf("##### MWMR NON CONFIG_PTHREAD ####");
-		cpu_interrupt_disable();
-		sched_context_switch();
-		cpu_interrupt_enable();
-# endif
-	}
-#else
-# if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-printf("##### MWMR CONFIG_SRL ####");
-	while (cpu_atomic_bit_testset((atomic_int_t*)&fifo->status->lock, 0)) {
-/* 		cpu_interrupt_disable(); */
-/* 		sched_context_switch(); */
-/* 		cpu_interrupt_enable(); */
-		srl_sched_wait_eq_le(&fifo->status->lock, 0);
-	}
-# elif defined(CONFIG_PTHREAD)
-printf("##### MWMR CONFIG_PTHREAD2 ####");
-
-while (cpu_atomic_bit_testset((atomic_int_t*)&fifo->status->lock, 0)) {
-		pthread_yield();printf("##### MWMR pthread_yield ####");
-	}
-# else
-printf("##### MWMR ELSE ####");
-	cpu_atomic_bit_waitset((atomic_int_t*)&fifo->status->lock, 0);
-# endif
-#endif
-}
-
-static inline uint32_t mwmr_try_lock( struct mwmr_s *fifo )
-{
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	return !!cpu_mem_read_32((uintptr_t)fifo->lock);
-#else
-	return cpu_atomic_bit_testset((atomic_int_t*)&fifo->status->lock, 0);
-#endif
-}
-
-static inline void mwmr_unlock( struct mwmr_s *fifo )
-{
-#ifdef CONFIG_MWMR_USE_RAMLOCKS
-	cpu_mem_write_32((uintptr_t)fifo->lock, 0);
-#else
-    cpu_mem_write_32((uintptr_t)&fifo->status->lock, 0);
-#endif
-}
-
-typedef struct {
-	uint32_t usage, wptr, rptr, modified;
-} local_mwmr_status_t;
-
-static inline void rehash_status( struct mwmr_s *fifo, local_mwmr_status_t *status )
-{
-	struct mwmr_status_s *fstatus = fifo->status;
-	cpu_dcache_invld_buf((void*)fstatus, sizeof(*fstatus));
-	status->usage = endian_le32(cpu_mem_read_32( (uintptr_t)&fstatus->usage ));
-    status->wptr =  endian_le32(cpu_mem_read_32( (uintptr_t)&fstatus->wptr ));
-    status->rptr =  endian_le32(cpu_mem_read_32( (uintptr_t)&fstatus->rptr ));
-	status->modified = 0;
-	printf("rehash_status : %s rptr %d wptr %d usage %d/depth %d\n", fifo->name, status->rptr, status->wptr, status->usage, fifo->gdepth);
-}
-
-static inline void writeback_status( struct mwmr_s *fifo, local_mwmr_status_t *status )
-{
-    struct mwmr_status_s *fstatus = fifo->status;
-	if ( !status->modified )
-		return;
-	cpu_mem_write_32( (uintptr_t)&fstatus->usage, endian_le32(status->usage) );
-    cpu_mem_write_32( (uintptr_t)&fstatus->wptr, endian_le32(status->wptr) );
-	cpu_mem_write_32( (uintptr_t)&fstatus->rptr, endian_le32(status->rptr) );
-}
-
-void mwmr_read( struct mwmr_s *fifo, void *_ptr, size_t lensw )
-{
-	uint8_t *ptr = _ptr;
-	local_mwmr_status_t status;
-
-        printf("###### MWMR SOCLIB READ 0 #############\n");
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	size_t tot = lensw/fifo->width;
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	mwmr_lock( fifo ); printf("###### MWMR SOCLIB READ 1 #############\n");
-	rehash_status( fifo, &status );
-    while ( lensw ) {printf("lensw %x \n",lensw);
-        size_t len;
-		while ( status.usage < fifo->width ) { //DG 15.12.
-                  printf("status address %x\n", &status);
-                  printf("status.usage %x\n",  status.usage);
-                  printf("fifo->width %x\n", fifo->width);
-
-                  writeback_status( fifo, &status );
-                  mwmr_unlock( fifo ); 
-                  printf("###### MWMR SOCLIB READ 2 #############\n");
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-			srl_sched_wait_ge_le(&fifo->status->usage, fifo->width);
-#elif defined(CONFIG_PTHREAD)
-			pthread_yield();
-                        printf("###### MWMR SOCLIB READ 2bis #############\n");
-#else
-			cpu_interrupt_disable();
-			sched_context_switch();
-			cpu_interrupt_enable();
-#endif
-printf("###### MWMR SOCLIB READ 3 #############\n");
-            mwmr_lock( fifo );
-printf("###### MWMR SOCLIB READ 4 #############\n");
-	rehash_status( fifo, &status );
-        } //DG 15.12.
-printf("###### MWMR SOCLIB READ 4a #############\n");
-        while ( lensw && status.usage >= fifo->width ) {
-			void *sptr;
-
-            if ( status.rptr < status.wptr )
-                len = status.usage;
-            else
-                len = (fifo->gdepth - status.rptr);
-            len = min(len, lensw);
-			sptr = &((uint8_t*)fifo->buffer)[status.rptr];
-			cpu_dcache_invld_buf(sptr, len);
-            memcpy( ptr, sptr, len );
-printf("###### MWMR SOCLIB READ 5 #############\n");
-            status.rptr += len;
-            if ( status.rptr == fifo->gdepth )
-                status.rptr = 0;
-            ptr += len;
-            status.usage -= len;
-            lensw -= len;
-			status.modified = 1;
-        }
-    }
-printf("###### MWMR SOCLIB READ 6 #############\n");
-	writeback_status( fifo, &status );
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_read += tot;
-	fifo->time_read += cpu_cycle_count()-access_begin;
-#endif
- printf("###### MWMR SOCLIB READ 7 #############\n");
-	mwmr_unlock( fifo );
-}
-
-void mwmr_write( struct mwmr_s *fifo, const void *_ptr, size_t lensw )
-{
-	const uint8_t *ptr = _ptr;
-    local_mwmr_status_t status;
-
-printf("###### MWMR SOCLIB WRITE #############\n");
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	size_t tot = lensw/fifo->width;
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-        //printf("###### MWMR SOCLIB WRITE2 #############\n");
-printf(" %x \n",fifo); 
-//printf(" %x \n",fifo->depth);  DG 08.12. c'est ici que ca plante, fifo non initialise??
-printf("###### MWMR SOCLIB WRITE2 #############\n");
-//printf(" %x \n",fifo->lock); DG 08.12. c'est ici que ca plante, on n'a pas d elock!
-        mwmr_lock( fifo );
-       
-printf("###### MWMR SOCLIB WRITE3 #############\n");
-printf("###### MWMR SOCLIB WRITE3b #############\n");
-	rehash_status( fifo, &status );
-    while ( lensw ) {
-        size_t len;
-        while (status.usage >= fifo->gdepth) {
-			writeback_status( fifo, &status );
-            mwmr_unlock( fifo );
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-			srl_sched_wait_le_le(&fifo->status->usage, fifo->gdepth-fifo->width);
-#elif defined(CONFIG_PTHREAD)
-			pthread_yield();
-#else
-			cpu_interrupt_disable();
-			sched_context_switch();
-			cpu_interrupt_enable();
-#endif
-            mwmr_lock( fifo );
-			rehash_status( fifo, &status );
-        }
-printf("###### MWMR SOCLIB WRITE4 #############\n");
-        while ( lensw && status.usage < fifo->gdepth ) {
-			void *dptr;
-
-            if ( status.rptr <= status.wptr )
-                len = (fifo->gdepth - status.wptr);
-            else
-                len = fifo->gdepth - status.usage;
-            len = min(len, lensw);
-			dptr = &((uint8_t*)fifo->buffer)[status.wptr];
-            memcpy( dptr, ptr, len );
-            status.wptr += len;
-            if ( status.wptr == fifo->gdepth )
-                status.wptr = 0;
-            ptr += len;
-            status.usage += len;
-            lensw -= len;
-			status.modified = 1;
-        }
-    }
-	writeback_status( fifo, &status );
-printf("###### MWMR SOCLIB WRITE5 #############\n");
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_write += tot;
-	fifo->time_write += cpu_cycle_count()-access_begin;
-#endif
-printf("###### MWMR SOCLIB WRITE6 #############\n");
-	mwmr_unlock( fifo );
-printf("###### MWMR SOCLIB WRITE7 #############\n");
-}
-
-size_t mwmr_try_read( struct mwmr_s *fifo, void *_ptr, size_t lensw )
-{
-	uint8_t *ptr = _ptr;
-	size_t done = 0;
-    local_mwmr_status_t status;
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	if ( mwmr_try_lock( fifo ) )
-		return done;
-	rehash_status( fifo, &status );
-	while ( lensw && status.usage >= fifo->width ) {
-        size_t len;
-		void *sptr;
-
-		if ( status.rptr < status.wptr )
-			len = status.usage;
-		else
-			len = (fifo->gdepth - status.rptr);
-		len = min(len, lensw);
-		sptr = &((uint8_t*)fifo->buffer)[status.rptr];
-		cpu_dcache_invld_buf(sptr, len);
-		memcpy( ptr, sptr, len );
-		status.rptr += len;
-		if ( status.rptr == fifo->gdepth )
-			status.rptr = 0;
-		ptr += len;
-		status.usage -= len;
-		lensw -= len;
-		done += len;
-		status.modified = 1;
-	}
-	writeback_status( fifo, &status );
-	mwmr_unlock( fifo );
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_read += done/fifo->width;
-	fifo->time_read += cpu_cycle_count()-access_begin;
-#endif
-	return done;
-}
-
-size_t mwmr_try_write( struct mwmr_s *fifo, const void *_ptr, size_t lensw )
-{
-	const uint8_t *ptr = _ptr;
-	size_t done = 0;
-    local_mwmr_status_t status;
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	uint32_t access_begin = cpu_cycle_count();
-#endif
-
-	if ( mwmr_try_lock( fifo ) )
-		return done;
-	rehash_status( fifo, &status );
-	while ( lensw && status.usage < fifo->gdepth ) {
-        size_t len;
-		void *dptr;
-
-		if ( status.rptr <= status.wptr )
-			len = (fifo->gdepth - status.wptr);
-		else
-			len = fifo->gdepth - status.usage;
-		len = min(len, lensw);
-		dptr = &((uint8_t*)fifo->buffer)[status.wptr];
-		memcpy( dptr, ptr, len );
-		status.wptr += len;
-		if ( status.wptr == fifo->gdepth )
-			status.wptr = 0;
-		ptr += len;
-		status.usage += len;
-		lensw -= len;
-		done += len;
-		status.modified = 1;
-    }
-	writeback_status( fifo, &status );
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-	cpu_dcache_invld_buf(fifo, sizeof(*fifo));
-	fifo->n_write += done/fifo->width;
-	fifo->time_write += cpu_cycle_count()-access_begin;
-#endif
-	mwmr_unlock( fifo );
-	return done;
-}
-
-#ifdef CONFIG_MWMR_INSTRUMENTATION
-void mwmr_dump_stats( const struct mwmr_s *mwmr )
-{
-	cpu_dcache_invld_buf(mwmr, sizeof(*mwmr));
-	if ( mwmr->n_read )
-		srl_log_printf(NONE, "read,%s,%d,%d,%d\n",
-					   mwmr->name, cpu_cycle_count(),
-					   mwmr->time_read, mwmr->n_read );
-	if ( mwmr->n_write )
-		srl_log_printf(NONE, "write,%s,%d,%d,%d\n",
-					   mwmr->name, cpu_cycle_count(),
-					   mwmr->time_write, mwmr->n_write );
-}
-
-void mwmr_clear_stats( struct mwmr_s *mwmr )
-{
-	cpu_dcache_invld_buf(mwmr, sizeof(*mwmr));
-	mwmr->time_read =
-		mwmr->n_read =
-		mwmr->time_write =
-		mwmr->n_write = 0;
-}
-#endif
diff --git a/MPSoC/mutekh/examples/avatar/mwmr_soclib_lockfree.c b/MPSoC/mutekh/examples/avatar/mwmr_soclib_lockfree.c
deleted file mode 100644
index a50c5cb283190cf0583dc5d4f4c014091aa4e42c..0000000000000000000000000000000000000000
--- a/MPSoC/mutekh/examples/avatar/mwmr_soclib_lockfree.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * This file is part of MutekH.
- * 
- * MutekH is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 of the License.
- * 
- * MutekH 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with MutekH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * Copyright (c) UPMC, Lip6, SoC
- *         Nicolas Pouillon <nipo@ssji.net>, 2008
- */
-
-#include <mutek/scheduler.h>
-#include <hexo/types.h>
-#include <hexo/atomic.h>
-#include <hexo/endian.h>
-#include <hexo/interrupt.h>
-#include <string.h>
-#include <mwmr/mwmr.h>
-#include <hexo/cpu.h>
-
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-# include <srl/srl_sched_wait.h>
-# include <srl/srl_log.h>
-# ifndef SRL_VERBOSITY
-#  define SRL_VERBOSITY VERB_DEBUG
-# endif
-#elif defined(CONFIG_PTHREAD)
-# include <pthread.h>
-#endif
-
-void
-mwmr_hw_init( void *coproc, enum SoclibMwmrWay way,
-			  size_t no, const struct mwmr_s* mwmr )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_FIFO_WAY, endian_le32(way));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_FIFO_NO, endian_le32(no));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_STATUS_ADDR, endian_le32((uintptr_t)mwmr->status));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_WIDTH, endian_le32(mwmr->width));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_DEPTH, endian_le32(mwmr->gdepth));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_BUFFER_ADDR, endian_le32((uintptr_t)mwmr->buffer));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_RUNNING, endian_le32(1));
-	cpu_mem_write_32( c + sizeof(uint32_t) * MWMR_CONFIG_ENDIANNESS, 0x11223344);
-}
-
-void mwmr_config( void *coproc, size_t no, const uint32_t val )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	cpu_mem_write_32( c + sizeof(uint32_t) * no, val);
-}
-
-uint32_t mwmr_status( void *coproc, size_t no )
-{
-	uintptr_t c = (uintptr_t)coproc;
-	return cpu_mem_read_32( c + sizeof(uint32_t) * no );
-}
-
-// returns substracted value
-static inline uint32_t
-cpu_atomic_sub_minz(uint32_t *a, uint32_t _tosub)
-{
-	uint32_t oldval;
-	uint32_t tosub;
-
-	do {
-		cpu_dcache_invld(a);
-		oldval = *a;
-		tosub = _tosub;
-		if ( tosub > oldval )
-			tosub = oldval;
-
-		if ( tosub == 0 )
-			return 0;
-	} while ( ! atomic_compare_and_swap((atomic_t*)a, oldval, oldval-tosub) );
-
-	return tosub;
-}
-
-// returns previous value
-static inline uint32_t
-cpu_atomic_add(uint32_t *a, uint32_t val)
-{
-	uint32_t oldval;
-
-	do {
-		cpu_dcache_invld(a);
-		oldval = *a;
-	} while ( ! atomic_compare_and_swap((atomic_t*)a, oldval, oldval+val) );
-
-	return oldval;
-}
-
-// returns previous value
-static inline uint32_t
-cpu_atomic_add_wrap(uint32_t *a, uint32_t val, uint32_t mod)
-{
-	uint32_t oldval, newval;
-
-	do {
-		cpu_dcache_invld(a);
-		oldval = *a;
-		newval = (oldval+val);
-		if ( newval >= mod )
-			newval -= mod;
-	} while ( ! atomic_compare_and_swap((atomic_t*)a, oldval, newval ) );
-
-	return oldval;
-}
-
-static inline void
-cpu_atomic_wait_and_swap(uint32_t *a, uint32_t old, uint32_t new)
-{
-	do {
-	} while ( ! atomic_compare_and_swap((atomic_t*)a, old, new ) );
-}
-
-size_t mwmr_read_unit(
-	struct mwmr_status_s *status,
-	const uint8_t *mwmr_buffer,
-	const size_t gdepth,
-	uint8_t *user_buffer,
-	size_t user_len)
-{
-#if MWMR_DEBUG
-	printk("mwmr_read_unit(status = %p, mwmr_buffer = %p, gdepth = %d, user_buf = %p, user_len = %d)\n",
-		   status, mwmr_buffer, (int)gdepth, user_buffer, (int)user_len);
-#endif
-
-	assert(mwmr_buffer);
-	assert(user_buffer);
-	if ( user_len > gdepth )
-		user_len = gdepth;
-
-	uint32_t xfer_size = cpu_atomic_sub_minz(&status->data_size, user_len);
-	if ( xfer_size == 0 )
-		return 0;
-
-	assert( xfer_size <= gdepth );
-	assert( xfer_size <= user_len );
-
-	uint32_t rptr = cpu_atomic_add_wrap(&status->data_tail, xfer_size, gdepth);
-	uint32_t future_rptr;
-
-	assert( rptr < gdepth );
-
-	if ( rptr + xfer_size > gdepth ) {
-		size_t tx1 = gdepth - rptr;
-		size_t tx2 = xfer_size - tx1;
-
-		cpu_dcache_invld_buf((char*)mwmr_buffer + rptr, tx1);
-		cpu_dcache_invld_buf((char*)mwmr_buffer, tx2);
-		memcpy( user_buffer, mwmr_buffer + rptr, tx1 );
-		memcpy( user_buffer + tx1, mwmr_buffer, tx2 );
-		future_rptr = tx2;
-	} else {
-		cpu_dcache_invld_buf((char*)mwmr_buffer + rptr, xfer_size);
-		memcpy( user_buffer, mwmr_buffer + rptr, xfer_size );
-		future_rptr = rptr + xfer_size;
-		if ( future_rptr == gdepth )
-			future_rptr = 0;
-	}
-	assert( future_rptr < gdepth );
-	cpu_atomic_wait_and_swap(&status->free_head, rptr, future_rptr);
-	cpu_atomic_add(&status->free_size, xfer_size);
-	return xfer_size;
-}
-
-size_t mwmr_write_unit(
-	struct mwmr_status_s *status,
-	uint8_t *mwmr_buffer,
-	const size_t gdepth,
-	const uint8_t *user_buffer,
-	size_t user_len)
-{
-#if MWMR_DEBUG
-	printk("mwmr_write_unit(status = %p, mwmr_buffer = %p, gdepth = %d, user_buf = %p, user_len = %d)\n",
-		   status, mwmr_buffer, (int)gdepth, user_buffer, (int)user_len);
-#endif
-
-	assert(mwmr_buffer);
-	assert(user_buffer);
-	if ( user_len > gdepth )
-		user_len = gdepth;
-
-	uint32_t xfer_size = cpu_atomic_sub_minz(&status->free_size, user_len);
-	if ( xfer_size == 0 )
-		return 0;
-
-	assert( xfer_size <= gdepth );
-	assert( xfer_size <= user_len );
-
-	uint32_t wptr = cpu_atomic_add_wrap(&status->free_tail, xfer_size, gdepth);
-	uint32_t future_wptr;
-
-	assert( wptr < gdepth );
-
-	if ( wptr + xfer_size > gdepth ) {
-		size_t tx1 = gdepth - wptr;
-		size_t tx2 = xfer_size - tx1;
-
-		memcpy( mwmr_buffer + wptr, user_buffer, tx1 );
-		memcpy( mwmr_buffer, user_buffer + tx1, tx2 );
-		future_wptr = tx2;
-	} else {
-		memcpy( mwmr_buffer + wptr, user_buffer, xfer_size );
-		future_wptr = wptr + xfer_size;
-		if ( future_wptr == gdepth )
-			future_wptr = 0;
-	}
-	assert( future_wptr < gdepth );
-	cpu_atomic_wait_and_swap(&status->data_head, wptr, future_wptr);
-	cpu_atomic_add(&status->data_size, xfer_size);
-	return xfer_size;
-}
-
-void mwmr_read( struct mwmr_s *fifo, void *_ptr, size_t lensw )
-{
-#if MWMR_DEBUG
-	printk("mwmr_read(fifo = %p, status = %p, user_buf = %p, user_len = %d)\n",
-		   fifo, fifo->status, _ptr, (int)lensw);
-#endif
-	size_t done = 0;
-	uint8_t *ptr = _ptr;
-	const uint8_t *buffer = fifo->buffer;
-	const size_t gdepth = fifo->gdepth;
-
-	while ( done < lensw ) {
-		size_t xfer_size = mwmr_read_unit(
-			fifo->status, buffer, gdepth,
-			ptr+done, lensw-done);
-
-		if ( xfer_size == 0 ) {
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-			srl_sched_wait_ne_cpu(&fifo->status->data_size, 0);
-#elif defined(CONFIG_PTHREAD)
-			pthread_yield();
-#else
-			cpu_interrupt_disable();
-			sched_context_switch();
-			cpu_interrupt_enable();
-#endif
-			continue;
-		}
-
-		ptr += xfer_size;
-		done += xfer_size;
-	}
-}
-
-void mwmr_write( struct mwmr_s *fifo, const void *_ptr, size_t lensw )
-{
-#if MWMR_DEBUG
-	printk("mwmr_write(fifo = %p, status = %p, user_buf = %p, user_len = %d)\n",
-		   fifo, fifo->status, _ptr, (int)lensw);
-#endif
-	size_t done = 0;
-	const uint8_t *ptr = _ptr;
-	uint8_t *buffer = fifo->buffer;
-	const size_t gdepth = fifo->gdepth;
-
-	while ( done < lensw ) {
-		size_t xfer_size = mwmr_write_unit(
-			fifo->status, buffer, gdepth,
-			ptr+done, lensw-done);
-
-		if ( xfer_size == 0 ) {
-#if defined(CONFIG_SRL) && !defined(CONFIG_PTHREAD)
-			srl_sched_wait_ne_cpu(&fifo->status->free_size, 0);
-#elif defined(CONFIG_PTHREAD)
-			pthread_yield();
-#else
-			cpu_interrupt_disable();
-			sched_context_switch();
-			cpu_interrupt_enable();
-#endif
-			continue;
-		}
-
-		ptr += xfer_size;
-		done += xfer_size;
-	}
-}
-
-size_t mwmr_try_read( struct mwmr_s *fifo, void *_ptr, size_t lensw )
-{
-#if MWMR_DEBUG
-	printk("mwmr_try_read(fifo = %p, status = %p, user_buf = %p, user_len = %d)\n",
-		   fifo, fifo->status, _ptr, (int)lensw);
-#endif
-	uint8_t *ptr = _ptr;
-	const uint8_t *buffer = fifo->buffer;
-	const size_t gdepth = fifo->gdepth;
-
-	return mwmr_read_unit(
-		fifo->status, buffer, gdepth,
-		ptr, lensw);
-}
-
-size_t mwmr_try_write( struct mwmr_s *fifo, const void *_ptr, size_t lensw )
-{
-#if MWMR_DEBUG
-	printk("mwmr_write_write(fifo = %p, status = %p, user_buf = %p, user_len = %d)\n",
-		   fifo, fifo->status, _ptr, (int)lensw);
-#endif
-	const uint8_t *ptr = _ptr;
-	uint8_t *buffer = fifo->buffer;
-	const size_t gdepth = fifo->gdepth;
-
-	return mwmr_write_unit(
-		fifo->status, buffer, gdepth,
-		ptr, lensw);
-}