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
@@ -405,12 +405,14 @@ void iPAQ::init ( )
                 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 ( );
         }
 
@@ -652,23 +654,19 @@ bool iPAQ::setSoftSuspend ( bool soft )
 
 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 );
@@ -676,13 +674,25 @@ bool iPAQ::setDisplayBrightness ( int bright )
         }
         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;
@@ -954,13 +964,7 @@ bool Zaurus::setDisplayBrightness ( int bright )
 
 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;
-//}