summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-05 19:10:48 (UTC)
committer sandman <sandman>2002-09-05 19:10:48 (UTC)
commitdd0222d2ec7a8f7363e746b079a46034d80d3466 (patch) (side-by-side diff)
treecb28ec395f5684a787d6c835c4cfe1ee04221064
parentb95c5502fb1b7425fe0cc503a17d8dd3658b032b (diff)
downloadopie-dd0222d2ec7a8f7363e746b079a46034d80d3466.zip
opie-dd0222d2ec7a8f7363e746b079a46034d80d3466.tar.gz
opie-dd0222d2ec7a8f7363e746b079a46034d80d3466.tar.bz2
suspend code now also calls sync() to flush fs caches (just like apm tool)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 1da8862..2f40731 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -133,46 +133,48 @@ ODevice::~ODevice ( )
bool ODevice::suspend ( )
{
if ( d-> m_model == OMODEL_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 );
+ ::sync ( ); // flush fs caches
+
res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending
- ::close ( fd );
if ( res ) {
- ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in out process group
+ ::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
}
+ ::close ( fd );
::signal ( SIGTSTP, SIG_DFL );
}
return res;
}
QString ODevice::vendorString ( )
{
return d-> m_vendorstr;
}
OVendor ODevice::vendor ( )
{
return d-> m_vendor;
}