summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_jornada.cpp54
-rw-r--r--libopie2/opiecore/device/odevice_jornada.h3
2 files changed, 37 insertions, 20 deletions
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index ad2f830..75c9fc5 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -102,9 +102,9 @@ void Jornada::init(const QString&)
int Jornada::displayBrightnessResolution() const
{
- return 0;
+ return 255;
}
bool Jornada::setDisplayBrightness( int bright )
@@ -116,35 +116,51 @@ bool Jornada::setDisplayBrightness( int bright )
bright = 255;
if ( bright < 0 )
bright = 0;
- 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 );
- }
+ QString cmdline;
+
+ int value = 255 - bright;
+ if ( !bright )
+ cmdline = QString().sprintf( "echo 0 > /sys/class/backlight/sa1100fb/power");
+ else
+ cmdline = QString().sprintf( "echo 1 > /sys/class/backlight/sa1100fb/power; echo %d > /sys/class/backlight/sa1100fb/brightness", value );
+
+ res = ( ::system( (const char*) cmdline ) == 0 );
+
return res;
}
-bool Jornada::setSoftSuspend( bool soft )
+bool Jornada::suspend( )
+{
+ qDebug("ODevice::suspend");
+ if ( !isQWS( ) ) // only qwsserver is allowed to suspend
+ return false;
+
+ if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
+ return false;
+
+ bool res = false;
+ ODevice::sendSuspendmsg();
+
+ struct timeval tvs, tvn;
+ ::gettimeofday ( &tvs, 0 );
+
+ ::sync(); // flush fs caches
+ res = ( ::system ( "apm --suspend" ) == 0 );
+
+ return res;
+}
+
+bool Jornada::setDisplayStatus ( bool on )
{
bool res = false;
int fd;
- if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
- if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 )
- res = true;
- else
- ::perror ( "write to /proc/sys/ts/suspend_button_mode" );
+ QString cmdline = QString().sprintf( "echo %d > /sys/class/lcd/sa1100fb/power; echo %d > /sys/class/backlight/sa1100fb/power", on ? "1" : "0",on ? "1" : "0" );
- ::close ( fd );
- }
- else
- ::perror ( "/proc/sys/ts/suspend_button_mode" );
+ res = ( ::system( (const char*) cmdline ) == 0 );
return res;
}
diff --git a/libopie2/opiecore/device/odevice_jornada.h b/libopie2/opiecore/device/odevice_jornada.h
index fddfe34..2a9e821 100644
--- a/libopie2/opiecore/device/odevice_jornada.h
+++ b/libopie2/opiecore/device/odevice_jornada.h
@@ -41,10 +41,11 @@ class Jornada : public ODevice
protected:
virtual void init(const QString&);
public:
- virtual bool setSoftSuspend ( bool soft );
+ virtual bool suspend ( );
virtual bool setDisplayBrightness ( int b );
+ virtual bool setDisplayStatus ( bool on);
virtual int displayBrightnessResolution() const;
};
}
}