1 files changed, 54 insertions, 15 deletions

diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 1a2b619..186dfea 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -41,2 +41,3 @@
 #include <qpe/applnk.h>
+#include <qpe/global.h>
 #include <qpe/resource.h>
@@ -46,2 +47,3 @@ using namespace Opie::Ui;
 /* QT */
+#include <qcombobox.h>
 #include <qcopchannel_qws.h>
@@ -180,3 +182,3 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
         {
-            odebug << "skipping empty card in socket " << it.current()->number() << oendl;
+            odebug << "pcmcia: skipping empty card in socket " << it.current()->number() << oendl;
             ++it;
@@ -193,3 +195,3 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
                 QString name = cfg.readEntry( "name" );
-                odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+                odebug << "pcmcia: comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
                 if ( cardName == name )
@@ -209,8 +211,9 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
                                            tr( "PCMCIA/CF Subsystem" ),
-                                           tr( "<qt>You have inserted the card '%1'. This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ),
+                                           tr( "<qt>You have inserted the card<br/><b>%1</b><br/>This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ),
                                            tr( "Yes" ), tr( "No" ), 0, 0, 1 );
-        odebug << "result = " << result << oendl;
+        odebug << "pcmcia: result = " << result << oendl;
         if ( result == 0 )
         {
-            bool configured = configure( theCard );
+            QString insertAction; QString resumeAction; QString driver; QString conf;
+            bool configured = configure( theCard, insertAction, resumeAction, driver, conf );
 
@@ -218,6 +221,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
             {
-                odebug << "card has been configured. writing out to dabase" << oendl;
+                odebug << "pcmcia: card has been configured. writing out to database" << oendl;
                 cfg.setGroup( QString( "Card_%1" ).arg( nCards ) );
                 cfg.writeEntry( "name", newCardName );
-                cfg.writeEntry( "insert", "suspend" );
+                cfg.writeEntry( "insertAction", insertAction );
+                cfg.writeEntry( "resumeAction", resumeAction );
                 cfg.setGroup( "Global" );
@@ -225,2 +229,24 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
                 cfg.write();
+
+                QFile confFile( QString( "/etc/pcmcia/%1" ).arg( conf ) );
+                if ( confFile.open( IO_ReadWrite | IO_Append ) )
+                {
+                    QString entryCard = QString( "card \"%1\"" ).arg( newCardName );
+                    QString entryVersion( "    version " );
+                    for ( QStringList::Iterator it = theCard->productIdentity().begin(); it != theCard->productIdentity().end(); ++it )
+                    {
+                        entryVersion += QString( "\"%1\", " ).arg( *it );
+                    }
+                    QString entryBind = QString( "    bind %1" ).arg( driver );
+                    QString entry = QString( "\n%1\n%2\n%3\n" ).arg( entryCard ).arg( entryVersion ).arg( entryBind );
+                    odebug << "pcmcia: writing entry...:" << entry << oendl;
+
+                    confFile.writeBlock( (const char*) entry, entry.length() );
+                    Global::statusMessage( "restarting pcmcia services..." );
+                    ::system( "/etc/init.d/pcmcia restart" );
+                }
+                else
+                {
+                    owarn << "pcmcia: couldn't write binding to '" << conf << "'." << oendl;
+                }
             }
@@ -228,3 +254,3 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
             {
-                odebug << "card has not been configured this time. leaving as unknown card" << oendl;
+                odebug << "pcmcia: card has not been configured this time. leaving as unknown card" << oendl;
             }
@@ -238,5 +264,5 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
     {
-        QString action = ConfigDialog::preferredAction( theCard );
+        QString insertAction = ConfigDialog::preferredAction( theCard, "insert" );
         odebug << "pcmcia: card has been previously configured" << oendl;
-        odebug << "pcmcia: need to perform action'" << action << "' now... sorry, not yet implemented..." << oendl;
+        odebug << "pcmcia: TODO: need to perform action'" << insertAction << "' now... sorry, not yet implemented..." << oendl;
     }
@@ -273,3 +299,3 @@ void PcmciaManager::userCardAction( int action )
 {
-    odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl;
+    odebug << "pcmcia: user action on socket " << action / 100 << " requested. action = " << action << oendl;
 
@@ -281,3 +307,9 @@ void PcmciaManager::userCardAction( int action )
     {
-        case CONFIGURE: configure( OPcmciaSystem::instance()->socket( socket ) ); success = true; break;
+        case CONFIGURE:
+        {
+            QString insertAction; QString resumeAction; QString driver; QString conf;
+            bool result = configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
+            success = true;
+            break;
+        }
         case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break;
@@ -287,3 +319,3 @@ void PcmciaManager::userCardAction( int action )
         case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break;
-        default: odebug << "not yet implemented" << oendl;
+        default: odebug << "pcmcia: not yet implemented" << oendl;
     }
@@ -292,3 +324,3 @@ void PcmciaManager::userCardAction( int action )
     {
-        owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl;
+        owarn << "pcmcia: couldn't perform user action (" << strerror( errno ) << ")" << oendl;
     }
@@ -297,3 +329,3 @@ void PcmciaManager::userCardAction( int action )
 
-bool PcmciaManager::configure( OPcmciaSocket* card )
+bool PcmciaManager::configure( OPcmciaSocket* card, QString& insertAction, QString& resumeAction, QString& driver, QString& conf )
 {
@@ -304,2 +336,9 @@ bool PcmciaManager::configure( OPcmciaSocket* card )
     odebug << "pcmcia: configresult = " << configresult << oendl;
+    if ( configresult )
+    {
+        insertAction = dialog.cbInsertAction->currentText();
+        resumeAction = dialog.cbResumeAction->currentText();
+        driver = dialog.cbBindTo->currentText();
+        conf = dialog.bindEntries[driver];
+    }
     return configresult;