Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 13 |
1 files changed, 10 insertions, 3 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; |