Skip to content

Commit

Permalink
Merge pull request #1457 from neilt6/fatfs-integer-fix
Browse files Browse the repository at this point in the history 
FATFileSystem -Fixed API integer widths
  • Loading branch information
@0xc0170
0xc0170 committed Dec 11, 2015
2 parents 739a190 + 11dbe1d commit bee1c95
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
10 changes: 5 additions & 5 deletions libraries/USBHost/USBHostMSD/USBHostMSD.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,37 +323,37 @@ int USBHostMSD::disk_initialize() {
return readCapacity();
}

int USBHostMSD::disk_write(const uint8_t* buffer, uint64_t block_number, uint8_t count) {
int USBHostMSD::disk_write(const uint8_t* buffer, uint32_t block_number, uint32_t count) {
USB_DBG("FILESYSTEM: write block: %lld, count: %d", block_number, count);
if (!disk_init) {
disk_initialize();
}
if (!disk_init)
return -1;
for (uint64_t b = block_number; b < block_number + count; b++) {
for (uint32_t b = block_number; b < block_number + count; b++) {
if (dataTransfer((uint8_t*)buffer, b, 1, HOST_TO_DEVICE))
return -1;
buffer += 512;
}
return 0;
}

int USBHostMSD::disk_read(uint8_t* buffer, uint64_t block_number, uint8_t count) {
int USBHostMSD::disk_read(uint8_t* buffer, uint32_t block_number, uint32_t count) {
USB_DBG("FILESYSTEM: read block: %lld, count: %d", block_number, count);
if (!disk_init) {
disk_initialize();
}
if (!disk_init)
return -1;
for (uint64_t b = block_number; b < block_number + count; b++) {
for (uint32_t b = block_number; b < block_number + count; b++) {
if (dataTransfer((uint8_t*)buffer, b, 1, DEVICE_TO_HOST))
return -1;
buffer += 512;
}
return 0;
}

uint64_t USBHostMSD::disk_sectors() {
uint32_t USBHostMSD::disk_sectors() {
USB_DBG("FILESYSTEM: sectors");
if (!disk_init) {
disk_initialize();
Expand Down
8 changes: 4 additions & 4 deletions libraries/USBHost/USBHostMSD/USBHostMSD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ class USBHostMSD : public IUSBEnumerator, public FATFileSystem {
// From FATFileSystem
virtual int disk_initialize();
virtual int disk_status() {return 0;};
virtual int disk_read(uint8_t* buffer, uint64_t sector, uint8_t count);
virtual int disk_write(const uint8_t* buffer, uint64_t sector, uint8_t count);
virtual int disk_read(uint8_t* buffer, uint32_t sector, uint32_t count);
virtual int disk_write(const uint8_t* buffer, uint32_t sector, uint32_t count);
virtual int disk_sync() {return 0;};
virtual uint64_t disk_sectors();
virtual uint32_t disk_sectors();

private:
USBHost * host;
Expand Down Expand Up @@ -104,7 +104,7 @@ class USBHostMSD : public IUSBEnumerator, public FATFileSystem {
int getMaxLun();

int blockSize;
uint64_t blockCount;
uint32_t blockCount;

int msd_intf;
bool msd_device_found;
Expand Down
6 changes: 3 additions & 3 deletions libraries/fs/fat/FATFileSystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ class FATFileSystem : public FileSystemLike {

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;

};

Expand Down
14 changes: 7 additions & 7 deletions libraries/fs/sd/SDFileSystem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions libraries/fs/sd/SDFileSystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ class SDFileSystem : public FATFileSystem {
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:

Expand All @@ -71,8 +71,8 @@ class SDFileSystem : public FATFileSystem {

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
Expand Down

0 comments on commit bee1c95

Please sign in to comment.