summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-06 19:24:57 (UTC)
committer sandman <sandman>2002-09-06 19:24:57 (UTC)
commit98c0d3f0eca58993cb18e740f2a3d07d67c5c64d (patch) (side-by-side diff)
tree4215a42f10fb9afa11ddfefcf21c6808e2c1ffae
parent4acfa3f53762b6c786e421444d23c49c279e556f (diff)
downloadopie-98c0d3f0eca58993cb18e740f2a3d07d67c5c64d.zip
opie-98c0d3f0eca58993cb18e740f2a3d07d67c5c64d.tar.gz
opie-98c0d3f0eca58993cb18e740f2a3d07d67c5c64d.tar.bz2
Added new functionality to libopie / ODevice, regarding LCD control (on/off
brightness)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp164
-rw-r--r--libopie/odevice.h4
2 files changed, 148 insertions, 20 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 95fd6bd..6e3f114 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -25,4 +25,5 @@
#include <sys/time.h>
#include <linux/soundcard.h>
+#include <math.h>
#include <qapplication.h>
@@ -34,7 +35,12 @@
#include <qpe/config.h>
+#include "odevice.h"
+// _IO and friends are only defined in kernel headers ...
-#include "odevice.h"
+#define OD_IO(type,area,number,args) (( type << 30 ) | ( area << 8 ) | ( number ) | ( sizeof( args ) << 16 ))
+#define OD_IOW(area,number,args) OD_IO(1,area,number,args)
+#define OD_IOR(area,number,args) OD_IO(2,area,number,args)
+#define OD_IORW(area,number,args) OD_IO(3,area,number,args)
@@ -62,4 +68,7 @@ public:
virtual bool setPowerButtonHandler ( PowerButtonHandler h );
+ virtual bool setDisplayBrightness ( int b );
+ virtual int displayBrightnessResolution ( ) const;
+
virtual void alarmSound ( );
@@ -76,4 +85,7 @@ public:
virtual bool setPowerButtonHandler ( PowerButtonHandler h );
+ virtual bool setDisplayBrightness ( int b );
+ virtual int displayBrightnessResolution ( ) const;
+
virtual void alarmSound ( );
virtual void keySound ( );
@@ -108,4 +120,12 @@ ODevice *ODevice::inst ( )
}
+
+/**************************************************
+ *
+ * common
+ *
+ **************************************************/
+
+
ODevice::ODevice ( )
{
@@ -130,10 +150,4 @@ ODevice::~ODevice ( )
}
-//#include <linux/apm_bios.h>
-
-//#define APM_IOC_SUSPEND _IO('A',2)
-
-#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 ))
-
bool ODevice::setPowerButtonHandler ( ODevice::PowerButtonHandler )
{
@@ -141,4 +155,9 @@ bool ODevice::setPowerButtonHandler ( ODevice::PowerButtonHandler )
}
+//#include <linux/apm_bios.h>
+
+#define APM_IOC_SUSPEND OD_IO( 0, 'A', 2, 0 )
+
+
bool ODevice::suspend ( )
{
@@ -178,4 +197,39 @@ bool ODevice::suspend ( )
}
+//#include <linux/fb.h> better not rely on kernel headers in userspace ...
+
+#define FBIOBLANK OD_IO( 0, 'F', 0x11, 0 ) // 0x4611
+
+/* VESA Blanking Levels */
+#define VESA_NO_BLANKING 0
+#define VESA_VSYNC_SUSPEND 1
+#define VESA_HSYNC_SUSPEND 2
+#define VESA_POWERDOWN 3
+
+
+bool ODevice::setDisplayStatus ( bool on )
+{
+ if ( d-> m_model == OMODEL_Unknown )
+ return false;
+
+ bool res = false;
+ int fd;
+
+ if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) {
+ res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
+ ::close ( fd );
+ }
+ return res;
+}
+
+bool ODevice::setDisplayBrightness ( int )
+{
+ return false;
+}
+
+int ODevice::displayBrightnessResolution ( ) const
+{
+ return 16;
+}
QString ODevice::vendorString ( )
@@ -244,9 +298,7 @@ void ODevice::touchSound ( )
#ifndef QT_NO_SOUND
static Sound snd ( "touchsound" );
-//qDebug("touchSound");
- if ( snd. isFinished ( )) {
+
+ if ( snd. isFinished ( ))
snd. play ( );
-// qDebug("sound should play");
- }
#endif
#endif
@@ -271,6 +323,9 @@ bool ODevice::setLed ( uint /*which*/, OLedState /*st*/ )
-//#if defined( QT_QWS_IPAQ ) // IPAQ
-
+/**************************************************
+ *
+ * iPAQ
+ *
+ **************************************************/
void ODeviceIPAQ::init ( )
@@ -316,5 +371,5 @@ void ODeviceIPAQ::init ( )
//#include <linux/h3600_ts.h> // including kernel headers is evil ...
-typedef struct h3600_ts_led {
+typedef struct {
unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */
unsigned char TotalTime; /* Units of 5 seconds */
@@ -323,8 +378,12 @@ typedef struct h3600_ts_led {
} LED_IN;
+typedef struct {
+ unsigned char mode;
+ unsigned char pwr;
+ unsigned char brightness;
+} FLITE_IN;
-// #define IOC_H3600_TS_MAGIC 'f'
-// #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led)
-#define LED_ON (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :(
+#define LED_ON OD_IOW( 'f', 5, LED_IN )
+#define FLITE_ON OD_IOW( 'f', 7, FLITE_IN )
@@ -391,5 +450,5 @@ bool ODeviceIPAQ::setLed ( uint which, OLedState st )
if ( which == 0 ) {
if ( fd >= 0 ) {
- struct h3600_ts_led leds;
+ LED_IN leds;
::memset ( &leds, 0, sizeof( leds ));
leds. TotalTime = 0;
@@ -434,5 +493,42 @@ bool ODeviceIPAQ::setPowerButtonHandler ( ODevice::PowerButtonHandler p )
+bool ODeviceIPAQ::setDisplayBrightness ( int bright )
+{
+ bool res = false;
+ int fd;
+
+ if ( bright > 255 )
+ bright = 255;
+ if ( bright < 0 )
+ bright = 0;
+
+ // 128 is the maximum if you want a decent lifetime for the LCD
+
+ bright = (int) (( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic
+// bright = ( bright + 1 ) / 2;
+
+ if ((( fd = ::open ( "/dev/ts", O_WRONLY )) >= 0 ) ||
+ (( fd = ::open ( "/dev/h3600_ts", 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 ODeviceIPAQ::displayBrightnessResolution ( ) const
+{
+ return 255; // really 128, but logarithmic control is smoother this way
+}
+
+/**************************************************
+ *
+ * Zaurus
+ *
+ **************************************************/
@@ -521,8 +617,9 @@ typedef struct sharp_led_status {
// #include <asm/sharp_apm.h> // including kernel headers is evil ...
-#define APM_IOCGEVTSRC (( 2 ) | ( 'A'<<8 ) | ( 203 ) | ( sizeof(int) ))
-#define APM_IOCSEVTSRC (( 3 ) | ( 'A'<<8 ) | ( 204 ) | ( sizeof(int) ))
+#define APM_IOCGEVTSRC OD_IOR( 'A', 203, int )
+#define APM_IOCSEVTSRC OD_IORW( 'A', 204, int )
#define APM_EVT_POWER_BUTTON (1 << 0)
+#define FL_IOCTL_STEP_CONTRAST 100
@@ -622,2 +719,29 @@ bool ODeviceZaurus::setPowerButtonHandler ( ODevice::PowerButtonHandler p )
return res;
}
+
+
+bool ODeviceZaurus::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 ODeviceZaurus::displayBrightnessResolution ( ) const
+{
+ return 4;
+}
diff --git a/libopie/odevice.h b/libopie/odevice.h
index ee01f0f..9dda68e 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -76,4 +76,8 @@ public:
virtual bool suspend ( );
+ virtual bool setDisplayStatus ( bool on );
+ virtual bool setDisplayBrightness ( int brightness );
+ virtual int displayBrightnessResolution ( ) const;
+
// information