moss-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Moss-devel] CVS: moss/colpatik/src/modules/input Device.cxx,NONE,1.1 De


From: Manfred Morgner <address@hidden>
Subject: [Moss-devel] CVS: moss/colpatik/src/modules/input Device.cxx,NONE,1.1 DeviceInterrupt.cxx,NONE,1.1 DevicePoll.cxx,NONE,1.1 DeviceQuery.cxx,NONE,1.1 ColpatikDevice.cxx,1.3,1.4 ColpatikInput.cxx,1.3,1.4 Event.cxx,1.4,1.5 Makefile.am,1.1,1.2 Queue.cxx,1.3,1.4
Date: Mon, 28 Oct 2002 17:42:31 -0500

Update of /cvsroot/moss//moss/colpatik/src/modules/input
In directory subversions:/tmp/cvs-serv5659/src/modules/input

Modified Files:
        ColpatikDevice.cxx ColpatikInput.cxx Event.cxx Makefile.am 
        Queue.cxx 
Added Files:
        Device.cxx DeviceInterrupt.cxx DevicePoll.cxx DeviceQuery.cxx 
Log Message:
New classes for input and filter processing. Old files have to be deleted 
(later).


--- NEW FILE ---
/***************************************************************************
                              Device.cxx
                          -------------------
    begin                : Fri Mar 3 2000
    copyright            : (C) 1993..2000 by Manfred Morgner
    email                : address@hidden
 ***************************************************************************/

/***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *                                                                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place Suite 330,                                            *
 *   Boston, MA  02111-1307, USA.                                          *
 *                                                                         *
 ***************************************************************************/


#include <string>

#include "Device.h"

using namespace std;
using namespace colpatik;

long CDevice::s_nNoValue = -1;


CDevice::CDevice(string sURI) //why not string&?
  {
  m_sURI   = sURI;
  m_nError = 0;
  } // CDevice::CDevice(string sURI = "")

CDevice::~CDevice()
  {
  } // CDevice::~CDevice()

long CDevice::GetErrorLast()
  {
  return m_nError;
  } // long CDevice::GetErrorLast()




long CDevice::GetErrorText(string& rsError, long nError)
  {
  rsError = "unknown error";
  return 0;
  } // long CDevice::GetErrorText(string& rsError, long nError)

bool CDevice::CallbackRegister(const pfnDeviceCallback fnCallback, char cType)
  {
  if (0 == fnCallback)
    {
    return false;
    }

  switch (cType)
    {
    case CB_DATA:
      m_lpfnDataCallback.push_back(fnCallback);
      return true;
      break;
    case CB_STATUS:
      m_lpfnStatusCallback.push_back(fnCallback);
      return true;
      break;
    } // switch (cType)

  return false;
  } // bool CDevice::CallbackRegister(const pfnCallback fnCallback, char cType)

void CDevice::CallbackFree(const pfnDeviceCallback fnCallback)
  {
  m_lpfnDataCallback.remove(fnCallback);
  m_lpfnStatusCallback.remove(fnCallback);
  } // void CDevice::CallbackFree(const pfnCallback fnCallback)

--- NEW FILE ---
/***************************************************************************
                       DeviceInterrupt.cxx
                       -------------------
    begin                : Fri Mar 3 2000
    copyright            : (C) 1993..2000 by Manfred Morgner
    email                : address@hidden
 ***************************************************************************/

/***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *                                                                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place Suite 330,                                            *
 *   Boston, MA  02111-1307, USA.                                          *
 *                                                                         *
 ***************************************************************************/

#include <string>

#include "DeviceInterrupt.h"

using namespace std;
using namespace colpatik;

CDeviceInterrupt::CDeviceInterrupt(string sURI)
  : inherited(sURI)
  {
  } // CDeviceInterrupt::CDeviceInterrupt(string sURI)

CDeviceInterrupt::~CDeviceInterrupt()
  {
  } // CDeviceInterrupt::~CDeviceInterrupt()
 
/*******************************************
 *
 *    interface
 *
 *******************************************/

// abstract Interface

long CDeviceInterrupt::GetVersion()
  {
  return s_nNoValue;
  } // 

long CDeviceInterrupt::GetType()
  {
  return s_nNoValue;
  } // 

double CDeviceInterrupt::GetPollingIntervall()
  {
  return 0;
  } // 

long CDeviceInterrupt::GetCapabilities()
  {
  return s_nNoValue;
  } // 

long CDeviceInterrupt::GetFunctions()
  {
  return s_nNoValue;
  } // 

void CDeviceInterrupt::GetInfo(long& rnVersion,
                               long& rnType,
                               long& rnCapabilities,
                               long& rnFunctions)
  {
  } // 

long CDeviceInterrupt::GetData(TDeviceData& rstData)
  {
  return s_nNoValue;
  } // 

// virtual Interface

long CDeviceInterrupt::GetErrorLast()
  {
  return s_nNoValue;
  } // 

long CDeviceInterrupt::GetErrorText(string& rsError, long nError)
  {
  return s_nNoValue;
  } // 

bool CDeviceInterrupt::CallbackRegister(const pfnDeviceCallback fnCallback, 
char cType)
  {
  return false;
  } // 

void CDeviceInterrupt::CallbackFree(const pfnDeviceCallback fnCallback)
  {
  } // 

