-rw-r--r-- | libopie2/opiecore/linux/linux.pro | 2 | ||||
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro index c0c4f7f..d2e36ae 100644 --- a/libopie2/opiecore/linux/linux.pro +++ b/libopie2/opiecore/linux/linux.pro @@ -1,11 +1,11 @@ HEADERS += \ linux/ofilenotify.h \ linux/oinputsystem.h \ linux/opcmciasystem.h SOURCES += \ linux/ofilenotify.cpp \ linux/oinputsystem.cpp \ linux/opcmciasystem.cpp -DEFINES += OPCMCIA_DEBUG=1 +# DEFINES += OPCMCIA_DEBUG=1 diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 445d903..2b0c01d 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -113,196 +113,198 @@ void OPcmciaSystem::synchronize() QString strSocket; int numSocket; char colon; QString cardName; cardinfo >> strSocket >> numSocket >> colon; cardName = cardinfo.readLine().stripWhiteSpace(); qDebug( "strSocket = '%s', numSocket = '%d', colon = '%c', cardName = '%s'", (const char*) strSocket, numSocket, colon, ( const char*) cardName ); if ( strSocket == "Socket" && colon == ':' ) { _interfaces.append( new OPcmciaSocket( _major, numSocket, this, (const char*) cardName ) ); } else { continue; } } } int OPcmciaSystem::count() const { return _interfaces.count(); } int OPcmciaSystem::cardCount() const { int nonEmpty = 0; OPcmciaSystem::CardIterator it = iterator(); while ( it.current() ) { if ( !it.current()->isEmpty() ) nonEmpty++; ++it; } return nonEmpty; } OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) { return _interfaces.at( number ); } OPcmciaSystem* OPcmciaSystem::instance() { if ( !_instance ) _instance = new OPcmciaSystem(); return _instance; } OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const { return OPcmciaSystem::CardIterator( _interfaces ); } /*====================================================================================== * OPcmciaSocket *======================================================================================*/ OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) :QObject( parent, name ), _major( major ), _socket( socket ) { qDebug( "OPcmciaSocket::OPcmciaSocket()" ); init(); } OPcmciaSocket::~OPcmciaSocket() { qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); cleanup(); } /* internal */ void OPcmciaSocket::init() { // open control socket and gather file descriptor if ( _major ) { dev_t dev = makedev( _major, _socket ); #ifdef OPCMCIA_DEBUG QString filename = "/tmp/opcmciasystem-debug"; if ( QFile::exists( filename ) ) #else QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) #endif { _fd = ::open( (const char*) filename, O_RDONLY); if ( !_fd ) { qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); } +#ifndef OPCMCIA_DEBUG else { ::unlink( (const char*) filename ); } +#endif } else { qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) ); } } } /* internal */ void OPcmciaSocket::cleanup() { // close control socket } /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const { _ioctlarg.tuple.DesiredTuple = tuple; _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON; _ioctlarg.tuple.TupleOffset = 0; int result; result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg); if ( result != 0 ) { qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) ); return false; } result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg); if ( result != 0 ) { qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) ); return false; } result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg ); if ( result != 0 ) { qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) ); return false; } return true; } int OPcmciaSocket::number() const { return _socket; } QString OPcmciaSocket::identity() const { return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); } const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const { cs_status_t cs_status; cs_status.Function = 0; int result = ::ioctl( _fd, DS_GET_STATUS, &cs_status ); if ( result != 0 ) { qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) ); return Unknown; } else { qDebug( " card status = 0x%08x", cs_status.CardState ); qDebug( " socket status = 0x%08x", cs_status.SocketState ); return (OPcmciaSocket::OPcmciaSocketCardStatus) (cs_status.CardState + cs_status.SocketState); } } bool OPcmciaSocket::isUnsupported() const { return ( strcmp( name(), "unsupported card" ) == 0 ); } bool OPcmciaSocket::isEmpty() const { return ! status() && ( Occupied || OccupiedCardBus ); } bool OPcmciaSocket::isSuspended() const { return status() && Suspended; } bool OPcmciaSocket::eject() { |