summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -40,25 +40,25 @@ using namespace Opie::Core;
/* STD */
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#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()
:_major( 0 )
{
qDebug( "OPcmciaSystem::OPcmciaSystem()" );
@@ -296,49 +296,49 @@ bool OPcmciaSocket::isEmpty() const
return ! status() && ( Occupied || OccupiedCardBus );
}
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 ) )
{
for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i )
{
qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] );
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
@@ -48,24 +48,25 @@ using namespace Opie::Ui;
#include <qpainter.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qmessagebox.h>
#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 )
{
QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
connect( pcmciaChannel,
SIGNAL( received(const QCString&,const QByteArray&) ), this,
SLOT( cardMessage(const QCString&,const QByteArray&) ) );
@@ -127,26 +128,26 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
while ( it.current() )
{
QPopupMenu* submenu = new QPopupMenu( menu );
submenu->insertItem( "&Eject", EJECT+i*100 );
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 ) );
QSize s = menu->sizeHint();
int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 );
qDebug( "pcmcia: menu result = %d", opt );
delete menu;
@@ -250,44 +251,44 @@ void PcmciaManager::paintEvent( QPaintEvent * )
int PcmciaManager::position()
{
return 7;
}
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;
case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break;
case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert(); break;
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() );
int configresult = QPEApplication::execDialog( &dialog, false );
configuring = false;
odebug << "pcmcia: configresult = " << configresult << oendl;
}