Query RAM size when scanning for Ipods. Return the target string for Video 64MB when apropriate amount of RAM is detected. Makes Rockbox Utility detect it correctly for first time installs.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22829 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-09-25 08:39:08 +00:00
parent 855fdc5ab9
commit 4e4510ee91

View file

@ -1234,7 +1234,12 @@ 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 = "ipodvideo64mb";
}
else {
ipod->targetname = "ipodvideo"; 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;
@ -1312,6 +1317,11 @@ int ipod_scan(struct ipod_t* ipod)
} }
ipod_version=(ipod->ipod_directory[0].vers>>8); ipod_version=(ipod->ipod_directory[0].vers>>8);
/* Windows requires the ipod in R/W mode for SCSI Inquiry */
ipod->ramsize = 0;
ipod_reopen_rw(ipod);
ipod_get_xmlinfo(ipod);
ipod_get_ramsize(ipod);
if (getmodel(ipod,ipod_version) < 0) { if (getmodel(ipod,ipod_version) < 0) {
ipod_close(ipod); ipod_close(ipod);
continue; continue;