author | mickeyl <mickeyl> | 2005-08-24 16:20:09 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-24 16:20:09 (UTC) |
commit | f0bb6c410f19d502cf563254d95158617a32b94e (patch) (unidiff) | |
tree | 63f9953ae1a310f8c286ea62b449e16e6e9d74ce /libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | |
parent | c1fc89afc42b1a8781b92b581f5be19916e2b69d (diff) | |
download | opie-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 (limited to 'libopie2/opiecore/device/odevice_abstractmobiledevice.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | 10 |
1 files changed, 7 insertions, 3 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 | |||
@@ -42,70 +42,74 @@ | |||
42 | namespace Opie { | 42 | namespace Opie { |
43 | namespace Core { | 43 | namespace Core { |
44 | OAbstractMobileDevice::OAbstractMobileDevice() | 44 | OAbstractMobileDevice::OAbstractMobileDevice() |
45 | : m_timeOut( 1500 ) | 45 | : m_timeOut( 1500 ) |
46 | {} | 46 | {} |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * @short Time to wait for the asynchronos APM implementation to suspend | 49 | * @short Time to wait for the asynchronos APM implementation to suspend |
50 | * | 50 | * |
51 | * Milli Seconds to wait before returning from the suspend method. | 51 | * Milli Seconds to wait before returning from the suspend method. |
52 | * This is needed due asynchrnonus implementations of the APM bios. | 52 | * This is needed due asynchrnonus implementations of the APM bios. |
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | void OAbstractMobileDevice::setAPMTimeOut( int time ) { | 55 | void OAbstractMobileDevice::setAPMTimeOut( int time ) { |
56 | m_timeOut = time; | 56 | m_timeOut = 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 | 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 ); |
73 | 75 | ||
74 | // This is needed because some apm implementations are asynchronous and we | 76 | // This is needed because some apm implementations are asynchronous and we |
75 | // can not be sure when exactly the device is really suspended | 77 | // can not be sure when exactly the device is really suspended |
76 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | 78 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. |
77 | 79 | ||
78 | if ( res ) { | 80 | if ( res ) { |
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 )) |
94 | #define OD_IO(type,number) OD_IOC(0,type,number,0) | 98 | #define OD_IO(type,number) OD_IOC(0,type,number,0) |
95 | 99 | ||
96 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 | 100 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 |
97 | 101 | ||
98 | /* VESA Blanking Levels */ | 102 | /* VESA Blanking Levels */ |
99 | #define VESA_NO_BLANKING 0 | 103 | #define VESA_NO_BLANKING 0 |
100 | #define VESA_VSYNC_SUSPEND 1 | 104 | #define VESA_VSYNC_SUSPEND 1 |
101 | #define VESA_HSYNC_SUSPEND 2 | 105 | #define VESA_HSYNC_SUSPEND 2 |
102 | #define VESA_POWERDOWN 3 | 106 | #define VESA_POWERDOWN 3 |
103 | 107 | ||
104 | bool OAbstractMobileDevice::setDisplayStatus ( bool on ) { | 108 | bool OAbstractMobileDevice::setDisplayStatus ( bool on ) { |
105 | bool res = false; | 109 | bool res = false; |
106 | int fd; | 110 | int fd; |
107 | 111 | ||
108 | #ifdef QT_QWS_DEVFS | 112 | #ifdef QT_QWS_DEVFS |
109 | if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { | 113 | if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { |
110 | #else | 114 | #else |
111 | if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) { | 115 | if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) { |