Diff: ChaNFSSD/SDFileSystem.h

Revision:

9:9c343b9ee6d8

Parent:

8:534fd41d8cc7

Child:

13:32b8a767cf0e

--- a/ChaNFSSD/SDFileSystem.h	Mon Nov 14 17:50:02 2011 +0000
+++ b/ChaNFSSD/SDFileSystem.h	Tue Nov 15 09:16:25 2011 +0000
@@ -27,13 +27,6 @@
 #include "FATFileSystem.h"
 #include "USBMSD.h"
 
-// MSC Bulk-only Stage
-enum STATUS {
-    NOINIT = (1 << 0),
-    NODISK = (1 << 1),
-    PROTECT = (1 << 2),
-};
-
 /** Access the filesystem on an SD Card using SPI
  *
  * @code
@@ -48,7 +41,7 @@
  *     fclose(fp);
  * }
  */
-class SDFileSystem : public USBMSD, FATFileSystem {
+class SDFileSystem : public USBMSD, public FATFileSystem {
 public:
 
     /** Create the File System for accessing an SD Card using SPI
@@ -66,7 +59,6 @@
     virtual int disk_status();
     virtual int disk_sync();
     virtual int disk_sectors();
-    virtual void set_status(int st);
 
 protected:
 
@@ -83,8 +75,6 @@
     int _sd_sectors();
     int _sectors;
     
-    int status;
-    
     SPI _spi;
     DigitalOut _cs;     
 };