summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-22 14:12:45 (UTC)
committer mickeyl <mickeyl>2005-06-22 14:12:45 (UTC)
commit4775588885d60ea208c667a5863244a847a69f94 (patch) (unidiff)
treeee6d5b1388a7b92dba2188af52995cefc4164d74
parentc7d80acef0bab4babadac288796117987bb4e846 (diff)
downloadopie-4775588885d60ea208c667a5863244a847a69f94.zip
opie-4775588885d60ea208c667a5863244a847a69f94.tar.gz
opie-4775588885d60ea208c667a5863244a847a69f94.tar.bz2
respect number of product strings in CIS data
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp4
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
@@ -337,15 +337,17 @@ bool OPcmciaSocket::reset()
337 337
338 338
339QStringList OPcmciaSocket::productIdentity() const 339QStringList OPcmciaSocket::productIdentity() const
340{ 340{
341 QStringList list; 341 QStringList list;
342 cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; 342 cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
343 vers->ns = 0; // number of strings
343 if ( getTuple( CISTPL_VERS_1 ) ) 344 if ( getTuple( CISTPL_VERS_1 ) )
344 { 345 {
345 for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i ) 346 qDebug( " NUMBER_OF_PRODIDs = %d", vers->ns );
347 for ( int i = 0; i < QMIN( CISTPL_VERS_1_MAX_PROD_STRINGS, vers->ns ); ++i )
346 { 348 {
347 qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] ); 349 qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] );
348 list += vers->str+vers->ofs[i]; 350 list += vers->str+vers->ofs[i];
349 } 351 }
350 } 352 }
351 else 353 else