- disable DEBUG in opcmciasystem

- fix suspend/resume logic

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
@@ -44,17 +44,17 @@ using namespace Opie::Core;
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #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;
 
 OPcmciaSystem::OPcmciaSystem()
@@ -300,41 +300,41 @@ bool OPcmciaSocket::isEmpty() const
 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;
     cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
     if ( getTuple( CISTPL_VERS_1 ) )
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
@@ -52,16 +52,17 @@ using namespace Opie::Ui;
 #include <qsound.h>
 #include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <fcntl.h>
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
 {
@@ -131,18 +132,18 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->insertItem( "&Insert",    INSERT+i*100 );
         submenu->insertItem( "&Suspend",   SUSPEND+i*100 );
         submenu->insertItem( "&Resume",    RESUME+i*100 );
         submenu->insertItem( "Rese&t",     RESET+i*100 );
         submenu->insertItem( "&Configure", CONFIGURE+i*100 );
 
         submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() );
         submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
-        submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
-        submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
+        submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
+        submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
         submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
 
         connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
         menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
         ++it;
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
@@ -254,17 +255,17 @@ int PcmciaManager::position()
 }
 
 void PcmciaManager::execCommand( const QStringList &strList )
 {
 }
 
 void PcmciaManager::userCardAction( int action )
 {
-    odebug << "user action requested. action = " << action << oendl;
+    odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl;
 
     int socket = action / 100;
     int what = action % 100;
     bool success = false;
 
     switch ( what )
     {
         case CONFIGURE: configure( OPcmciaSystem::instance()->socket( socket ) ); success = true; break;
@@ -273,17 +274,17 @@ void PcmciaManager::userCardAction( int action )
         case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend(); break;
         case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume(); break;
         case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break;
         default: odebug << "not yet implemented" << oendl;
     }
 
     if ( !success )
     {
-        owarn << "couldn't perform user action" << oendl;
+        owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl;
     }
 
 }
 
 void PcmciaManager::configure( OPcmciaSocket* card )
 {
     configuring = true;
     ConfigDialog dialog( card, qApp->desktop() );