| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 22 | ||||
| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 6 |
2 files changed, 19 insertions, 9 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 929e289..2eece6b 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -36,32 +36,34 @@ using namespace Opie::Core; /* QT */ #include <qfile.h> #include <qtextstream.h> /* 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 + /*====================================================================================== * OPcmciaSystem *======================================================================================*/ OPcmciaSystem* OPcmciaSystem::_instance = 0; OPcmciaSystem::OPcmciaSystem() :_major( 0 ) { qDebug( "OPcmciaSystem::OPcmciaSystem()" ); // get major node number out of /proc/devices QFile procfile( PROC_DEVICES ); if ( procfile.exists() && procfile.open( IO_ReadOnly ) ) { QTextStream devstream( &procfile ); @@ -176,48 +178,54 @@ OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char } 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 ) ); } else { ::unlink( (const char*) filename ); } } else { - qWarning( "OPcmciaSocket::init() - can't create device node (%s)", strerror( errno ) ); + 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; @@ -332,38 +340,42 @@ QStringList OPcmciaSocket::productIdentity() const 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] ); list += vers->str+vers->ofs[i]; } } else { list += "<unknown>"; } return list; } -#if 0 -const QPair& OPcmciaSocket::manufacturerIdentity() const +QString OPcmciaSocket::manufacturerIdentity() const +{ + cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid; + if ( getTuple( CISTPL_MANFID ) ) { - return _manufId; + return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card ); + } + else + return "<unknown>"; } -#endif QString OPcmciaSocket::function() const { cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid; if ( getTuple( CISTPL_FUNCID ) ) { switch ( funcid->func ) { case 0: return "Multifunction"; break; case 1: return "Memory"; break; case 2: return "Serial"; break; case 3: return "Parallel"; break; case 4: return "Fixed Disk"; break; case 5: return "Video"; break; case 6: return "Network"; break; diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h index ac6c1de..0fd43cf 100644 --- a/libopie2/opiecore/linux/opcmciasystem.h +++ b/libopie2/opiecore/linux/opcmciasystem.h @@ -179,37 +179,35 @@ class OPcmciaSocket : public QObject bool suspend(); /** * Resume card. @returns true, if operation succeeded * @note: This operation needs root privileges */ bool resume(); /** * Reset card. @returns true, if operation succeeded * @note: This operation needs root privileges */ bool reset(); /** * @returns a list of product IDs */ QStringList productIdentity() const; /** - * @returns the manufacturer ID pair + * @returns the manufacturer ID string */ -#if 0 - const QPair& manufacturerIdentity() const; -#endif + QString manufacturerIdentity() const; /** * @returns the function string */ QString function() const; private: void init(); void cleanup(); bool getTuple( cisdata_t tuple ) const; int _major; int _socket; int _fd; mutable ds_ioctl_arg_t _ioctlarg; private: class Private; |