[Moss-devel] CVS: moss/colpatik/src/modules/input ColpatikInput.cxx,1.4,1.5 Device.cxx,1.1,1.2 DeviceInterrupt.cxx,1.1,1.2 DevicePoll.cxx,1.1,1.2 DeviceQuery.cxx,1.1,1.2 Event.cxx,1.5,1.6 Makefile.am,1.2,1.3 Queue.cxx,1.4,1.5

[Manfred Morgner <address@hidden>]

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

Modified Files:
        ColpatikInput.cxx Device.cxx DeviceInterrupt.cxx 
        DevicePoll.cxx DeviceQuery.cxx Event.cxx Makefile.am Queue.cxx 
Log Message:
searching th eproblem, while gcc returns an error


Index: ColpatikInput.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/ColpatikInput.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ColpatikInput.cxx   28 Oct 2002 22:42:29 -0000      1.4
--- ColpatikInput.cxx   30 Oct 2002 01:48:48 -0000      1.5
***************
*** 41,48 ****
    colpatik::CColpatikInput
  
!   Implements the input class to support input device drivers of two kinds.
  
    (1) Polling devices
    (2) Interrupting devices
  
    CColpatikInput uses two methods to support these devices.
--- 41,49 ----
    colpatik::CColpatikInput
  
!   Implements the input class to support input device drivers of three kinds.
  
    (1) Polling devices
    (2) Interrupting devices
+   (3) Querying devices
  
    CColpatikInput uses two methods to support these devices.
***************
*** 52,55 ****
--- 53,60 ----
    messages into an output queue that is accessiable from the outside of the
    class.
+   
+   Querying devices are similiar to polling devices, but they don't return
+   from an call until there is an event. So, they have to use threads to
+   enable multiple devices in one single device queue.
  
    Interrupting devices get a unique queue for each device to hold the
***************
*** 69,74 ****
  
  
- using namespace colpatik;
  using namespace std;
  
  //////////////////////////////////////////////////////////////////////
--- 74,79 ----
  
  
  using namespace std;
+ using namespace colpatik;
  
  //////////////////////////////////////////////////////////////////////
***************
*** 105,109 ****
    while (...) 
      {
!     m_lpoDevicesPoll.append(..);
      }
  
--- 110,114 ----
    while (...) 
      {
!     m_lpoDevicesPoll.append(new CDevice???);
      }
  
***************
*** 114,118 ****
    while (...) 
      {
!     m_lpoDevicesInterrupt.append(..);
      }
  
--- 119,123 ----
    while (...) 
      {
!     m_lpoDevicesInterrupt.append(new CDevice???);
      }
  

Index: Device.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/Device.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Device.cxx  28 Oct 2002 22:42:29 -0000      1.1
--- Device.cxx  30 Oct 2002 01:48:48 -0000      1.2
***************
*** 33,47 ****
  #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()
--- 33,47 ----
  #include "Device.h"
  
! using namespace std;
  using namespace colpatik;
  
! long CDevice::s_nNoValue = -1;
! 
! 
! CDevice::CDevice(const string& rsURI) //why not string&?
    {
!   m_sURI   = rsURI;
    m_nError = 0;
!   } // CDevice::CDevice(const string& rsURI)
  
  CDevice::~CDevice()
***************
*** 49,91 ****
    } // 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)
--- 49,91 ----
    } // 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_lpfnCallbackData.push_back(fnCallback);
!       return true;
!       break;
!     case CB_STATUS:
!       m_lpfnCallbackStatus.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_lpfnCallbackData.remove(fnCallback);
!   m_lpfnCallbackStatus.remove(fnCallback);
!   } // void CDevice::CallbackFree(const pfnCallback fnCallback)

Index: DeviceInterrupt.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/DeviceInterrupt.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DeviceInterrupt.cxx 28 Oct 2002 22:42:29 -0000      1.1
--- DeviceInterrupt.cxx 30 Oct 2002 01:48:48 -0000      1.2
***************
*** 32,42 ****
  #include "DeviceInterrupt.h"
  
! using namespace std;
  using namespace colpatik;
  
