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
@@ -21,24 +21,26 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef OPCMCIASYSTEM_H
 #define OPCMCIASYSTEM_H
 
+#include "linux_pcmcia.h"
+
 #include <qobject.h>
 #include <qlist.h>
 
 namespace Opie {
 namespace Core {
 
 class OPcmciaSocket;
 
 /*======================================================================================
  * OPcmciaSystem
  *======================================================================================*/
 
@@ -83,43 +85,46 @@ class OPcmciaSystem : public QObject
      * @internal Rebuild the internal database
      * @note Sometimes it might be useful to call this from client code,
      * e.g. after issuing a cardctl insert
      */
     void synchronize();
 
   protected:
     OPcmciaSystem();
 
   private:
     static OPcmciaSystem* _instance;
     CardList _interfaces;
+    int _major;
+
+  private:
     class Private;
     Private *d;
 };
 
 
 /*======================================================================================
  * OPcmciaSocket
  *======================================================================================*/
 
 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
      */
     int number() const;
     /**
      * @returns the identification string of the card in this socket, or "<Empty Socket>"
      */
     QString identity() const;
@@ -151,30 +156,47 @@ class OPcmciaSocket : public QObject
      */
     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();
+    /**
+      * @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;
 };
 
 
 }
 }
 
 #endif // OPCMCIASYSTEM_H