From d3ea919999af9c11a819a795d275641238ba615d Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 19 Sep 2007 22:02:34 +0000 Subject: 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 --- rbutil/rbutilqt/autodetection.cpp | 4 ++-- rbutil/rbutilqt/installbootloader.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'rbutil') 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() struct sansa_t sansa; n = sansa_scan(&sansa); if(n == 1) { - qDebug() << "Sansa found:" << "sansae200" << "at" << sansa.diskname; - m_device = "sansae200"; + qDebug() << "Sansa found:" << sansa.targetname << "at" << sansa.diskname; + m_device = QString("sansa%1").arg(sansa.targetname); m_mountpoint = resolveMountPoint(sansa.diskname); return true; } 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() return; } - int i = is_e200(&sansa); + int i = is_sansa(&sansa); if (i < 0) { - m_dp->addItem(tr("Disk is not an E200 (%1), aborting.").arg(i),LOGERROR); + m_dp->addItem(tr("Disk is not a Sansa (%1), aborting.").arg(i),LOGERROR); emit done(true); return; } @@ -988,10 +988,10 @@ void BootloaderInstaller::sansaFinish() } - int i = is_e200(&sansa); + int i = is_sansa(&sansa); if (i < 0) { - m_dp->addItem(tr("Disk is not an E200 (%1), aborting.").arg(i),LOGERROR); + m_dp->addItem(tr("Disk is not a Sansa (%1), aborting.").arg(i),LOGERROR); emit done(true); return; } -- cgit