1 files changed, 7 insertions, 0 deletions

diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 21c5a84..9f151ce 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -61,192 +61,199 @@ OPcmciaSystem::OPcmciaSystem()
     qDebug( "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();
 
     //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;
         }
     }
 }
 
 
 int OPcmciaSystem::count() const
 {
     return _interfaces.count();
 }
 
 
 int OPcmciaSystem::cardCount() const
 {
     int nonEmpty = 0;
     OPcmciaSystem::CardIterator it = iterator();
     while ( it.current() )
     {
         if ( !it.current()->isEmpty() ) nonEmpty++;
         ++it;
     }
     return nonEmpty;
 }
 
 
 OPcmciaSocket* OPcmciaSystem::socket( unsigned int number )
 {
     return _interfaces.at( number );
 }
 
 
+void OPcmciaSystem::restart()
+{
+    //FIXME Use OProcess or something that allows more control
+    ::system( "/etc/init.d/pcmcia restart" );
+}
+
+
 OPcmciaSystem* OPcmciaSystem::instance()
 {
     if ( !_instance ) _instance = new OPcmciaSystem();
     return _instance;
 }
 
 
 OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const
 {
     return OPcmciaSystem::CardIterator( _interfaces );
 }
 
 
 /*======================================================================================
  * OPcmciaSocket
  *======================================================================================*/
 
 OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name )
                  :QObject( parent, name ), _major( major ), _socket( socket )
 {
     qDebug( "OPcmciaSocket::OPcmciaSocket()" );
     init();
 }
 
 
 OPcmciaSocket::~OPcmciaSocket()
 {
     qDebug( "OPcmciaSocket::~OPcmciaSocket()" );
     cleanup();
 }
 
 
 /* internal */ void OPcmciaSocket::init()
 {
     // open control socket and gather file descriptor
     if ( _major )
     {
         dev_t dev = makedev( _major, _socket );
 
 #ifdef OPCMCIA_DEBUG
         QString filename = "/tmp/opcmciasystem-debug";
         if ( QFile::exists( filename ) )
 #else
         QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
         if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
 #endif
         {
             _fd = ::open( (const char*) filename, O_RDONLY);
             if ( !_fd )
             {
                 qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) );
             }
 #ifndef OPCMCIA_DEBUG
             else
             {
                 ::unlink( (const char*) filename );
             }
 #endif
         }
         else
         {
             qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) );
         }
     }
 }
 
 /* internal */ void OPcmciaSocket::cleanup()
 {
     // close control socket
 }
 
 /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const
 {
     _ioctlarg.tuple.DesiredTuple = tuple;
     _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON;
     _ioctlarg.tuple.TupleOffset = 0;
 
     int result;
     result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg);
     if ( result != 0 )
     {
         qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) );
         return false;
     }
 
     result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg);
     if ( result != 0 )
     {
         qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) );
         return false;
     }
 
     result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg );
     if ( result != 0 )
     {
         qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) );