Reverting back to use system ( "apm --suspend" );, even though I don't

like it. It is needed since a real apm implementation only allows suspends
by uid == 0, which doesn't work with a multi-user Opie.
So making apm SUID root and calling it on suspend is the only option here.

1 files changed, 14 insertions, 24 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 2d2f7db..d8415ad 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -178,75 +178,65 @@ void ODevice::init ( )
 
 ODevice::~ODevice ( )
 {
         delete d;
 }
 
 bool ODevice::setSoftSuspend ( bool /*soft*/ )
 {
         return false;
 }
 
 //#include <linux/apm_bios.h>
 
 #define APM_IOC_SUSPEND          OD_IO( 'A', 2 )
 
 
 bool ODevice::suspend ( )
 {
         if ( !d-> m_qwsserver ) // only qwsserver is allowed to suspend
                 return false;
 
         if ( d-> m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
                 return false;
 
-        int fd;
         bool res = false;
         
-        if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
-                    (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
-                struct timeval tvs, tvn;
-
-        //              ::signal ( SIGTSTP, SIG_IGN );// we don't want to be stopped
-                ::gettimeofday ( &tvs, 0 );
+        struct timeval tvs, tvn;
+        ::gettimeofday ( &tvs, 0 );
         
-                ::sync ( ); // flush fs caches
-        
-                res = ( ::ioctl ( fd, APM_IOC_SUSPEND, 0 ) == 0 ); // tell the kernel to "start" suspending
-                ::close ( fd );
-
-                        if ( res ) {
-        //              ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in our process group
-
-                        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 ) < 1500 );
-                        
-        //              ::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group
-                        }
-                
-        //      ::signal ( SIGTSTP, SIG_DFL );
+        ::sync ( ); // flush fs caches
+        res = ( ::system ( "apm --suspend" ) == 0 );
+
+        // This is needed because the iPAQ apm implementation is 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 ) < 1500 );
         }
         
         return res;
 }
 
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
 
 #define FBIOBLANK             OD_IO( 'F', 0x11 ) // 0x4611
 
 /* VESA Blanking Levels */
 #define VESA_NO_BLANKING      0
 #define VESA_VSYNC_SUSPEND    1
 #define VESA_HSYNC_SUSPEND    2
 #define VESA_POWERDOWN        3
 
 
 bool ODevice::setDisplayStatus ( bool on )
 {
         if ( d-> m_model == Model_Unknown )
                 return false;
 
         bool res = false;
         int fd;