| -rw-r--r-- | libopie2/opiecore/device/odevice_simpad.cpp | 32 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_simpad.h | 6 |
2 files changed, 5 insertions, 33 deletions
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp index 34876da..335e0db 100644 --- a/libopie2/opiecore/device/odevice_simpad.cpp +++ b/libopie2/opiecore/device/odevice_simpad.cpp @@ -147,9 +147,4 @@ void SIMpad::initButtons() return; - if ( isQWS( ) ) { - addPreHandler(this); - } - - d->m_buttons = new QValueList <ODeviceButton>; @@ -194,6 +189,5 @@ void SIMpad::initButtons() //SIMpad touchscreen backlight strength control -#define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/registers/PWM_CONTROL" -#define SIMPAD_BACKLIGHT_MASK 0x00a10044 +#define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/backlight" @@ -300,11 +294,4 @@ bool SIMpad::setLedState ( OLed l, OLedState st ) } - -bool SIMpad::filter ( int /*unicode*/, int /*keycode*/, int /*modifiers*/, bool /*isPress*/, bool /*autoRepeat*/ ) -{ - //TODO - return false; -} - void SIMpad::timerEvent ( QTimerEvent * ) { @@ -353,12 +340,4 @@ bool SIMpad::suspend() // Must override because SIMpad does NOT have apm } - -bool SIMpad::setSoftSuspend ( bool soft ) -{ - qDebug( "ODevice for SIMpad: UNHANDLED setSoftSuspend(%s)", soft? "on" : "off" ); - return false; -} - - bool SIMpad::setDisplayStatus ( bool on ) { @@ -381,11 +360,6 @@ bool SIMpad::setDisplayBrightness ( int bright ) if (( fd = ::open ( SIMPAD_BACKLIGHT_CONTROL, O_WRONLY )) >= 0 ) { - int value = 255 - bright; - const int mask = SIMPAD_BACKLIGHT_MASK; - value = value << 8; - value += mask; - char writeCommand[100]; - const int count = snprintf( writeCommand, sizeof(writeCommand), "0x%x\n", value ); - res = ( ::write ( fd, writeCommand, count ) != -1 ); + QCString str = QFile::encodeName( QString::number(bright)); + res = ( ::write(fd, str, str.length()) != -1 ); ::close ( fd ); } diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h index 6c42be7..dbcbbb4 100644 --- a/libopie2/opiecore/device/odevice_simpad.h +++ b/libopie2/opiecore/device/odevice_simpad.h @@ -40,5 +40,5 @@ namespace Core { namespace Internal { -class SIMpad : public ODevice, public QWSServer::KeyboardFilter +class SIMpad : public ODevice { protected: @@ -47,5 +47,4 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter public: - virtual bool setSoftSuspend( bool soft ); virtual bool suspend(); @@ -61,6 +60,5 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter virtual bool setLedState( OLed led, OLedState st ); - protected: - virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); +protected: virtual void timerEvent( QTimerEvent *te ); |