-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 2b0c01d..a5725f1 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -319,51 +319,53 @@ bool OPcmciaSocket::insert() bool OPcmciaSocket::suspend() { return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1; } bool OPcmciaSocket::resume() { return ::ioctl( _fd, DS_RESUME_CARD ) != -1; } bool OPcmciaSocket::reset() { return ::ioctl( _fd, DS_RESET_CARD ) != -1; } QStringList OPcmciaSocket::productIdentity() const { QStringList list; cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; + vers->ns = 0; // number of strings if ( getTuple( CISTPL_VERS_1 ) ) { - for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i ) + qDebug( " NUMBER_OF_PRODIDs = %d", vers->ns ); + for ( int i = 0; i < QMIN( CISTPL_VERS_1_MAX_PROD_STRINGS, vers->ns ); ++i ) { qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] ); list += vers->str+vers->ofs[i]; } } else { list += "<unknown>"; } return list; } QString OPcmciaSocket::manufacturerIdentity() const { 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>"; } |