author | sandman <sandman> | 2002-09-06 19:24:57 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-06 19:24:57 (UTC) |
commit | 98c0d3f0eca58993cb18e740f2a3d07d67c5c64d (patch) (side-by-side diff) | |
tree | 4215a42f10fb9afa11ddfefcf21c6808e2c1ffae | |
parent | 4acfa3f53762b6c786e421444d23c49c279e556f (diff) | |
download | opie-98c0d3f0eca58993cb18e740f2a3d07d67c5c64d.zip opie-98c0d3f0eca58993cb18e740f2a3d07d67c5c64d.tar.gz opie-98c0d3f0eca58993cb18e740f2a3d07d67c5c64d.tar.bz2 |
Added new functionality to libopie / ODevice, regarding LCD control (on/off
brightness)
-rw-r--r-- | libopie/odevice.cpp | 164 | ||||
-rw-r--r-- | libopie/odevice.h | 4 |
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 @@ -21,24 +21,30 @@ #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> #include <signal.h> #include <sys/time.h> #include <linux/soundcard.h> +#include <math.h> #include <qapplication.h> #include <qfile.h> #include <qtextstream.h> #include <qpe/sound.h> #include <qpe/resource.h> #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) class ODeviceData { public: QString m_vendorstr; OVendor m_vendor; @@ -58,12 +64,15 @@ class ODeviceIPAQ : public ODevice { protected: virtual void init ( ); public: virtual bool setPowerButtonHandler ( PowerButtonHandler h ); + virtual bool setDisplayBrightness ( int b ); + virtual int displayBrightnessResolution ( ) const; + virtual void alarmSound ( ); virtual uint hasLeds ( ) const; virtual OLedState led ( uint which ) const; virtual bool setLed ( uint which, OLedState st ); }; @@ -72,12 +81,15 @@ class ODeviceZaurus : public ODevice { protected: virtual void init ( ); public: virtual bool setPowerButtonHandler ( PowerButtonHandler h ); + virtual bool setDisplayBrightness ( int b ); + virtual int displayBrightnessResolution ( ) const; + virtual void alarmSound ( ); virtual void keySound ( ); virtual void touchSound ( ); virtual uint hasLeds ( ) const; virtual OLedState led ( uint which ) const; @@ -104,12 +116,20 @@ ODevice *ODevice::inst ( ) dev-> init ( ); } return dev; } + +/************************************************** + * + * common + * + **************************************************/ + + ODevice::ODevice ( ) { d = new ODeviceData; d-> m_modelstr = "Unknown"; d-> m_model = OMODEL_Unknown; @@ -126,23 +146,22 @@ void ODevice::init ( ) ODevice::~ODevice ( ) { delete d; } -//#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 ) { return false; } +//#include <linux/apm_bios.h> + +#define APM_IOC_SUSPEND OD_IO( 0, 'A', 2, 0 ) + + bool ODevice::suspend ( ) { if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices return false; int fd; @@ -174,12 +193,47 @@ bool ODevice::suspend ( ) ::signal ( SIGTSTP, SIG_DFL ); } return res; } +//#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 ( ) { return d-> m_vendorstr; } @@ -240,17 +294,15 @@ void ODevice::keySound ( ) void ODevice::touchSound ( ) { #ifndef QT_QWS_EBX #ifndef QT_NO_SOUND static Sound snd ( "touchsound" ); -//qDebug("touchSound"); - if ( snd. isFinished ( )) { + + if ( snd. isFinished ( )) snd. play ( ); -// qDebug("sound should play"); - } #endif #endif } uint ODevice::hasLeds ( ) const { @@ -267,14 +319,17 @@ bool ODevice::setLed ( uint /*which*/, OLedState /*st*/ ) return false; } -//#if defined( QT_QWS_IPAQ ) // IPAQ - +/************************************************** + * + * iPAQ + * + **************************************************/ void ODeviceIPAQ::init ( ) { d-> m_vendorstr = "HP"; d-> m_vendor = OVENDOR_HP; @@ -312,23 +367,27 @@ void ODeviceIPAQ::init ( ) d-> m_leds [0] = OLED_Off; } //#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 */ unsigned char OnTime; /* units of 100m/s */ unsigned char OffTime; /* units of 100m/s */ } 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 ) void ODeviceIPAQ::alarmSound ( ) { #if defined( QT_QWS_IPAQ ) // IPAQ #ifndef QT_NO_SOUND @@ -387,13 +446,13 @@ OLedState ODeviceIPAQ::led ( uint which ) const bool ODeviceIPAQ::setLed ( uint which, OLedState st ) { static int fd = ::open ( "/dev/touchscreen/0", O_RDWR|O_NONBLOCK ); if ( which == 0 ) { if ( fd >= 0 ) { - struct h3600_ts_led leds; + LED_IN leds; ::memset ( &leds, 0, sizeof( leds )); leds. TotalTime = 0; leds. OnTime = 0; leds. OffTime = 1; leds. OffOnBlink = 2; @@ -430,13 +489,50 @@ bool ODeviceIPAQ::setPowerButtonHandler ( ODevice::PowerButtonHandler p ) ::perror ( "/proc/sys/ts/suspend_button_mode" ); return res; } +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 + * + **************************************************/ void ODeviceZaurus::init ( ) { d-> m_modelstr = "Zaurus SL5000"; @@ -517,16 +613,17 @@ typedef struct sharp_led_status { #define LED_MAIL_NO_UNREAD_MAIL 0 /* for SHARP_LED_MAIL_EXISTS */ #define LED_MAIL_NEWMAIL_EXISTS 1 /* for SHARP_LED_MAIL_EXISTS */ #define LED_MAIL_UNREAD_MAIL_EX 2 /* for SHARP_LED_MAIL_EXISTS */ // #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 void ODeviceZaurus::buzzer ( int sound ) { static int fd = ::open ( "/dev/sharp_buz", O_RDWR|O_NONBLOCK ); @@ -618,6 +715,33 @@ bool ODeviceZaurus::setPowerButtonHandler ( ODevice::PowerButtonHandler p ) } else perror ( "/dev/apm_bios or /dev/misc/apm_bios" ); 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 @@ -72,12 +72,16 @@ public: OPIE }; virtual bool setPowerButtonHandler ( PowerButtonHandler h ); virtual bool suspend ( ); + virtual bool setDisplayStatus ( bool on ); + virtual bool setDisplayBrightness ( int brightness ); + virtual int displayBrightnessResolution ( ) const; + // information QString modelString ( ); OModel model ( ); QString vendorString ( ); |