summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index a924696..34e4477 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -65,38 +65,39 @@ void OPcmciaSystem::synchronize()
65 //FIXME: Use cardmgr subsystem ioctls 65 //FIXME: Use cardmgr subsystem ioctls
66 66
67 QString fileName; 67 QString fileName;
68 if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; } 68 if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; }
69 else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; } 69 else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; }
70 else { fileName = "/var/lib/pcmcia/stab"; } 70 else { fileName = "/var/lib/pcmcia/stab"; }
71 QFile cardinfofile( fileName ); 71 QFile cardinfofile( fileName );
72 if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) ) 72 if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) )
73 { 73 {
74 qWarning( "pcmcia info file not found or unaccessible" ); 74 qWarning( "pcmcia info file not found or unaccessible" );
75 return; 75 return;
76 } 76 }
77 QTextStream cardinfo( &cardinfofile ); 77 QTextStream cardinfo( &cardinfofile );
78 while ( !cardinfo.atEnd() ) 78 while ( !cardinfo.atEnd() )
79 { 79 {
80 QString line = cardinfo.readLine(); 80 QString line = cardinfo.readLine();
81 if ( line.startsWith( "Socket" ) ) 81 // qDebug( "line = '%s'", (const char*) line );
82 if ( line.startsWith( "Socket" ) && ! line.contains( "empty" ) )
82 { 83 {
83 int mid = line.find( ':' ); 84 int mid = line.find( ':' );
84 QString name = line.right( line.length() - mid - 1 ); 85 QString name = line.right( line.length() - mid - 1 );
85 QString id = line.right( line.length() - mid + 1 ); 86 QString id = line.right( line.length() - mid + 1 );
86 if ( mid ) _interfaces.insert( name, new OPcmciaCard( this, (const char*) id ) ); 87 if ( mid ) _interfaces.insert( name.stripWhiteSpace(), new OPcmciaCard( this, (const char*) id.stripWhiteSpace() ) );
87 } 88 }
88 else 89 else
89 { 90 {
90 continue; 91 continue;
91 } 92 }
92 } 93 }
93} 94}
94 95
95 96
96int OPcmciaSystem::count() const 97int OPcmciaSystem::count() const
97{ 98{
98 return _interfaces.count(); 99 return _interfaces.count();
99} 100}
100 101
101 102
102OPcmciaCard* OPcmciaSystem::card( const QString& iface ) const 103OPcmciaCard* OPcmciaSystem::card( const QString& iface ) const