- redone the Model enum to make it easy to check for series (like: is this an

  iPAQ - and not is this a 31xx or 36xx or ...)
- fixed the disply brightness resolution bug on H38xx

1 files changed, 19 insertions, 15 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4c49c4f..8f4e296 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -379,64 +379,66 @@ int ODevice::lightSensorResolution ( ) const
 //{
         //return QValueList <int> ( );
 //}
 
 
 
 /**************************************************
  *
  * iPAQ
  *
  **************************************************/
 
 void iPAQ::init ( )
 {
         d-> m_vendorstr = "HP";
         d-> m_vendor = Vendor_HP;
 
         QFile f ( "/proc/hal/model" );
 
         if ( f. open ( IO_ReadOnly )) {
                 QTextStream ts ( &f );
 
                 d-> m_modelstr = "H" + ts. readLine ( );
 
                 if ( d-> m_modelstr == "H3100" )
                         d-> m_model = Model_iPAQ_H31xx;
                 else if ( d-> m_modelstr == "H3600" )
                         d-> m_model = Model_iPAQ_H36xx;
                 else if ( d-> m_modelstr == "H3700" )
                         d-> m_model = Model_iPAQ_H37xx;
                 else if ( d-> m_modelstr == "H3800" )
                         d-> m_model = Model_iPAQ_H38xx;
+                else if ( d-> m_modelstr == "H3900" )
+                        d-> m_model = Model_iPAQ_H39xx;
                 else
                         d-> m_model = Model_Unknown;
 
                 f. close ( );
         }
 
         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 */
@@ -626,89 +628,97 @@ void iPAQ::alarmSound ( )
                 ::close ( fd );
         }
 #endif
 #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;
+        int maxbright = displayBrightnessResolution ( );
+        
+        if ( bright > maxbright )
+                bright = maxbright;
         if ( bright < 0 )
                 bright = 0;
 
-        // 128 is the maximum if you want a decent lifetime for the LCD
-        
-        if ( bright > 1 ) 
-                bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic
-        //bright = ( bright + 1 ) / 2;
-        
         if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
                 FLITE_IN bl;
                 bl. mode = 1;
                 bl. pwr = bright ? 1 : 0;
                 bl. brightness = bright;
                 res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
                 ::close ( fd );
         }
         return res;
 }
 
 int iPAQ::displayBrightnessResolution ( ) const
 {
-        return 256; // really 128, but logarithmic control is smoother this way
+        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
@@ -928,39 +938,33 @@ bool Zaurus::setSoftSuspend ( bool soft )
                 perror ( "/dev/apm_bios or /dev/misc/apm_bios" );
                 
     return res;
 }
 
 
 bool Zaurus::setDisplayBrightness ( int bright )
 {
         bool res = false;
         int fd;
         
         if ( bright > 255 )
                 bright = 255;
         if ( bright < 0 )
                 bright = 0;
         
         if (( fd = ::open ( "/dev/fl", O_WRONLY )) >= 0 ) {
                 int bl = ( bright * 4 + 127 ) / 255; // only 4 steps on zaurus
                 if ( bright && !bl )
                         bl = 1;
                 res = ( ::ioctl ( fd, FL_IOCTL_STEP_CONTRAST, bl ) == 0 );
                 ::close ( fd );
         }
         return res;
 }
 
 
 int Zaurus::displayBrightnessResolution ( ) const 
 {
         return 5;
 }
 
-//QValueList <int> Zaurus::keyList ( ) const
-//{
-        //QValueList <int> vl;
-        //vl << HardKey_Datebook << HardKey_Contacts << HardKey_Mail << HardKey_Menu << HardKey_Home << HardKey_Suspend << HardKey_Backlight;
-        //return vl;
-//}