summaryrefslogtreecommitdiff
path: root/libopie2
authorerik <erik>2007-02-08 01:15:31 (UTC)
committer erik <erik>2007-02-08 01:15:31 (UTC)
commitc36a2e25a8875a31957968482ba8a0831a8b0aba (patch) (side-by-side diff)
tree73c5f9231d3fe7157d814d8a948f27e31eb87c81 /libopie2
parentc4aaefcbe64cecb35f1f1bfa10337e95d8ae439c (diff)
downloadopie-c36a2e25a8875a31957968482ba8a0831a8b0aba.zip
opie-c36a2e25a8875a31957968482ba8a0831a8b0aba.tar.gz
opie-c36a2e25a8875a31957968482ba8a0831a8b0aba.tar.bz2
This commit provides support for any iPAQ handheld that runs a 2.6 kernel
and follows the backlight class in sysfs. This patch was originally done by an unknown poster and maintained by Paul S. Thanks all who contributed.
Diffstat (limited to 'libopie2') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp71
1 files changed, 29 insertions, 42 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 16ecc27..02b685a 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -397,45 +397,19 @@ bool iPAQ::setDisplayBrightness ( int bright )
if ( bright < 0 )
bright = 0;
- QString cmdline;
-
- switch ( model()) {
- case Model_iPAQ_H191x:
- case Model_iPAQ_H4xxx:
- {
- QDir sysClass( "/sys/class/backlight/pxafb/" );
+ QDir sysClass( "/sys/class/backlight/" );
sysClass.setFilter(QDir::Dirs);
- int fd;
- if ( sysClass.exists() ) {
- QString sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/power" );
- fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK );
- if ( fd ) {
- char buf[10];
- buf[0] = bright ? 0 : 4;
- buf[1] = '\0';
- res = ( ::write( fd, &buf[0], 2 ) == 0 );
- ::close( fd );
- }
- sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/brightness" );
- fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK );
+ if ( sysClass.exists() && sysClass.count() > 2 ) {
+ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/brightness" );
+ int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK );
if ( fd ) {
char buf[100];
- int len = ::snprintf( &buf[0], sizeof buf, "%d", bright );
+ int val = bright * displayBrightnessResolution() / 255;
+ int len = ::snprintf( &buf[0], sizeof buf, "%d", val );
res = ( ::write( fd, &buf[0], len ) == 0 );
::close( fd );
}
- }
- }
- break;
-
- case Model_iPAQ_HX4700:
- cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/w100fb/brightness" ).arg( bright );
- // No Global::shellQuote as we gurantee it to be sane
- res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
- break;
-
-
- default:
+ } else {
if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
FLITE_IN bl;
bl. mode = 1;
@@ -445,11 +419,28 @@ bool iPAQ::setDisplayBrightness ( int bright )
::close ( fd );
}
}
+
return res;
}
int iPAQ::displayBrightnessResolution() const
{
+ int res = 16;
+
+ QDir sysClass( "/sys/class/backlight/" );
+ sysClass.setFilter(QDir::Dirs);
+ if ( sysClass.exists() && sysClass.count() > 2 ) {
+ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/max_brightness" );
+ int fd = ::open( sysClassPath, O_RDONLY|O_NONBLOCK );
+ if ( fd ) {
+ char buf[100];
+ if ( ::read( fd, &buf[0], sizeof buf ) )
+ ::sscanf( &buf[0], "%d", &res );
+ ::close( fd );
+ }
+ return res;
+ }
+
switch ( model()) {
case Model_iPAQ_H31xx:
case Model_iPAQ_H36xx:
@@ -478,11 +469,10 @@ bool iPAQ::setDisplayStatus ( bool on )
QString cmdline;
- if ( model() == Model_iPAQ_H191x ) {
- QDir sysClass( "/sys/class/lcd/pxafb/" );
+ QDir sysClass( "/sys/class/lcd/" );
sysClass.setFilter(QDir::Dirs);
- if ( sysClass.exists() ) {
- QString sysClassPath = sysClass.absFilePath( "/sys/class/lcd/pxafb/power" );
+ if ( sysClass.exists() && sysClass.count() > 2 ) {
+ QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/power" );
int fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK );
if ( fd ) {
char buf[10];
@@ -491,14 +481,10 @@ bool iPAQ::setDisplayStatus ( bool on )
res = ( ::write( fd, &buf[0], 2 ) == 0 );
::close( fd );
}
- }
- return res;
} else {
- return OAbstractMobileDevice::setDisplayStatus(on);
+ res = OAbstractMobileDevice::setDisplayStatus(on);
}
- res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
-
return res;
}
@@ -506,6 +492,7 @@ bool iPAQ::hasLightSensor() const
{
switch (model()) {
case Model_iPAQ_H191x:
+ case Model_iPAQ_H22xx:
case Model_iPAQ_H4xxx:
return false;
default: