| -rw-r--r-- | libopie/odevice.cpp | 117 | ||||
| -rw-r--r-- | libopie/odevice.h | 1 |
2 files changed, 54 insertions, 64 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index bf64676..6572fb6 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -19,4 +19,12 @@ #include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <signal.h> +#include <sys/time.h> +#include <linux/soundcard.h> + +#include <qapplication.h> #include <qfile.h> @@ -24,4 +32,6 @@ #include <qpe/sound.h> #include <qpe/resource.h> +#include <qpe/config.h> + @@ -50,6 +60,4 @@ protected: public: - virtual bool suspend ( ); - virtual void alarmSound ( ); @@ -57,7 +65,4 @@ public: virtual OLedState led ( uint which ) const; virtual bool setLed ( uint which, OLedState st ); - -private: - static void tstp_sighandler ( int ); }; @@ -121,14 +126,52 @@ ODevice::~ODevice ( ) } -bool ODevice::suspend ( ) +//#include <linux/apm_bios.h> + +//#define APM_IOC_SUSPEND _IO('A',2) + +#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 )) + + +void ODevice::tstp_sighandler ( int ) { - int rc = ::system ( "apm --suspend" ); +} + - if (( rc == 127 ) || ( rc == -1 )) +bool ODevice::suspend ( ) +{ + if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices return false; - else - return true; + + int fd; + bool res = false; + + if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) || + (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) { + struct timeval tvs, tvn; + + ::signal ( SIGTSTP, tstp_sighandler ); // we don't want to be stopped + ::gettimeofday ( &tvs, 0 ); + + res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending + ::close ( fd ); + + if ( res ) { + ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in out process group + + do { // wait at most 1.5 sec: either suspend didn't work or the device resumed + ::usleep ( 200 * 1000 ); + ::gettimeofday ( &tvn, 0 ); + } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 ); + + ::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group + } + + ::signal ( SIGTSTP, SIG_DFL ); + } + + return res; } + QString ODevice::vendorString ( ) { @@ -266,13 +309,4 @@ void ODeviceIPAQ::init ( ) } -#include <unistd.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <signal.h> -#include <sys/time.h> -#include <linux/soundcard.h> -#include <qapplication.h> -#include <qpe/config.h> - //#include <linux/h3600_ts.h> // including kernel headers is evil ... @@ -290,49 +324,4 @@ typedef struct h3600_ts_led { -//#include <linux/apm_bios.h> - -//#define APM_IOC_SUSPEND _IO('A',2) - -#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 )) - - -void ODeviceIPAQ::tstp_sighandler ( int ) -{ -} - - -bool ODeviceIPAQ::suspend ( ) -{ - int fd; - bool res = false; - - if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) || - (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) { - struct timeval tvs, tvn; - - ::signal ( SIGTSTP, tstp_sighandler ); - ::gettimeofday ( &tvs, 0 ); - - res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); - ::close ( fd ); - - if ( res ) { - ::kill ( -::getpid ( ), SIGTSTP ); - - do { - ::usleep ( 200 * 1000 ); - ::gettimeofday ( &tvn, 0 ); - } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 ); - - ::kill ( -::getpid ( ), SIGCONT ); - } - - ::signal ( SIGTSTP, SIG_DFL ); - } - - return res; -} - - void ODeviceIPAQ::alarmSound ( ) { diff --git a/libopie/odevice.h b/libopie/odevice.h index eeae357..cda504a 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -104,4 +104,5 @@ private: ODevice ( const ODevice & ); + static void tstp_sighandler ( int ); }; |