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
@@ -46,12 +46,14 @@ using namespace Opie::Core;
 #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;
 
@@ -186,14 +188,20 @@ OPcmciaSocket::~OPcmciaSocket()
 /* 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 ) );
             }
@@ -201,13 +209,13 @@ OPcmciaSocket::~OPcmciaSocket()
             {
                 ::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()
 {
@@ -288,13 +296,13 @@ 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 );
@@ -342,18 +350,22 @@ QStringList OPcmciaSocket::productIdentity() const
         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 ) )
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
@@ -189,17 +189,15 @@ class OPcmciaSocket : public QObject
     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: