summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-09-01 17:47:33 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-09-01 17:47:33 +0000
commit0110e558deb54ac421754abf807dac1420c02dc6 (patch)
treef5f143b724fe60a3f97ec9fbed33ccadaa73aede /rbutil/rbutilqt
parent21c7b9debbade715f7cf79d04e5fe8b22d067c7b (diff)
downloadrockbox-0110e558deb54ac421754abf807dac1420c02dc6.tar.gz
rockbox-0110e558deb54ac421754abf807dac1420c02dc6.tar.bz2
rockbox-0110e558deb54ac421754abf807dac1420c02dc6.zip
Remove Ipod Video 64MB handling.
Since the builds for the Ipod Video 32MB and 64MB are now unified there is no need to handle them separately in Rockbox Utility anymore. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27966 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp8
-rw-r--r--rbutil/rbutilqt/rbutil.ini13
2 files changed, 2 insertions, 19 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index 695cb6a204..2bd61ff5ba 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -98,12 +98,6 @@ bool Autodetection::detect()
if(m_device.isEmpty())
{
m_device = info.target();
- // special case for video64mb. This is a workaround, and
- // should get replaced when autodetection is reworked.
- if(m_device == "ipodvideo" && info.ram() == 64)
- {
- m_device = "ipodvideo64mb";
- }
}
m_mountpoint = mounts.at(i);
qDebug() << "[Autodetect] rockbox-info.txt detected:"
@@ -267,7 +261,7 @@ QStringList Autodetection::mountpoints()
endmntent(mn);
#else
-#error Unknown Plattform
+#error Unknown Platform
#endif
return tempList;
}
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 924007a7bf..5ad9f2f30a 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -50,7 +50,6 @@ platform21=ipod3g
platform22=ipod4g
platform23=ipodcolor
platform24=ipodvideo
-platform25=ipodvideo.64mb
platform26=ipodmini1g
platform27=ipodmini2g
platform28=ipodnano1g
@@ -285,7 +284,7 @@ configure_modelname=ipod4g
encoder=rbspeex
[ipodvideo]
-name="Ipod Video (5th gen) 30GB"
+name="Ipod Video (5th gen)"
buildserver_modelname=ipodvideo
bootloadermethod=ipod
bootloadername=/ipod/bootloader-ipodvideo.ipod
@@ -294,16 +293,6 @@ brand=Apple
configure_modelname=ipodvideo
encoder=rbspeex
-[ipodvideo.64mb]
-name="Ipod Video (5th gen) 60/80GB"
-buildserver_modelname=ipodvideo64mb
-bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodvideo.ipod
-manualname=
-brand=Apple
-configure_modelname=ipodvideo
-encoder=rbspeex
-
[ipod3g]
name="Ipod (3rd gen)"
buildserver_modelname=ipod3g