| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 13 | ||||
| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 8 |
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 @@ -279,2 +279,3 @@ const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) ); + // return ( errno == -ENODEV ) ? Empty : Unknown; return Unknown; @@ -298,3 +299,3 @@ bool OPcmciaSocket::isEmpty() const { - return ! status() && ( Occupied || OccupiedCardBus ); + return !(status() & ( Occupied | OccupiedCardBus )); } @@ -304,3 +305,3 @@ bool OPcmciaSocket::isSuspended() const { - return status() && Suspended; + return status() & Suspended; } @@ -338,3 +339,3 @@ bool OPcmciaSocket::reset() -QStringList OPcmciaSocket::productIdentity() const +QStringList OPcmciaSocket::productIdentityVector() const { @@ -360,2 +361,8 @@ 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 @@ -190,5 +190,9 @@ class OPcmciaSocket : public QObject /** - * @returns a list of product IDs + * @returns the product ID vector + */ + QStringList productIdentityVector() const; + /** + * @returns the product ID string */ - QStringList productIdentity() const; + QString productIdentity() const; /** |