diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-09-19 22:02:34 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-09-19 22:02:34 +0000 |
commit | d3ea919999af9c11a819a795d275641238ba615d (patch) | |
tree | 021d2768baa92b481b99c3709ef8320af860cdfa /rbutil/rbutilqt | |
parent | b9022cf0eb23054a70a9f4c66d13c1560867e148 (diff) | |
download | rockbox-d3ea919999af9c11a819a795d275641238ba615d.tar.gz rockbox-d3ea919999af9c11a819a795d275641238ba615d.zip |
Update rbutil to match up with latest sansapatcher changes. Installing c200 bootloader isn't added yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14759 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/autodetection.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/autodetection.cpp b/rbutil/rbutilqt/autodetection.cpp index dc1bb72428..9b547bdb88 100644 --- a/rbutil/rbutilqt/autodetection.cpp +++ b/rbutil/rbutilqt/autodetection.cpp | |||
@@ -133,8 +133,8 @@ bool Autodetection::detect() | |||
133 | struct sansa_t sansa; | 133 | struct sansa_t sansa; |
134 | n = sansa_scan(&sansa); | 134 | n = sansa_scan(&sansa); |
135 | if(n == 1) { | 135 | if(n == 1) { |
136 | qDebug() << "Sansa found:" << "sansae200" << "at" << sansa.diskname; | 136 | qDebug() << "Sansa found:" << sansa.targetname << "at" << sansa.diskname; |
137 | m_device = "sansae200"; | 137 | m_device = QString("sansa%1").arg(sansa.targetname); |
138 | m_mountpoint = resolveMountPoint(sansa.diskname); | 138 | m_mountpoint = resolveMountPoint(sansa.diskname); |
139 | return true; | 139 | return true; |
140 | } | 140 | } |
diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp index 6265f519f9..c4b5b8514c 100644 --- a/rbutil/rbutilqt/installbootloader.cpp +++ b/rbutil/rbutilqt/installbootloader.cpp | |||
@@ -923,9 +923,9 @@ void BootloaderInstaller::sansaPrepare() | |||
923 | return; | 923 | return; |
924 | } | 924 | } |
925 | 925 | ||
926 | int i = is_e200(&sansa); | 926 | int i = is_sansa(&sansa); |
927 | if (i < 0) { | 927 | if (i < 0) { |
928 | m_dp->addItem(tr("Disk is not an E200 (%1), aborting.").arg(i),LOGERROR); | 928 | m_dp->addItem(tr("Disk is not a Sansa (%1), aborting.").arg(i),LOGERROR); |
929 | emit done(true); | 929 | emit done(true); |
930 | return; | 930 | return; |
931 | } | 931 | } |
@@ -988,10 +988,10 @@ void BootloaderInstaller::sansaFinish() | |||
988 | } | 988 | } |
989 | 989 | ||
990 | 990 | ||
991 | int i = is_e200(&sansa); | 991 | int i = is_sansa(&sansa); |
992 | if (i < 0) { | 992 | if (i < 0) { |
993 | 993 | ||
994 | m_dp->addItem(tr("Disk is not an E200 (%1), aborting.").arg(i),LOGERROR); | 994 | m_dp->addItem(tr("Disk is not a Sansa (%1), aborting.").arg(i),LOGERROR); |
995 | emit done(true); | 995 | emit done(true); |
996 | return; | 996 | return; |
997 | } | 997 | } |