8 files changed, 2 insertions, 82 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index a824392..3d69614 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -233,53 +233,48 @@ void ODevice::initButtons()
     qDebug ( "init Buttons" );
     d->m_buttons = new QValueList <ODeviceButton>;
     for ( uint i = 0; i < ( sizeof( default_buttons ) / sizeof( default_button )); i++ ) {
         default_button *db = default_buttons + i;
         ODeviceButton b;
         b. setKeycode ( db->code );
         b. setUserText ( QObject::tr ( "Button", db->utext ));
         b. setPixmap ( Resource::loadPixmap ( db->pix ));
         b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( db->fpressedservice ), db->fpressedaction ));
         b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( db->fheldservice ), db->fheldaction ));
         d->m_buttons->append ( b );
     }
 
     reloadButtonMapping();
 }
 
 ODevice::~ODevice()
 {
 // we leak m_devicebuttons and m_cpu_frequency
 // but it's a singleton and it is not so importantant
 // -zecke
     delete d;
 }
 
-bool ODevice::setSoftSuspend ( bool /*soft*/ )
-{
-    return false;
-}
-
 //#include <linux/apm_bios.h>
 
 #define APM_IOC_SUSPEND          OD_IO( 'A', 2 )
 
 /**
 * This method will try to suspend the device
 * It only works if the user is the QWS Server and the apm application
 * is installed.
 * It tries to suspend and then waits some time cause some distributions
 * do have asynchronus apm implementations.
 * This method will either fail and return false or it'll suspend the
 * device and return once the device got woken up
 *
 * @return if the device got suspended
 */
 bool 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;
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index bbc32fa..96a41fc 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -234,50 +234,48 @@ protected:
 public:
     // sandman do we want to allow destructions? -zecke?
     virtual ~ODevice();
 
     static ODevice *inst();
 
     // information
 
     QString modelString() const;
     OModel model() const;
     inline OModel series() const { return (OModel) ( model() & Model_Series_Mask ); }
 
     QString vendorString() const;
     OVendor vendor() const;
 
     QString systemString() const;
     OSystem system() const;
 
     QString systemVersionString() const;
 
     virtual Transformation rotation() const;
     virtual ODirection direction() const;
 
     // system
-
-    virtual bool setSoftSuspend ( bool on );
     virtual bool suspend();
 
     virtual bool setDisplayStatus ( bool on );
     virtual bool setDisplayBrightness ( int brightness );
     virtual int displayBrightnessResolution() const;
     virtual bool setDisplayContrast ( int contrast );
     virtual int displayContrastResolution() const;
 
     // don't add new virtual methods, use this:
     //  /*virtual */ void boo(int i ) { return virtual_hook(1,&i); };
     // and in your subclass do overwrite
     //  protected virtual int virtual_hook(int, void *)
     // which is defined below
 
     // input / output
     virtual void playAlarmSound();
     virtual void playKeySound();
     virtual void playTouchSound();
 
     virtual QValueList <OLed> ledList() const;
     virtual QValueList <OLedState> ledStateList ( OLed led ) const;
     virtual OLedState ledState ( OLed led ) const;
     virtual bool setLedState ( OLed led, OLedState st );
 
diff --git a/libopie2/opiecore/device/odevice_genuineintel.cpp b/libopie2/opiecore/device/odevice_genuineintel.cpp
index 61ba052..1584249 100644
--- a/libopie2/opiecore/device/odevice_genuineintel.cpp
+++ b/libopie2/opiecore/device/odevice_genuineintel.cpp
@@ -139,54 +139,48 @@ OLedState GenuineIntel::ledState ( OLed ) const
 bool GenuineIntel::setLedState ( OLed , OLedState )
 {
     return false;
 }
 
 
 bool GenuineIntel::filter ( int /*unicode*/, int , int , bool , bool )
 {
     return false;
 }
 
 void GenuineIntel::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
     if(!snd.isFinished())
         return;
 
     changeMixerForAlarm(0, "/dev/sound/mixer", &snd );
     snd. play();
 #endif
 }
 
 
