summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-01 23:42:48 (UTC)
committer alwin <alwin>2005-03-01 23:42:48 (UTC)
commit374cb9f45664c307ab7d0ed88fea5e76631518d9 (patch) (unidiff)
tree97d63c360117877ff26aca8fc6c61ebc14c528b5
parentbb6be9cbe75892a7cc1d7c234f1c48023f9c9592 (diff)
downloadopie-374cb9f45664c307ab7d0ed88fea5e76631518d9.zip
opie-374cb9f45664c307ab7d0ed88fea5e76631518d9.tar.gz
opie-374cb9f45664c307ab7d0ed88fea5e76631518d9.tar.bz2
mmc/sd cards may mounted via /dev/mmcblk* within linux 2.6
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/ostorageinfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp
index 8fcf5fc..6c7c138 100644
--- a/libopie2/opiecore/ostorageinfo.cpp
+++ b/libopie2/opiecore/ostorageinfo.cpp
@@ -55,33 +55,34 @@ QString OStorageInfo::cfPath()const
55 return r; 55 return r;
56} 56}
57 57
58QString OStorageInfo::sdPath()const 58QString OStorageInfo::sdPath()const
59{ 59{
60 QString r = ""; 60 QString r = "";
61 61
62 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) 62 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
63 { 63 {
64 if ( (*i)->disk().left( 9 ) == "/dev/mmcd" ) 64 if ( (*i)->disk().left( 9 ) == "/dev/mmcd" )
65 { 65 {
66 r = (*i)->path(); 66 r = (*i)->path();
67 break; 67 break;
68 } 68 }
69 } 69 }
70 return r; 70 return r;
71} 71}
72 72
73QString OStorageInfo::mmcPath()const 73QString OStorageInfo::mmcPath()const
74{ 74{
75 QString r = ""; 75 QString r = "";
76 76
77 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) 77 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
78 { 78 {
79 if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" ) 79 if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1"||
80 (*i)->disk().left(11) == "/dev/mmcblk" )
80 { 81 {
81 r = (*i)->path(); 82 r = (*i)->path();
82 break; 83 break;
83 } 84 }
84 } 85 }
85 return r; 86 return r;
86} 87}
87 88