author | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
commit | dd410f1eb69e68f04cf26b6d3e6bca88f0987f71 (patch) (side-by-side diff) | |
tree | 0f2b59bae4c326011783e9cdea0754e180ae0e27 /libopie2 | |
parent | 78e658cecc7521cf3932f5eb44d3f551d73f3181 (diff) | |
download | opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.zip opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.gz opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.bz2 |
remove setSoftSuspend() from ODevice. this is a left-over from the old days
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 5 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_genuineintel.cpp | 6 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_genuineintel.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 21 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 42 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.h | 2 |
8 files changed, 1 insertions, 81 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 @@ -255,9 +255,4 @@ ODevice::~ODevice() } -bool ODevice::setSoftSuspend ( bool /*soft*/ ) -{ - return false; -} - //#include <linux/apm_bios.h> 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 @@ -256,6 +256,4 @@ public: // system - - virtual bool setSoftSuspend ( bool on ); virtual bool suspend(); 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 @@ -161,10 +161,4 @@ void GenuineIntel::playAlarmSound() -bool GenuineIntel::setSoftSuspend ( bool ) -{ - return false; -} - - bool GenuineIntel::setDisplayBrightness ( int ) { 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 @@ -48,6 +48,4 @@ class GenuineIntel : public ODevice, public QWSServer::KeyboardFilter public: - virtual bool setSoftSuspend( bool soft ); - virtual bool setDisplayBrightness( int b ); virtual int displayBrightnessResolution() 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 @@ -337,25 +337,4 @@ void iPAQ::playAlarmSound() } - -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 ) { 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 @@ -48,6 +48,4 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter public: - virtual bool setSoftSuspend( bool soft ); - virtual bool setDisplayBrightness( int b ); virtual int displayBrightnessResolution() 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 @@ -381,41 +381,4 @@ bool Zaurus::setLedState( OLed which, OLedState st ) } -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 { @@ -541,6 +504,4 @@ Transformation Zaurus::rotation() const { Transformation rot; - int handle = 0; - int retval = 0; switch ( d->m_model ) { @@ -567,6 +528,5 @@ ODirection Zaurus::direction() const { ODirection dir; - int handle = 0; - int retval = 0; + switch ( d->m_model ) { case Model_Zaurus_SLC3000: // fallthrough 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 @@ -95,6 +95,4 @@ class Zaurus : public ODevice public: - virtual bool setSoftSuspend( bool soft ); - virtual bool setDisplayBrightness( int b ); virtual bool setDisplayStatus( bool on ); |