summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp24
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h6
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
@@ -51,2 +51,4 @@ using namespace Opie::Core;
+#define OPCMCIA_DEBUG 1
+
/*======================================================================================
@@ -191,4 +193,10 @@ OPcmciaSocket::~OPcmciaSocket()
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
{
@@ -206,3 +214,3 @@ OPcmciaSocket::~OPcmciaSocket()
{
- 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 ) );
}
@@ -293,3 +301,3 @@ bool OPcmciaSocket::isSuspended() const
{
- return status() && Suspended;
+ return status() && Suspended;
}
@@ -347,8 +355,12 @@ QStringList OPcmciaSocket::productIdentity() const
-#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
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
@@ -194,7 +194,5 @@ class OPcmciaSocket : public QObject
/**
- * @returns the manufacturer ID pair
+ * @returns the manufacturer ID string
*/
-#if 0
- const QPair& manufacturerIdentity() const;
-#endif
+ QString manufacturerIdentity() const;
/**