From 8fd0780faa16abbcf7db9220af1bc333ae484ec8 Mon Sep 17 00:00:00 2001 From: sandman Date: Sun, 04 Aug 2002 02:25:54 +0000 Subject: 1) Fixes for suspend/resume (improved it for iPAQ, shouldn't have changed anything for Z) -- It seems that this also fixes the 70% CPU load problem (needs more testing/feedback though) 2) the launcher now creates a /var/run/opie.pid file containing its pid 3) the launcher catches SIGTERM and kills all its child processes --- (limited to 'libopie') diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index bc8014a..057c344 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -17,6 +17,8 @@ Boston, MA 02111-1307, USA. */ +#include + #include #include #include @@ -47,11 +49,16 @@ protected: virtual void init ( ); public: + virtual bool suspend ( ); + virtual void alarmSound ( ); virtual uint hasLeds ( ) const; virtual OLedState led ( uint which ) const; virtual bool setLed ( uint which, OLedState st ); + +private: + static void tstp_sighandler ( int ); }; class ODeviceZaurus : public ODevice { @@ -113,6 +120,16 @@ ODevice::~ODevice ( ) delete d; } +bool ODevice::suspend ( ) +{ + int rc = ::system ( "apm --suspend" ); + + if (( rc == 127 ) || ( rc == -1 )) + return false; + else + return true; +} + QString ODevice::vendorString ( ) { return d-> m_vendorstr; @@ -251,6 +268,8 @@ void ODeviceIPAQ::init ( ) #include #include #include +#include +#include #include #include #include @@ -270,6 +289,49 @@ typedef struct h3600_ts_led { #define LED_ON (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :( +//#include + +//#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 ) { + 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 ( ) { #if defined( QT_QWS_IPAQ ) // IPAQ diff --git a/libopie/odevice.h b/libopie/odevice.h index b54e576..eeae357 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -65,7 +65,9 @@ public: public: static ODevice *inst ( ); - + +// system + virtual bool suspend ( ); // information -- cgit v0.9.0.2