summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-21 20:23:05 (UTC)
committer mickeyl <mickeyl>2005-05-21 20:23:05 (UTC)
commitdb6b46788db3653812f07c3018abc5bfaaa821c3 (patch) (side-by-side diff)
treee159683e96eed09bbc9a886c39c6fd7776fe5f42
parentafb929e7fd04ecdfec2799a5cf9cf298d1af77c6 (diff)
downloadopie-db6b46788db3653812f07c3018abc5bfaaa821c3.zip
opie-db6b46788db3653812f07c3018abc5bfaaa821c3.tar.gz
opie-db6b46788db3653812f07c3018abc5bfaaa821c3.tar.bz2
add more methods to OPcmciaSocket
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp15
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h9
2 files changed, 23 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index c4b5316..c310b85 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -153,53 +153,66 @@ 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();
}
+bool OPcmciaSocket::isUnsupported() const
+{
+ return ( strcmp( name(), "unsupported card" ) == 0 );
+}
+
+
bool OPcmciaSocket::isEmpty() const
{
return ( strcmp( name(), "empty" ) == 0 );
}
bool OPcmciaSocket::isSuspended() const
{
+ //FIXME
+ return false;
}
bool OPcmciaSocket::eject()
{
return command( "eject" );
}
bool OPcmciaSocket::insert()
{
return command( "insert" );
}
bool OPcmciaSocket::suspend()
{
return command( "suspend" );
}
bool OPcmciaSocket::resume()
{
- return command( "resume ");
+ return command( "resume");
+}
+
+bool OPcmciaSocket::reset()
+{
+ return command( "reset");
}
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h
index 4b445aa..630a434 100644
--- a/libopie2/opiecore/linux/opcmciasystem.h
+++ b/libopie2/opiecore/linux/opcmciasystem.h
@@ -103,69 +103,78 @@ class OPcmciaSystem : public QObject
class OPcmciaSocket : public QObject
{
Q_OBJECT
public:
/**
* Constructor. Normally you don't create @ref OPcmciaSocket objects yourself,
* but access them via @ref OPcmciaSystem::card().
*/
OPcmciaSocket( int socket, QObject* parent, const char* name );
/**
* Destructor.
*/
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 card is unsupported by the cardmgr
+ */
+ bool isUnsupported() 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();
+ /**
+ * Reset card. @returns true, if operation succeeded
+ * @note: This operation needs root privileges
+ */
+ bool reset();
protected:
private:
void init();
bool command( const QString& cmd );
int _socket;
private:
class Private;
Private *d;
};
}
}
#endif // OPCMCIASYSTEM_H