- read ( fd, buffer, 4 ); return 5 (!!) for /proc/hal/light_sensor

  so we better try to read 5 bytes ...
- small "off by one" fix for the lcd brightness resolution

1 files changed, 7 insertions, 7 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 6ea4d45..2b7e927 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -661,59 +661,59 @@ bool iPAQ::setDisplayBrightness ( int bright )
 		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 255; // really 128, but logarithmic control is smoother this way
+	return 256; // really 128, but logarithmic control is smoother this way
 }
 
 
 bool iPAQ::hasLightSensor ( ) const
 {
 	return true;
 }
-
+#include <errno.h>
+#include <string.h>
 int iPAQ::readLightSensor ( )
 {
 	int fd;
 	int val = -1;
 	
 	if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) {
-		char buffer [5];
+		char buffer [8];
 	
-		if ( ::read ( fd, buffer, 4 ) == 4 ) {
+		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;
 }
 
 
 /**************************************************
  *
  * Zaurus
  *
  **************************************************/
 
 
 
 void Zaurus::init ( )
@@ -933,26 +933,26 @@ bool Zaurus::setDisplayBrightness ( int bright )
 	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 4;
+	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;
 //}