- 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

2 files changed, 31 insertions, 24 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4c49c4f..8f4e296 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -387,48 +387,50 @@ int ODevice::lightSensorResolution ( ) const
  * 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 );	
 }
@@ -634,73 +636,81 @@ 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;
@@ -936,31 +946,25 @@ 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;
-//}
 
diff --git a/libopie/odevice.h b/libopie/odevice.h
index e07b91c..e50009c 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -8,59 +8,63 @@
                              
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
                                           
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef _LIBOPIE_ODEVICE_H_
 #define _LIBOPIE_ODEVICE_H_
 
 #include <qstring.h>
 #include <qnamespace.h>
 
 class ODeviceData;
 
 namespace Opie {
 
 enum OModel {
 	Model_Unknown,
+	
+	Model_Series_Mask   = 0xff000000,
 
-	Model_iPAQ = ( 1 << 16 ),
+	Model_iPAQ          = ( 1 << 24 ),
 
-	Model_iPAQ_H31xx = ( Model_iPAQ | 1 ),
-	Model_iPAQ_H36xx = ( Model_iPAQ | 2 ),
-	Model_iPAQ_H37xx = ( Model_iPAQ | 3 ),
-	Model_iPAQ_H38xx = ( Model_iPAQ | 4 ),
+	Model_iPAQ_All      = ( Model_iPAQ | 0xffffff ),
+	Model_iPAQ_H31xx    = ( Model_iPAQ | 0x000001 ),
+	Model_iPAQ_H36xx    = ( Model_iPAQ | 0x000002 ),
+	Model_iPAQ_H37xx    = ( Model_iPAQ | 0x000004 ),
+	Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
+	Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
 
-	Model_Zaurus = ( 2 << 16 ),
+	Model_Zaurus        = ( 2 << 24 ),
 
-	Model_Zaurus_SL5000 = ( Model_Zaurus | 1 ),
+	Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
 };
 
 enum OVendor {	
 	Vendor_Unknown,
 
 	Vendor_HP,
 	Vendor_Sharp
 };	
 
 enum OSystem {
 	System_Unknown,
 
 	System_Familiar,
 	System_Zaurus,
 	System_OpenZaurus
 };
 
 enum OLedState {
 	Led_Off,
 	Led_On,
 	Led_BlinkSlow,
 	Led_BlinkFast
 };
 
@@ -83,64 +87,63 @@ enum OHardKey {
 
 
 class ODevice
 {
 private:
 	ODevice ( const ODevice & );
 
 protected:
 	ODevice ( );
 	virtual void init ( );
 	
 	ODeviceData *d;
 
 public:
 	virtual ~ODevice ( );
 
 	static ODevice *inst ( );
 
 
 
 // information
 
 	QString modelString ( ) const; 
 	OModel model ( ) const;
+	inline OModel series ( ) const { return (OModel) ( model ( ) & Model_Series_Mask ); }
 	
 	QString vendorString ( ) const;
 	OVendor vendor ( ) const;
 
 	QString systemString ( ) const;
 	OSystem system ( ) const;
 
 	QString systemVersionString ( ) const;
 
 // system	
 
 	virtual bool setSoftSuspend ( bool on );
 	virtual bool suspend ( );
 
 	virtual bool setDisplayStatus ( bool on );
 	virtual bool setDisplayBrightness ( int brightness );
 	virtual int displayBrightnessResolution ( ) const;
 	
 // input / output
 
 	virtual void alarmSound ( );
 	virtual void keySound ( );
 	virtual void touchSound ( );
 
 	virtual QValueList <OLed> ledList ( ) const;
 	virtual QValueList <OLedState> ledStateList ( OLed led ) const;
 	virtual OLedState ledState ( OLed led ) const;
 	virtual bool setLedState ( OLed led, OLedState st );
 
 	virtual bool hasLightSensor ( ) const;
 	virtual int readLightSensor ( );
 	virtual int lightSensorResolution ( ) const;
-
-	//virtual QValueList <int> keyList ( ) const;
 };
 
 }
 
 #endif