does react on mmc on ipaq now

2 files changed, 140 insertions, 108 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index e94f1dc..367ef3b 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -23,2 +23,4 @@
 
+#include <opie/odevice.h>
+
 #include <qcopchannel_qws.h>
@@ -43,11 +45,11 @@
 CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
-                     pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) {
+                                              pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) {
 
     QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this );
-    connect( pcmciaChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-             this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
+    connect( pcmciaChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
+             this, SLOT( cardMessage( const QCString &, const QByteArray &) ) );
 
     QCopChannel* sdChannel = new QCopChannel( "QPE/Card", this );
-    connect( sdChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-             this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
+    connect( sdChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
+             this, SLOT( cardMessage( const QCString &, const QByteArray &) ) );
 
@@ -55,7 +57,8 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
     cardInPcmcia1 = FALSE;
+    cardInSd = FALSE;
 
     setFixedSize( pm.size() );
-    getStatusPcmcia(TRUE);
-    getStatusSd(TRUE);
-    repaint(FALSE);
+    getStatusPcmcia( TRUE );
+    getStatusSd( TRUE );
+    repaint( FALSE );
     popupMenu = 0;
@@ -64,3 +67,5 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
 CardMonitor::~CardMonitor() {
-    if( popupMenu ) { delete popupMenu; }
+    if( popupMenu ) {
+        delete popupMenu;
+    }
 }
@@ -71,2 +76,3 @@ void CardMonitor::popUp( QString message, QString icon ) {
     }
+
     popupMenu->clear();
@@ -75,13 +81,12 @@ void CardMonitor::popUp( QString message, QString icon ) {
     } else {
-        popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )),
-                message, 0 );
+        popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ),  message, 0 );
     }
 
-    QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
-    QSize s = popupMenu->sizeHint ( );
+    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);
+                          p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
+                          p. y ( ) - s. height ( ) ), 0);
 
-    QTimer::singleShot( 2000, this, SLOT(popupTimeout()) );
+    QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
 }
@@ -102,4 +107,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( cardInPcmcia0 ) {
-        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )),
-                tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ),
+                          tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 );
     }
@@ -107,8 +112,8 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( cardInPcmcia1 ) {
-        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )),
-                tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ),
+                tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
 
-    QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
-    QSize s = menu->sizeHint ( );
+    QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
+    QSize s = menu->sizeHint ();
     int opt = menu->exec( QPoint (
@@ -118,25 +123,31 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( opt == 1 ) {
-
         cmd = "/sbin/cardctl eject 0";
-        err = system( (const char *) cmd );
+        err = system( ( const char * ) cmd );
         if ( ( err == 127 ) || ( err < 0 ) ) {
-            qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err);
-            popUp( tr("CF/PCMCIA card eject failed!"));
+            qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err );
+            popUp( tr( "CF/PCMCIA card eject failed!" ) );
         }
     } else if ( opt == 0 ) {
-        cmd = "/etc/sdcontrol compeject";
-        err = system( (const char *) cmd );
-        if ( ( err != 0 ) ) {
-            qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err);
-            popUp( tr("SD/MMC card eject failed!"));
-        }
+        if ( ODevice::inst()->system() == OSYSTEM_Familiar ) {
+            cmd = "umount /dev/mmc/part1";
+            err = system( ( const char *) cmd );
+            if ( ( err != 0 ) ) {
+                popUp( tr("SD/MMC card eject failed!") );
+            }
+        } else {
+            cmd = "/etc/sdcontrol compeject";
+            err = system( ( const char *) cmd );
+            if ( ( err != 0 ) ) {
+                qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err );
+                popUp( tr("SD/MMC card eject failed!") );
+            }
+        }
     } else if ( opt == 2 ) {
         cmd = "/sbin/cardctl eject 1";
-        err = system( (const char *) cmd );
+        err = system( ( const char *) cmd );
         if ( ( err == 127 ) || ( err < 0 ) ) {
-            qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err);
-            popUp( tr("CF/PCMCIA card eject failed!"));
+            qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err );
+            popUp( tr( "CF/PCMCIA card eject failed!" ) );
         }
     }
