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,64 +1,64 @@
 /*
-                             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
 #define OPIE_CORE_DEVICE_ABSTRACT_MOBILE_DEVICE
 
 #include "odevice.h"
 
 namespace Opie {
 namespace Core {
 /**
  * @short Common Implementations for Linux Handheld Devices
  *
  * Abstract Class with implementation for suspending using
  * asynchrnonus apm implementations and displaystatus using
  * the Linux Frame Buffer API
  *
  */
 class OAbstractMobileDevice : public ODevice {
     Q_OBJECT
 protected:
     OAbstractMobileDevice();
     void setAPMTimeOut( int time );
 public:
     virtual bool suspend();
     virtual bool setDisplayStatus(bool);
 
-private:
+protected:
     int m_timeOut;
 };
 }
 }
 
 
 #endif
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
@@ -535,96 +535,123 @@ ODirection Zaurus::direction() const
                 OHingeStatus hs = readHingeSensor();
                 if ( hs == CASE_PORTRAIT ) dir = CCW;
                 else if ( hs == CASE_UNKNOWN ) dir = CCW;
                 else dir = CW;
             }
             break;
         case Model_Zaurus_SL6000:
         case Model_Zaurus_SLA300:
         case Model_Zaurus_SLB600:
         case Model_Zaurus_SL5500:
         case Model_Zaurus_SL5000:
         default: dir = d->m_direction;
             break;
     }
     return dir;
 
 }
 
 bool Zaurus::hasHingeSensor() const
 {
     return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000;
 }
 
 OHingeStatus Zaurus::readHingeSensor() const
 {
     if (m_embedix)
     {
         int handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK);
         if (handle == -1)
         {
             qWarning("Zaurus::readHingeSensor() - failed (%s)", "unknown reason" ); //FIXME: use strerror
             return CASE_UNKNOWN;
         }
         else
         {
             int retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
             ::close (handle);
             if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE )
             {
                 qDebug( "Zaurus::readHingeSensor() - result = %d", retval );
                 return static_cast<OHingeStatus>( retval );
             }
             else
             {
                 qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" );
                 return CASE_UNKNOWN;
             }
         }
     }
     else
     {
         // corgi keyboard is event source 0 in OZ kernel 2.6
         OInputDevice* keyboard = OInputSystem::instance()->device( "event0" );
         if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP0 ) ) return CASE_LANDSCAPE;
         else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP1 ) ) return CASE_PORTRAIT;
         else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP2 ) ) return CASE_CLOSED;
         qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" );
         return CASE_UNKNOWN;
     }
 }
 
 /*
  * Take code from iPAQ device.
  * That way we switch the cursor directions depending on status of hinge sensor, eg. hardware direction.
  * I hope that is ok - Alwin
  */
 bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
     int newkeycode = keycode;
 
     if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false;
 
     /* map cursor keys depending on the hinge status */
     switch ( keycode ) {
         // Rotate cursor keys
         case Key_Left :
         case Key_Right:
         case Key_Up   :
         case Key_Down :
         {
             if (rotation()==Rot90) {
                 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
             }
         }
         break;
 
     }
     if (newkeycode!=keycode) {
         if ( newkeycode != Key_unknown ) {
             QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
         }
         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
@@ -26,118 +26,119 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef ODEVICE_ZAURUS
 #define ODEVICE_ZAURUS
 
 #include "odevice_abstractmobiledevice.h"
 
 /* QT */
 #include <qwindowsystem_qws.h>
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
 // _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 OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 
 // Audio
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
 #define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 
 // LED
 #define SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
 #define SHARP_LED_MAIL_EXISTS  9     /* mail status (exists or not) */
 
 #define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_NEWMAIL_EXISTS  1   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_UNREAD_MAIL_EX  2   /* for SHARP_LED_MAIL_EXISTS */
 
 // Rotation and Power Management
 #define SHARP_IOCTL_GET_ROTATION 0x413c
 
 #define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
 #define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
 #define APM_EVT_POWER_BUTTON    (1 << 0)
 
 // Brightness Embedix
 #define SHARP_FL_IOCTL_DEVICE   "/dev/sharp_fl"
 #define SHARP_FL_IOCTL_ON                  1
 #define SHARP_FL_IOCTL_OFF                 2
 #define SHARP_FL_IOCTL_STEP_CONTRAST     100
 #define SHARP_FL_IOCTL_GET_STEP_CONTRAST 101
 #define SHARP_FL_IOCTL_GET_STEP          102
 
 // Vesa Standard
 #define FB_BLANK_UNBLANK            0
 #define FB_BLANK_POWERDOWN          4
 
 namespace Opie {
 namespace Core {
 namespace Internal {
 
 class Zaurus : public OAbstractMobileDevice, public QWSServer::KeyboardFilter
 {
   protected:
     virtual void init(const QString&);
     virtual void initButtons();
 
   public:
     virtual bool setDisplayBrightness( int b );
     virtual bool setDisplayStatus( bool on );
     virtual int displayBrightnessResolution() const;
 
     virtual void playAlarmSound();
     virtual void playKeySound();
     virtual void playTouchSound();
 
     virtual QValueList <OLed> ledList() const;
     virtual QValueList <OLedState> ledStateList ( OLed led ) const;
     virtual OLedState ledState( OLed led ) const;
     virtual bool setLedState( OLed led, OLedState st );
 
     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];
     bool m_embedix;
 };
 
 struct z_button {
     Qt::Key code;
     char *utext;
     char *pix;
     char *fpressedservice;
     char *fpressedaction;
     char *fheldservice;
     char *fheldaction;
 };
 }
 }
 }
 #endif