len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Ipod Video 64MB handling.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2010-09-01 17:47:33 +00:00
parent 21c7b9debb
commit 0110e558de
3 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rbutil/ipodpatcher/ipodpatcher.c
View file

@ -1696,12 +1696,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version)
ipod->modelstr="Video (aka 5th Generation)"; ipod->modelstr="Video (aka 5th Generation)";
ipod->modelnum = 5; ipod->modelnum = 5;
ipod->modelname = "ipvd"; ipod->modelname = "ipvd";
if(ipod->ramsize == 64) { ipod->targetname = "ipodvideo";
ipod->targetname = "ipodvideo64mb";
}
else {
ipod->targetname = "ipodvideo";
}
#ifdef WITH_BOOTOBJS #ifdef WITH_BOOTOBJS
ipod->bootloader = ipodvideo; ipod->bootloader = ipodvideo;
ipod->bootloader_len = LEN_ipodvideo; ipod->bootloader_len = LEN_ipodvideo;

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

@ -98,12 +98,6 @@ bool Autodetection::detect()
if(m_device.isEmpty()) if(m_device.isEmpty())
{ {
m_device = info.target(); 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); m_mountpoint = mounts.at(i);
qDebug() << "[Autodetect] rockbox-info.txt detected:" qDebug() << "[Autodetect] rockbox-info.txt detected:"
@ -267,7 +261,7 @@ QStringList Autodetection::mountpoints()
endmntent(mn); endmntent(mn);
#else #else
#error Unknown Plattform #error Unknown Platform
#endif #endif
return tempList; return tempList;
} }

13
rbutil/rbutilqt/rbutil.ini
View file

@ -50,7 +50,6 @@ platform21=ipod3g
platform22=ipod4g platform22=ipod4g
platform23=ipodcolor platform23=ipodcolor
platform24=ipodvideo platform24=ipodvideo
platform25=ipodvideo.64mb
platform26=ipodmini1g platform26=ipodmini1g
platform27=ipodmini2g platform27=ipodmini2g
platform28=ipodnano1g platform28=ipodnano1g
@ -285,7 +284,7 @@ configure_modelname=ipod4g
encoder=rbspeex encoder=rbspeex
[ipodvideo] [ipodvideo]
name="Ipod Video (5th gen) 30GB" name="Ipod Video (5th gen)"
buildserver_modelname=ipodvideo buildserver_modelname=ipodvideo
bootloadermethod=ipod bootloadermethod=ipod
bootloadername=/ipod/bootloader-ipodvideo.ipod bootloadername=/ipod/bootloader-ipodvideo.ipod
@ -294,16 +293,6 @@ brand=Apple
configure_modelname=ipodvideo configure_modelname=ipodvideo
encoder=rbspeex 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] [ipod3g]
name="Ipod (3rd gen)" name="Ipod (3rd gen)"
buildserver_modelname=ipod3g buildserver_modelname=ipod3g