Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h index 630a434..ef34964 100644 --- a/libopie2/opiecore/linux/opcmciasystem.h +++ b/libopie2/opiecore/linux/opcmciasystem.h @@ -27,12 +27,14 @@ */ #ifndef OPCMCIASYSTEM_H #define OPCMCIASYSTEM_H +#include "linux_pcmcia.h" + #include <qobject.h> #include <qlist.h> namespace Opie { namespace Core { @@ -89,12 +91,15 @@ class OPcmciaSystem : public QObject protected: OPcmciaSystem(); private: static OPcmciaSystem* _instance; CardList _interfaces; + int _major; + + private: class Private; Private *d; }; /*====================================================================================== @@ -105,15 +110,15 @@ class OPcmciaSocket : public QObject { Q_OBJECT public: /** * Constructor. Normally you don't create @ref OPcmciaSocket objects yourself, - * but access them via @ref OPcmciaSystem::card(). + * but access them via @ref OPcmciaSystem::socket(). */ - OPcmciaSocket( int socket, QObject* parent, const char* name ); + OPcmciaSocket( int major, int socket, QObject* parent, const char* name ); /** * Destructor. */ virtual ~OPcmciaSocket(); /** * @returns the corresponding socket number @@ -157,19 +162,36 @@ class OPcmciaSocket : public QObject bool resume(); /** * Reset card. @returns true, if operation succeeded * @note: This operation needs root privileges */ bool reset(); + /** + * @returns a list of product IDs + */ + const QStringList& productIdentity() const; + /** + * @returns the manufacturer ID pair + */ +#if 0 + const QPair& manufacturerIdentity() const; +#endif - protected: + private: + QStringList _productId; private: void init(); + void buildInformation(); + void cleanup(); bool command( const QString& cmd ); + bool getTuple( cisdata_t tuple ); + int _major; int _socket; + int _fd; + ds_ioctl_arg_t _ioctlarg; private: class Private; Private *d; }; |