X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIOEvent.cc;h=f63288d4c8d0c03e9662ea7ddd60386aae5b9d7f;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=a20e8eb638a66bc01d40bc6f87273114ee9e2226;hpb=51044eb18f034c1a059ffe2fb109a422c1cbe251;p=senf.git diff --git a/PPI/IOEvent.cc b/PPI/IOEvent.cc index a20e8eb..f63288d 100644 --- a/PPI/IOEvent.cc +++ b/PPI/IOEvent.cc @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// 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 @@ -28,7 +28,6 @@ // Custom includes #include "../Utils/senfassert.hh" -#include //#include "IOEvent.mpp" #define prefix_ @@ -42,18 +41,17 @@ prefix_ void senf::ppi::IOEvent::v_enable() { - Scheduler::instance().add(fd_, boost::bind(&IOEvent::cb,this,_1), - Scheduler::EventId(events_)); + event_.enable(); } prefix_ void senf::ppi::IOEvent::v_disable() { - Scheduler::instance().remove(fd_, Scheduler::EventId(events_)); + event_.disable(); } -prefix_ void senf::ppi::IOEvent::cb(Scheduler::EventId event) +prefix_ void senf::ppi::IOEvent::cb(int event) { - if ((event & ~events_) != 0) { + if ((event & ~event_.events()) != 0) { if (event & Err) throw ErrorException(); else if (event & Hup)