-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 054d261..eae356e 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -65,65 +65,68 @@ OPcmciaSystem::OPcmciaSystem() // get major node number out of /proc/devices QFile procfile( PROC_DEVICES ); if ( procfile.exists() && procfile.open( IO_ReadOnly ) ) { QTextStream devstream( &procfile ); devstream.readLine(); // skip header while ( !devstream.atEnd() && !_major ) { int nodenumber; QString driver; devstream >> nodenumber >> driver; if ( driver == "pcmcia" ) { qDebug( "OPcmciaSystem::OPcmciaSystem(): gotcha! pcmcia node number = %d", nodenumber ); _major = nodenumber; break; } } } else { qWarning( "OPcmciaSystem::OPcmciaSystem() - can't open /proc/devices - continuing with limited functionality." ); } synchronize(); } void OPcmciaSystem::synchronize() { qDebug( "OPcmciaSystem::synchronize()" ); _interfaces.clear(); - //FIXME: Use cardmgr subsystem ioctls + //NOTE: We _could_ use ioctl's here as well, however we want to know if + // the card is recognized by the cardmgr (hence has a valid binding) + // If it is not recognized yet, userland may want to provide a configuration dialog + //TODO: Revise for pcmciautils QString fileName; if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; } else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; } else { fileName = "/var/lib/pcmcia/stab"; } QFile cardinfofile( fileName ); if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) ) { qWarning( "pcmcia info file not found or unaccessible" ); return; } QTextStream cardinfo( &cardinfofile ); while ( !cardinfo.atEnd() ) { QString strSocket; int numSocket; char colon; QString cardName; cardinfo >> strSocket >> numSocket >> colon; cardName = cardinfo.readLine().stripWhiteSpace(); qDebug( "strSocket = '%s', numSocket = '%d', colon = '%c', cardName = '%s'", (const char*) strSocket, numSocket, colon, ( const char*) cardName ); if ( strSocket == "Socket" && colon == ':' ) { _interfaces.append( new OPcmciaSocket( _major, numSocket, this, (const char*) cardName ) ); } else { continue; } } } |