author | erik <erik> | 2007-02-08 01:15:31 (UTC) |
---|---|---|
committer | erik <erik> | 2007-02-08 01:15:31 (UTC) |
commit | c36a2e25a8875a31957968482ba8a0831a8b0aba (patch) (side-by-side diff) | |
tree | 73c5f9231d3fe7157d814d8a948f27e31eb87c81 /libopie2/opiecore/device | |
parent | c4aaefcbe64cecb35f1f1bfa10337e95d8ae439c (diff) | |
download | opie-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.
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 71 |
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 @@ -394,65 +394,56 @@ bool iPAQ::setDisplayBrightness ( int bright ) if ( bright > 255 ) bright = 255; 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; bl. pwr = bright ? 1 : 0; bl. brightness = ( bright * ( displayBrightnessResolution() - 1 ) + 127 ) / 255; res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); ::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: case Model_iPAQ_H37xx: return 128; // really 256, but >128 could damage the LCD @@ -475,40 +466,36 @@ int iPAQ::displayBrightnessResolution() const bool iPAQ::setDisplayStatus ( bool on ) { bool res = false; 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]; buf[0] = on ? 0 : 4; buf[1] = '\0'; 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; } bool iPAQ::hasLightSensor() const { switch (model()) { case Model_iPAQ_H191x: + case Model_iPAQ_H22xx: case Model_iPAQ_H4xxx: return false; default: return true; } } |