Diff: UsbFlashDrive/UsbFlashDrive.h

Revision:

1:80205a2de336

Parent:

0:2a9734a95d55

Child:

3:6ae9a03a6145

--- a/UsbFlashDrive/UsbFlashDrive.h	Tue Dec 04 13:39:57 2012 +0000
+++ b/UsbFlashDrive/UsbFlashDrive.h	Wed Dec 05 13:25:18 2012 +0000
@@ -1,4 +1,4 @@
-// usbFlashDrive.h 2012/12/4
+// usbFlashDrive.h 2012/12/5
 #ifndef USB_FLASH_DRIVE_H
 #define USB_FLASH_DRIVE_H
 
@@ -33,18 +33,18 @@
 class UsbFlashDrive : public FATFileSystem {
 public:
     UsbFlashDrive(const char* name, ControlEp* ctlEp = NULL);
+    static bool check(ControlEp* ctlEp);
     virtual int disk_initialize();
     virtual int disk_write(const uint8_t* buffer, uint64_t sector);
     virtual int disk_read(uint8_t* buffer, uint64_t sector);    
     virtual int disk_status();
     virtual int disk_sync();
     virtual uint64_t disk_sectors();
-
-    int setup(int timeout = 9000);
 private:
-    int ParseConfiguration();
-    int BulkOnlyMassStorageReset();
-    int GetMaxLUN();
+    int setup(ControlEp* ctlEp, int timeout = 9000);
+    int ParseConfiguration(ControlEp* ctlEp);
+    int BulkOnlyMassStorageReset(ControlEp* ctlEp);
+    int GetMaxLUN(ControlEp* ctlEp);
     int ReadCapacity();
     int GetSenseInfo();
     int TestUnitReady();
@@ -65,7 +65,7 @@
     uint32_t m_tag;
     CBW m_CBW;
     CSW m_CSW;
-    ControlEp* m_ctlEp;
+    // endpoint
     BulkEp* m_pEpBulkIn;
     BulkEp* m_pEpBulkOut;
     // report