len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

storage: Support a default virtual sector size

Browse source 
Normally, we figure out the virual sector size from the filesystem info.
However, if there's no filesystem, we fall back to the hardware's
logical sector size.

Some device firmware (eg ipod5g/6g) need their partition tables set up
with larger-than-logical sector sizes; this way we can present the
"correct" sector size to maintain interoperability with the stock
firmware and make it so that the drive can still be properly partitioned
from within rockbox.

This patch adds support for DEFAULT_VIRT_SECTOR_SIZE.  Nothing uses it yet.

Change-Id: Iae746a50ffc37c51abb2c9b82d3c4596f1fa7559
This commit is contained in:
Solomon Peachy 2024-11-09 16:38:28 -05:00
parent c61ad40812
commit 1516c48a37
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/main.c
View file

@ -634,6 +634,13 @@ static void init(void)
lcd_puts(0, 4, rbversion); lcd_puts(0, 4, rbversion);
lcd_update(); lcd_update();
#if defined(MAX_VIRT_SECTOR_SIZE) && defined(DEFAULT_VIRT_SECTOR_SIZE)
#ifdef HAVE_MULTIDRIVE
for (int i = 0 ; i < NUM_DRIVES ; i++)
#endif
disk_set_sector_multiplier(IF_MD(i,) DEFAULT_VIRT_SECTOR_SIZE);
#endif
#ifndef USB_NONE #ifndef USB_NONE
usb_start_monitoring(); usb_start_monitoring();
while(button_get(true) != SYS_USB_CONNECTED) {}; while(button_get(true) != SYS_USB_CONNECTED) {};
@ -650,6 +657,7 @@ static void init(void)
lcd_putsf(0, 4, "Error mounting: %08x", rc); lcd_putsf(0, 4, "Error mounting: %08x", rc);
lcd_update(); lcd_update();
sleep(HZ*5); sleep(HZ*5);
system_reboot();
} }
#endif #endif
} }

12
firmware/common/disk.c
View file

@ -124,6 +124,18 @@ int disk_get_sector_multiplier(IF_MD_NONVOID(int drive))
disk_reader_unlock(); disk_reader_unlock();
return multiplier; return multiplier;
} }
#ifdef DEFAULT_VIRT_SECTOR_SIZE
void disk_set_sector_multiplier(IF_MD(int drive,) uint16_t mult)
{
if (!CHECK_DRV(drive))
return;
disk_writer_lock();
disk_sector_multiplier[IF_MD_DRV(drive)] = mult;
disk_writer_unlock();
}
#endif /* DEFAULT_VIRT_SECTOR_SIZE */
#endif /* MAX_VIRT_SECTOR_SIZE */ #endif /* MAX_VIRT_SECTOR_SIZE */
#ifdef MAX_VARIABLE_LOG_SECTOR #ifdef MAX_VARIABLE_LOG_SECTOR

4
firmware/export/disk.h
View file

@ -50,6 +50,10 @@ int disk_unmount(int drive);
/* Used when the drive's logical sector size is smaller than the sector size used by the partition table and filesystem. Notably needed for ipod 5.5G/6G. */ /* Used when the drive's logical sector size is smaller than the sector size used by the partition table and filesystem. Notably needed for ipod 5.5G/6G. */
#ifdef MAX_VIRT_SECTOR_SIZE #ifdef MAX_VIRT_SECTOR_SIZE
int disk_get_sector_multiplier(IF_MD_NONVOID(int drive)); int disk_get_sector_multiplier(IF_MD_NONVOID(int drive));
/* The logical sector size to use when we have no valid paritions */
#ifdef DEFAULT_VIRT_SECTOR_SIZE
void disk_set_sector_multiplier(IF_MD(int drive,) uint16_t mult);
#endif
#endif #endif
#ifdef MAX_VARIABLE_LOG_SECTOR #ifdef MAX_VARIABLE_LOG_SECTOR