summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-05 21:23:09 (UTC)
committer sandman <sandman>2002-09-05 21:23:09 (UTC)
commitbaea6aaf4f0c9672a4383470a9389bca1a20bdba (patch) (unidiff)
treedef42730d45a0aa47eeb4f637cf140633b8d2c7c
parent930e178bf07eb5685852f56a3ecb05b8b823f42c (diff)
downloadopie-baea6aaf4f0c9672a4383470a9389bca1a20bdba.zip
opie-baea6aaf4f0c9672a4383470a9389bca1a20bdba.tar.gz
opie-baea6aaf4f0c9672a4383470a9389bca1a20bdba.tar.bz2
- added a setPowerButtonHandler() for iPAQs and Zs
(-> disableAPM() in launcher can be removed) - another try to fix the OZ suspend code
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/odevice.cpp68
-rw-r--r--libopie/odevice.h6
2 files changed, 70 insertions, 4 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 2f40731..95fd6bd 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -56,24 +56,28 @@ public:
56 56
57class ODeviceIPAQ : public ODevice { 57class ODeviceIPAQ : public ODevice {
58protected: 58protected:
59 virtual void init ( ); 59 virtual void init ( );
60 60
61public: 61public:
62 virtual bool setPowerButtonHandler ( PowerButtonHandler h );
63
62 virtual void alarmSound ( ); 64 virtual void alarmSound ( );
63 65
64 virtual uint hasLeds ( ) const; 66 virtual uint hasLeds ( ) const;
65 virtual OLedState led ( uint which ) const; 67 virtual OLedState led ( uint which ) const;
66 virtual bool setLed ( uint which, OLedState st ); 68 virtual bool setLed ( uint which, OLedState st );
67}; 69};
68 70
69class ODeviceZaurus : public ODevice { 71class ODeviceZaurus : public ODevice {
70protected: 72protected:
71 virtual void init ( ); 73 virtual void init ( );
72 74
73 public: 75 public:
76 virtual bool setPowerButtonHandler ( PowerButtonHandler h );
77
74 virtual void alarmSound ( ); 78 virtual void alarmSound ( );
75 virtual void keySound ( ); 79 virtual void keySound ( );
76 virtual void touchSound ( ); 80 virtual void touchSound ( );
77 81
78 virtual uint hasLeds ( ) const; 82 virtual uint hasLeds ( ) const;
79 virtual OLedState led ( uint which ) const; 83 virtual OLedState led ( uint which ) const;
@@ -128,12 +132,17 @@ ODevice::~ODevice ( )
128//#include <linux/apm_bios.h> 132//#include <linux/apm_bios.h>
129 133
130//#define APM_IOC_SUSPEND _IO('A',2) 134//#define APM_IOC_SUSPEND _IO('A',2)
131 135
132#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 )) 136#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 ))
133 137
138bool ODevice::setPowerButtonHandler ( ODevice::PowerButtonHandler )
139{
140 return false;
141}
142
134bool ODevice::suspend ( ) 143bool ODevice::suspend ( )
135{ 144{
136 if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices 145 if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices
137 return false; 146 return false;
138 147
139 int fd; 148 int fd;
@@ -145,13 +154,13 @@ bool ODevice::suspend ( )
145 154
146 ::signal ( SIGTSTP, SIG_IGN );// we don't want to be stopped 155 ::signal ( SIGTSTP, SIG_IGN );// we don't want to be stopped
147 ::gettimeofday ( &tvs, 0 ); 156 ::gettimeofday ( &tvs, 0 );
148 157
149 ::sync ( ); // flush fs caches 158 ::sync ( ); // flush fs caches
150 159
151 res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending 160 res = ( ::ioctl ( fd, APM_IOC_SUSPEND, 0 ) == 0 ); // tell the kernel to "start" suspending
152 161
153 if ( res ) { 162 if ( res ) {
154 ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in our process group 163 ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in our process group
155 164
156 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed 165 do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
157 ::usleep ( 200 * 1000 ); 166 ::usleep ( 200 * 1000 );
@@ -401,20 +410,35 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
401 } 410 }
402 } 411 }
403 } 412 }
404 return false; 413 return false;
405} 414}
406 415
416bool ODeviceIPAQ::setPowerButtonHandler ( ODevice::PowerButtonHandler p )
417{
418 bool res = false;
419 int fd;
420
421 if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
422 if ( ::write ( fd, p == KERNEL ? "0" : "1", 1 ) == 1 )
423 res = true;
424 else
425 ::perror ( "write to /proc/sys/ts/suspend_button_mode" );
426
427 ::close ( fd );
428 }
429 else
430 ::perror ( "/proc/sys/ts/suspend_button_mode" );
407 431
408//#endif 432 return res;
433}
409 434
410 435
411 436
412 437
413 438
414//#if defined( QT_QWS_EBX ) // Zaurus
415 439
416void ODeviceZaurus::init ( ) 440void ODeviceZaurus::init ( )
417{ 441{
418 d-> m_modelstr = "Zaurus SL5000"; 442 d-> m_modelstr = "Zaurus SL5000";
419 d-> m_model = OMODEL_Zaurus_SL5000; 443 d-> m_model = OMODEL_Zaurus_SL5000;
420 d-> m_vendorstr = "Sharp"; 444 d-> m_vendorstr = "Sharp";
@@ -491,12 +515,18 @@ typedef struct sharp_led_status {
491#define SHARP_LED_MAIL_EXISTS 9 /* mail status (exists or not) */ 515#define SHARP_LED_MAIL_EXISTS 9 /* mail status (exists or not) */
492 516
493#define LED_MAIL_NO_UNREAD_MAIL 0 /* for SHARP_LED_MAIL_EXISTS */ 517#define LED_MAIL_NO_UNREAD_MAIL 0 /* for SHARP_LED_MAIL_EXISTS */
494#define LED_MAIL_NEWMAIL_EXISTS 1 /* for SHARP_LED_MAIL_EXISTS */ 518#define LED_MAIL_NEWMAIL_EXISTS 1 /* for SHARP_LED_MAIL_EXISTS */
495#define LED_MAIL_UNREAD_MAIL_EX 2 /* for SHARP_LED_MAIL_EXISTS */ 519#define LED_MAIL_UNREAD_MAIL_EX 2 /* for SHARP_LED_MAIL_EXISTS */
496 520
521// #include <asm/sharp_apm.h> // including kernel headers is evil ...
522
523#define APM_IOCGEVTSRC (( 2 ) | ( 'A'<<8 ) | ( 203 ) | ( sizeof(int) ))
524#define APM_IOCSEVTSRC (( 3 ) | ( 'A'<<8 ) | ( 204 ) | ( sizeof(int) ))
525#define APM_EVT_POWER_BUTTON (1 << 0)
526
497 527
498 528
499void ODeviceZaurus::buzzer ( int sound ) 529void ODeviceZaurus::buzzer ( int sound )
500{ 530{
501 static int fd = ::open ( "/dev/sharp_buz", O_RDWR|O_NONBLOCK ); 531 static int fd = ::open ( "/dev/sharp_buz", O_RDWR|O_NONBLOCK );
502 532
@@ -557,7 +587,37 @@ bool ODeviceZaurus::setLed ( uint which, OLedState st )
557 } 587 }
558 } 588 }
559 } 589 }
560 return false; 590 return false;
561} 591}
562 592
563//#endif 593bool ODeviceZaurus::setPowerButtonHandler ( ODevice::PowerButtonHandler p )
594{
595 bool res = false;
596 int fd;
597
598 if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
599 (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
600
601 int sources = ::ioctl ( fd, APM_IOCGEVTSRC, 0 ); // get current event sources
602
603 if ( sources >= 0 ) {
604 if ( p == KERNEL )
605 sources |= APM_EVT_POWER_BUTTON;
606 else
607 sources &= ~APM_EVT_POWER_BUTTON;
608
609 if ( ::ioctl ( fd, APM_IOCSEVTSRC, sources & ~APM_EVT_POWER_BUTTON ) >= 0 ) // set new event sources
610 res = true;
611 else
612 perror ( "APM_IOCGEVTSRC" );
613 }
614 else
615 perror ( "APM_IOCGEVTSRC" );
616
617 ::close ( fd );
618 }
619 else
620 perror ( "/dev/apm_bios or /dev/misc/apm_bios" );
621
622 return res;
623}
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 5009b91..ee01f0f 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -64,12 +64,18 @@ class ODevice
64public: 64public:
65 65
66public: 66public:
67 static ODevice *inst ( ); 67 static ODevice *inst ( );
68 68
69 // system 69 // system
70 enum PowerButtonHandler {
71 KERNEL,
72 OPIE
73 };
74
75 virtual bool setPowerButtonHandler ( PowerButtonHandler h );
70 virtual bool suspend ( ); 76 virtual bool suspend ( );
71 77
72// information 78// information
73 79
74 QString modelString ( ); 80 QString modelString ( );
75 OModel model ( ); 81 OModel model ( );