--- NEW FILE ---
/***************************************************************************
                         DevicePoll.cxx
                       -------------------
    begin                : Fri Mar 3 2000
    copyright            : (C) 1993..2000 by Manfred Morgner
    email                : address@hidden
 ***************************************************************************/

/***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *                                                                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place Suite 330,                                            *
 *   Boston, MA  02111-1307, USA.                                          *
 *                                                                         *
 ***************************************************************************/

#include <string>

#include "DevicePoll.h"

using namespace std;
using namespace colpatik;

CDevicePoll::CDevicePoll(string sURI)
  : inherited(sURI)
  {
  } // CDevicePoll::CDevicePoll(string sURI)

CDevicePoll::~CDevicePoll()
  {
  } // CDevicePoll::~CDevicePoll()
 

--- NEW FILE ---
/***************************************************************************
                         DeviceQuery.cxx
                       -------------------
    begin                : Fri Mar 3 2000
    copyright            : (C) 1993..2000 by Manfred Morgner
    email                : address@hidden
 ***************************************************************************/

/***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 *   This program is distributed in the hope that it will be useful,       *
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *                                                                         *
 *   Free Software Foundation, Inc.,                                       *
 *   59 Temple Place Suite 330,                                            *
 *   Boston, MA  02111-1307, USA.                                          *
 *                                                                         *
 ***************************************************************************/

#include <string>

#include "DeviceQuery.h"

using namespace std;
using namespace colpatik;

CDeviceQuery::CDeviceQuery(string sURI)
  : inherited(sURI)
  {
  } // CDeviceQuery::CDeviceQuery(string sURI)

CDeviceQuery::~CDeviceQuery()
  {
  } // CDeviceQuery::~CDeviceQuery()
 

Index: ColpatikDevice.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/ColpatikDevice.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ColpatikDevice.cxx  13 Jul 2002 14:07:39 -0000      1.3
--- ColpatikDevice.cxx  28 Oct 2002 22:42:29 -0000      1.4
***************
*** 32,36 ****
  
  
! #include "modules/input/ColpatikDevice.h"
  
  
--- 32,36 ----
  
  
! #include "ColpatikDevice.h"
  
  

Index: ColpatikInput.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/ColpatikInput.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ColpatikInput.cxx   13 Jul 2002 14:07:39 -0000      1.3
--- ColpatikInput.cxx   28 Oct 2002 22:42:29 -0000      1.4
***************
*** 66,70 ****
  
  
! #include "modules/input/ColpatikInput.h"
  
  
--- 66,70 ----
  
  
! #include "ColpatikInput.h"
  
  

Index: Event.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/Event.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Event.cxx   14 Jul 2002 21:41:30 -0000      1.4
--- Event.cxx   28 Oct 2002 22:42:29 -0000      1.5
***************
*** 78,88 ****
    m_nType  = src.m_nType;
    m_pData  = src.m_pData;
!   return (TEvent) *this;
    } // const TEvent& CEvent::operator = (const TEvent& src)
  
  CEvent::operator const TEvent& ()
    {
    return (TEvent) *this;
    } // CEvent::operator const TEvent& ()
    
  ///////////////////////////////////////////////////
--- 78,90 ----
    m_nType  = src.m_nType;
    m_pData  = src.m_pData;
!   return *( (TEvent*) this);
    } // const TEvent& CEvent::operator = (const TEvent& src)
  
+ /*
  CEvent::operator const TEvent& ()
    {
    return (TEvent) *this;
    } // CEvent::operator const TEvent& ()
+ */
    
  ///////////////////////////////////////////////////

Index: Makefile.am
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 13 Jul 2002 14:07:39 -0000      1.1
--- Makefile.am 28 Oct 2002 22:42:29 -0000      1.2
***************
*** 2,7 ****
  
  CXXFLAGS = -Wall -g -O2
! INCLUDES=-I../../../include -I$(includedir)
  
  lib3DsiaInput_la_LDFLAGS = --export-dynamic
! lib3DsiaInput_la_SOURCES = ColpatikDevice.cxx ColpatikInput.cxx Event.cxx 
Queue.cxx
--- 2,7 ----
  
  CXXFLAGS = -Wall -g -O2
! INCLUDES=-I../../../include -I../../../include/modules/input -I$(includedir)
  
  lib3DsiaInput_la_LDFLAGS = --export-dynamic
! lib3DsiaInput_la_SOURCES = ColpatikDevice.cxx ColpatikInput.cxx Event.cxx 
Queue.cxx Device.cxx DevicePoll.cxx DeviceQuery.cxx DeviceInterrupt.cxx

Index: Queue.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/Queue.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Queue.cxx   13 Jul 2002 14:07:39 -0000      1.3
--- Queue.cxx   28 Oct 2002 22:42:29 -0000      1.4
***************
*** 47,54 ****
--- 47,56 ----
  CEvent& CQueue::operator << (CEvent& roEvent)
    {
+   return roEvent;
    } // CEvent& CQueue::operator << (CEvent& roEvent)
  
  CEvent& CQueue::operator >> (CEvent& roEvent)
    {
+   return roEvent;
    } // CEvent& CQueue::operator >> (CEvent& roEvent)
  





reply via email to

[Prev in Thread] Current Thread [Next in Thread]