summaryrefslogtreecommitdiff
path: root/libopie2/opiecore
Unidiff
Diffstat (limited to 'libopie2/opiecore') (more/less context) (show 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
@@ -319,51 +319,53 @@ bool OPcmciaSocket::insert()
319 319
320 320
321bool OPcmciaSocket::suspend() 321bool OPcmciaSocket::suspend()
322{ 322{
323 return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1; 323 return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1;
324} 324}
325 325
326 326
327bool OPcmciaSocket::resume() 327bool OPcmciaSocket::resume()
328{ 328{
329 return ::ioctl( _fd, DS_RESUME_CARD ) != -1; 329 return ::ioctl( _fd, DS_RESUME_CARD ) != -1;
330} 330}
331 331
332 332
333bool OPcmciaSocket::reset() 333bool OPcmciaSocket::reset()
334{ 334{
335 return ::ioctl( _fd, DS_RESET_CARD ) != -1; 335 return ::ioctl( _fd, DS_RESET_CARD ) != -1;
336} 336}
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
352 { 354 {
353 list += "<unknown>"; 355 list += "<unknown>";
354 } 356 }
355 return list; 357 return list;
356} 358}
357 359
358 360
359QString OPcmciaSocket::manufacturerIdentity() const 361QString OPcmciaSocket::manufacturerIdentity() const
360{ 362{
361 cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid; 363 cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
362 if ( getTuple( CISTPL_MANFID ) ) 364 if ( getTuple( CISTPL_MANFID ) )
363 { 365 {
364 return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card ); 366 return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card );
365 } 367 }
366 else 368 else
367 return "<unknown>"; 369 return "<unknown>";
368} 370}
369 371