author | alwin <alwin> | 2005-03-03 22:38:59 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-03 22:38:59 (UTC) |
commit | e007cb2e4e3627ece4a093bc976debd6366ed1fa (patch) (unidiff) | |
tree | cdc8f70802fc167f698dcc647d048c4bac332878 /library | |
parent | 98af15f829dadf9083e5e897328ab58e5e82a0fd (diff) | |
download | opie-e007cb2e4e3627ece4a093bc976debd6366ed1fa.zip opie-e007cb2e4e3627ece4a093bc976debd6366ed1fa.tar.gz opie-e007cb2e4e3627ece4a093bc976debd6366ed1fa.tar.bz2 |
added device names for 2.6 kernel
-rw-r--r-- | library/storage.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/library/storage.cpp b/library/storage.cpp index fcee689..9549ff3 100644 --- a/library/storage.cpp +++ b/library/storage.cpp | |||
@@ -134,33 +134,34 @@ void StorageInfo::update() | |||
134 | struct mntent *me; | 134 | struct mntent *me; |
135 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); | 135 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); |
136 | 136 | ||
137 | QStringList curdisks; | 137 | QStringList curdisks; |
138 | QStringList curopts; | 138 | QStringList curopts; |
139 | QStringList curfs; | 139 | QStringList curfs; |
140 | bool rebuild = FALSE; | 140 | bool rebuild = FALSE; |
141 | int n=0; | 141 | int n=0; |
142 | if ( mntfp ) | 142 | if ( mntfp ) |
143 | { | 143 | { |
144 | while ( (me = getmntent( mntfp )) != 0 ) | 144 | while ( (me = getmntent( mntfp )) != 0 ) |
145 | { | 145 | { |
146 | QString fs = me->mnt_fsname; | 146 | QString fs = me->mnt_fsname; |
147 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" | 147 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" |
148 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" | 148 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" |
149 | || fs.left( 14 ) == "/dev/mmc/part1" | 149 | || fs.left( 14 ) == "/dev/mmc/part1" |
150 | || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" ) | 150 | || fs.left(5)=="tmpfs" || fs.left(11)=="/dev/mmcblk" |
151 | || fs.left(9)=="/dev/root" ) | ||
151 | { | 152 | { |
152 | n++; | 153 | n++; |
153 | curdisks.append(fs); | 154 | curdisks.append(fs); |
154 | curopts.append( me->mnt_opts ); | 155 | curopts.append( me->mnt_opts ); |
155 | //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); | 156 | //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); |
156 | curfs.append( me->mnt_dir ); | 157 | curfs.append( me->mnt_dir ); |
157 | bool found = FALSE; | 158 | bool found = FALSE; |
158 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) | 159 | for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) |
159 | { | 160 | { |
160 | if ( (*i)->disk() == fs ) | 161 | if ( (*i)->disk() == fs ) |
161 | { | 162 | { |
162 | found = TRUE; | 163 | found = TRUE; |
163 | break; | 164 | break; |
164 | } | 165 | } |
165 | } | 166 | } |
166 | if ( !found ) | 167 | if ( !found ) |
@@ -183,33 +184,33 @@ void StorageInfo::update() | |||
183 | QString humanname; | 184 | QString humanname; |
184 | bool removable = FALSE; | 185 | bool removable = FALSE; |
185 | if ( isCF(disk) ) | 186 | if ( isCF(disk) ) |
186 | { | 187 | { |
187 | humanname = tr("CF Card"); | 188 | humanname = tr("CF Card"); |
188 | removable = TRUE; | 189 | removable = TRUE; |
189 | } | 190 | } |
190 | else if ( disk == "/dev/hda1" ) | 191 | else if ( disk == "/dev/hda1" ) |
191 | { | 192 | { |
192 | humanname = tr("Hard Disk"); | 193 | humanname = tr("Hard Disk"); |
193 | } | 194 | } |
194 | else if ( disk.left(9) == "/dev/mmcd" ) | 195 | else if ( disk.left(9) == "/dev/mmcd" ) |
195 | { | 196 | { |
196 | humanname = tr("SD Card"); | 197 | humanname = tr("SD Card"); |
197 | removable = TRUE; | 198 | removable = TRUE; |
198 | } | 199 | } |
199 | else if ( disk.left( 14 ) == "/dev/mmc/part1" ) | 200 | else if ( disk.left( 14 ) == "/dev/mmc/part1" || disk.left(11) == "/dev/mmcblk" ) |
200 | { | 201 | { |
201 | humanname = tr("MMC Card"); | 202 | humanname = tr("MMC Card"); |
202 | removable = TRUE; | 203 | removable = TRUE; |
203 | } | 204 | } |
204 | else if ( disk.left(7) == "/dev/hd" ) | 205 | else if ( disk.left(7) == "/dev/hd" ) |
205 | humanname = tr("Hard Disk") + " " + disk; | 206 | humanname = tr("Hard Disk") + " " + disk; |
206 | else if ( disk.left(7) == "/dev/sd" ) | 207 | else if ( disk.left(7) == "/dev/sd" ) |
207 | humanname = tr("SCSI Hard Disk") + " " + disk; | 208 | humanname = tr("SCSI Hard Disk") + " " + disk; |
208 | else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs | 209 | else if ( disk.left(14) == "/dev/mtdblock6" ) //openzaurus ramfs |
209 | humanname = tr("Internal Memory"); | 210 | humanname = tr("Internal Memory"); |
210 | else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) | 211 | else if ( disk == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) |
211 | humanname = tr("Internal Storage"); | 212 | humanname = tr("Internal Storage"); |
212 | else if ( disk.left(14) == "/dev/mtdblock/" ) | 213 | else if ( disk.left(14) == "/dev/mtdblock/" ) |
213 | humanname = tr("Internal Storage") + " " + disk; | 214 | humanname = tr("Internal Storage") + " " + disk; |
214 | else if ( disk.left(13) == "/dev/mtdblock" ) | 215 | else if ( disk.left(13) == "/dev/mtdblock" ) |
215 | humanname = tr("Internal Storage") + " " + disk; | 216 | humanname = tr("Internal Storage") + " " + disk; |