! CDeviceInterrupt::CDeviceInterrupt(string sURI)
!   : inherited(sURI)
    {
!   } // CDeviceInterrupt::CDeviceInterrupt(string sURI)
  
  CDeviceInterrupt::~CDeviceInterrupt()
--- 32,42 ----
  #include "DeviceInterrupt.h"
  
! using namespace std;
  using namespace colpatik;
  
! CDeviceInterrupt::CDeviceInterrupt(const string& rsURI)
!   : inherited(rsURI)
    {
!   } // CDeviceInterrupt::CDeviceInterrupt(const string& rsURI)
  
  CDeviceInterrupt::~CDeviceInterrupt()
***************
*** 44,110 ****
    } // 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)
!   {
!   } // 
--- 44,110 ----
    } // 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)
!   {
!   } // 

Index: DevicePoll.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/DevicePoll.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DevicePoll.cxx      28 Oct 2002 22:42:29 -0000      1.1
--- DevicePoll.cxx      30 Oct 2002 01:48:48 -0000      1.2
***************
*** 32,42 ****
  #include "DevicePoll.h"
  
! using namespace std;
  using namespace colpatik;
  
! CDevicePoll::CDevicePoll(string sURI)
!   : inherited(sURI)
    {
!   } // CDevicePoll::CDevicePoll(string sURI)
  
  CDevicePoll::~CDevicePoll()
--- 32,42 ----
  #include "DevicePoll.h"
  
! using namespace std;
  using namespace colpatik;
  
! CDevicePoll::CDevicePoll(const string& rsURI)
!   : inherited(rsURI)
    {
!   } // CDevicePoll::CDevicePoll(const string& rsURI)
  
  CDevicePoll::~CDevicePoll()

Index: DeviceQuery.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/DeviceQuery.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DeviceQuery.cxx     28 Oct 2002 22:42:29 -0000      1.1
--- DeviceQuery.cxx     30 Oct 2002 01:48:48 -0000      1.2
***************
*** 32,42 ****
  #include "DeviceQuery.h"
  
! using namespace std;
  using namespace colpatik;
  
! CDeviceQuery::CDeviceQuery(string sURI)
!   : inherited(sURI)
    {
!   } // CDeviceQuery::CDeviceQuery(string sURI)
  
  CDeviceQuery::~CDeviceQuery()
--- 32,42 ----
  #include "DeviceQuery.h"
  
! using namespace std;
  using namespace colpatik;
  
! CDeviceQuery::CDeviceQuery(const string& rsURI)
!   : inherited(rsURI)
    {
!   } // CDeviceQuery::CDeviceQuery(const string& rsURI)
  
  CDeviceQuery::~CDeviceQuery()

Index: Event.cxx
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/Event.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Event.cxx   28 Oct 2002 22:42:29 -0000      1.5
--- Event.cxx   30 Oct 2002 01:48:48 -0000      1.6
***************
*** 81,91 ****
    } // const TEvent& CEvent::operator = (const TEvent& src)
  
- /*
- CEvent::operator const TEvent& ()
-   {
-   return (TEvent) *this;
-   } // CEvent::operator const TEvent& ()
- */
-   
  ///////////////////////////////////////////////////
  // protected members
--- 81,84 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/src/modules/input/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 28 Oct 2002 22:42:29 -0000      1.2
--- Makefile.am 30 Oct 2002 01:48:48 -0000      1.3
***************
*** 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
--- 2,10 ----
  
  CXXFLAGS = -Wall -g -O2
! INCLUDES = -I../../../include -I../../../include/modules/input -I$(includedir)
! CFLAGS   = -D_REENTRANT
  
  lib3DsiaInput_la_LDFLAGS = --export-dynamic
! 
! lib3DsiaInput_la_LIBFLAGS = -lstdc++
! lib3DsiaInput_la_SOURCES = 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.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Queue.cxx   28 Oct 2002 22:42:29 -0000      1.4
--- Queue.cxx   30 Oct 2002 01:48:48 -0000      1.5
***************
*** 33,38 ****
  
  
! #include "modules/input/Queue.h"
  
  using namespace colpatik;
  
--- 33,39 ----
  
  
! #include "Queue.h"
  
+ using namespace std;
  using namespace colpatik;