diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-09-01 17:47:33 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-09-01 17:47:33 +0000 |
commit | 0110e558deb54ac421754abf807dac1420c02dc6 (patch) | |
tree | f5f143b724fe60a3f97ec9fbed33ccadaa73aede /rbutil | |
parent | 21c7b9debbade715f7cf79d04e5fe8b22d067c7b (diff) | |
download | rockbox-0110e558deb54ac421754abf807dac1420c02dc6.tar.gz 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')
-rw-r--r-- | rbutil/ipodpatcher/ipodpatcher.c | 7 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 13 |
3 files changed, 3 insertions, 25 deletions
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c index b2f01b8223..9f446d4ea4 100644 --- a/rbutil/ipodpatcher/ipodpatcher.c +++ b/rbutil/ipodpatcher/ipodpatcher.c | |||
@@ -1696,12 +1696,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version) | |||
1696 | ipod->modelstr="Video (aka 5th Generation)"; | 1696 | ipod->modelstr="Video (aka 5th Generation)"; |
1697 | ipod->modelnum = 5; | 1697 | ipod->modelnum = 5; |
1698 | ipod->modelname = "ipvd"; | 1698 | ipod->modelname = "ipvd"; |
1699 | if(ipod->ramsize == 64) { | 1699 | ipod->targetname = "ipodvideo"; |
1700 | ipod->targetname = "ipodvideo64mb"; | ||
1701 | } | ||
1702 | else { | ||
1703 | ipod->targetname = "ipodvideo"; | ||
1704 | } | ||
1705 | #ifdef WITH_BOOTOBJS | 1700 | #ifdef WITH_BOOTOBJS |
1706 | ipod->bootloader = ipodvideo; | 1701 | ipod->bootloader = ipodvideo; |
1707 | ipod->bootloader_len = LEN_ipodvideo; | 1702 | ipod->bootloader_len = LEN_ipodvideo; |
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() | |||
98 | if(m_device.isEmpty()) | 98 | if(m_device.isEmpty()) |
99 | { | 99 | { |
100 | m_device = info.target(); | 100 | m_device = info.target(); |
101 | // special case for video64mb. This is a workaround, and | ||
102 | // should get replaced when autodetection is reworked. | ||
103 | if(m_device == "ipodvideo" && info.ram() == 64) | ||
104 | { | ||
105 | m_device = "ipodvideo64mb"; | ||
106 | } | ||
107 | } | 101 | } |
108 | m_mountpoint = mounts.at(i); | 102 | m_mountpoint = mounts.at(i); |
109 | qDebug() << "[Autodetect] rockbox-info.txt detected:" | 103 | qDebug() << "[Autodetect] rockbox-info.txt detected:" |
@@ -267,7 +261,7 @@ QStringList Autodetection::mountpoints() | |||
267 | endmntent(mn); | 261 | endmntent(mn); |
268 | 262 | ||
269 | #else | 263 | #else |
270 | #error Unknown Plattform | 264 | #error Unknown Platform |
271 | #endif | 265 | #endif |
272 | return tempList; | 266 | return tempList; |
273 | } | 267 | } |
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 | |||
50 | platform22=ipod4g | 50 | platform22=ipod4g |
51 | platform23=ipodcolor | 51 | platform23=ipodcolor |
52 | platform24=ipodvideo | 52 | platform24=ipodvideo |
53 | platform25=ipodvideo.64mb | ||
54 | platform26=ipodmini1g | 53 | platform26=ipodmini1g |
55 | platform27=ipodmini2g | 54 | platform27=ipodmini2g |
56 | platform28=ipodnano1g | 55 | platform28=ipodnano1g |
@@ -285,7 +284,7 @@ configure_modelname=ipod4g | |||
285 | encoder=rbspeex | 284 | encoder=rbspeex |
286 | 285 | ||
287 | [ipodvideo] | 286 | [ipodvideo] |
288 | name="Ipod Video (5th gen) 30GB" | 287 | name="Ipod Video (5th gen)" |
289 | buildserver_modelname=ipodvideo | 288 | buildserver_modelname=ipodvideo |
290 | bootloadermethod=ipod | 289 | bootloadermethod=ipod |
291 | bootloadername=/ipod/bootloader-ipodvideo.ipod | 290 | bootloadername=/ipod/bootloader-ipodvideo.ipod |
@@ -294,16 +293,6 @@ brand=Apple | |||
294 | configure_modelname=ipodvideo | 293 | configure_modelname=ipodvideo |
295 | encoder=rbspeex | 294 | encoder=rbspeex |
296 | 295 | ||
297 | [ipodvideo.64mb] | ||
298 | name="Ipod Video (5th gen) 60/80GB" | ||
299 | buildserver_modelname=ipodvideo64mb | ||
300 | bootloadermethod=ipod | ||
301 | bootloadername=/ipod/bootloader-ipodvideo.ipod | ||
302 | manualname= | ||
303 | brand=Apple | ||
304 | configure_modelname=ipodvideo | ||
305 | encoder=rbspeex | ||
306 | |||
307 | [ipod3g] | 296 | [ipod3g] |
308 | name="Ipod (3rd gen)" | 297 | name="Ipod (3rd gen)" |
309 | buildserver_modelname=ipod3g | 298 | buildserver_modelname=ipod3g |