summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp7
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h8
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
@@ -133,48 +133,55 @@ 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();
}
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
@@ -48,61 +48,65 @@ class OPcmciaSocket;
* @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
*======================================================================================*/