summaryrefslogtreecommitdiff
Unidiff
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 ( )
133 133
134bool ODevice::suspend ( ) 134bool ODevice::suspend ( )
135{ 135{
136 if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices 136 if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices
137 return false; 137 return false;
138 138
139 int fd; 139 int fd;
140 bool res = false; 140 bool res = false;
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
170QString ODevice::vendorString ( ) 172QString ODevice::vendorString ( )
171{ 173{
172 return d-> m_vendorstr; 174 return d-> m_vendorstr;
173} 175}
174 176
175OVendor ODevice::vendor ( ) 177OVendor ODevice::vendor ( )
176{ 178{
177 return d-> m_vendor; 179 return d-> m_vendor;
178} 180}