- 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 !!

2 files changed, 54 insertions, 5 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 58bd663..44fe35f 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -83,6 +83,9 @@ public:
 	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;
 	
@@ -356,6 +359,15 @@ 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
@@ -666,6 +678,36 @@ int iPAQ::displayBrightnessResolution ( ) const
 }
 
 
+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
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 38f3787..be2a9c7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -30,12 +30,16 @@ namespace Opie {
 enum OModel {
 	Model_Unknown,
 
-	Model_iPAQ_H31xx,
-	Model_iPAQ_H36xx,
-	Model_iPAQ_H37xx,
-	Model_iPAQ_H38xx,
+	Model_iPAQ = ( 1 << 16 ),
 
-	Model_Zaurus_SL5000
+	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_Zaurus = ( 2 << 16 ),
+
+	Model_Zaurus_SL5000 = ( Model_Zaurus | 1 ),
 };
 
 enum OVendor {	
@@ -129,6 +133,9 @@ public:
 	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;
 };