summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
committer mickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
commitf0bb6c410f19d502cf563254d95158617a32b94e (patch) (unidiff)
tree63f9953ae1a310f8c286ea62b449e16e6e9d74ce
parentc1fc89afc42b1a8781b92b581f5be19916e2b69d (diff)
downloadopie-f0bb6c410f19d502cf563254d95158617a32b94e.zip
opie-f0bb6c410f19d502cf563254d95158617a32b94e.tar.gz
opie-f0bb6c410f19d502cf563254d95158617a32b94e.tar.bz2
fix STUPID bug by remembering that a QCopEnvelope is sent in the object destructor
sometimes C++ is too tricky for human beings :/
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_abstractmobiledevice.cpp10
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp8
2 files changed, 13 insertions, 5 deletions
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index fe5864b..dbe9364 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -60,13 +60,15 @@ void OAbstractMobileDevice::setAPMTimeOut( int time ) {
60bool OAbstractMobileDevice::suspend() { 60bool OAbstractMobileDevice::suspend() {
61 if ( !isQWS( ) ) // only qwsserver is allowed to suspend 61 if ( !isQWS( ) ) // only qwsserver is allowed to suspend
62 return false; 62 return false;
63 63
64 bool res = false; 64 bool res = false;
65 65
66 QCopEnvelope( "QPE/System", "aboutToSuspend()" ); 66 {
67 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
68 }
67 69
68 struct timeval tvs, tvn; 70 struct timeval tvs, tvn;
69 ::gettimeofday ( &tvs, 0 ); 71 ::gettimeofday ( &tvs, 0 );
70 72
71 ::sync(); // flush fs caches 73 ::sync(); // flush fs caches
72 res = ( ::system ( "apm --suspend" ) == 0 ); 74 res = ( ::system ( "apm --suspend" ) == 0 );
@@ -79,15 +81,17 @@ bool OAbstractMobileDevice::suspend() {
79 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed 81 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
80 ::usleep ( 200 * 1000 ); 82 ::usleep ( 200 * 1000 );
81 ::gettimeofday ( &tvn, 0 ); 83 ::gettimeofday ( &tvn, 0 );
82 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 84 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
83 } 85 }
84 86
85 return res; 87 {
88 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
89 }
86 90
87 QCopEnvelope( "QPE/System", "returnFromSuspend()" ); 91 return res;
88} 92}
89 93
90//#include <linux/fb.h> better not rely on kernel headers in userspace ... 94//#include <linux/fb.h> better not rely on kernel headers in userspace ...
91 95
92// _IO and friends are only defined in kernel headers ... 96// _IO and friends are only defined in kernel headers ...
93#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) 97#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 4a80a7e..5d48488 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -709,13 +709,15 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
709 709
710bool Zaurus::suspend() { 710bool Zaurus::suspend() {
711 if ( !isQWS( ) ) // only qwsserver is allowed to suspend 711 if ( !isQWS( ) ) // only qwsserver is allowed to suspend
712 return false; 712 return false;
713 713
714 bool res = false; 714 bool res = false;
715 QCopEnvelope( "QPE/System", "aboutToSuspend()" ); 715 {
716 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
717 }
716 718
717 struct timeval tvs, tvn; 719 struct timeval tvs, tvn;
718 ::gettimeofday ( &tvs, 0 ); 720 ::gettimeofday ( &tvs, 0 );
719 721
720 ::sync(); // flush fs caches 722 ::sync(); // flush fs caches
721 res = ( ::system ( "apm --suspend" ) == 0 ); 723 res = ( ::system ( "apm --suspend" ) == 0 );
@@ -729,10 +731,12 @@ bool Zaurus::suspend() {
729 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed 731 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
730 ::usleep ( 200 * 1000 ); 732 ::usleep ( 200 * 1000 );
731 ::gettimeofday ( &tvn, 0 ); 733 ::gettimeofday ( &tvn, 0 );
732 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 734 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
733 } 735 }
734 736
735 QCopEnvelope( "QPE/System", "returnFromSuspend()" ); 737 {
738 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
739 }
736 740
737 return res; 741 return res;
738} 742}