Diff: USBMSD/USBMSD.h

Revision:

12:a12eb1fc05f3

Parent:

11:a26e7b7a1221

--- a/USBMSD/USBMSD.h	Wed Nov 16 17:17:42 2011 +0000
+++ b/USBMSD/USBMSD.h	Wed Nov 30 17:50:35 2011 +0000
@@ -16,7 +16,6 @@
 #include "USBDevice_Types.h"
 
 #include "USBDevice.h"
-#include "USBHID.h"
 
 #define DEFAULT_CONFIGURATION (1)
 
@@ -60,31 +59,7 @@
     * @param product_id Your product_id
     * @param product_release Your preoduct_release
     */
-    USBMSD(uint16_t vendor_id = 0x0933, uint16_t product_id = 0x0554, uint16_t product_release = 0x0001);
-    
-    /**
-    * Send a Report
-    *
-    * @param report Report which will be sent (a report is defined by all data and the length)
-    * @returns true if successful
-    */
-    bool send(HID_REPORT *report);
-    
-    /**
-    * Read a report: blocking
-    *
-    * @param report pointer to the report to fill
-    * @returns true if successful
-    */
-    bool read(HID_REPORT * report);
-    
-    /**
-    * Read a report: non blocking
-    *
-    * @param report pointer to the report to fill
-    * @returns true if successful
-    */
-    bool readNB(HID_REPORT * report);
+    USBMSD(uint16_t vendor_id = 0x0703, uint16_t product_id = 0x0104, uint16_t product_release = 0x0001);
     
     /*
     * read a block on a storage chip
@@ -124,20 +99,6 @@
     virtual uint32_t memorySize(){return 0;};
     
     /*
-    * Get the Report descriptor
-    *
-    * @returns pointer to the report descriptor
-    */
-    virtual uint8_t * reportDesc();
-
-    /*
-    * Get the length of the report descriptor
-    *
-    * @returns the length of the report descriptor
-    */
-    virtual uint16_t reportDescLength();
-    
-    /*
     * Connect the USB MSD device. Establish disk initialization before really connect the device.
     *
     * @returns
@@ -147,6 +108,7 @@
     
 protected:
 
+
     /*
     * Get number of logical unit - 1 (here 0)
     *
@@ -237,9 +199,6 @@
     void memoryWrite (uint8_t * buf, uint16_t size);
     void reset();
     void fail();
-    
-    uint16_t reportLength;
-    HID_REPORT outputReport;
 };
 
 #endif