start talking directly to pcmcia card services

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
@@ -32,2 +32,4 @@
 
+#include "linux_pcmcia.h"
+
 #include <qobject.h>
@@ -94,2 +96,5 @@ class OPcmciaSystem : public QObject
     CardList _interfaces;
+    int _major;
+
+  private:
     class Private;
@@ -110,5 +115,5 @@ class OPcmciaSocket : public QObject
      * 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 );
     /**
@@ -162,4 +167,15 @@ class OPcmciaSocket : public QObject
     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;
 
@@ -167,4 +183,10 @@ class OPcmciaSocket : public QObject
     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;