author | mickeyl <mickeyl> | 2005-06-22 14:12:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-22 14:12:45 (UTC) |
commit | 4775588885d60ea208c667a5863244a847a69f94 (patch) (side-by-side diff) | |
tree | ee6d5b1388a7b92dba2188af52995cefc4164d74 /libopie2/opiecore/linux/opcmciasystem.cpp | |
parent | c7d80acef0bab4babadac288796117987bb4e846 (diff) | |
download | opie-4775588885d60ea208c667a5863244a847a69f94.zip opie-4775588885d60ea208c667a5863244a847a69f94.tar.gz opie-4775588885d60ea208c667a5863244a847a69f94.tar.bz2 |
respect number of product strings in CIS data
Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.cpp') (more/less context) (ignore whitespace changes)
-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 @@ -247,148 +247,150 @@ OPcmciaSocket::~OPcmciaSocket() } result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg ); if ( result != 0 ) { qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) ); return false; } return true; } int OPcmciaSocket::number() const { return _socket; } QString OPcmciaSocket::identity() const { return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); } const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const { cs_status_t cs_status; cs_status.Function = 0; int result = ::ioctl( _fd, DS_GET_STATUS, &cs_status ); if ( result != 0 ) { qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) ); return Unknown; } else { qDebug( " card status = 0x%08x", cs_status.CardState ); qDebug( " socket status = 0x%08x", cs_status.SocketState ); return (OPcmciaSocket::OPcmciaSocketCardStatus) (cs_status.CardState + cs_status.SocketState); } } bool OPcmciaSocket::isUnsupported() const { return ( strcmp( name(), "unsupported card" ) == 0 ); } bool OPcmciaSocket::isEmpty() const { return ! status() && ( Occupied || OccupiedCardBus ); } bool OPcmciaSocket::isSuspended() const { return status() && Suspended; } bool OPcmciaSocket::eject() { return ::ioctl( _fd, DS_EJECT_CARD ) != -1; } bool OPcmciaSocket::insert() { return ::ioctl( _fd, DS_INSERT_CARD ) != -1; } 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>"; } QString OPcmciaSocket::function() const { cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid; if ( getTuple( CISTPL_FUNCID ) ) { switch ( funcid->func ) { case 0: return "Multifunction"; break; case 1: return "Memory"; break; case 2: return "Serial"; break; case 3: return "Parallel"; break; case 4: return "Fixed Disk"; break; case 5: return "Video"; break; case 6: return "Network"; break; case 7: return "AIMS"; break; case 8: return "SCSI"; break; default: return "<unknown>"; break; } } else { return "<unknown>"; } } |