make detection algorithm work with any number of sockets

1 files changed, 28 insertions, 10 deletions

diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 7f24371..a1deb6b 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -1,259 +1,277 @@
 /*
                              This file is part of the Opie Project
              =.             (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          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.
 
 */
 
 #include "pcmcia.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/oconfig.h>
 #include <opie2/oprocess.h>
 #include <opie2/opcmciasystem.h>
 #include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
 {
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
              SIGNAL( received(const QCString&,const QByteArray&) ), this,
              SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
     setFocusPolicy( NoFocus );
     setFixedWidth ( AppLnk::smallIconSize() );
     setFixedHeight ( AppLnk::smallIconSize() );
     pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
 }
 
 
 PcmciaManager::~PcmciaManager()
 {
 }
 
 
 void PcmciaManager::popUp( QString message, QString icon )
 {
     if ( !popupMenu ) {
         popupMenu = new QPopupMenu( this );
     }
 
     popupMenu->clear();
     if ( icon.isEmpty() ) {
         popupMenu->insertItem( message, 0 );
     } else {
         popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
                                message, 0 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = popupMenu->sizeHint();
     popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                               p.y() - s.height() ), 0 );
 
     QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
 }
 
 
 void PcmciaManager::popupTimeout()
 {
     popupMenu->hide();
 }
 
 
 void PcmciaManager::mousePressEvent( QMouseEvent* )
 {
     QPopupMenu* menu = new QPopupMenu( this );
     QStringList cmd;
     bool execute = true;
 
     OPcmciaSystem* sys = OPcmciaSystem::instance();
     OPcmciaSystem::CardIterator it = sys->iterator();
     if ( !sys->count() ) return;
 
     int i = 0;
     while ( it.current() )
     {
 
         QPopupMenu* submenu = new QPopupMenu( menu );
         submenu->insertItem( "Eject" );
         submenu->insertItem( "Insert" );
         submenu->insertItem( "Suspend" );
         submenu->insertItem( "Resume" );
         submenu->insertItem( "Configure" );
 
         menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
         ++it;
     }
 
 
 
     /* insert items depending on number of cards etc.
 
     if ( cardInSd ) {
         menu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( "cardmon/ide", Opie::Core::OResource::SmallIcon ) ),
                           tr( "Eject SD/MMC card" ), 0 );
     }
 
 
 
     if ( cardInPcmcia0 ) {
         menu->
         insertItem( QIconSet
                     ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ),
                     tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
     }
 
     if ( cardInPcmcia1 ) {
         menu->
         insertItem( QIconSet
                     ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ),
                     tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
         */
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = menu->sizeHint();
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 );
     qDebug( "pcmcia: menu result = %d", opt );
     delete menu;
 }
 
 
 void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
 {
     odebug << "PcmciaManager::cardMessage( '" << msg << "' )" << oendl;
     if ( msg != "stabChanged()" ) return;
 
     /* check if a previously unknown card has been inserted */
     OPcmciaSystem::instance()->synchronize();
 
     if ( !OPcmciaSystem::instance()->cardCount() ) return;
 
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
 
     OPcmciaSystem* sys = OPcmciaSystem::instance();
     OPcmciaSystem::CardIterator it = sys->iterator();
 
     bool newCard = true;
+    QString cardName;
 
-    while ( it.current() && !it.current()->isEmpty() && newCard )
+    while ( it.current() && newCard )
     {
-        QString name = it.current()->identity();
+        if ( it.current()->isEmpty() )
+        {
+            odebug << "skipping empty card in socket " << it.current()->number() << oendl;
+            ++it;
+            continue;
+        }
+        else
+        {
+            cardName = it.current()->identity();
         for ( int i = 0; i < nCards; ++i )
         {
             QString cardSection = QString( "Card_%1" ).arg( i );
             cfg.setGroup( cardSection );
-            QString cardName = cfg.readEntry( "name" );
-            odebug << "comparing card '" << name << "' with known card '" << cardName << "'" << oendl;
+                QString name = cfg.readEntry( "name" );
+                odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
             if ( cardName == name )
             {
                 newCard = false;
                 break;
             }
         }
         if ( !newCard ) ++it; else break;
     }
-
+    }
     if ( newCard )
     {
-        QString newCardName = it.current()->identity();
         odebug << "pcmcia: new card detected" << oendl;
         cfg.setGroup( QString( "Card_%1" ).arg( nCards ) );
-        cfg.writeEntry( "name", newCardName );
+        cfg.writeEntry( "name", cardName );
         cfg.setGroup( "Global" );
         cfg.writeEntry( "nCards", nCards+1 );
         cfg.write();
 
         int result = QMessageBox::information( qApp->desktop(),
                                            tr( "PCMCIA/CF Subsystem" ),
-                                           tr( "You have inserted a new card\n%1\nDo you want to configure this card?" ).arg( newCardName ),
+                                           tr( "You have inserted a new card:\n%1\nDo you want to configure?" ).arg( cardName ),
                                            tr( "Yes" ), tr( "No" ), 0, 0, 1 );
         odebug << "result = " << result << oendl;
-
+        if ( result == 0 )
+        {
+            QMessageBox::information( qApp->desktop(),
+                                      tr( "PCMCIA/CF Subsystem" ),
+                                      tr( "Sorry, not yet implemented...\n~lart mickeyl :D" ),
+                                      tr( "No Problem" ), 0, 0, 0 );
+        }
+        else
+        {
+            odebug << "pcmcia: user doesn't want to configure " << cardName << " now." << oendl;
+        }
     }
     else
     {
         odebug << "pcmcia: card has been previously inserted" << oendl;
     }
-    repaint( TRUE );
+    repaint( true );
 }
 
 
 void PcmciaManager::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
     qDebug( "count = %d", (OPcmciaSystem::instance()->count() ) );
     if ( OPcmciaSystem::instance()->count() )
     {
         p.drawPixmap( 0, 0, pm );
         show();
     }
     else
     {
         hide();
     }
 }
 
 int PcmciaManager::position()
 {
     return 7;
 }
 
 void PcmciaManager::execCommand( const QStringList &strList )
 {
 }
 
 EXPORT_OPIE_APPLET_v1( PcmciaManager )