remove setSoftSuspend() from ODevice. this is a left-over from the old days

10 files changed, 3 insertions, 95 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 734d072..5bbed59 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -155,15 +155,12 @@ int initApplication( int argc, char ** argv )
     if ( firstUse() )
     {
         a.restart();
         return 0;
     }
 
-#ifndef Q_OS_MACX
-    ODevice::inst()->setSoftSuspend( true );
-#endif
     {
         QCopEnvelope e("QPE/System", "setBacklight(int)" );
         e << -3; // Forced on
     }
 
     AlarmServer::initialize();
@@ -192,16 +189,12 @@ int initApplication( int argc, char ** argv )
     int rv = a.exec();
     odebug << "<-- mainloop out" << oendl;
     remove_pidfile();          
     odebug << "removing server object..." << oendl;
     delete s;
 
-#ifndef Q_OS_MACX
-    ODevice::inst()->setSoftSuspend( false );
-#endif
-    
     odebug << "returning from qpe/initapplication..." << oendl;
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 0699d0a..2de0180 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -189,14 +189,13 @@ int main ( int argc, char **argv )
 					autolog = ::strdup ( user. latin1 ( ));
 			}
 
 			if ( autolog && !userExited ) {
 
                 QWSServer::setDesktopBackground( QImage() );
-                ODevice::inst ( )-> setDisplayStatus ( true );
-                ODevice::inst ( )-> setSoftSuspend ( false );
+                ODevice::inst()->setDisplayStatus( true );
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                 LoginApplication::setLoginAs ( autolog );
 
 
 				if ( LoginApplication::changeIdentity ( ))
 					::exit ( LoginApplication::login ( ));
@@ -332,14 +331,12 @@ int login_main ( int argc, char **argv, pid_t ppid )
 
 	Opie::force_appearance = 0;
 
 	app-> setFont ( QFont ( "Helvetica", 10 ));
 	app-> setStyle ( new QPEStyle ( ));
 
-	ODevice::inst ( )-> setSoftSuspend ( true );
-
 	if ( QWSServer::mouseHandler() &&
              QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
 		if ( !QFile::exists ( "/etc/pointercal" )) {
 			// Make sure calibration widget starts on top.
 			Calibrate *cal = new Calibrate;
 			cal-> exec ( );
@@ -358,14 +355,12 @@ int login_main ( int argc, char **argv, pid_t ppid )
 	app-> setMainWidget ( lw );
 	lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
 	lw-> show ( );
 
 	int rc = app-> exec ( );
 
-	ODevice::inst ( )-> setSoftSuspend ( false );
-
 	if ( app-> loginAs ( )) {
 		if ( app-> changeIdentity ( )) {
 			app-> login ( );
 
 			// if login succeeds, it never comes back
 
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
@@ -251,17 +251,12 @@ 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
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
@@ -252,14 +252,12 @@ public:
     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 );
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
@@ -157,18 +157,12 @@ void GenuineIntel::playAlarmSound()
     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
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
@@ -44,14 +44,12 @@ 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;
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
@@ -333,33 +333,12 @@ void iPAQ::playAlarmSound()
 
     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 )
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
@@ -44,14 +44,12 @@ 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;
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
@@ -377,49 +377,12 @@ bool Zaurus::setLedState( OLed which, OLedState st )
             }
         }
     }
     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 );
@@ -537,15 +500,13 @@ bool Zaurus::suspend()
 }
 
 
 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;
@@ -563,14 +524,13 @@ Transformation Zaurus::rotation() const
 
     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;
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
@@ -91,14 +91,12 @@ 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();