summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-21 15:42:44 (UTC)
committer mickeyl <mickeyl>2005-05-21 15:42:44 (UTC)
commitc5cb180e37514584fd0015d7713fe07c041f3815 (patch) (side-by-side diff)
treef7fa392e38ca7dd213a6078996695350e772741e
parent81a650dc44d3be986cbf8f60e7c7b21ef76d1b94 (diff)
downloadopie-c5cb180e37514584fd0015d7713fe07c041f3815.zip
opie-c5cb180e37514584fd0015d7713fe07c041f3815.tar.gz
opie-c5cb180e37514584fd0015d7713fe07c041f3815.tar.bz2
change OPcmciaCard to OPcmciaSocket, it now resembles a socket rather than a card
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp92
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h74
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
@@ -41,6 +41,7 @@ using namespace Opie::Core;
#include <errno.h>
#include <fcntl.h>
#include <string.h>
+#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -77,14 +78,16 @@ void OPcmciaSystem::synchronize()
QTextStream cardinfo( &cardinfofile );
while ( !cardinfo.atEnd() )
{
- 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 ) );
}
else
{
@@ -100,9 +103,22 @@ 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 );
}
@@ -120,24 +136,70 @@ 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();
}
-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();
}
-void OPcmciaCard::init()
+bool OPcmciaSocket::isEmpty() const
{
+ return ( strcmp( name(), "empty" ) == 0 );
}
+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
@@ -31,13 +31,12 @@
#define OPCMCIASYSTEM_H
#include <qobject.h>
-#include <qdict.h>
-#include <qmap.h>
+#include <qlist.h>
namespace Opie {
namespace Core {
-class OPcmciaCard;
+class OPcmciaSocket;
/*======================================================================================
* OPcmciaSystem
@@ -55,15 +54,19 @@ class OPcmciaSystem : public QObject
Q_OBJECT
public:
- typedef QDict<OPcmciaCard> CardMap;
- typedef QDictIterator<OPcmciaCard> CardIterator;
+ typedef QList<OPcmciaSocket> CardList;
+ typedef QListIterator<OPcmciaSocket> CardIterator;
public:
/**
- * @returns the number of available interfaces
+ * @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.
*/
static OPcmciaSystem* instance();
@@ -72,12 +75,12 @@ class OPcmciaSystem : public QObject
*/
CardIterator iterator() const;
/**
- * @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,
* e.g. after issuing a cardctl insert
*/
@@ -88,35 +91,74 @@ class OPcmciaSystem : public QObject
private:
static OPcmciaSystem* _instance;
- CardMap _interfaces;
+ CardList _interfaces;
class Private;
Private *d;
};
/*======================================================================================
- * OPcmciaCard
+ * OPcmciaSocket
*======================================================================================*/
-class OPcmciaCard : public QObject
+class OPcmciaSocket : public QObject
{
Q_OBJECT
public:
/**
- * 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 );
/**
* Destructor.
*/
- 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();
protected:
private:
void init();
+ bool command( const QString& cmd );
+ int _socket;
+
private:
class Private;
Private *d;