summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-17 13:47:42 (UTC)
committer mickeyl <mickeyl>2005-06-17 13:47:42 (UTC)
commitc36e39b5b1e450e64d4c38cb59e56048a2bec258 (patch) (unidiff)
tree0e796a165a2e4ce8e24b8b79f15bb58f4265a7bb
parent0e11eb29a20ff6bff533a07ff604ed858237f82b (diff)
downloadopie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.zip
opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.gz
opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.bz2
- disable DEBUG in opcmciasystem
- fix suspend/resume logic
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp12
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp9
2 files changed, 11 insertions, 10 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
@@ -51,3 +51,3 @@ using namespace Opie::Core;
51 51
52#define OPCMCIA_DEBUG 1 52// #define OPCMCIA_DEBUG 1
53 53
@@ -307,3 +307,3 @@ bool OPcmciaSocket::eject()
307{ 307{
308 return ::ioctl( _fd, DS_EJECT_CARD ); 308 return ::ioctl( _fd, DS_EJECT_CARD ) != -1;
309} 309}
@@ -313,3 +313,3 @@ bool OPcmciaSocket::insert()
313{ 313{
314 return ::ioctl( _fd, DS_INSERT_CARD ); 314 return ::ioctl( _fd, DS_INSERT_CARD ) != -1;
315} 315}
@@ -319,3 +319,3 @@ bool OPcmciaSocket::suspend()
319{ 319{
320 return ::ioctl( _fd, DS_SUSPEND_CARD ); 320 return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1;
321} 321}
@@ -325,3 +325,3 @@ bool OPcmciaSocket::resume()
325{ 325{
326 return ::ioctl( _fd, DS_RESUME_CARD ); 326 return ::ioctl( _fd, DS_RESUME_CARD ) != -1;
327} 327}
@@ -331,3 +331,3 @@ bool OPcmciaSocket::reset()
331{ 331{
332 return ::ioctl( _fd, DS_RESET_CARD ); 332 return ::ioctl( _fd, DS_RESET_CARD ) != -1;
333} 333}
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index aea699f..99c1bc9 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -59,2 +59,3 @@ using namespace Opie::Ui;
59#include <string.h> 59#include <string.h>
60#include <errno.h>
60#include <fcntl.h> 61#include <fcntl.h>
@@ -138,4 +139,4 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
138 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() ); 139 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
139 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() ); 140 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
140 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && it.current()->isSuspended() ); 141 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
141 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring ); 142 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
@@ -261,3 +262,3 @@ void PcmciaManager::userCardAction( int action )
261{ 262{
262 odebug << "user action requested. action = " << action << oendl; 263 odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl;
263 264
@@ -280,3 +281,3 @@ void PcmciaManager::userCardAction( int action )
280 { 281 {
281 owarn << "couldn't perform user action" << oendl; 282 owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl;
282 } 283 }