1 files changed, 1 insertions, 1 deletions

diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 7bd7178..0f7ff46 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -97,193 +97,193 @@ void OPcmciaSystem::synchronize()
     QString fileName;
     if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; }
     else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; }
     else { fileName = "/var/lib/pcmcia/stab"; }
     QFile cardinfofile( fileName );
     if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) )
     {
         qWarning( "pcmcia info file not found or unaccessible" );
         return;
     }
     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( _major, numSocket, this, (const char*) cardName ) );
         }
         else
         {
             continue;
         }
     }
 }
 
 
 int OPcmciaSystem::count() const
 {
     return _interfaces.count();
 }
 
 
 int OPcmciaSystem::cardCount() const
 {
     int nonEmpty = 0;
     OPcmciaSystem::CardIterator it = iterator();
     while ( it.current() )
     {
         if ( !it.current()->isEmpty() ) nonEmpty++;
         ++it;
     }
     return nonEmpty;
 }
 
 
 OPcmciaSocket* OPcmciaSystem::socket( unsigned int number )
 {
     return _interfaces.at( number );
 }
 
 
 OPcmciaSystem* OPcmciaSystem::instance()
 {
     if ( !_instance ) _instance = new OPcmciaSystem();
     return _instance;
 }
 
 
 OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const
 {
     return OPcmciaSystem::CardIterator( _interfaces );
 }
 
 
 /*======================================================================================
  * OPcmciaSocket
  *======================================================================================*/
 
 OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name )
                  :QObject( parent, name ), _major( major ), _socket( socket )
 {
     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 );
+        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;
 }