Diffstat (limited to 'libopie2/opiecore/device/odevice_abstractmobiledevice.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp index b446d05..7ee72ba 100644 --- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp +++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | |||
@@ -26,17 +26,18 @@ | |||
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "odevice_abstractmobiledevice.h" | 30 | #include "odevice_abstractmobiledevice.h" |
31 | 31 | ||
32 | #include <qpe/qcopenvelope_qws.h> | 32 | /* QT */ |
33 | #include <qcopchannel_qws.h> | ||
33 | 34 | ||
35 | /* STD */ | ||
34 | #include <sys/time.h> | 36 | #include <sys/time.h> |
35 | #include <sys/ioctl.h> | 37 | #include <sys/ioctl.h> |
36 | |||
37 | #include <time.h> | 38 | #include <time.h> |
38 | #include <fcntl.h> | 39 | #include <fcntl.h> |
39 | #include <unistd.h> | 40 | #include <unistd.h> |
40 | #include <stdlib.h> | 41 | #include <stdlib.h> |
41 | 42 | ||
42 | namespace Opie { | 43 | namespace Opie { |
@@ -59,17 +60,13 @@ void OAbstractMobileDevice::setAPMTimeOut( int time ) { | |||
59 | 60 | ||
60 | bool OAbstractMobileDevice::suspend() { | 61 | bool OAbstractMobileDevice::suspend() { |
61 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 62 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
62 | return false; | 63 | return false; |
63 | 64 | ||
64 | bool res = false; | 65 | bool res = false; |
65 | 66 | QCopChannel::send( "QPE/System", "aboutToSuspend()" ); | |
66 | { | ||
67 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | ||
68 | } | ||
69 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
70 | 67 | ||
71 | struct timeval tvs, tvn; | 68 | struct timeval tvs, tvn; |
72 | ::gettimeofday ( &tvs, 0 ); | 69 | ::gettimeofday ( &tvs, 0 ); |
73 | 70 | ||
74 | ::sync(); // flush fs caches | 71 | ::sync(); // flush fs caches |
75 | res = ( ::system ( "apm --suspend" ) == 0 ); | 72 | res = ( ::system ( "apm --suspend" ) == 0 ); |
@@ -82,16 +79,13 @@ bool OAbstractMobileDevice::suspend() { | |||
82 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 79 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
83 | ::usleep ( 200 * 1000 ); | 80 | ::usleep ( 200 * 1000 ); |
84 | ::gettimeofday ( &tvn, 0 ); | 81 | ::gettimeofday ( &tvn, 0 ); |
85 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 82 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
86 | } | 83 | } |
87 | 84 | ||
88 | { | 85 | QCopChannel::send( "QPE/System", "returnFromSuspend()" ); |
89 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | ||
90 | } | ||
91 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
92 | 86 | ||
93 | return res; | 87 | return res; |
94 | } | 88 | } |
95 | 89 | ||
96 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... | 90 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... |
97 | 91 | ||