summaryrefslogtreecommitdiff
path: root/libopie2
authormickeyl <mickeyl>2005-06-17 13:47:42 (UTC)
committer mickeyl <mickeyl>2005-06-17 13:47:42 (UTC)
commitc36e39b5b1e450e64d4c38cb59e56048a2bec258 (patch) (side-by-side diff)
tree0e796a165a2e4ce8e24b8b79f15bb58f4265a7bb /libopie2
parent0e11eb29a20ff6bff533a07ff604ed858237f82b (diff)
downloadopie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.zip
opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.gz
opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.bz2
- disable DEBUG in opcmciasystem
- fix suspend/resume logic
Diffstat (limited to 'libopie2') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 2eece6b..054d261 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -46,13 +46,13 @@ using namespace Opie::Core;
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#define PROC_DEVICES "/proc/devices"
-#define OPCMCIA_DEBUG 1
+// #define OPCMCIA_DEBUG 1
/*======================================================================================
* OPcmciaSystem
*======================================================================================*/
OPcmciaSystem* OPcmciaSystem::_instance = 0;
@@ -302,37 +302,37 @@ bool OPcmciaSocket::isSuspended() const
return status() && Suspended;
}
bool OPcmciaSocket::eject()
{
- return ::ioctl( _fd, DS_EJECT_CARD );
+ return ::ioctl( _fd, DS_EJECT_CARD ) != -1;
}
bool OPcmciaSocket::insert()
{
- return ::ioctl( _fd, DS_INSERT_CARD );
+ return ::ioctl( _fd, DS_INSERT_CARD ) != -1;
}
bool OPcmciaSocket::suspend()
{
- return ::ioctl( _fd, DS_SUSPEND_CARD );
+ return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1;
}
bool OPcmciaSocket::resume()
{
- return ::ioctl( _fd, DS_RESUME_CARD );
+ return ::ioctl( _fd, DS_RESUME_CARD ) != -1;
}
bool OPcmciaSocket::reset()
{
- return ::ioctl( _fd, DS_RESET_CARD );
+ return ::ioctl( _fd, DS_RESET_CARD ) != -1;
}
QStringList OPcmciaSocket::productIdentity() const
{
QStringList list;