- repair broken headers (tss...)

- fix logical error in ODevice::sendSuspendmsg()
- send qcop signal returnFromSuspend() after resuming from suspend
- remove debug macro from opcmciasystem; better do this from the .pro file with DEFINES +=

4 files changed, 36 insertions, 36 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index dd1e2f3..5e91d8b 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -1,42 +1,42 @@
 /*
-                             This file is part of the Opie Project
-
-                             Copyright (C)2002-2005 The Opie Team <opie-devel@handhelds.org>
-              =.
+                             This file is part of the Opie Project
+             =.              (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       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
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
-:     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       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
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
+
 */
 
+
 #include "odevice_beagle.h"
 #include "odevice_ipaq.h"
 #include "odevice_jornada.h"
 #include "odevice_ramses.h"
 #include "odevice_simpad.h"
 #include "odevice_yopy.h"
 #include "odevice_zaurus.h"
 #include "odevice_genuineintel.h"
 
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
@@ -685,25 +685,25 @@ void ODevice::virtual_hook(int, void* ){
  * \brief Send a QCOP Message before suspending
  *
  * Sends a QCOP message to channel QPE/System
  * with the message "aboutToSuspend()" if this
  * is the windowing server.
  *
  * Call this in your custom \sa suspend() Method
  * before going to suspend.
  *
  */
 void ODevice::sendSuspendmsg()
 {
-    if ( isQWS() )
+    if ( !isQWS() )
         return;
 
     QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
 }
 
 /**
  * \brief Prepend the QWSServer::KeyboardFilter to the list of installed KeyFilters
  *
  * Prepend a QWSServer::KeyboardFilter to the List of Keyboard
  * Filters. This function is the only way to prepend a KeyFilter.
  *
  * @param aFilter The KeyFilter to be prepended to the list of filters
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index f3f6af5..fe5864b 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -1,47 +1,45 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>
-                             Copyright (C) 2004, 2005 Michael 'mickey' Lauer <mickeyl@handhelds.org>
-                             Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org>
-
-
-              =.
-            .=l.
+                             Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>
+              =.             Copyright (C) 2004, 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+            .=l.             Copyright (C) 2002, 2003 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :
     .%`+i>       _;_.
     .i_,=:_.      -<s.       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
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "odevice_abstractmobiledevice.h"
 
+#include <qpe/qcopenvelope_qws.h>
+
 #include <sys/time.h>
 #include <sys/ioctl.h>
 
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 namespace Opie {
 namespace Core {
 OAbstractMobileDevice::OAbstractMobileDevice()
     : m_timeOut( 1500 )
@@ -55,44 +53,47 @@ OAbstractMobileDevice::OAbstractMobileDevice()
  *
  */
 void OAbstractMobileDevice::setAPMTimeOut( int time ) {
     m_timeOut = time;
 }
 
 
 bool OAbstractMobileDevice::suspend() {
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
     bool res = false;
-    ODevice::sendSuspendmsg();
+
+    QCopEnvelope( "QPE/System", "aboutToSuspend()" );
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
 
     ::sync(); // flush fs caches
     res = ( ::system ( "apm --suspend" ) == 0 );
 
     // This is needed because some apm implementations are asynchronous and we
     // can not be sure when exactly the device is really suspended
     // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists.
 
     if ( res ) {
         do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
             ::usleep ( 200 * 1000 );
             ::gettimeofday ( &tvn, 0 );
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
     }
 
     return res;
+
+    QCopEnvelope( "QPE/System", "returnFromSuspend()" );
 }
 
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
 
 // _IO and friends are only defined in kernel headers ...
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 
 #define FBIOBLANK             OD_IO( 'F', 0x11 ) // 0x4611
 
 /* VESA Blanking Levels */
 #define VESA_NO_BLANKING      0
diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro
index c396e59..c0c4f7f 100644
--- a/libopie2/opiecore/linux/linux.pro
+++ b/libopie2/opiecore/linux/linux.pro
@@ -1,10 +1,11 @@
 HEADERS += \
            linux/ofilenotify.h   \
            linux/oinputsystem.h  \
            linux/opcmciasystem.h
 
 SOURCES += \
            linux/ofilenotify.cpp  \
            linux/oinputsystem.cpp \
            linux/opcmciasystem.cpp
 
+DEFINES += OPCMCIA_DEBUG=1
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index eae356e..445d903 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -40,26 +40,24 @@ using namespace Opie::Core;
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #define PROC_DEVICES "/proc/devices"
 
-// #define OPCMCIA_DEBUG 1
-
 /*======================================================================================
  * OPcmciaSystem
  *======================================================================================*/
 
 OPcmciaSystem* OPcmciaSystem::_instance = 0;
 
 OPcmciaSystem::OPcmciaSystem()
               :_major( 0 )
 {
     qDebug( "OPcmciaSystem::OPcmciaSystem()" );
 
     // get major node number out of /proc/devices