-bool GenuineIntel::setSoftSuspend ( bool )
-{
-    return false;
-}
-
-
 bool GenuineIntel::setDisplayBrightness ( int )
 {
     return false;
 }
 
 int GenuineIntel::displayBrightnessResolution() const
 {
     return 1; // perhaps to avoid division by zero
 }
 
 
 bool GenuineIntel::hasLightSensor() const
 {
     return false;
 }
 
 int GenuineIntel::readLightSensor()
 {
     return 0;
 }
 
 int GenuineIntel::lightSensorResolution() const
 {
     return 1; // see above
diff --git a/libopie2/opiecore/device/odevice_genuineintel.h b/libopie2/opiecore/device/odevice_genuineintel.h
index 52c5fc6..69316af 100644
--- a/libopie2/opiecore/device/odevice_genuineintel.h
+++ b/libopie2/opiecore/device/odevice_genuineintel.h
@@ -26,50 +26,48 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef ODEVICE_GENUINEINTEL
 #define ODEVICE_GENUINEINTEL
 
 #include "odevice.h"
 
 /* QT */
 #include <qwindowsystem_qws.h>
 
 namespace Opie {
 namespace Core {
 namespace Internal {
 
 class GenuineIntel : public ODevice, public QWSServer::KeyboardFilter
 {
 
   protected:
     virtual void init(const QString&);
     virtual void initButtons();
 
   public:
-    virtual bool setSoftSuspend( bool soft );
-
     virtual bool setDisplayBrightness( int b );
     virtual int displayBrightnessResolution() const;
 
     virtual void playAlarmSound();
 
     virtual QValueList <OLed> ledList() const;
     virtual QValueList <OLedState> ledStateList( OLed led ) const;
     virtual OLedState ledState( OLed led ) const;
     virtual bool setLedState( OLed led, OLedState st );
 
     virtual bool hasLightSensor() const;
     virtual int readLightSensor();
     virtual int lightSensorResolution() const;
   protected:
     virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
 
 };
 
 struct gi_button {
     Qt::Key code;
     char *utext;
     char *pix;
     char *fpressedservice;
     char *fpressedaction;
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 9e01a0c..2ce38a9 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -315,69 +315,48 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
         return false;
 }
 
 void iPAQ::timerEvent ( QTimerEvent * )
 {
     killTimer ( m_power_timer );
     m_power_timer = 0;
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void iPAQ::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
     if(!snd.isFinished())
         return;
 
     changeMixerForAlarm(0, "/dev/sound/mixer", &snd );
     snd. play();
 #endif
 }
 
-
-bool iPAQ::setSoftSuspend ( bool soft )
-{
-    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" );
-
-        ::close ( fd );
-    }
-    else
-        ::perror ( "/proc/sys/ts/suspend_button_mode" );
-
-    return res;
-}
-
-
 bool iPAQ::setDisplayBrightness ( int bright )
 {
     bool res = false;
     int fd;
 
     if ( bright > 255 )
         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 );
     }
     return res;
 }
 
 int iPAQ::displayBrightnessResolution() const
 {
     switch ( model()) {
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h
index cc0b8ac..b1dac74 100644
--- a/libopie2/opiecore/device/odevice_ipaq.h
+++ b/libopie2/opiecore/device/odevice_ipaq.h
@@ -26,50 +26,48 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef ODEVICE_IPAQ
 #define ODEVICE_IPAQ
 
 #include "odevice.h"
 
 /* QT */
 #include <qwindowsystem_qws.h>
 
 namespace Opie {
 namespace Core {
 namespace Internal {
 
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter
 {
 
   protected:
     virtual void init(const QString&);
     virtual void initButtons();
 
   public:
-    virtual bool setSoftSuspend( bool soft );
-
     virtual bool setDisplayBrightness( int b );
     virtual int displayBrightnessResolution() const;
 
     virtual void playAlarmSound();
 
     virtual QValueList <OLed> ledList() const;
     virtual QValueList <OLedState> ledStateList( OLed led ) const;
     virtual OLedState ledState( OLed led ) const;
     virtual bool setLedState( OLed led, OLedState st );
 
     virtual bool hasLightSensor() const;
     virtual int readLightSensor();
     virtual int lightSensorResolution() const;
 
   protected:
     virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
     virtual void timerEvent( QTimerEvent *te );
 
     int m_power_timer;
 
     OLedState m_leds [2];
 };
 
 struct i_button {
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index b22ee70..cbc7a24 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -359,85 +359,48 @@ bool Zaurus::setLedState( OLed which, OLedState st )
 
     if ( which == Led_Mail ) {
         if ( fd >= 0 ) {
             struct sharp_led_status leds;
             ::memset ( &leds, 0, sizeof( leds ));
             leds. which = SHARP_LED_MAIL_EXISTS;
             bool ok = true;
 
             switch ( st ) {
                 case Led_Off      : leds. status = LED_MAIL_NO_UNREAD_MAIL; break;
                 case Led_On       : leds. status = LED_MAIL_NEWMAIL_EXISTS; break;
                 case Led_BlinkSlow: leds. status = LED_MAIL_UNREAD_MAIL_EX; break;
                 default            : ok = false;
             }
 
             if ( ok && ( ::ioctl ( fd, SHARP_LED_SETSTATUS, &leds ) >= 0 )) {
                 m_leds [0] = st;
                 return true;
             }
         }
     }
     return false;
 }
 
-bool Zaurus::setSoftSuspend ( bool soft )
-{
-    if (!m_embedix) {
-        /* non-Embedix kernels dont have kernel autosuspend */
-        return ODevice::setSoftSuspend( soft );
-    }
-
-    bool res = false;
-    int fd;
-
-    if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
-        (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
-
-        int sources = ::ioctl( fd, APM_IOCGEVTSRC, 0 ); // get current event sources
-
-        if ( sources >= 0 ) {
-            if ( soft )
-                sources &= ~APM_EVT_POWER_BUTTON;
-            else
-                sources |= APM_EVT_POWER_BUTTON;
-
-            if ( ::ioctl( fd, APM_IOCSEVTSRC, sources ) >= 0 ) // set new event sources
-                res = true;
-            else
-                perror ( "APM_IOCGEVTSRC" );
-        }
-        else
-            perror ( "APM_IOCGEVTSRC" );
-
-        ::close( fd );
-    }
-    else
-        perror( "/dev/apm_bios or /dev/misc/apm_bios" );
-
-    return res;
-}
-
 int Zaurus::displayBrightnessResolution() const
 {
     int res = 1;
     if (m_embedix)
     {
         int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_RDWR|O_NONBLOCK );
         if ( fd )
         {
             int value = ::ioctl( fd, SHARP_FL_IOCTL_GET_STEP, 0 );
             ::close( fd );
             return value ? value : res;
         }
     }
     else
     {
         int fd = ::open( "/sys/class/backlight/corgi-bl/max_brightness", O_RDONLY|O_NONBLOCK );
         if ( fd )
         {
             char buf[100];
             if ( ::read( fd, &buf[0], sizeof buf ) ) ::sscanf( &buf[0], "%d", &res );
             ::close( fd );
         }
     }
     return res;
@@ -519,76 +482,73 @@ bool Zaurus::suspend()
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
 
     ::sync(); // flush fs caches
     res = ( ::system ( "apm --suspend" ) == 0 );
 
     // This is needed because the apm implementation is asynchronous and we
     // can not be sure when exactly the device is really suspended
     if ( res ) {
         do { // Yes, wait 15 seconds. This APM sucks big time.
             ::usleep ( 200 * 1000 );
             ::gettimeofday ( &tvn, 0 );
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 15000 );
     }
 
     QCopEnvelope ( "QPE/Rotation", "rotateDefault()" );
     return res;
 }
 
 
 Transformation Zaurus::rotation() const
 {
     Transformation rot;
-    int handle = 0;
-    int retval = 0;
-
+    
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
             OHingeStatus hs = readHingeSensor();
             if ( hs == CASE_PORTRAIT ) rot = Rot0;
             else if ( hs == CASE_UNKNOWN ) rot = Rot0;
             else rot = Rot270;
             break;
         case Model_Zaurus_SL6000:
         case Model_Zaurus_SLB600:
         case Model_Zaurus_SLA300:
         case Model_Zaurus_SL5500:
         case Model_Zaurus_SL5000:
         default:
             rot = d->m_rotation;
             break;
     }
 
     return rot;
 }
 ODirection Zaurus::direction() const
 {
     ODirection dir;
-    int handle = 0;
-    int retval = 0;
+    
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
             OHingeStatus hs = readHingeSensor();
             if ( hs == CASE_PORTRAIT ) dir = CCW;
             else if ( hs == CASE_UNKNOWN ) dir = CCW;
             else dir = CW;        
             break;
         case Model_Zaurus_SL6000:
         case Model_Zaurus_SLA300:
         case Model_Zaurus_SLB600:
         case Model_Zaurus_SL5500:
         case Model_Zaurus_SL5000:
         default: dir = d->m_direction;
             break;
     }
     return dir;
 
 }
 
 bool Zaurus::hasHingeSensor() const
 {
     return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000;
 }
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index c763798..04e73c4 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -73,50 +73,48 @@
 
 #define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
 #define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
 #define APM_EVT_POWER_BUTTON    (1 << 0)
 
 // Brightness
 #define SHARP_FL_IOCTL_DEVICE   "/dev/sharp_fl"
 #define SHARP_FL_IOCTL_ON                  1
 #define SHARP_FL_IOCTL_OFF                 2
 #define SHARP_FL_IOCTL_STEP_CONTRAST     100
 #define SHARP_FL_IOCTL_GET_STEP_CONTRAST 101
 #define SHARP_FL_IOCTL_GET_STEP          102
 
 namespace Opie {
 namespace Core {
 namespace Internal {
 
 class Zaurus : public ODevice
 {
   protected:
     virtual void init(const QString&);
     virtual void initButtons();
 
   public:
-    virtual bool setSoftSuspend( bool soft );
-
     virtual bool setDisplayBrightness( int b );
     virtual bool setDisplayStatus( bool on );
     virtual int displayBrightnessResolution() const;
 
     virtual void playAlarmSound();
     virtual void playKeySound();
     virtual void playTouchSound();
 
     virtual QValueList <OLed> ledList() const;
     virtual QValueList <OLedState> ledStateList ( OLed led ) const;
     virtual OLedState ledState( OLed led ) const;
     virtual bool setLedState( OLed led, OLedState st );
 
     virtual bool hasHingeSensor() const;
     virtual OHingeStatus readHingeSensor() const;
 
     virtual bool suspend();
     virtual Transformation rotation() const;
     virtual ODirection direction() const;
 
   protected:
     virtual void buzzer( int snd );
 
     OLedState m_leds[1];