| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 92 | ||||
| -rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 74 |
2 files changed, 135 insertions, 31 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 34e4477..c4b5316 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp @@ -43,2 +43,3 @@ using namespace Opie::Core; #include <string.h> +#include <stdlib.h> #include <sys/ioctl.h> @@ -79,10 +80,12 @@ void OPcmciaSystem::synchronize() { - QString line = cardinfo.readLine(); - // qDebug( "line = '%s'", (const char*) line ); - if ( line.startsWith( "Socket" ) && ! line.contains( "empty" ) ) + 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 == ':' ) { - int mid = line.find( ':' ); - QString name = line.right( line.length() - mid - 1 ); - QString id = line.right( line.length() - mid + 1 ); - if ( mid ) _interfaces.insert( name.stripWhiteSpace(), new OPcmciaCard( this, (const char*) id.stripWhiteSpace() ) ); + _interfaces.append( new OPcmciaSocket( numSocket, this, (const char*) cardName ) ); } @@ -102,5 +105,18 @@ int OPcmciaSystem::count() const -OPcmciaCard* OPcmciaSystem::card( const QString& iface ) const +int OPcmciaSystem::cardCount() const { - return _interfaces[iface]; + 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 ); } @@ -122,9 +138,9 @@ OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const /*====================================================================================== - * OPcmciaCard + * OPcmciaSocket *======================================================================================*/ -OPcmciaCard::OPcmciaCard( QObject* parent, const char* name ) - :QObject( parent, name ) +OPcmciaSocket::OPcmciaSocket( int socket, QObject* parent, const char* name ) + :QObject( parent, name ), _socket( socket ) { - odebug << "OPcmciaCard::OPcmciaCard()" << oendl; + odebug << "OPcmciaSocket::OPcmciaSocket()" << oendl; init(); @@ -133,4 +149,26 @@ OPcmciaCard::OPcmciaCard( QObject* parent, const char* name ) -OPcmciaCard::~OPcmciaCard() +OPcmciaSocket::~OPcmciaSocket() +{ +} + + +/* internal */ void OPcmciaSocket::init() +{ +} + +/* internal */ bool OPcmciaSocket::command( const QString& cmd ) +{ + QString cmdline = QString().sprintf( "cardctl %s %d &", (const char*) cmd, _socket ); + ::system( (const char*) cmdline ); +} + +int OPcmciaSocket::number() const +{ + return _socket; +} + + +QString OPcmciaSocket::identity() const { + return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); } @@ -138,4 +176,5 @@ OPcmciaCard::~OPcmciaCard() -void OPcmciaCard::init() +bool OPcmciaSocket::isEmpty() const { + return ( strcmp( name(), "empty" ) == 0 ); } @@ -143 +182,24 @@ void OPcmciaCard::init() +bool OPcmciaSocket::isSuspended() const +{ +} + +bool OPcmciaSocket::eject() +{ + return command( "eject" ); +} + +bool OPcmciaSocket::insert() +{ + return command( "insert" ); +} + +bool OPcmciaSocket::suspend() +{ + return command( "suspend" ); +} + +bool OPcmciaSocket::resume() +{ + return command( "resume "); +} diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h index 694bf16..4b445aa 100644 --- a/libopie2/opiecore/linux/opcmciasystem.h +++ b/libopie2/opiecore/linux/opcmciasystem.h @@ -33,4 +33,3 @@ #include <qobject.h> -#include <qdict.h> -#include <qmap.h> +#include <qlist.h> @@ -39,3 +38,3 @@ namespace Core { -class OPcmciaCard; +class OPcmciaSocket; @@ -57,4 +56,4 @@ class OPcmciaSystem : public QObject public: - typedef QDict<OPcmciaCard> CardMap; - typedef QDictIterator<OPcmciaCard> CardIterator; + typedef QList<OPcmciaSocket> CardList; + typedef QListIterator<OPcmciaSocket> CardIterator; @@ -62,3 +61,3 @@ class OPcmciaSystem : public QObject /** - * @returns the number of available interfaces + * @returns the number of available sockets */ @@ -66,2 +65,6 @@ class OPcmciaSystem : public QObject /** + * @returns the number of populated sockets + */ + int cardCount() const; + /** * @returns a pointer to the (one and only) @ref OSystem instance. @@ -74,8 +77,8 @@ class OPcmciaSystem : public QObject /** - * @returns a pointer to the @ref OAudioInterface object for the specified @a interface or 0, if not found - * @see OAudioInterface + * @returns a pointer to the @ref OPcmciaSocket object correspinding to socket number n, or 0, if not found + * @see OPcmciaSocket */ - OPcmciaCard* card( const QString& interface ) const; + OPcmciaSocket* socket( unsigned int number ); /** - * @internal Rebuild the internal interface database + * @internal Rebuild the internal database * @note Sometimes it might be useful to call this from client code, @@ -90,3 +93,3 @@ class OPcmciaSystem : public QObject static OPcmciaSystem* _instance; - CardMap _interfaces; + CardList _interfaces; class Private; @@ -97,6 +100,6 @@ class OPcmciaSystem : public QObject /*====================================================================================== - * OPcmciaCard + * OPcmciaSocket *======================================================================================*/ -class OPcmciaCard : public QObject +class OPcmciaSocket : public QObject { @@ -106,6 +109,6 @@ class OPcmciaCard : public QObject /** - * Constructor. Normally you don't create @ref OPcmciaCard objects yourself, + * Constructor. Normally you don't create @ref OPcmciaSocket objects yourself, * but access them via @ref OPcmciaSystem::card(). */ - OPcmciaCard( QObject* parent, const char* name ); + OPcmciaSocket( int socket, QObject* parent, const char* name ); /** @@ -113,3 +116,39 @@ class OPcmciaCard : public QObject */ - virtual ~OPcmciaCard(); + virtual ~OPcmciaSocket(); + /** + * @returns the corresponding socket number + */ + int number() const; + /** + * @returns the identification string of the card in this socket, or "<Empty Socket>" + */ + QString identity() const; + /** + * @returns true, if the socket is empty + */ + bool isEmpty() const; + /** + * @returns true, if the socket is suspended + */ + bool isSuspended() const; + /** + * Eject card. @returns true, if operation succeeded + * @note: This operation needs root privileges + */ + bool eject(); + /** + * Insert card. @returns true, if operation succeeded + * @note: This operation needs root privileges + */ + bool insert(); + /** + * Suspend card. @returns true, if operation succeeded + * @note: This operation needs root privileges + */ + bool suspend(); + /** + * Resume card. @returns true, if operation succeeded + * @note: This operation needs root privileges + */ + bool resume(); @@ -119,2 +158,5 @@ class OPcmciaCard : public QObject void init(); + bool command( const QString& cmd ); + int _socket; + private: |