- new function to check for and read the light sensor

- redone the Model enum, to make it easier to check for "any iPAQ"
  !! This means every application using this enum has to be recompiled !!

1 files changed, 42 insertions, 0 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 58bd663..44fe35f 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -75,24 +75,27 @@ public:
 	virtual bool setSoftSuspend ( bool soft );
 
 	virtual bool setDisplayBrightness ( int b );
 	virtual int displayBrightnessResolution ( ) const;
 
 	virtual void alarmSound ( );
 	
     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 QValueList <int> keyList ( ) const;
 	
 protected:
 	virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
 	virtual void timerEvent ( QTimerEvent *te );
 	
 	int m_power_timer;
 	
 	OLedState m_leds [2];
 };
 
 class Zaurus : public ODevice {
@@ -347,24 +350,33 @@ QValueList <OLedState> ODevice::ledStateList ( OLed /*which*/ ) const
 }
 
 OLedState ODevice::ledState ( OLed /*which*/ ) const
 {
 	return Led_Off;
 }
 
 bool ODevice::setLedState ( OLed /*which*/, OLedState /*st*/ )
 {
 	return false;
 }
 
+bool ODevice::hasLightSensor ( ) const
+{
+	return false;
+}
+
+int ODevice::readLightSensor ( )
+{
+	return -1;
+}
 
 
 //QValueList <int> ODevice::keyList ( ) const
 //{
 //	return QValueList <int> ( );
 //}
 
 
 
 /**************************************************
  *
  * iPAQ
@@ -657,24 +669,54 @@ bool iPAQ::setDisplayBrightness ( int 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
 }
 
 
+bool iPAQ::hasLightSensor ( ) const
+{
+	return true;
+}
+
+int iPAQ::readLightSensor ( )
+{
+	int fd;
+	int val = -1;
+	
+	if (( fd = ::open ( "/proc/hal/lightsensor", O_RDONLY )) >= 0 ) {
+		char buffer [5];
+	
+		if ( ::read ( fd, buffer, 4 ) == 4 ) {
+			char *endptr;
+		
+			buffer [4] = 0;
+			val = ::strtol ( buffer + 2, &endptr, 16 );
+			
+			if ( *endptr != 0 )
+				val = -1;
+		}
+	
+		::close ( fd );
+	}
+
+	return val;
+}
+
+
 /**************************************************
  *
  * Zaurus
  *
  **************************************************/
 
 
 
 void Zaurus::init ( )
 {
 	d-> m_modelstr = "Zaurus SL5000";
 	d-> m_model = Model_Zaurus_SL5000;