Revision 2:b2034ad4951b, committed 2015-04-21

Comitter:

k4zuki

Date:

Tue Apr 21 09:08:46 2015 +0000

Parent:

1:88089dd56f0e

Commit message:

[ FIX ] matching latest USBMSD library(2015-Apr)

Changed in this revision

diff -r 88089dd56f0e -r b2034ad4951b USBSDFileSystem.cpp
--- a/USBSDFileSystem.cpp	Tue Aug 27 19:41:48 2013 +0000
+++ b/USBSDFileSystem.cpp	Tue Apr 21 09:08:46 2015 +0000
@@ -210,9 +210,11 @@
     return 0;
 }
 
-int USBSDFileSystem::_disk_write(const uint8_t *buffer, uint64_t block_number) {
+//disk_read(uint8_t * buffer, uint64_t sector, uint8_t count)
+//_disk_write(const uint8_t * buffer, uint64_t sector, uint8_t count)
+int USBSDFileSystem::_disk_write(const uint8_t * buffer, uint64_t sector, uint8_t count=1) {
     // set write address for single block (CMD24)
-    if (_cmd(24, block_number * cdv) != 0) {
+    if (_cmd(24, sector * cdv) != 0) {
         return 1;
     }
     
@@ -221,9 +223,9 @@
     return 0;
 }
 
-int USBSDFileSystem::disk_read(uint8_t *buffer, uint64_t block_number) {
+int USBSDFileSystem::disk_read(uint8_t * buffer, uint64_t sector, uint8_t count) {
     // set read address for single block (CMD17)
-    if (_cmd(17, block_number * cdv) != 0) {
+    if (_cmd(17, sector * cdv) != 0) {
         return 1;
     }
     

diff -r 88089dd56f0e -r b2034ad4951b USBSDFileSystem.h
--- a/USBSDFileSystem.h	Tue Aug 27 19:41:48 2013 +0000
+++ b/USBSDFileSystem.h	Tue Apr 21 09:08:46 2015 +0000
@@ -33,8 +33,8 @@
     USBSDFileSystem(const char *name, PinName mosi, PinName miso, PinName sclk, PinName cs);
     virtual int disk_initialize();
     virtual int _disk_status();
-    virtual int disk_read(uint8_t * buffer, uint64_t block_number);
-    virtual int _disk_write(const uint8_t * buffer, uint64_t block_number);
+    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_sync();
     virtual uint64_t disk_sectors();