Diff: USBMSD/USBMSD.h

Revision:

8:534fd41d8cc7

Parent:

7:6494da2a5c60

Child:

9:9c343b9ee6d8

--- a/USBMSD/USBMSD.h	Mon Nov 14 12:08:32 2011 +0000
+++ b/USBMSD/USBMSD.h	Mon Nov 14 17:50:02 2011 +0000
@@ -68,7 +68,7 @@
     * @param block block number
     * @returns 0 if successful
     */
-    virtual int blockRead(uint8_t * data, uint16_t block){return 1;};
+    virtual int disk_read(char *buffer, int block_number){return 1;};
     
     /*
     * write a block on a storage chip
@@ -77,26 +77,21 @@
     * @param block block number
     * @returns 0 if successful
     */
-    virtual int blockWrite(uint8_t * data, uint16_t block){return 1;};
+    virtual int disk_write(const char *buffer, int block_number){return 1;};
     
     /*
     * Disk initilization
     */
-    virtual int diskInit(){return -1;};
-    
+    virtual int disk_initialize(){return -1;};
+ 
     /*
-    * Return block size
+    * Return number of sectors
     *
-    * @returns size of a block
+    * @returns number of sectors
     */
-    virtual uint16_t blockSize(){return 0;};
+    virtual int disk_sectors(){return 0;};
     
-    /*
-    * Return memory size
-    *
-    * @returns memory size
-    */
-    virtual uint32_t memorySize(){return 0;};
+    virtual void set_status(int st){};
     
     /*
     * Connect the USB MSD device. Establish disk initialization before really connect the device.
@@ -182,7 +177,7 @@
     
     uint16_t BlockSize;
     uint32_t MemorySize;
-    uint16_t BlockCount;
+    uint32_t BlockCount;
 
     void CBWDecode(uint8_t * buf, uint16_t size);
     void sendCSW (void);