enable OPcmciaSocket::manufacturer()

Did I mention Qt2 sucks? We don't even have a QPair :/

2 files changed, 20 insertions, 10 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
@@ -40,24 +40,26 @@ 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
+
 /*======================================================================================
  * OPcmciaSystem
  *======================================================================================*/
 
 OPcmciaSystem* OPcmciaSystem::_instance = 0;
 
 OPcmciaSystem::OPcmciaSystem()
               :_major( 0 )
 {
     qDebug( "OPcmciaSystem::OPcmciaSystem()" );
 
     // get major node number out of /proc/devices
@@ -180,40 +182,46 @@ 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;
@@ -282,25 +290,25 @@ 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;    
+    return status() && Suspended;
 }
 
 
 bool OPcmciaSocket::eject()
 {
     return ::ioctl( _fd, DS_EJECT_CARD );
 }
 
 
 bool OPcmciaSocket::insert()
 {
     return ::ioctl( _fd, DS_INSERT_CARD );
@@ -336,30 +344,34 @@ QStringList OPcmciaSocket::productIdentity() const
             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
 {
-    return _manufId;
+    cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
+    if ( getTuple( CISTPL_MANFID ) )
+    {
+        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;
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
@@ -183,29 +183,27 @@ class OPcmciaSocket : public QObject
      */
     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;