author | mickeyl <mickeyl> | 2005-06-17 13:47:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-17 13:47:42 (UTC) |
commit | c36e39b5b1e450e64d4c38cb59e56048a2bec258 (patch) (unidiff) | |
tree | 0e796a165a2e4ce8e24b8b79f15bb58f4265a7bb /libopie2 | |
parent | 0e11eb29a20ff6bff533a07ff604ed858237f82b (diff) | |
download | opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.zip opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.gz opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.bz2 |
- disable DEBUG in opcmciasystem
- fix suspend/resume logic
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 12 |
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 | |||
@@ -49,7 +49,7 @@ using namespace Opie::Core; | |||
49 | 49 | ||
50 | #define PROC_DEVICES "/proc/devices" | 50 | #define PROC_DEVICES "/proc/devices" |
51 | 51 | ||
52 | #define OPCMCIA_DEBUG 1 | 52 | // #define OPCMCIA_DEBUG 1 |
53 | 53 | ||
54 | /*====================================================================================== | 54 | /*====================================================================================== |
55 | * OPcmciaSystem | 55 | * OPcmciaSystem |
@@ -305,31 +305,31 @@ bool OPcmciaSocket::isSuspended() const | |||
305 | 305 | ||
306 | bool OPcmciaSocket::eject() | 306 | bool OPcmciaSocket::eject() |
307 | { | 307 | { |
308 | return ::ioctl( _fd, DS_EJECT_CARD ); | 308 | return ::ioctl( _fd, DS_EJECT_CARD ) != -1; |
309 | } | 309 | } |
310 | 310 | ||
311 | 311 | ||
312 | bool OPcmciaSocket::insert() | 312 | bool OPcmciaSocket::insert() |
313 | { | 313 | { |
314 | return ::ioctl( _fd, DS_INSERT_CARD ); | 314 | return ::ioctl( _fd, DS_INSERT_CARD ) != -1; |
315 | } | 315 | } |
316 | 316 | ||
317 | 317 | ||
318 | bool OPcmciaSocket::suspend() | 318 | bool OPcmciaSocket::suspend() |
319 | { | 319 | { |
320 | return ::ioctl( _fd, DS_SUSPEND_CARD ); | 320 | return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1; |
321 | } | 321 | } |
322 | 322 | ||
323 | 323 | ||
324 | bool OPcmciaSocket::resume() | 324 | bool OPcmciaSocket::resume() |
325 | { | 325 | { |
326 | return ::ioctl( _fd, DS_RESUME_CARD ); | 326 | return ::ioctl( _fd, DS_RESUME_CARD ) != -1; |
327 | } | 327 | } |
328 | 328 | ||
329 | 329 | ||
330 | bool OPcmciaSocket::reset() | 330 | bool OPcmciaSocket::reset() |
331 | { | 331 | { |
332 | return ::ioctl( _fd, DS_RESET_CARD ); | 332 | return ::ioctl( _fd, DS_RESET_CARD ) != -1; |
333 | } | 333 | } |
334 | 334 | ||
335 | 335 | ||