From a46b1282d204bf910d72f6cbfc45c1e36ec643b3 Mon Sep 17 00:00:00 2001 From: neilt6 Date: Wed, 8 Jul 2015 09:52:45 -0600 Subject: [PATCH] [FATFileSystem] Modified arguments to match FatFs Changed the virtual method argument types to match the integer widths expected by FatFs. --- libraries/fs/fat/ChaN/diskio.cpp | 4 ++-- libraries/fs/fat/FATFileSystem.h | 6 +++--- libraries/fs/sd/SDFileSystem.cpp | 14 +++++++------- libraries/fs/sd/SDFileSystem.h | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/fs/fat/ChaN/diskio.cpp b/libraries/fs/fat/ChaN/diskio.cpp index 6b3284cd39..50c4a72fe7 100644 --- a/libraries/fs/fat/ChaN/diskio.cpp +++ b/libraries/fs/fat/ChaN/diskio.cpp @@ -36,7 +36,7 @@ DRESULT disk_read ( ) { debug_if(FFS_DBG, "disk_read(sector %d, count %d) on pdrv [%d]\n", sector, count, pdrv); - if (FATFileSystem::_ffs[pdrv]->disk_read((uint8_t*)buff, sector, count)) + if (FATFileSystem::_ffs[pdrv]->disk_read(buff, sector, count)) return RES_PARERR; else return RES_OK; @@ -51,7 +51,7 @@ DRESULT disk_write ( ) { debug_if(FFS_DBG, "disk_write(sector %d, count %d) on pdrv [%d]\n", sector, count, pdrv); - if (FATFileSystem::_ffs[pdrv]->disk_write((uint8_t*)buff, sector, count)) + if (FATFileSystem::_ffs[pdrv]->disk_write(buff, sector, count)) return RES_PARERR; else return RES_OK; diff --git a/libraries/fs/fat/FATFileSystem.h b/libraries/fs/fat/FATFileSystem.h index 0c6708e44b..51009651ad 100644 --- a/libraries/fs/fat/FATFileSystem.h +++ b/libraries/fs/fat/FATFileSystem.h @@ -84,10 +84,10 @@ public: virtual int disk_initialize() { return 0; } virtual int disk_status() { return 0; } - virtual int disk_read(uint8_t * buffer, uint64_t sector, uint8_t count) = 0; - virtual int disk_write(const uint8_t * buffer, uint64_t sector, uint8_t count) = 0; + virtual int disk_read(uint8_t * buffer, uint32_t sector, uint32_t count) = 0; + virtual int disk_write(const uint8_t * buffer, uint32_t sector, uint32_t count) = 0; virtual int disk_sync() { return 0; } - virtual uint64_t disk_sectors() = 0; + virtual uint32_t disk_sectors() = 0; }; diff --git a/libraries/fs/sd/SDFileSystem.cpp b/libraries/fs/sd/SDFileSystem.cpp index 054035553d..27a698d42a 100644 --- a/libraries/fs/sd/SDFileSystem.cpp +++ b/libraries/fs/sd/SDFileSystem.cpp @@ -223,12 +223,12 @@ int SDFileSystem::disk_initialize() { return 0; } -int SDFileSystem::disk_write(const uint8_t* buffer, uint64_t block_number, uint8_t count) { +int SDFileSystem::disk_write(const uint8_t* buffer, uint32_t block_number, uint32_t count) { if (!_is_initialized) { return -1; } - for (uint64_t b = block_number; b < block_number + count; b++) { + for (uint32_t b = block_number; b < block_number + count; b++) { // set write address for single block (CMD24) if (_cmd(24, b * cdv) != 0) { return 1; @@ -242,12 +242,12 @@ int SDFileSystem::disk_write(const uint8_t* buffer, uint64_t block_number, uint8 return 0; } -int SDFileSystem::disk_read(uint8_t* buffer, uint64_t block_number, uint8_t count) { +int SDFileSystem::disk_read(uint8_t* buffer, uint32_t block_number, uint32_t count) { if (!_is_initialized) { return -1; } - for (uint64_t b = block_number; b < block_number + count; b++) { + for (uint32_t b = block_number; b < block_number + count; b++) { // set read address for single block (CMD17) if (_cmd(17, b * cdv) != 0) { return 1; @@ -271,7 +271,7 @@ int SDFileSystem::disk_status() { } int SDFileSystem::disk_sync() { return 0; } -uint64_t SDFileSystem::disk_sectors() { return _sectors; } +uint32_t SDFileSystem::disk_sectors() { return _sectors; } // PRIVATE FUNCTIONS @@ -443,11 +443,11 @@ static uint32_t ext_bits(unsigned char *data, int msb, int lsb) { return bits; } -uint64_t SDFileSystem::_sd_sectors() { +uint32_t SDFileSystem::_sd_sectors() { uint32_t c_size, c_size_mult, read_bl_len; uint32_t block_len, mult, blocknr, capacity; uint32_t hc_c_size; - uint64_t blocks; + uint32_t blocks; // CMD9, Response R2 (R1 byte + 16-byte block read) if (_cmdx(9, 0) != 0) { diff --git a/libraries/fs/sd/SDFileSystem.h b/libraries/fs/sd/SDFileSystem.h index 73aba494d7..24e6cdaf03 100644 --- a/libraries/fs/sd/SDFileSystem.h +++ b/libraries/fs/sd/SDFileSystem.h @@ -54,10 +54,10 @@ public: SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name); virtual int disk_initialize(); virtual int disk_status(); - virtual int disk_read(uint8_t* buffer, uint64_t block_number, uint8_t count); - virtual int disk_write(const uint8_t* buffer, uint64_t block_number, uint8_t count); + virtual int disk_read(uint8_t* buffer, uint32_t block_number, uint32_t count); + virtual int disk_write(const uint8_t* buffer, uint32_t block_number, uint32_t count); virtual int disk_sync(); - virtual uint64_t disk_sectors(); + virtual uint32_t disk_sectors(); protected: @@ -71,8 +71,8 @@ protected: int _read(uint8_t * buffer, uint32_t length); int _write(const uint8_t *buffer, uint32_t length); - uint64_t _sd_sectors(); - uint64_t _sectors; + uint32_t _sd_sectors(); + uint32_t _sectors; void set_init_sck(uint32_t sck) { _init_sck = sck; } // Note: The highest SPI clock rate is 20 MHz for MMC and 25 MHz for SD