on non-embedix kernel zaurii devices don't wait after suspend 'cause

apm there is synchronous.
for that I had to move a variable from private to protected in
abstractmobiledevice.

3 files changed, 50 insertions, 22 deletions

diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.h b/libopie2/opiecore/device/odevice_abstractmobiledevice.h
index 9467e82..335b02f 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.h
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.h
@@ -1,33 +1,33 @@
 /*
-                             This file is part of the Opie Project
-                             Copyright (C) 2004, 2005 Holger Hans Peter Freyther <freyther@handhelds.org>
+                     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>
 
 
               =.
             .=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; 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.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OPIE_CORE_DEVICE_ABSTRACT_MOBILE_DEVICE
@@ -51,13 +51,13 @@ protected:
     OAbstractMobileDevice();
     void setAPMTimeOut( int time );
 public:
     virtual bool suspend();
     virtual bool setDisplayStatus(bool);
 
-private:
+protected:
     int m_timeOut;
 };
 }
 }
 
 
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 72378ff..8aefc13 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -625,6 +625,33 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
         }
         return true;
     }
     return false;
 }
 
+bool Zaurus::suspend() {
+    if ( !isQWS( ) ) // only qwsserver is allowed to suspend
+        return false;
+
+    bool res = false;
+    OAbstractMobileDevice::sendSuspendmsg();
+
+    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.
+    // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here.
+
+    if ( res && m_embedix) {
+        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;
+}
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index 1fb0cd9..4548e35 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -116,12 +116,13 @@ class Zaurus : public OAbstractMobileDevice, public QWSServer::KeyboardFilter
 
     virtual bool hasHingeSensor() const;
     virtual OHingeStatus readHingeSensor() const;
 
     virtual Transformation rotation() const;
     virtual ODirection direction() const;
+    virtual bool suspend();
 
   protected:
     virtual void buzzer( int snd );
     virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
 
     OLedState m_leds[1];