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

imx233/creative: workaround stupid Creative partition table

Browse source 
This should fix wrong partition size on the ZEN, X-Fi and Mozaic

Change-Id: Ib8999d414773c12e1b97d515e9bf058a82141d35
This commit is contained in:
Amaury Pouly 2013-11-11 02:02:11 +00:00
parent 39bfd0d2ab
commit bb8dd05343
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/target/arm/imx233/partitions-imx233.c
View file

@ -64,7 +64,6 @@ static const char *creative_part_name(enum imx233_part_t part)
{ {
switch(part) switch(part)
{ {
case IMX233_PART_USER: return "cfs";
case IMX233_PART_CFS: return "cfs"; case IMX233_PART_CFS: return "cfs";
case IMX233_PART_MINIFS: return "minifs"; case IMX233_PART_MINIFS: return "minifs";
default: return ""; default: return "";
@ -90,7 +89,17 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
if(strcmp(ent[i].name, name) == 0) if(strcmp(ent[i].name, name) == 0)
{ {
*start = ent[i].start * hdr->block_size / 512; *start = ent[i].start * hdr->block_size / 512;
*end = *start + ent[i].size * hdr->block_size / 512; if(part == IMX233_PART_CFS)
{
/* There is a bug in Creative's partitioner which restrict
* computations to 32-bit even though the format itself can
* handle much bigger volumes. We make the assumption
* that the CFS partition always extends up the end of the
* volume. So don't touch *end */
}
else
*end = *start + ent[i].size * hdr->block_size / 512;
return 0; return 0;
} }
} }
@ -126,7 +135,7 @@ static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
* it seems that it is similarly truncated. */ * it seems that it is similarly truncated. */
if(mbr[510] != 0x55 || mbr[511] != 0xAA) if(mbr[510] != 0x55 || mbr[511] != 0xAA)
return -101; /* invalid MBR */ return -101; /* invalid MBR */
if(part == IMX233_PART_USER) if(part == IMX233_PART_DATA)
{ {
/* sanity check that the first partition is greater than 2Gib */ /* sanity check that the first partition is greater than 2Gib */
uint8_t *ent = &mbr[446]; uint8_t *ent = &mbr[446];

10
firmware/target/arm/imx233/partitions-imx233.h
View file

@ -30,13 +30,15 @@
enum imx233_part_t enum imx233_part_t
{ {
IMX233_PART_USER,
#if (IMX233_PARTITIONS & IMX233_FREESCALE) #if (IMX233_PARTITIONS & IMX233_FREESCALE)
IMX233_PART_BOOT, IMX233_PART_BOOT,
IMX233_PART_DATA,
IMX233_PART_USER = IMX233_PART_DATA,
#endif #endif
#if (IMX233_PARTITIONS & IMX233_CREATIVE) #if (IMX233_PARTITIONS & IMX233_CREATIVE)
IMX233_PART_CFS, IMX233_PART_CFS,
IMX233_PART_MINIFS, IMX233_PART_MINIFS,
IMX233_PART_USER = IMX233_PART_CFS,
#endif #endif
}; };
@ -45,9 +47,13 @@ enum imx233_part_t
* issue, one must provide a read function. */ * issue, one must provide a read function. */
typedef int (*part_read_fn_t)(intptr_t user, unsigned long start, int count, void* buf); typedef int (*part_read_fn_t)(intptr_t user, unsigned long start, int count, void* buf);
/* Enable/Disable window computations for internal storage following the /* Enable/Disable window computations for internal storage following the
* Freescale convention */ * Freescale/Creative convention */
void imx233_partitions_enable_window(bool enable); void imx233_partitions_enable_window(bool enable);
bool imx233_partitions_is_window_enabled(void); bool imx233_partitions_is_window_enabled(void);
/* Compute the window size. The *start and *end parameters should contain
* the initial window in which the computation is done. So in particular,
* for a whole disk, *end should be the size of the disk when the function is
* called */
int imx233_partitions_compute_window(intptr_t user, part_read_fn_t read_fn, int imx233_partitions_compute_window(intptr_t user, part_read_fn_t read_fn,
enum imx233_part_t part, unsigned *start, unsigned *end); enum imx233_part_t part, unsigned *start, unsigned *end);