summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base/autodetection.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-07-17 08:08:58 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-07-17 08:08:58 +0000
commit9c9bc1216c78f2295ede77462d1dadf107b8d456 (patch)
tree6fa738e228b14e300faa42ffd9827e06ca935084 /rbutil/rbutilqt/base/autodetection.cpp
parentb7fe90aa364c98eb2d5260dce0078f7ad034f0a3 (diff)
downloadrockbox-9c9bc1216c78f2295ede77462d1dadf107b8d456.tar.gz
rockbox-9c9bc1216c78f2295ede77462d1dadf107b8d456.tar.bz2
rockbox-9c9bc1216c78f2295ede77462d1dadf107b8d456.zip
Move some helper functions out of Autodetection.
Those functions are rather general, so put them into the Utils class instead. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30146 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/autodetection.cpp')
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp231
1 files changed, 3 insertions, 228 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index 2bd61ff5ba..1a78ae54a8 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -25,32 +25,6 @@
#include "../ipodpatcher/ipodpatcher.h"
#include "../sansapatcher/sansapatcher.h"
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
-#include <stdio.h>
-#endif
-#if defined(Q_OS_LINUX)
-#include <mntent.h>
-#endif
-#if defined(Q_OS_MACX)
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#endif
-#if defined(Q_OS_WIN32)
-#if defined(UNICODE)
-#define _UNICODE
-#endif
-#include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
-#include <setupapi.h>
-#include <winioctl.h>
-#endif
-
-#if defined(Q_OS_OPENBSD)
-#include <sys/param.h>
-#include <sys/mount.h>
-#endif
#include "system.h"
#include "utils.h"
@@ -69,7 +43,7 @@ bool Autodetection::detect()
detectUsb();
// Try detection via rockbox.info / rbutil.log
- QStringList mounts = mountpoints();
+ QStringList mounts = Utils::mountpoints();
for(int i=0; i< mounts.size();i++)
{
@@ -183,7 +157,7 @@ bool Autodetection::detect()
#ifdef Q_OS_MACX
mp.append("s2");
#endif
- m_mountpoint = resolveMountPoint(mp);
+ m_mountpoint = Utils::resolveMountPoint(mp);
return true;
}
else {
@@ -208,7 +182,7 @@ bool Autodetection::detect()
#ifdef Q_OS_MACX
mp.append("s1");
#endif
- m_mountpoint = resolveMountPoint(mp);
+ m_mountpoint = Utils::resolveMountPoint(mp);
return true;
}
else {
@@ -224,205 +198,6 @@ bool Autodetection::detect()
}
-QStringList Autodetection::mountpoints()
-{
- QStringList tempList;
-#if defined(Q_OS_WIN32)
- QFileInfoList list = QDir::drives();
- for(int i=0; i<list.size();i++)
- {
- tempList << list.at(i).absolutePath();
- qDebug() << "[Autodetection] Mounted on" << list.at(i).absolutePath();
- }
-
-#elif defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
- int num;
- struct statfs *mntinf;
-
- num = getmntinfo(&mntinf, MNT_WAIT);
- while(num--) {
- tempList << QString(mntinf->f_mntonname);
- qDebug() << "[Autodetection] Mounted on" << mntinf->f_mntonname
- << "is" << mntinf->f_mntfromname << "type" << mntinf->f_fstypename;
- mntinf++;
- }
-#elif defined(Q_OS_LINUX)
-
- FILE *mn = setmntent("/etc/mtab", "r");
- if(!mn)
- return QStringList("");
-
- struct mntent *ent;
- while((ent = getmntent(mn))) {
- tempList << QString(ent->mnt_dir);
- qDebug() << "[Autodetection] Mounted on" << ent->mnt_dir
- << "is" << ent->mnt_fsname << "type" << ent->mnt_type;
- }
- endmntent(mn);
-
-#else
-#error Unknown Platform
-#endif
- return tempList;
-}
-
-
-/** resolve device name to mount point / drive letter
- * @param device device name / disk number
- * @return mount point / drive letter
- */
-QString Autodetection::resolveMountPoint(QString device)
-{
- qDebug() << "[Autodetect] resolving mountpoint:" << device;
-
-#if defined(Q_OS_LINUX)
- FILE *mn = setmntent("/etc/mtab", "r");
- if(!mn)
- return QString("");
-
- struct mntent *ent;
- while((ent = getmntent(mn))) {
- // Check for valid filesystem. Allow hfs too, as an Ipod might be a
- // MacPod.
- if(QString(ent->mnt_fsname) == device) {
- QString result;
- if(QString(ent->mnt_type).contains("vfat", Qt::CaseInsensitive)
- || QString(ent->mnt_type).contains("hfs", Qt::CaseInsensitive)) {
- qDebug() << "[Autodetect] resolved mountpoint is:" << ent->mnt_dir;
- result = QString(ent->mnt_dir);
- }
- else {
- qDebug() << "[Autodetect] mountpoint is wrong filesystem!";
- }
- endmntent(mn);
- return result;
- }
- }
- endmntent(mn);
-
-#endif
-
-#if defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
- int num;
- struct statfs *mntinf;
-
- num = getmntinfo(&mntinf, MNT_WAIT);
- while(num--) {
- // Check for valid filesystem. Allow hfs too, as an Ipod might be a
- // MacPod.
- if(QString(mntinf->f_mntfromname) == device) {
- if(QString(mntinf->f_fstypename).contains("msdos", Qt::CaseInsensitive)
- || QString(mntinf->f_fstypename).contains("hfs", Qt::CaseInsensitive)) {
- qDebug() << "[Autodetect] resolved mountpoint is:" << mntinf->f_mntonname;
- return QString(mntinf->f_mntonname);
- }
- else {
- qDebug() << "[Autodetect] mountpoint is wrong filesystem!";
- return QString();
- }
- }
- mntinf++;
- }
-#endif
-
-#if defined(Q_OS_WIN32)
- QString result;
- unsigned int driveno = device.replace(QRegExp("^.*([0-9]+)"), "\\1").toInt();
-
- int letter;
- for(letter = 'A'; letter <= 'Z'; letter++) {
- if(resolveDevicename(QString(letter)).toUInt() == driveno) {
- result = letter;
- qDebug() << "[Autodetect] resolved mountpoint is:" << result;
- break;
- }
- }
- if(!result.isEmpty())
- return result + ":/";
-#endif
- qDebug() << "[Autodetect] resolving mountpoint failed!";
- return QString("");
-}
-
-
-/** Resolve mountpoint to devicename / disk number
- * @param path mountpoint path / drive letter
- * @return devicename / disk number
- */
-QString Autodetection::resolveDevicename(QString path)
-{
- qDebug() << "[Autodetect] resolving device name" << path;
-#if defined(Q_OS_LINUX)
- FILE *mn = setmntent("/etc/mtab", "r");
- if(!mn)
- return QString("");
-
- struct mntent *ent;
- while((ent = getmntent(mn))) {
- // check for valid filesystem type.
- // Linux can handle hfs (and hfsplus), so consider it a valid file
- // system. Otherwise resolving the device name would fail, which in
- // turn would make it impossible to warn about a MacPod.
- if(QString(ent->mnt_dir) == path
- && (QString(ent->mnt_type).contains("vfat", Qt::CaseInsensitive)
- || QString(ent->mnt_type).contains("hfs", Qt::CaseInsensitive))) {
- endmntent(mn);
- qDebug() << "[Autodetect] device name is" << ent->mnt_fsname;
- return QString(ent->mnt_fsname);
- }
- }
- endmntent(mn);
-
-#endif
-
-#if defined(Q_OS_MACX) || defined(Q_OS_OPENBSD)
- int num;
- struct statfs *mntinf;
-
- num = getmntinfo(&mntinf, MNT_WAIT);
- while(num--) {
- // check for valid filesystem type. OS X can handle hfs (hfs+ is
- // treated as hfs), BSD should be the same.
- if(QString(mntinf->f_mntonname) == path
- && (QString(mntinf->f_fstypename).contains("msdos", Qt::CaseInsensitive)
- || QString(mntinf->f_fstypename).contains("hfs", Qt::CaseInsensitive))) {
- qDebug() << "[Autodetect] device name is" << mntinf->f_mntfromname;
- return QString(mntinf->f_mntfromname);
- }
- mntinf++;
- }
-#endif
-
-#if defined(Q_OS_WIN32)
- DWORD written;
- HANDLE h;
- TCHAR uncpath[MAX_PATH];
- UCHAR buffer[0x400];
- PVOLUME_DISK_EXTENTS extents = (PVOLUME_DISK_EXTENTS)buffer;
-
- _stprintf(uncpath, _TEXT("\\\\.\\%c:"), path.toAscii().at(0));
- h = CreateFile(uncpath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, OPEN_EXISTING, 0, NULL);
- if(h == INVALID_HANDLE_VALUE) {
- //qDebug() << "error getting extents for" << uncpath;
- return "";
- }
- // get the extents
- if(DeviceIoControl(h, IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS,
- NULL, 0, extents, sizeof(buffer), &written, NULL)) {
- if(extents->NumberOfDiskExtents > 1) {
- qDebug() << "[Autodetect] resolving device name: volume spans multiple disks!";
- return "";
- }
- qDebug() << "[Autodetect] device name is" << extents->Extents[0].DiskNumber;
- return QString("%1").arg(extents->Extents[0].DiskNumber);
- }
-#endif
- return QString("");
-
-}
-
-
/** @brief detect devices based on usb pid / vid.
* @return true upon success, false otherwise.
*/