summaryrefslogtreecommitdiff
authorsandman <sandman>2002-11-20 22:50:41 (UTC)
committer sandman <sandman>2002-11-20 22:50:41 (UTC)
commit9cef034e112118ad388b0678cd492d81b1695021 (patch) (side-by-side diff)
treeac3da27c6ccc31663583a2f223098765f5d2d4a3
parent15c598ff6bc390ca0d2b0c82b236b4dd3257bb99 (diff)
downloadopie-9cef034e112118ad388b0678cd492d81b1695021.zip
opie-9cef034e112118ad388b0678cd492d81b1695021.tar.gz
opie-9cef034e112118ad388b0678cd492d81b1695021.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp38
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
@@ -200,31 +200,21 @@ bool ODevice::suspend ( )
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 );
}