summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.cpp48
-rw-r--r--libopie2/opiecore/device/odevice_abstractmobiledevice.cpp21
-rw-r--r--libopie2/opiecore/linux/linux.pro1
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp2
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,33 +1,33 @@
/*
-                 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"
@@ -694,7 +694,7 @@ void ODevice::virtual_hook(int, void* ){
*/
void ODevice::sendSuspendmsg()
{
- if ( isQWS() )
+ if ( !isQWS() )
return;
QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
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,19 +1,15 @@
/*
                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;
@@ -33,6 +29,8 @@
#include "odevice_abstractmobiledevice.h"
+#include <qpe/qcopenvelope_qws.h>
+
#include <sys/time.h>
#include <sys/ioctl.h>
@@ -64,7 +62,8 @@ bool OAbstractMobileDevice::suspend() {
return false;
bool res = false;
- ODevice::sendSuspendmsg();
+
+ QCopEnvelope( "QPE/System", "aboutToSuspend()" );
struct timeval tvs, tvn;
::gettimeofday ( &tvs, 0 );
@@ -84,6 +83,8 @@ bool OAbstractMobileDevice::suspend() {
}
return res;
+
+ QCopEnvelope( "QPE/System", "returnFromSuspend()" );
}
//#include <linux/fb.h> better not rely on kernel headers in userspace ...
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
@@ -8,3 +8,4 @@ SOURCES += \
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
@@ -49,8 +49,6 @@ using namespace Opie::Core;
#define PROC_DEVICES "/proc/devices"
-// #define OPCMCIA_DEBUG 1
-
/*======================================================================================
* OPcmciaSystem
*======================================================================================*/