From 15e52374698ba7395ff0ece0d3d70435a66406c4 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 5 Jul 2024 16:00:30 -0400 Subject: storage: 64-bit sector offsets * Create new 'sector_t' type alias: * uint64_t for all targets with HAVE_LBA48 or HAVE_SDUC * unsigned long for the everything else * Alter all storage APIs to use sector_t instead of 'unsigned long' * Alter Volume/Partition/storage info structures to use sector_t * Disk cache converted to sector_t * ATA Core: * convert to using sector_t for sector addresses and drive sizes * Always fill out upper 16 bits of LBA48 addresses * IDENTIFY INFO is fixed at 512 bytes, not SECTOR_SIZE * USB mass storage: * convert to using sector_t for sector addesses and drive sizes * Implement READ_16/WRITE_16 for LBA48 addresses * Convert FAT code to use sector_t for all sector references * output_dyn_value() now accepts int64_t instead of 'int' * Corrected "rockbox info" to work for (MULTIVOLUME & !MULTIDRIVE) * Better reporting of disk and (logical+physical) sector sizes in debug info * Detect SDUC cards and report on storage debug_info screen To-do: SDUC * Refactor SD core to remove duplicate code in every driver * Card probe and init state machine * Implement core SDUC support * SD2.0 needs to be 2.0+ (fixed for jz47xx and x1000) * Host and Card ID (ACMD41) * 32-bit addressing for all read/write/erase operations (CMD22) * ADD SDUC to target device drivers, defining HAVE_SDUC as appropriate Change-Id: Ib0138781a0081664d11511037685503df1b93608 --- firmware/target/mips/ingenic_x1000/sd-x1000.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'firmware/target/mips/ingenic_x1000/sd-x1000.c') diff --git a/firmware/target/mips/ingenic_x1000/sd-x1000.c b/firmware/target/mips/ingenic_x1000/sd-x1000.c index 4312937ee8..c1aec59aa3 100644 --- a/firmware/target/mips/ingenic_x1000/sd-x1000.c +++ b/firmware/target/mips/ingenic_x1000/sd-x1000.c @@ -51,7 +51,7 @@ static int sd_init_card(msc_drv* d) } static int sd_transfer(msc_drv* d, bool write, - unsigned long start, int count, void* buf) + sector_t start, int count, void* buf) { int status = -1; @@ -114,6 +114,7 @@ static int sd_transfer(msc_drv* d, bool write, : SD_READ_MULTIPLE_BLOCK; } + // XXX 64-bit if(d->driver_flags & MSC_DF_V2_CARD) req.argument = start; else @@ -142,14 +143,14 @@ static int sd_transfer(msc_drv* d, bool write, return status; } -int sd_read_sectors(IF_MD(int drive,) unsigned long start, +int sd_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf) { return sd_transfer(sd_to_msc[IF_MD_DRV(drive)], false, start, count, buf); } -int sd_write_sectors(IF_MD(int drive,) unsigned long start, +int sd_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf) { return sd_transfer(sd_to_msc[IF_MD_DRV(drive)], true, -- cgit v1.2.3