Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.cpp') (more/less context) (show 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 | |||
@@ -295,99 +295,101 @@ bool OPcmciaSocket::isUnsupported() const | |||
295 | 295 | ||
296 | 296 | ||
297 | bool OPcmciaSocket::isEmpty() const | 297 | bool OPcmciaSocket::isEmpty() const |
298 | { | 298 | { |
299 | return ! status() && ( Occupied || OccupiedCardBus ); | 299 | return ! status() && ( Occupied || OccupiedCardBus ); |
300 | } | 300 | } |
301 | 301 | ||
302 | 302 | ||
303 | bool OPcmciaSocket::isSuspended() const | 303 | bool OPcmciaSocket::isSuspended() const |
304 | { | 304 | { |
305 | return status() && Suspended; | 305 | return status() && Suspended; |
306 | } | 306 | } |
307 | 307 | ||
308 | 308 | ||
309 | bool OPcmciaSocket::eject() | 309 | bool OPcmciaSocket::eject() |
310 | { | 310 | { |
311 | return ::ioctl( _fd, DS_EJECT_CARD ) != -1; | 311 | return ::ioctl( _fd, DS_EJECT_CARD ) != -1; |
312 | } | 312 | } |
313 | 313 | ||
314 | 314 | ||
315 | bool OPcmciaSocket::insert() | 315 | bool OPcmciaSocket::insert() |
316 | { | 316 | { |
317 | return ::ioctl( _fd, DS_INSERT_CARD ) != -1; | 317 | return ::ioctl( _fd, DS_INSERT_CARD ) != -1; |
318 | } | 318 | } |
319 | 319 | ||
320 | 320 | ||
321 | bool OPcmciaSocket::suspend() | 321 | bool 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 | ||
327 | bool OPcmciaSocket::resume() | 327 | bool 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 | ||
333 | bool OPcmciaSocket::reset() | 333 | bool 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 | ||
339 | QStringList OPcmciaSocket::productIdentity() const | 339 | QStringList 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 | ||
359 | QString OPcmciaSocket::manufacturerIdentity() const | 361 | QString 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 | ||
370 | 372 | ||
371 | QString OPcmciaSocket::function() const | 373 | QString OPcmciaSocket::function() const |
372 | { | 374 | { |
373 | cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid; | 375 | cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid; |
374 | if ( getTuple( CISTPL_FUNCID ) ) | 376 | if ( getTuple( CISTPL_FUNCID ) ) |
375 | { | 377 | { |
376 | switch ( funcid->func ) | 378 | switch ( funcid->func ) |
377 | { | 379 | { |
378 | case 0: return "Multifunction"; break; | 380 | case 0: return "Multifunction"; break; |
379 | case 1: return "Memory"; break; | 381 | case 1: return "Memory"; break; |
380 | case 2: return "Serial"; break; | 382 | case 2: return "Serial"; break; |
381 | case 3: return "Parallel"; break; | 383 | case 3: return "Parallel"; break; |
382 | case 4: return "Fixed Disk"; break; | 384 | case 4: return "Fixed Disk"; break; |
383 | case 5: return "Video"; break; | 385 | case 5: return "Video"; break; |
384 | case 6: return "Network"; break; | 386 | case 6: return "Network"; break; |
385 | case 7: return "AIMS"; break; | 387 | case 7: return "AIMS"; break; |
386 | case 8: return "SCSI"; break; | 388 | case 8: return "SCSI"; break; |
387 | default: return "<unknown>"; break; | 389 | default: return "<unknown>"; break; |
388 | } | 390 | } |
389 | } | 391 | } |
390 | else | 392 | else |
391 | { | 393 | { |
392 | return "<unknown>"; | 394 | return "<unknown>"; |
393 | } | 395 | } |