summaryrefslogtreecommitdiff
authoraquadran <aquadran>2006-06-09 08:27:01 (UTC)
committer aquadran <aquadran>2006-06-09 08:27:01 (UTC)
commitb06b849f271079b0dd5d3419ad1162232ff4a9f5 (patch) (side-by-side diff)
treedfa7d602169ff414ee76f37c400ac3d2eff801d2
parentab1422b3e7df8644d6df2519f5ef5b5c831e3965 (diff)
downloadopie-b06b849f271079b0dd5d3419ad1162232ff4a9f5.zip
opie-b06b849f271079b0dd5d3419ad1162232ff4a9f5.tar.gz
opie-b06b849f271079b0dd5d3419ad1162232ff4a9f5.tar.bz2
changed access method for lcd sys params of ipaq h191x and mypal a716 based on Slavek Banko patch
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp53
-rw-r--r--libopie2/opiecore/device/odevice_mypal.cpp55
2 files changed, 79 insertions, 29 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index e6e3145..63b60a7 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -26,16 +26,17 @@
Boston, MA 02111-1307, USA.
*/
#include "odevice_ipaq.h"
/* QT */
#include <qapplication.h>
+#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qwindowsystem_qws.h>
/* OPIE */
#include <qpe/config.h>
#include <qpe/sound.h>
#include <qpe/qcopenvelope_qws.h>
@@ -374,22 +375,40 @@ bool iPAQ::setDisplayBrightness ( int bright )
bright = 255;
if ( bright < 0 )
bright = 0;
QString cmdline;
switch ( model()) {
case Model_iPAQ_H191x:
- if ( !bright )
- cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/pxafb/power");
- else
- cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/pxafb/power; echo %1 > /sys/class/backlight/pxafb/brightness" ).arg( bright );
- // No Global::shellQuote as we gurantee it to be sane
- res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
+ {
+ QDir sysClass( "/sys/class/backlight/pxafb/" );
+ 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 ( fd ) {
+ char buf[100];
+ int len = ::snprintf( &buf[0], sizeof buf, "%d", bright );
+ 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;
@@ -432,29 +451,47 @@ int iPAQ::displayBrightnessResolution() const
bool iPAQ::setDisplayStatus ( bool on )
{
bool res = false;
QString cmdline;
if ( model() == Model_iPAQ_H191x ) {
- cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/pxafb/power; echo %2 > /sys/class/backlight/pxafb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
+ QDir sysClass( "/sys/class/lcd/pxafb/" );
+ sysClass.setFilter(QDir::Dirs);
+ if ( sysClass.exists() ) {
+ QString sysClassPath = sysClass.absFilePath( "/sys/class/lcd/pxafb/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 = ( ::system( QFile::encodeName(cmdline) ) == 0 );
return res;
}
bool iPAQ::hasLightSensor() const
{
- return true;
+ switch (model()) {
+ case Model_iPAQ_H191x:
+ return false;
+ default:
+ return true;
+ }
}
int iPAQ::readLightSensor()
{
int fd;
int val = -1;
if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) {
diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp
index 7e1245a..7eb8d1d 100644
--- a/libopie2/opiecore/device/odevice_mypal.cpp
+++ b/libopie2/opiecore/device/odevice_mypal.cpp
@@ -26,16 +26,17 @@
Boston, MA 02111-1307, USA.
*/
#include "odevice_mypal.h"
/* QT */
#include <qapplication.h>
+#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qwindowsystem_qws.h>
/* OPIE */
#include <qpe/config.h>
#include <qpe/sound.h>
#include <qpe/qcopenvelope_qws.h>
@@ -201,29 +202,37 @@ bool MyPal::setDisplayBrightness ( int bright )
{
bool res = false;
if ( bright > 255 )
bright = 255;
if ( bright < 0 )
bright = 0;
- QString cmdline;
-
- switch ( model()) {
- case Model_MyPal_716:
- if ( !bright )
- cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/pxafb/power");
- else
- cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/pxafb/power; echo %1 > /sys/class/backlight/pxafb/brightness" ).arg( bright );
- // No Global::shellQuote as we gurantee it to be sane
- res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
- break;
- default:
- res = OAbstractMobileDevice::setDisplayBrightness(bright);
+ QDir sysClass( "/sys/class/backlight/pxafb/" );
+ 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 ( fd ) {
+ char buf[100];
+ int len = ::snprintf( &buf[0], sizeof buf, "%d", bright );
+ res = ( ::write( fd, &buf[0], len ) == 0 );
+ ::close( fd );
+ }
}
return res;
}
int MyPal::displayBrightnessResolution() const
{
switch ( model()) {
@@ -233,20 +242,24 @@ int MyPal::displayBrightnessResolution() const
return OAbstractMobileDevice::displayBrightnessResolution();
}
}
bool MyPal::setDisplayStatus ( bool on )
{
bool res = false;
- QString cmdline;
-
- if ( model() == Model_MyPal_716 ) {
- cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/pxafb/power; echo %2 > /sys/class/backlight/pxafb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
- } else {
- return OAbstractMobileDevice::setDisplayStatus(on);
+ QDir sysClass( "/sys/class/lcd/" );
+ sysClass.setFilter(QDir::Dirs);
+ if ( sysClass.exists() ) {
+ QString sysClassPath = sysClass.absFilePath( "/sys/class/lcd/pxafb/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 );
+ }
}
- res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
-
return res;
}