summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp13
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h8
2 files changed, 16 insertions, 5 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index a5725f1..21c5a84 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -277,6 +277,7 @@ const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const
if ( result != 0 )
{
qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) );
+ // return ( errno == -ENODEV ) ? Empty : Unknown;
return Unknown;
}
else
@@ -296,13 +297,13 @@ bool OPcmciaSocket::isUnsupported() const
bool OPcmciaSocket::isEmpty() const
{
- return ! status() && ( Occupied || OccupiedCardBus );
+ return !(status() & ( Occupied | OccupiedCardBus ));
}
bool OPcmciaSocket::isSuspended() const
{
- return status() && Suspended;
+ return status() & Suspended;
}
@@ -336,7 +337,7 @@ bool OPcmciaSocket::reset()
}
-QStringList OPcmciaSocket::productIdentity() const
+QStringList OPcmciaSocket::productIdentityVector() const
{
QStringList list;
cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
@@ -358,6 +359,12 @@ QStringList OPcmciaSocket::productIdentity() const
}
+QString OPcmciaSocket::productIdentity() const
+{
+ return productIdentityVector().join( " " ).stripWhiteSpace();
+}
+
+
QString OPcmciaSocket::manufacturerIdentity() const
{
cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h
index 0fd43cf..23d8c41 100644
--- a/libopie2/opiecore/linux/opcmciasystem.h
+++ b/libopie2/opiecore/linux/opcmciasystem.h
@@ -188,9 +188,13 @@ class OPcmciaSocket : public QObject
*/
bool reset();
/**
- * @returns a list of product IDs
+ * @returns the product ID vector
*/
- QStringList productIdentity() const;
+ QStringList productIdentityVector() const;
+ /**
+ * @returns the product ID string
+ */
+ QString productIdentity() const;
/**
* @returns the manufacturer ID string
*/