Simpad:

  -We're not a KeyFilter remove the inheritance and installing of it
  -Use /proc/mq200/driver/backlight instead of PWM_CONTROL
  -Soft Suspend is dead long time do not reimplement it..

2 files changed, 4 insertions, 32 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
@@ -148,7 +148,2 @@ void SIMpad::initButtons()
 
-    if ( isQWS( ) ) {
-        addPreHandler(this);
-    }
-
-
     d->m_buttons = new QValueList <ODeviceButton>;
@@ -195,4 +190,3 @@ 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"
 
@@ -301,9 +295,2 @@ 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 * )
@@ -354,10 +341,2 @@ 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 )
@@ -382,9 +361,4 @@ 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
@@ -41,3 +41,3 @@ namespace Internal {
 
-class SIMpad : public ODevice, public QWSServer::KeyboardFilter
+class SIMpad : public ODevice
 { 
@@ -48,3 +48,2 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter
   public:
-    virtual bool setSoftSuspend( bool soft );
     virtual bool suspend();
@@ -63,3 +62,2 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter
   protected:
-    virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
     virtual void timerEvent( QTimerEvent *te );