Diff: USBHostMSD/USBHostMSD.h

Revision:

8:6463cd1964c0

Parent:

3:a3872f7593e2

Child:

9:7f9f64cf5ded

--- a/USBHostMSD/USBHostMSD.h	Tue Jan 28 06:50:12 2014 +0000
+++ b/USBHostMSD/USBHostMSD.h	Fri Jan 31 13:45:07 2014 +0000
@@ -17,12 +17,18 @@
 #ifndef USBHOSTMSD_H
 #define USBHOSTMSD_H
 
-#if 0
+#if _USB_DBG
 #define USB_DBG(...) do{fprintf(stderr,"[%s@%d] ",__PRETTY_FUNCTION__,__LINE__);fprintf(stderr,__VA_ARGS__);fprintf(stderr,"\r\n");} while(0);
 #else
 #define USB_DBG(...)  while(0);
 #endif
 
+#if 0
+#define USB_DBG2(...) do{fprintf(stderr,"[%s@%d] ",__PRETTY_FUNCTION__,__LINE__);fprintf(stderr,__VA_ARGS__);fprintf(stderr,"\r\n");} while(0);
+#else
+#define USB_DBG2(...)  while(0);
+#endif
+
 #if 1
 #define USB_INFO(...) do{fprintf(stderr,__VA_ARGS__);fprintf(stderr,"\r\n");}while(0);
 #else
@@ -36,7 +42,7 @@
 /** 
  * A class to communicate a USB flash disk
  */
-class USBHostMSD : public FATFileSystem {
+class USBHostMSD : public IUSBEnumerator, public FATFileSystem {
 public:
     /**
     * Constructor
@@ -59,8 +65,11 @@
      */
     bool connect();
 
-    Report* report;
 protected:
+    //From IUSBEnumerator
+    virtual void setVidPid(uint16_t vid, uint16_t pid);
+    virtual bool parseInterface(uint8_t intf_nb, uint8_t intf_class, uint8_t intf_subclass, uint8_t intf_protocol); //Must return true if the interface should be parsed
+    virtual bool useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir); //Must return true if the endpoint will be used
 
     // From FATFileSystem
     virtual int disk_initialize();