devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

ZVM:

Browse source 
* Optimize MiniFS handling
 * Add basic CFS handling (doesn't work yet)
 * Remove hacky stuff in disk.c


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18438 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2008-09-07 17:24:14 +00:00
parent 97f775df05
commit 23fc923bde
4 changed files with 319 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

43
firmware/common/disk.c
View file

@ -81,7 +81,6 @@ struct partinfo* disk_init(IF_MV_NONVOID(int drive))
#endif
ata_read_sectors(IF_MV2(drive,) 0,1, &sector);
#ifndef CREATIVE_ZVx
/* check that the boot sector is initialized */
if ( (sector[510] != 0x55) ||
(sector[511] != 0xaa)) {
@ -104,46 +103,6 @@ struct partinfo* disk_init(IF_MV_NONVOID(int drive))
/* not handled yet */
}
}
#else
struct partition_struct
{
unsigned int end;
unsigned int start;
char name[8];
};
struct hdd_struct
{
unsigned char MBLK[4];
int sector_size;
long long total_disk_size;
struct partition_struct partitions[4];
};
struct hdd_struct* hdd_struct = (struct hdd_struct*)sector;
if(hdd_struct->MBLK[0] != 0x4B ||
hdd_struct->MBLK[1] != 0x4C ||
hdd_struct->MBLK[2] != 0x42 ||
hdd_struct->MBLK[3] != 0x4D) /* 0x4B4C424D = KLBM */
{
DEBUGF("Bad boot sector signature\n");
return NULL;
}
else
{
/* parse partitions */
for ( i=0; i<4; i++ ) {
if(hdd_struct->partitions[i].name[0] != 0)
{
pinfo[i].type = ( strcmp(hdd_struct->partitions[i].name, "cfs") == 0 ? PARTITION_TYPE_FAT32_LBA : 0);
pinfo[i].start = hdd_struct->partitions[i].start;
pinfo[i].size = (hdd_struct->partitions[i].end - hdd_struct->partitions[i].start);
DEBUGF("Part%d: Type %02x, start: %08lx size: %08lx\n",
i,pinfo[i].type,pinfo[i].start,pinfo[i].size);
}
}
}
#endif
return pinfo;
}
@ -200,7 +159,7 @@ int disk_mount(int drive)
{
return 0;
}
#if defined(TOSHIBA_GIGABEAT_S) || defined(CREATIVE_ZVx)
#if defined(TOSHIBA_GIGABEAT_S)
int i = 1; /* For the Gigabeat S, we mount the second partition */
#else
int i = 0;