-rw-r--r-- | libopie/odevice.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 057c344..bf64676 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -277,86 +277,88 @@ void ODeviceIPAQ::init ( ) //#include <linux/h3600_ts.h> // including kernel headers is evil ... typedef struct h3600_ts_led { unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ unsigned char TotalTime; /* Units of 5 seconds */ unsigned char OnTime; /* units of 100m/s */ unsigned char OffTime; /* units of 100m/s */ } LED_IN; // #define IOC_H3600_TS_MAGIC 'f' // #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, 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 <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 ) { + 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 ( ) { #if defined( QT_QWS_IPAQ ) // IPAQ #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); int fd; int vol; bool vol_reset = false; if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) || (( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) { if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { Config cfg ( "qpe" ); cfg. setGroup ( "Volume" ); int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); if ( volalarm < 0 ) volalarm = 0; else if ( volalarm > 100 ) volalarm = 100; volalarm |= ( volalarm << 8 ); if (( volalarm & 0xff ) > ( vol & 0xff )) { if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 ) vol_reset = true; } } |