add restart() method (FIXME included ;)

2 files changed, 13 insertions, 2 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
@@ -109,96 +109,103 @@ void OPcmciaSystem::synchronize()
     }
     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);
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h
index 23d8c41..fecbb21 100644
--- a/libopie2/opiecore/linux/opcmciasystem.h
+++ b/libopie2/opiecore/linux/opcmciasystem.h
@@ -24,109 +24,113 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef OPCMCIASYSTEM_H
 #define OPCMCIASYSTEM_H
 
 #include "linux_pcmcia.h"
 
 #include <qobject.h>
 #include <qlist.h>
 
 namespace Opie {
 namespace Core {
 
 class OPcmciaSocket;
 
 /*======================================================================================
  * OPcmciaSystem
  *======================================================================================*/
 
 /**
  * @brief A container class for the linux pcmcia subsystem
  *
  * This class provides access to all available pcmcia/cf cards on your device.
  *
  * @author Michael 'Mickey' Lauer <mickey@Vanille.de>
  */
 class OPcmciaSystem : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QList<OPcmciaSocket> CardList;
     typedef QListIterator<OPcmciaSocket> CardIterator;
 
   public:
     /**
      * @returns the number of available sockets
      */
     int count() const;
     /**
      * @returns the number of populated sockets
      */
     int cardCount() const;
     /**
-     * @returns a pointer to the (one and only) @ref OSystem instance.
+     * @returns a pointer to the (one and only) @ref OSystem instance
      */
     static OPcmciaSystem* instance();
     /**
-     * @returns an iterator usable for iterating through all sound cards.
+     * @returns an iterator usable for iterating through all sound cards
      */
     CardIterator iterator() const;
     /**
      * @returns a pointer to the @ref OPcmciaSocket object correspinding to socket number n, or 0, if not found
      * @see OPcmciaSocket
      */
     OPcmciaSocket* socket( unsigned int number );
     /**
+      * Restarts the subsystem
+      */
+    void restart();
+    /**
      * @internal Rebuild the internal database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
 
   protected:
     OPcmciaSystem();
 
   private:
     static OPcmciaSystem* _instance;
     CardList _interfaces;
     int _major;
 
   private:
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OPcmciaSocket
  *======================================================================================*/
 
 class OPcmciaSocket : public QObject
 {
   Q_OBJECT
   public:
 
     enum OPcmciaSocketCardStatus
     {
         Unknown             = 0,
         Occupied            = CS_EVENT_CARD_DETECT,
         OccupiedCardBus     = CS_EVENT_CB_DETECT,
         WriteProtected      = CS_EVENT_WRITE_PROTECT,
         BatteryLow          = CS_EVENT_BATTERY_LOW,
         BatteryDead         = CS_EVENT_BATTERY_DEAD,
         Ready               = CS_EVENT_READY_CHANGE,
         Suspended           = CS_EVENT_PM_SUSPEND,
         Attention           = CS_EVENT_REQUEST_ATTENTION,
         InsertionInProgress = CS_EVENT_CARD_INSERTION,
         RemovalInProgress   = CS_EVENT_CARD_REMOVAL,
         ThreeVolts          = CS_EVENT_3VCARD,
         SupportsVoltage     = CS_EVENT_XVCARD,
     };
 
   public:
     /**