| -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 @@ -145,13 +145,8 @@ void SIMpad::initButtons() { if ( d->m_buttons ) return; - if ( isQWS( ) ) { - addPreHandler(this); - } - - d->m_buttons = new QValueList <ODeviceButton>; for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) { s_button *sb = simpad_buttons + i; @@ -192,10 +187,9 @@ void SIMpad::initButtons() #define SIMPAD_ENABLE_5V 0x4000 // Enable 5V circuit #define SIMPAD_RESET_SIMCARD 0x8000 //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" /* * The SIMpad exposes ChipSelect3 to userspace @@ -298,15 +292,8 @@ bool SIMpad::setLedState ( OLed l, OLedState st ) return false; } - -bool SIMpad::filter ( int /*unicode*/, int /*keycode*/, int /*modifiers*/, bool /*isPress*/, bool /*autoRepeat*/ ) -{ - //TODO - return false; -} - void SIMpad::timerEvent ( QTimerEvent * ) { killTimer ( m_power_timer ); m_power_timer = 0; @@ -351,16 +338,8 @@ bool SIMpad::suspend() // Must override because SIMpad does NOT have apm return res; } - -bool SIMpad::setSoftSuspend ( bool soft ) -{ - qDebug( "ODevice for SIMpad: UNHANDLED setSoftSuspend(%s)", soft? "on" : "off" ); - return false; -} - - bool SIMpad::setDisplayStatus ( bool on ) { qDebug( "ODevice for SIMpad: setDisplayStatus(%s)", on? "on" : "off" ); @@ -379,15 +358,10 @@ bool SIMpad::setDisplayBrightness ( int bright ) if ( bright < 1 ) bright = 0; 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 ); } return res; } 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 @@ -38,16 +38,15 @@ namespace Opie { namespace Core { namespace Internal { -class SIMpad : public ODevice, public QWSServer::KeyboardFilter +class SIMpad : public ODevice { protected: virtual void init(const QString&); virtual void initButtons(); public: - virtual bool setSoftSuspend( bool soft ); virtual bool suspend(); virtual bool setDisplayStatus( bool on ); virtual bool setDisplayBrightness( int b ); @@ -59,10 +58,9 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter virtual QValueList <OLedState> ledStateList( OLed led ) const; virtual OLedState ledState( OLed led ) const; 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 ); int m_power_timer; |