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

Hopefully fix the remaining red from 15e52374

Browse source 
(imx233, ipodnano2g, !multidrive hosted/sims)

Change-Id: I9c89887078f9f50d3aac73f468ac323699e1fd1f
This commit is contained in:
Solomon Peachy 2024-08-12 15:14:33 -04:00
parent 6e69241279
commit 05354e1bef
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/debug_menu.c
View file

@ -1792,7 +1792,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
simplelist_addline("Firmware: %s", info.revision); simplelist_addline("Firmware: %s", info.revision);
simplelist_addline( simplelist_addline(
"Size: %lld MB", (uint64_t)(info.num_sectors*(info.sector_size/512)/2048)); "Size: %lld MB", (uint64_t)(info.num_sectors*(info.sector_size/512)/2048));
storage_t free; sector_t free;
volume_size( IF_MV(0,) NULL, &free ); volume_size( IF_MV(0,) NULL, &free );
simplelist_addline( simplelist_addline(
"Free: %ld MB", free / 1024); "Free: %ld MB", free / 1024);

2
apps/menus/main_menu.c
View file

@ -185,7 +185,7 @@ static int refresh_data(struct info_data *info)
max = drive; max = drive;
else if (drive < max) else if (drive < max)
break; break;
#elif defined(HAVE_MULTIVOLUME) #elif defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA)
if (volume_partition(i) == -1) if (volume_partition(i) == -1)
break; break;
#endif #endif

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

@ -71,7 +71,7 @@ static const char *creative_part_name(enum imx233_part_t part)
} }
static int compute_window_creative(intptr_t user, part_read_fn_t read_fn, static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
enum imx233_part_t part, sector_t *start, unsigned *end) enum imx233_part_t part, sector_t *start, sector_t *end)
{ {
uint8_t mblk[512]; uint8_t mblk[512];
int ret = read_fn(user, MBLK_ADDR / 512, 1, mblk); int ret = read_fn(user, MBLK_ADDR / 512, 1, mblk);
@ -99,7 +99,7 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
} }
else else
*end = *start + ent[i].size * hdr->block_size / 512; *end = *start + ent[i].size * hdr->block_size / 512;
return 0; return 0;
} }
} }
@ -109,7 +109,7 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
#if (IMX233_PARTITIONS & IMX233_FREESCALE) #if (IMX233_PARTITIONS & IMX233_FREESCALE)
static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn, static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
enum imx233_part_t part, unsigned *start, unsigned *end) enum imx233_part_t part, sector_t *start, sector_t *end)
{ {
uint8_t mbr[512]; uint8_t mbr[512];
int ret = read_fn(user, 0, 1, mbr); int ret = read_fn(user, 0, 1, mbr);
@ -179,7 +179,7 @@ static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
#endif /* (IMX233_PARTITIONS & IMX233_FREESCALE) */ #endif /* (IMX233_PARTITIONS & IMX233_FREESCALE) */
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, sector_t *start, sector_t *end)
{ {
int ret = -1; int ret = -1;
#if (IMX233_PARTITIONS & IMX233_CREATIVE) #if (IMX233_PARTITIONS & IMX233_CREATIVE)

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

@ -55,6 +55,6 @@ bool imx233_partitions_is_window_enabled(void);
* for a whole disk, *end should be the size of the disk when the function is * for a whole disk, *end should be the size of the disk when the function is
* called */ * 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, sector_t *start, unsigned *end); enum imx233_part_t part, sector_t *start, sector_t *end);
#endif /* __PARTITIONS_IMX233__ */ #endif /* __PARTITIONS_IMX233__ */

4
firmware/target/arm/imx233/sdmmc-imx233.c
View file

@ -203,8 +203,8 @@ struct sdmmc_status_t
* the RCA is the 16-bit msb. Be careful that this is not the actuall RCA ! */ * the RCA is the 16-bit msb. Be careful that this is not the actuall RCA ! */
/* common */ /* common */
static unsigned window_start[SDMMC_NUM_DRIVES]; static sector_t window_start[SDMMC_NUM_DRIVES];
static unsigned window_end[SDMMC_NUM_DRIVES]; static sector_t window_end[SDMMC_NUM_DRIVES];
static uint8_t aligned_buffer[SDMMC_NUM_DRIVES][512] CACHEALIGN_ATTR; static uint8_t aligned_buffer[SDMMC_NUM_DRIVES][512] CACHEALIGN_ATTR;
static tCardInfo sdmmc_card_info[SDMMC_NUM_DRIVES]; static tCardInfo sdmmc_card_info[SDMMC_NUM_DRIVES];
static struct mutex mutex[SDMMC_NUM_DRIVES]; static struct mutex mutex[SDMMC_NUM_DRIVES];