-
     delete menu;
@@ -147,10 +158,10 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
     if ( msg == "stabChanged()" ) {
-        // qDebug("Pcmcia: stabchanged");
-        if ( getStatusPcmcia() ) {
-            repaint(FALSE);
+       // qDebug("Pcmcia: stabchanged");
+        if ( getStatusPcmcia() ) {
+            repaint( FALSE );
         }
     } else if ( msg == "mtabChanged()" ) {
-        // qDebug("Pcmcia: mtabchanged");
+        qDebug("CARDMONAPPLET: mtabchanged");
         if ( getStatusSd() ) {
-            repaint(FALSE);
+            repaint( FALSE );
         }
@@ -167,68 +178,78 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
     // one of these 3 files should exist
-    if (QFile::exists("/var/run/stab")) {
-        fileName = "/var/run/stab";
-    } else if (QFile::exists("/var/state/pcmcia/stab"))  {
-        fileName="/var/state/pcmcia/stab";
+    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";
+        fileName = "/var/lib/pcmcia/stab";
     }
 
-    QFile f(fileName);
+    QFile f( fileName );
 
-    if ( f.open(IO_ReadOnly) ) {
-        QStringList list;
-        QTextStream stream ( &f);
+    if ( f.open( IO_ReadOnly ) ) {
+        QStringList list;
+        QTextStream stream ( &f );
         QString streamIn;
         streamIn = stream.read();
-        list = QStringList::split("\n", streamIn);
-        for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
-            if( (*line).startsWith("Socket 0:") ){
-                if( (*line).startsWith("Socket 0: empty") && cardInPcmcia0  ){
+        list = QStringList::split( "\n", streamIn );
+        for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) {
+            if( (*line).startsWith( "Socket 0:" ) ){
+                if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0  ){
                     cardInPcmcia0 = FALSE;
-                } else if ( !(*line).startsWith("Socket 0: empty") && !cardInPcmcia0 ){
-                    cardInPcmcia0Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 );
-                    cardInPcmcia0Name.stripWhiteSpace();
+                } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){
+                    cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 );
+                    cardInPcmcia0Name.stripWhiteSpace();
                     cardInPcmcia0 = TRUE;
                     show();
-                    line++;
-                    int pos=(*line).find('\t')+1;
-                    cardInPcmcia0Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
+                    line++;
+            int pos=(*line).find('\t' ) + 1;
+            cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos );
                 }
-            }
-            else if( (*line).startsWith("Socket 1:") ){
-                if( (*line).startsWith("Socket 1: empty") && cardInPcmcia1 ){
+            }  else if( (*line).startsWith( "Socket 1:" ) ){
+                if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) {
                     cardInPcmcia1 = FALSE;
-                } else if ( !(*line).startsWith("Socket 1: empty") && !cardInPcmcia1 ){
-                    cardInPcmcia1Name = (*line).mid(((*line).find(':')+1), (*line).length()-9  );
-                    cardInPcmcia1Name.stripWhiteSpace();
+                } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) {
+                    cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9  );
+                    cardInPcmcia1Name.stripWhiteSpace();
                     cardInPcmcia1 = TRUE;
                     show();
-                    line++;
-                    int pos=(*line).find('\t')+1;
-                    cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos);
-                }
+                    line++;
+            int pos=(*line).find('\t') + 1;
+            cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos );
+                }
             }
         }
