- fix logic in isEmpty() and isSuspended()

- add convenience API productIdentityVendor()

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
@@ -278,4 +278,5 @@ const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const
     {
         qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) );
+        // return ( errno == -ENODEV ) ? Empty : Unknown;
         return Unknown;
     }
@@ -297,5 +298,5 @@ bool OPcmciaSocket::isUnsupported() const
 bool OPcmciaSocket::isEmpty() const
 {
-    return ! status() && ( Occupied || OccupiedCardBus );
+    return !(status() & ( Occupied | OccupiedCardBus ));
 }
 
@@ -303,5 +304,5 @@ bool OPcmciaSocket::isEmpty() const
 bool OPcmciaSocket::isSuspended() const
 {
-    return status() && Suspended;
+    return status() & Suspended;
 }
 
@@ -337,5 +338,5 @@ bool OPcmciaSocket::reset()
 
 
-QStringList OPcmciaSocket::productIdentity() const
+QStringList OPcmciaSocket::productIdentityVector() const
 {
     QStringList list;
@@ -359,4 +360,10 @@ QStringList OPcmciaSocket::productIdentity() const
 
 
+QString OPcmciaSocket::productIdentity() const
+{
+    return productIdentityVector().join( " " ).stripWhiteSpace();
+}
+
+
 QString OPcmciaSocket::manufacturerIdentity() const
 {
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
@@ -189,7 +189,11 @@ 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