1 files changed, 4 insertions, 32 deletions

diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 82e127e..67dfa41 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -111,48 +111,52 @@ struct z_button z_buttons_c700 [] = {
     "QPE/Rotation", "rotateDefault()",
     "QPE/Rotation", "rotateDefault()" },
     { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"),
     "devicebuttons/z_hinge3",
     "QPE/Rotation", "rotateDefault()",
     "QPE/Rotation", "rotateDefault()" },
 };
 
 // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus
 //       class up into individual classes. We need three classes
 //
 //       Zaurus-Collie (SA-model  w/ 320x240 lcd, for SL5500 and SL5000)
 //       Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600)
 //       Zaurus-Corgi  (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000)
 //       Zaurus-Tosa   (PXA-model w/ 480x640 lcd, for SL6000)
 //
 //       Only question right now is: Do we really need to do it? Because as soon
 //       as the OpenZaurus kernel is ready, there will be a unified interface for all
 //       Zaurus models (concerning apm, backlight, buttons, etc.)
 //
 //       Comments? - mickeyl.
 
 void Zaurus::init(const QString& cpu_info)
 {
+    // Set the time to wait until the system is realy suspended
+    // the delta between apm --suspend and sleeping
+    setAPMTimeOut( 15000 );
+    
     // generic distribution code already scanned /etc/issue at that point -
     // embedix releases contain "Embedix <version> | Linux for Embedded Devices"
     if ( d->m_sysverstr.contains( "embedix", false ) )
     {
         d->m_vendorstr = "Sharp";
         d->m_vendor = Vendor_Sharp;
         d->m_systemstr = "Zaurus";
         d->m_system = System_Zaurus;
         m_embedix = true;
     }
     else
     {
         d->m_vendorstr = "OpenZaurus Team";
         d->m_systemstr = "OpenZaurus";
         d->m_system = System_OpenZaurus;
         // sysver already gathered
 
         // OpenZaurus sometimes uses the embedix kernel, check if this is one
         FILE *uname = popen("uname -r", "r");
         QFile f;
         QString line;
         if ( f.open(IO_ReadOnly, uname) ) {
             QTextStream ts ( &f );
             line = ts. readLine();
@@ -461,80 +465,48 @@ bool Zaurus::setDisplayStatus( bool on )
     {
         int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK );
         if ( fd )
         {
             int ioctlnum = on ? SHARP_FL_IOCTL_ON : SHARP_FL_IOCTL_OFF;
             res = ( ::ioctl ( fd, ioctlnum, 0 ) == 0 );
             ::close ( fd );
         }
     }
     else
     {
         int fd = ::open( "/sys/class/backlight/corgi-bl/power", O_WRONLY|O_NONBLOCK );
         if ( fd )
         {
             char buf[10];
             buf[0] = on ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN;
             buf[1] = '\0';
             res = ( ::write( fd, &buf[0], 2 ) == 0 );
             ::close( fd );
         }
     }
     return res;
 }
 
-bool Zaurus::suspend()
-{
-    qDebug("ODevice::suspend");
-    if ( !isQWS( ) ) // only qwsserver is allowed to suspend
-        return false;
-
-    if ( d->m_model == Model_Unknown ) // better don't suspend on unknown devices
-        return false;
-
-    bool res = false;
-    ODevice::sendSuspendmsg();
-
-    struct timeval tvs, tvn;
-    ::gettimeofday ( &tvs, 0 );
-
-    ::sync(); // flush fs caches
-    res = ( ::system ( "apm --suspend" ) == 0 );
-
-    // This is needed because the apm implementation is asynchronous and we
-    // can not be sure when exactly the device is really suspended
-    if ( res ) {
-        do { // Yes, wait 15 seconds. This APM sucks big time.
-            ::usleep ( 200 * 1000 );
-            ::gettimeofday ( &tvn, 0 );
-        } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 15000 );
-    }
-
-    QCopEnvelope ( "QPE/Rotation", "rotateDefault()" );
-    return res;
-}
-
-
 Transformation Zaurus::rotation() const
 {
     qDebug( "Zaurus::rotation()" );
     Transformation rot;
 
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
         {
             OHingeStatus hs = readHingeSensor();
             qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs );
 
             if ( m_embedix )
             {
                 if ( hs == CASE_PORTRAIT ) rot = Rot0;
                 else if ( hs == CASE_UNKNOWN ) rot = Rot0;
                 else rot = Rot270;
             }
             else
             {
                 if ( hs == CASE_PORTRAIT ) rot = Rot90;
                 else if ( hs == CASE_UNKNOWN ) rot = Rot0;
                 else rot = Rot0;
             }