Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the data partition device node when trying to resolve the mountpoint.

Browse source 
The stricter matching for device nodes introduced with r24802 broke resolving
the mountpoint during autodetection as sansapatcher and ipodpatcher return the
device node of the player instead of its data partition.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24936 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2010-02-27 11:27:13 +00:00
parent b21b0c872e
commit dd0a571c49
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rbutil/rbutilqt/base/autodetection.cpp
View file

@ -179,7 +179,16 @@ bool Autodetection::detect()
if(ipod.macpod)
m_errdev = ipod.targetname;
m_device = ipod.targetname;
m_mountpoint = resolveMountPoint(ipod.diskname);
// since resolveMountPoint is doing exact matches we need to select
// the correct partition.
QString mp(ipod.diskname);
#ifdef Q_OS_LINUX
mp.append("2");
#endif
#ifdef Q_OS_MACX
mp.append("s2");
#endif
m_mountpoint = resolveMountPoint(mp);
return true;
}
else {
@ -197,7 +206,14 @@ bool Autodetection::detect()
if(n == 1) {
qDebug() << "[Autodetect] Sansa found:" << sansa.targetname << "at" << sansa.diskname;
m_device = QString("sansa%1").arg(sansa.targetname);
m_mountpoint = resolveMountPoint(sansa.diskname);
QString mp(sansa.diskname);
#ifdef Q_OS_LINUX
mp.append("1");
#endif
#ifdef Q_OS_MACX
mp.append("s1");
#endif
m_mountpoint = resolveMountPoint(mp);
return true;
}
else {