author | mickeyl <mickeyl> | 2005-08-27 17:19:12 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-27 17:19:12 (UTC) |
commit | 85bddcabafcf7a0529e3738f306d63988b7dcbbc (patch) (unidiff) | |
tree | 65f87cbffbcb42e90a47a683c68cdebf69882990 /libopie2 | |
parent | 193c968b94fd6db646af8a3588e90982a20e3fc5 (diff) | |
download | opie-85bddcabafcf7a0529e3738f306d63988b7dcbbc.zip opie-85bddcabafcf7a0529e3738f306d63988b7dcbbc.tar.gz opie-85bddcabafcf7a0529e3738f306d63988b7dcbbc.tar.bz2 |
call processEvents() to make it more likely^w^w^wsure the QCopEnvelope gets processed
-rw-r--r-- | libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp index dbe9364..b446d05 100644 --- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp +++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | |||
@@ -57,45 +57,47 @@ void OAbstractMobileDevice::setAPMTimeOut( int time ) { | |||
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
60 | bool OAbstractMobileDevice::suspend() { | 60 | bool 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 | { | 66 | { |
67 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | 67 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); |
68 | } | 68 | } |
69 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
69 | 70 | ||
70 | struct timeval tvs, tvn; | 71 | struct timeval tvs, tvn; |
71 | ::gettimeofday ( &tvs, 0 ); | 72 | ::gettimeofday ( &tvs, 0 ); |
72 | 73 | ||
73 | ::sync(); // flush fs caches | 74 | ::sync(); // flush fs caches |
74 | res = ( ::system ( "apm --suspend" ) == 0 ); | 75 | res = ( ::system ( "apm --suspend" ) == 0 ); |
75 | 76 | ||
76 | // This is needed because some apm implementations are asynchronous and we | 77 | // This is needed because some apm implementations are asynchronous and we |
77 | // can not be sure when exactly the device is really suspended | 78 | // can not be sure when exactly the device is really suspended |
78 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 79 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
79 | 80 | ||
80 | if ( res ) { | 81 | if ( res ) { |
81 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 82 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
82 | ::usleep ( 200 * 1000 ); | 83 | ::usleep ( 200 * 1000 ); |
83 | ::gettimeofday ( &tvn, 0 ); | 84 | ::gettimeofday ( &tvn, 0 ); |
84 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 85 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
85 | } | 86 | } |
86 | 87 | ||
87 | { | 88 | { |
88 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | 89 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); |
89 | } | 90 | } |
91 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
90 | 92 | ||
91 | return res; | 93 | return res; |
92 | } | 94 | } |
93 | 95 | ||
94 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... | 96 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... |
95 | 97 | ||
96 | // _IO and friends are only defined in kernel headers ... | 98 | // _IO and friends are only defined in kernel headers ... |
97 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) | 99 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) |
98 | #define OD_IO(type,number) OD_IOC(0,type,number,0) | 100 | #define OD_IO(type,number) OD_IOC(0,type,number,0) |
99 | 101 | ||
100 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 | 102 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 |
101 | 103 | ||
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 5d48488..2b2467c 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -706,37 +706,39 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, | |||
706 | } | 706 | } |
707 | return false; | 707 | return false; |
708 | } | 708 | } |
709 | 709 | ||
710 | bool Zaurus::suspend() { | 710 | bool 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 | { | 715 | { |
716 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); | 716 | QCopEnvelope( "QPE/System", "aboutToSuspend()" ); |
717 | } | 717 | } |
718 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
718 | 719 | ||
719 | struct timeval tvs, tvn; | 720 | struct timeval tvs, tvn; |
720 | ::gettimeofday ( &tvs, 0 ); | 721 | ::gettimeofday ( &tvs, 0 ); |
721 | 722 | ||
722 | ::sync(); // flush fs caches | 723 | ::sync(); // flush fs caches |
723 | res = ( ::system ( "apm --suspend" ) == 0 ); | 724 | res = ( ::system ( "apm --suspend" ) == 0 ); |
724 | 725 | ||
725 | // This is needed because some apm implementations are asynchronous and we | 726 | // This is needed because some apm implementations are asynchronous and we |
726 | // can not be sure when exactly the device is really suspended | 727 | // can not be sure when exactly the device is really suspended |
727 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 728 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
728 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. | 729 | // on non embedix eg. 2.6 kernel line apm is synchronous so we don't need it here. |
729 | 730 | ||
730 | if ( res && m_embedix) { | 731 | if ( res && m_embedix) { |
731 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 732 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
732 | ::usleep ( 200 * 1000 ); | 733 | ::usleep ( 200 * 1000 ); |
733 | ::gettimeofday ( &tvn, 0 ); | 734 | ::gettimeofday ( &tvn, 0 ); |
734 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); | 735 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); |
735 | } | 736 | } |
736 | 737 | ||
737 | { | 738 | { |
738 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); | 739 | QCopEnvelope( "QPE/System", "returnFromSuspend()" ); |
739 | } | 740 | } |
741 | qApp->processEvents(); // ensure the qcop call is being processed asap | ||
740 | 742 | ||
741 | return res; | 743 | return res; |
742 | } | 744 | } |