-        f.close();
-        if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
-            QString text = QString::null;
-            QString what = QString::null;
-            if(cardWas0 != cardInPcmcia0) {
-                if(cardInPcmcia0) { text += tr("New card: "); what="on";}
-                else { text += tr("Ejected: "); what="off";}
-                text += cardInPcmcia0Name;
-                popUp( text, "cardmon/" + cardInPcmcia0Type );
-            }
-            if(cardWas1 != cardInPcmcia1) {
-                if(cardInPcmcia1) { text += tr("New card: "); what="on";}
-                else { text += tr("Ejected: "); what="off";}
-                text += cardInPcmcia1Name;
-                popUp( text, "cardmon/" + cardInPcmcia1Type );
-            }
-            QSound::play(Resource::findSound("cardmon/card" + what));
-        }
+        f.close();
+
+        if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) {
+            QString text = QString::null;
+            QString what = QString::null;
+            if(cardWas0 != cardInPcmcia0) {
+                if(cardInPcmcia0) {
+                    text += tr( "New card: " );
+                    what="on";
+                } else {
+                    text += tr( "Ejected: " );
+                    what="off";
+                }
+                text += cardInPcmcia0Name;
+        popUp( text, "cardmon/" + cardInPcmcia0Type );
+            }
 
+            if( cardWas1 != cardInPcmcia1) {
+                if( cardInPcmcia1) {
+                    text += tr( "New card: " );
+                    what = "on";
+                }  else {
+                    text += tr( "Ejected: " );
+                    what = "off";
+                }
+        text += cardInPcmcia1Name;
+        popUp( text, "cardmon/" + cardInPcmcia1Type );
+            }
+            QSound::play( Resource::findSound( "cardmon/card" + what) );
+        }
     } else {
         // no file found
-        qDebug("no file found");
+        qDebug("no file found");
         cardInPcmcia0 = FALSE;
@@ -236,4 +257,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
     }
-
-    return ((cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
+    return ( (cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
 }
@@ -243,4 +263,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
 
-    bool cardWas=cardInSd; // remember last state
-    cardInSd=false;
+    bool cardWas = cardInSd; // remember last state
 
@@ -251,6 +270,10 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
     if ( mntfp ) {
-        while ( (me = getmntent( mntfp )) != 0 ) {
+        while ( ( me = getmntent( mntfp ) ) != 0 ) {
             QString fs = me->mnt_fsname;
-            if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) {
-                cardInSd=true;
+            qDebug( fs );
+            if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) {
+                cardInSd = TRUE;
+                show();
+            } else {
+                cardInSd = FALSE;
             }
@@ -259,9 +282,17 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
     }
-    if(!showPopUp && cardWas != cardInSd) {
-        QString text = QString::null;
-        if(cardInSd) { text += "SD Inserted"; }
-        else { text += "SD Removed"; }
-        popUp( text); // XX add SD pic
-    }
 
+    if( !showPopUp && cardWas != cardInSd ) {
+        QString text = QString::null;
+        QString what = QString::null;
+        if( cardInSd )  {
+            text += "SD Inserted";
+            what = "on";
+        }  else {
+            text += "SD Removed";
+            what = "off";
+        }
+        qDebug("TEXT: " + text );
+        QSound::play( Resource::findSound( "cardmon/card" + what ) );
+        popUp( text,  "cardmon/ide" ); // XX add SD pic
+    }
 #else
@@ -269,3 +300,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
 #endif
-    return ((cardWas == cardInSd) ? FALSE : TRUE);
+    return ( ( cardWas == cardInSd) ? FALSE : TRUE );
 }
@@ -273,2 +304,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
 void CardMonitor::paintEvent( QPaintEvent * ) {
+
     QPainter p( this );
@@ -276,7 +308,7 @@ void CardMonitor::paintEvent( QPaintEvent * ) {
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
-        p.drawPixmap( 0, 0, pm );
-        show();
+        p.drawPixmap( 0, 0, pm );
+        show();
     } else {
-        p.eraseRect( rect() );
-        hide();
+        p.eraseRect( rect() );
+        hide();
     }
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index aa34042..b2a2a4a 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include ../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
         VERSION         = 1.0.0