author | sandman <sandman> | 2002-09-05 19:10:48 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-05 19:10:48 (UTC) |
commit | dd0222d2ec7a8f7363e746b079a46034d80d3466 (patch) (unidiff) | |
tree | cb28ec395f5684a787d6c835c4cfe1ee04221064 | |
parent | b95c5502fb1b7425fe0cc503a17d8dd3658b032b (diff) | |
download | opie-dd0222d2ec7a8f7363e746b079a46034d80d3466.zip opie-dd0222d2ec7a8f7363e746b079a46034d80d3466.tar.gz opie-dd0222d2ec7a8f7363e746b079a46034d80d3466.tar.bz2 |
suspend code now also calls sync() to flush fs caches (just like apm tool)
-rw-r--r-- | libopie/odevice.cpp | 6 |
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 | |||
@@ -141,30 +141,32 @@ bool ODevice::suspend ( ) | |||
141 | 141 | ||
142 | if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) || | 142 | if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) || |
143 | (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) { | 143 | (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) { |
144 | struct timeval tvs, tvn; | 144 | struct timeval tvs, tvn; |
145 | 145 | ||
146 | ::signal ( SIGTSTP, SIG_IGN );// we don't want to be stopped | 146 | ::signal ( SIGTSTP, SIG_IGN );// we don't want to be stopped |
147 | ::gettimeofday ( &tvs, 0 ); | 147 | ::gettimeofday ( &tvs, 0 ); |
148 | 148 | ||
149 | ::sync ( ); // flush fs caches | ||
150 | |||
149 | res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending | 151 | res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending |
150 | ::close ( fd ); | ||
151 | 152 | ||
152 | if ( res ) { | 153 | if ( res ) { |
153 | ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in out process group | 154 | ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in our process group |
154 | 155 | ||
155 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 156 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
156 | ::usleep ( 200 * 1000 ); | 157 | ::usleep ( 200 * 1000 ); |
157 | ::gettimeofday ( &tvn, 0 ); | 158 | ::gettimeofday ( &tvn, 0 ); |
158 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 ); | 159 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 ); |
159 | 160 | ||
160 | ::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group | 161 | ::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group |
161 | } | 162 | } |
162 | 163 | ||
164 | ::close ( fd ); | ||
163 | ::signal ( SIGTSTP, SIG_DFL ); | 165 | ::signal ( SIGTSTP, SIG_DFL ); |
164 | } | 166 | } |
165 | 167 | ||
166 | return res; | 168 | return res; |
167 | } | 169 | } |
168 | 170 | ||
169 | 171 | ||
170 | QString ODevice::vendorString ( ) | 172 | QString ODevice::vendorString ( ) |