2 files changed, 163 insertions, 7 deletions

diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index c310b85..7bd7178 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -36,34 +36,63 @@ using namespace Opie::Core;
 /* QT */
 #include <qfile.h>
 #include <qtextstream.h>
 
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
+
+#define PROC_DEVICES "/proc/devices"
 
 /*======================================================================================
  * OPcmciaSystem
  *======================================================================================*/
 
 OPcmciaSystem* OPcmciaSystem::_instance = 0;
 
 OPcmciaSystem::OPcmciaSystem()
+              :_major( 0 )
 {
     qDebug( "OPcmciaSystem::OPcmciaSystem()" );
+
+    // get major node number out of /proc/devices
+    QFile procfile( PROC_DEVICES );
+    if ( procfile.exists() && procfile.open( IO_ReadOnly ) )
+    {
+        QTextStream devstream( &procfile );
+        devstream.readLine(); // skip header
+        while ( !devstream.atEnd() && !_major )
+        {
+            int nodenumber;
+            QString driver;
+            devstream >> nodenumber >> driver;
+            if ( driver == "pcmcia" )
+            {
+                qDebug( "OPcmciaSystem::OPcmciaSystem(): gotcha! pcmcia node number = %d", nodenumber );
+                _major = nodenumber;
+                break;
+            }
+        }
+    }
+    else
+    {
+        qWarning( "OPcmciaSystem::OPcmciaSystem() - can't open /proc/devices - continuing with limited functionality." );
+    }
+
     synchronize();
 }
 
 void OPcmciaSystem::synchronize()
 {
     qDebug( "OPcmciaSystem::synchronize()" );
     _interfaces.clear();
 
     //FIXME: Use cardmgr subsystem ioctls
 
     QString fileName;
     if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; }
@@ -78,25 +107,25 @@ void OPcmciaSystem::synchronize()
     QTextStream cardinfo( &cardinfofile );
     while ( !cardinfo.atEnd() )
     {
         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 == ':' )
         {
-            _interfaces.append( new OPcmciaSocket( numSocket, this, (const char*) cardName ) );
+            _interfaces.append( new OPcmciaSocket( _major, numSocket, this, (const char*) cardName ) );
         }
         else
         {
             continue;
         }
     }
 }
 
 
 int OPcmciaSystem::count() const
 {
     return _interfaces.count();
@@ -130,41 +159,133 @@ OPcmciaSystem* OPcmciaSystem::instance()
 
 
 OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const
 {
     return OPcmciaSystem::CardIterator( _interfaces );
 }
 
 
 /*======================================================================================
  * OPcmciaSocket
  *======================================================================================*/
 
-OPcmciaSocket::OPcmciaSocket( int socket, QObject* parent, const char* name )
-                 :QObject( parent, name ), _socket( socket )
+OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name )
+                 :QObject( parent, name ), _major( major ), _socket( socket )
 {
-    odebug << "OPcmciaSocket::OPcmciaSocket()" << oendl;
+    qDebug( "OPcmciaSocket::OPcmciaSocket()" );
+
     init();
+    buildInformation();
 }
 
 
 OPcmciaSocket::~OPcmciaSocket()
 {
+    qDebug( "OPcmciaSocket::~OPcmciaSocket()" );
+    cleanup();
 }
 
 
 /* internal */ void OPcmciaSocket::init()
 {
+    // open control socket and gather file descriptor
+    if ( _major )
+    {
+        dev_t dev = ::makedev( _major, _socket );
+        QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
+        if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
+        {
+            _fd = ::open( (const char*) filename, O_RDONLY);
+            if ( !_fd )
+            {
+                qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) );
+            }
+            else
+            {
+                ::unlink( (const char*) filename );
+            }
+        }
+        else
+        {
+            qWarning( "OPcmciaSocket::init() - can't create device node (%s)", strerror( errno ) );
+        }
+    }
+}
+
+/* internal */ void OPcmciaSocket::buildInformation()
+{
+    cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
+    cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
+    cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid;
+    config_info_t config;
+
+    if ( getTuple( CISTPL_VERS_1 ) )
+    {
+        for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i )
+        {
+            qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] );
+            _productId += vers->str+vers->ofs[i];
+        }
+    }
+        /*
+        for (i = 0; i < 4; i++)
+            printf("PRODID_%d=\"%s\"\n", i+1,
+                (i < vers->ns) ? vers->str+vers->ofs[i] : "");
+        *manfid = (cistpl_manfid_t) { 0, 0 };
+        get_tuple(fd, CISTPL_MANFID, &arg);
+        printf("MANFID=%04x,%04x\n", manfid->manf, manfid->card);
+        *funcid = (cistpl_funcid_t) { 0xff, 0xff };
+        get_tuple(fd, CISTPL_FUNCID, &arg);
+        printf("FUNCID=%d\n", funcid->func);
+        config.Function = config.ConfigBase = 0;
+        */
 }
 
+/* internal */ void OPcmciaSocket::cleanup()
+{
+    // close control socket
+}
+
+/* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple )
+{
+    _ioctlarg.tuple.DesiredTuple = tuple;
+    _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON;
+    _ioctlarg.tuple.TupleOffset = 0;
+
+    int result;
+    result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg);
+    if ( result != 0 )
+    {
+        qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) );
+        return false;
+    }
+
+    result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg);
+    if ( result != 0 )
+    {
+        qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) );
+        return false;
+    }
+
+    result = ::ioctl(_fd, DS_PARSE_TUPLE, &_ioctlarg);
+    if ( result != 0 )
+    {
+        qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) );
+        return false;
+    }
+
+    return true;
+}
+
+
 /* 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;
 }
 
 
@@ -207,12 +328,25 @@ bool OPcmciaSocket::suspend()
     return command( "suspend" );
 }
 
 bool OPcmciaSocket::resume()
 {
     return command( "resume");
 }
 
 bool OPcmciaSocket::reset()
 {
     return command( "reset");
 }
+
+const QStringList& OPcmciaSocket::productIdentity() const
+{
+    return _productId;
+}
+
+#if 0
+const QPair& OPcmciaSocket::manufacturerIdentity() const
+{
+    return _manufId;
+}
+#endif
+
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