X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSetup.cci;h=127a45f884463db878859ac1cd66995fff6d310e;hb=82e8df5de8b11448423388632e8602ad97bc7885;hp=f14f33b6bf6b48d84d617447525bc1e766df5503;hpb=81ffa1c459b96dd44472bcef37e1e373934ee138;p=senf.git diff --git a/PPI/Setup.cci b/PPI/Setup.cci index f14f33b..127a45f 100644 --- a/PPI/Setup.cci +++ b/PPI/Setup.cci @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -23,30 +23,42 @@ /** \file \brief Setup inline non-template implementation */ +//#include "Setup.ih" + // Custom includes #include "Connectors.hh" -#include "Scheduler/Scheduler.hh" +#include "Module.hh" +#include "ModuleManager.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// -prefix_ void senf::ppi::connect(connector::ActiveOutput & source, - connector::PassiveInput & target) +#ifndef DOXYGEN + +prefix_ void senf::ppi::connect(connector::GenericActiveOutput & source, + connector::GenericPassiveInput & target) { source.connect(target); } -prefix_ void senf::ppi::connect(connector::PassiveOutput & source, - connector::ActiveInput & target) +prefix_ void senf::ppi::connect(connector::GenericPassiveOutput & source, + connector::GenericActiveInput & target) { source.connect(target); } prefix_ void senf::ppi::run() { - Scheduler::instance().process(); + ModuleManager::instance().run(); +} + +prefix_ void senf::ppi::init() +{ + ModuleManager::instance().init(); } +#endif + ///////////////////////////////cci.e/////////////////////////////////////// #undef prefix_