-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 | |||
@@ -117,78 +117,80 @@ ODevice::ODevice ( ) | |||
117 | } | 117 | } |
118 | 118 | ||
119 | void ODevice::init ( ) | 119 | void ODevice::init ( ) |
120 | { | 120 | { |
121 | } | 121 | } |
122 | 122 | ||
123 | ODevice::~ODevice ( ) | 123 | ODevice::~ODevice ( ) |
124 | { | 124 | { |
125 | delete d; | 125 | delete d; |
126 | } | 126 | } |
127 | 127 | ||
128 | //#include <linux/apm_bios.h> | 128 | //#include <linux/apm_bios.h> |
129 | 129 | ||
130 | //#define APM_IOC_SUSPEND _IO('A',2) | 130 | //#define APM_IOC_SUSPEND _IO('A',2) |
131 | 131 | ||
132 | #define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 )) | 132 | #define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 )) |
133 | 133 | ||
134 | bool ODevice::suspend ( ) | 134 | bool 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 | ||
170 | QString ODevice::vendorString ( ) | 172 | QString ODevice::vendorString ( ) |
171 | { | 173 | { |
172 | return d-> m_vendorstr; | 174 | return d-> m_vendorstr; |
173 | } | 175 | } |
174 | 176 | ||
175 | OVendor ODevice::vendor ( ) | 177 | OVendor ODevice::vendor ( ) |
176 | { | 178 | { |
177 | return d-> m_vendor; | 179 | return d-> m_vendor; |
178 | } | 180 | } |
179 | 181 | ||
180 | QString ODevice::modelString ( ) | 182 | QString ODevice::modelString ( ) |
181 | { | 183 | { |
182 | return d-> m_modelstr; | 184 | return d-> m_modelstr; |
183 | } | 185 | } |
184 | 186 | ||
185 | OModel ODevice::model ( ) | 187 | OModel ODevice::model ( ) |
186 | { | 188 | { |
187 | return d-> m_model; | 189 | return d-> m_model; |
188 | } | 190 | } |
189 | 191 | ||
190 | QString ODevice::systemString ( ) | 192 | QString ODevice::systemString ( ) |
191 | { | 193 | { |
192 | return d-> m_systemstr; | 194 | return d-> m_systemstr; |
193 | } | 195 | } |
194 | 196 | ||