summaryrefslogtreecommitdiff
path: root/library
authorharlekin <harlekin>2002-10-31 23:13:41 (UTC)
committer harlekin <harlekin>2002-10-31 23:13:41 (UTC)
commitaad44cbe72cda54a92e5f777fb3f4ea7d01cc429 (patch) (side-by-side diff)
treecc922addb9fcc5a709870162923c70136cfb8e37 /library
parent0fcca5c3bf885262393a9c3291e5c1823fe1b1b9 (diff)
downloadopie-aad44cbe72cda54a92e5f777fb3f4ea7d01cc429.zip
opie-aad44cbe72cda54a92e5f777fb3f4ea7d01cc429.tar.gz
opie-aad44cbe72cda54a92e5f777fb3f4ea7d01cc429.tar.bz2
added ipaqs mmc slot to storage
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/storage.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/library/storage.cpp b/library/storage.cpp
index 35e0255..937908d 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -81,13 +81,13 @@ const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
}
void StorageInfo::cardMessage( const QCString& msg, const QByteArray& )
{
if ( msg == "mtabChanged()" )
- update();
+ update();
}
// cause of the lack of a d pointer we need
// to store informations in a config file :(
void StorageInfo::update()
{
//qDebug("StorageInfo::updating");
@@ -101,14 +101,15 @@ void StorageInfo::update()
bool rebuild = FALSE;
int n=0;
if ( mntfp ) {
while ( (me = getmntent( mntfp )) != 0 ) {
QString fs = me->mnt_fsname;
if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
- || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
- || fs.left(5)=="tmpfs" )
+ || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
+ || fs.left( 14 ) == "/dev/mmc/part1"
+ || fs.left(5)=="tmpfs" )
{
n++;
curdisks.append(fs);
curopts.append( me->mnt_opts );
//qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
curfs.append( me->mnt_dir );
@@ -129,24 +130,27 @@ void StorageInfo::update()
mFileSystems.clear();
QStringList::ConstIterator it=curdisks.begin();
QStringList::ConstIterator fsit=curfs.begin();
QStringList::ConstIterator optsIt=curopts.begin();
for (; it!=curdisks.end(); ++it, ++fsit, ++optsIt) {
QString opts = *optsIt;
-
- QString disk = *it;
+
+ QString disk = *it;
QString humanname;
bool removable = FALSE;
if ( isCF(disk) ) {
humanname = tr("CF Card");
removable = TRUE;
} else if ( disk == "/dev/hda1" ) {
humanname = tr("Hard Disk");
} else if ( disk.left(9) == "/dev/mmcd" ) {
humanname = tr("SD Card");
removable = TRUE;
+ } else if ( disk.left( 14 ) == "/dev/mmc/part1" ) {
+ humanname = tr("MMC Card");
+ removable = TRUE;
} else if ( disk.left(7) == "/dev/hd" )
humanname = tr("Hard Disk") + " " + disk;
else if ( disk.left(7) == "/dev/sd" )
humanname = tr("SCSI Hard Disk") + " " + disk;
else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs
humanname = tr("Internal Memory");