fix for alarm volume handling on iPAQs

1 files changed, 2 insertions, 4 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 9fd3ae2..c947630 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -403,388 +403,386 @@ void iPAQ::init ( )
         f. setName ( "/etc/familiar-version" );
         if ( f. open ( IO_ReadOnly )) { 
                 d-> m_systemstr = "Familiar";
                 d-> m_system = System_Familiar;
                 
                 QTextStream ts ( &f );
                 d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
                 
                 f. close ( );
         }
 
         m_leds [0] = m_leds [1] = Led_Off;
         
         m_power_timer = 0;
         
         if ( d-> m_qwsserver )
                         QWSServer::setKeyboardFilter ( this );
 }
 
 //#include <linux/h3600_ts.h>  // including kernel headers is evil ...
 
 typedef struct {
   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;
 
 typedef struct {
         unsigned char mode;
         unsigned char pwr;
         unsigned char brightness;
 } FLITE_IN;
 
 #define LED_ON    OD_IOW( 'f', 5, LED_IN )
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
 
 
 
 QValueList <OLed> iPAQ::ledList ( ) const
 {
         QValueList <OLed> vl;
         vl << Led_Power;
 
         if ( d-> m_model == Model_iPAQ_H38xx )
                 vl << Led_BlueTooth;
         return vl;
 }
 
 QValueList <OLedState> iPAQ::ledStateList ( OLed l ) const
 {
         QValueList <OLedState> vl;
 
         if ( l == Led_Power )
                 vl << Led_Off << Led_On << Led_BlinkSlow << Led_BlinkFast;
         else if ( l == Led_BlueTooth && d-> m_model == Model_iPAQ_H38xx )
                 vl << Led_Off; // << Led_On << ???
                 
         return vl;
 }
 
 OLedState iPAQ::ledState ( OLed l ) const
         {
         switch ( l ) {
                 case Led_Power:
                         return m_leds [0];
                 case Led_BlueTooth:
                         return m_leds [1];
                 default:
                         return Led_Off;
         }
 }
 
 bool iPAQ::setLedState ( OLed l, OLedState st ) 
 {
         static int fd = ::open ( "/dev/touchscreen/0", O_RDWR | O_NONBLOCK );
 
         if ( l == Led_Power ) {
                 if ( fd >= 0 ) {
                         LED_IN leds;
                         ::memset ( &leds, 0, sizeof( leds ));
                         leds. TotalTime  = 0;
                         leds. OnTime     = 0;
                         leds. OffTime    = 1;
                         leds. OffOnBlink = 2;
 
                         switch ( st ) {
                                 case Led_Off      : leds. OffOnBlink = 0; break;
                                 case Led_On       : leds. OffOnBlink = 1; break;
                                 case Led_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break;
                                 case Led_BlinkFast: leds. OnTime =  5; leds. OffTime =  5; break;
                         }
 
                         if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) {
                                 m_leds [0] = st;
                                 return true;
                         }
                 }
         }
         return false;
 }
 
 
 //QValueList <int> iPAQ::keyList ( ) const
 //{
         //QValueList <int> vl;
         //vl << HardKey_Datebook << HardKey_Contacts << ( model ( ) == Model_iPAQ_H38xx ? HardKey_Mail : HardKey_Menu ) << HardKey_Home << HardKey_Record << HardKey_Suspend << HardKey_Backlight;
         //return vl;
 //}
 
 bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
         int newkeycode = keycode;
 
         switch ( keycode ) {
                 // H38xx/H39xx have no "Q" key anymore - this is now the Mail key
                 case HardKey_Menu: {
                         if (( d-> m_model == Model_iPAQ_H38xx ) ||
                                     ( d-> m_model == Model_iPAQ_H39xx )) {                  
                                 newkeycode = HardKey_Mail;
                         }
                         break;
                 }
                                 
                 // Rotate cursor keys 180°
                 case Key_Left : 
                 case Key_Right: 
                 case Key_Up   : 
                 case Key_Down : {
                         if (( d-> m_model == Model_iPAQ_H31xx ) ||
                                     ( d-> m_model == Model_iPAQ_H38xx )) {                  
                                 newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
                         }
                         break;
                 }
 
                 // map Power Button short/long press to F34/F35
                 case Key_SysReq: {
                         if ( isPress ) {
                                 if ( m_power_timer )
                                         killTimer ( m_power_timer );
                                 m_power_timer = startTimer ( 500 );
                         }
                         else if ( m_power_timer ) {
                                 killTimer ( m_power_timer );
                                 m_power_timer = 0;
                                 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
                                 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
                         }
                                 newkeycode = Key_unknown;
                                 break;
                 }
         }
                         
         if ( newkeycode != keycode ) {
                 if ( newkeycode != Key_unknown )
                         QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
                 return true;
         }
         else
                 return false;
 }
 
 void iPAQ::timerEvent ( QTimerEvent * )
 {
         killTimer ( m_power_timer );
         m_power_timer = 0;
         QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
         QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void iPAQ::alarmSound ( )
 {
 #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 ) {
                 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;
-                        }
+                        if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 )
+                                vol_reset = true;
                 }
         }
 
         snd. play ( );
         while ( !snd. isFinished ( ))
                 qApp-> processEvents ( );
 
         if ( fd >= 0 ) {
                 if ( vol_reset )
                         ::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
                 ::close ( fd );
         }
 #endif
 }
 
 
 bool iPAQ::setSoftSuspend ( bool soft )
 {
         bool res = false;
         int fd;
         
         if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
                 if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 )
                         res = true;
                 else
                         ::perror ( "write to /proc/sys/ts/suspend_button_mode" );
                 
                 ::close ( fd );
         }
         else
                 ::perror ( "/proc/sys/ts/suspend_button_mode" );
         
         return res;
 }
 
 
 bool iPAQ::setDisplayBrightness ( int bright )
 {
         bool res = false;
         int fd;
         
         if ( bright > 255 )
                 bright = 255;
         if ( bright < 0 )
                 bright = 0;
 
         if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
                 FLITE_IN bl;
                 bl. mode = 1;
                 bl. pwr = bright ? 1 : 0;
                 bl. brightness = ( bright * ( displayBrightnessResolution ( ) - 1 ) + 127 ) / 255;
                 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
                 ::close ( fd );
         }
         return res;
 }
 
 int iPAQ::displayBrightnessResolution ( ) const
 {
         switch ( model ( )) {
                 case Model_iPAQ_H31xx:
                 case Model_iPAQ_H36xx:
                 case Model_iPAQ_H37xx:
                                 return 128;  // really 256, but >128 could damage the LCD
                         
                 case Model_iPAQ_H38xx:
                 case Model_iPAQ_H39xx:
                         return 64;
                 
                 default:
                         return 2;
                 }
 }
 
 
 bool iPAQ::hasLightSensor ( ) const
 {
         return true;
 }
 
 int iPAQ::readLightSensor ( )
 {
         int fd;
         int val = -1;
         
         if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) {
                 char buffer [8];
         
                 if ( ::read ( fd, buffer, 5 ) == 5 ) {
                         char *endptr;
                 
                         buffer [4] = 0;
                         val = ::strtol ( buffer + 2, &endptr, 16 );
                         
                         if ( *endptr != 0 )
                                 val = -1;
                         }
                 ::close ( fd );
         }
 
         return val;
 }
 
 int iPAQ::lightSensorResolution ( ) const
 {
         return 256;
 }
 
 /**************************************************
  *
  * Zaurus
  *
  **************************************************/
 
 
 
 void Zaurus::init ( )
 {
         d-> m_vendorstr = "Sharp";
         d-> m_vendor = Vendor_Sharp;
 
         QFile f ( "/proc/filesystems" );
 
         if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
                 d-> m_vendorstr = "OpenZaurus Team";
                 d-> m_systemstr = "OpenZaurus";
                 d-> m_system = System_OpenZaurus;
 
                 f. close ( );
 
                 f. setName ( "/etc/oz_version" );
                 if ( f. open ( IO_ReadOnly )) { 
                         QTextStream ts ( &f );
                         d-> m_sysverstr = ts. readLine ( );//. mid ( 10 );
                         f. close ( );
                 }
         }
         else {
                 d-> m_systemstr = "Zaurus";
                 d-> m_system = System_Zaurus;
         }
 
         f. setName ( "/proc/deviceinfo/product" );
         if ( f. open ( IO_ReadOnly ) ) {
                 QTextStream ts ( &f );
                 QString model = ts. readLine ( );
                 f. close ( );
                 if ( model == "SL-5000D" ) {
                         d-> m_model = Model_Zaurus_SL5000;
                         d-> m_modelstr = "Zaurus SL-5000D";
                 } else if ( model == "SL-5500" ) {
                         d-> m_model = Model_Zaurus_SL5500;
                         d-> m_modelstr = "Zaurus SL-5500";
                 }
         }
         else {
                 d-> m_model = Model_Zaurus_SL5000;
                 d-> m_modelstr = "Zaurus SL-5000D (unverified)";
         }
 
         m_leds [0] = Led_Off;
 }
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
 
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
         #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 
 /* --- for SHARP_BUZZER device --- */
 
         //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 //#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 
 //#define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 //#define SHARP_BUZ_KEYSOUND         2  /* key sound */