Revision 1:efbcfbae4747, committed 2011-11-10

Comitter:

okini3939

Date:

Thu Nov 10 03:20:42 2011 +0000

Parent:

0:02c293160df3

Commit message:

Changed in this revision

diff -r 02c293160df3 -r efbcfbae4747 USBMSC.cpp
--- a/USBMSC.cpp	Wed Nov 09 17:30:56 2011 +0000
+++ b/USBMSC.cpp	Thu Nov 10 03:20:42 2011 +0000
@@ -114,28 +114,6 @@
     return true;
 }
 
-
-uint8_t * USBMSC::stringIinterfaceDesc() {
-    static uint8_t stringIinterfaceDescriptor[] = {
-        14,                           //bLength
-        STRING_DESCRIPTOR,              //bDescriptorType 0x03
-        'C',0,'D',0,'C',0,'M',0,'S',0,'C',0   //bString iInterface - Audio
-    };
-    DBG("stringIinterfaceDesc\r\n");
-    return stringIinterfaceDescriptor;
-}
-
-uint8_t * USBMSC::stringIproductDesc() {
-    static uint8_t stringIproductDescriptor[] = {
-        24,                                                       //bLength
-        STRING_DESCRIPTOR,                                          //bDescriptorType 0x03
-        'M',0,'b',0,'e',0,'d',0,' ',0,'D',0,'e',0,'v',0,'i',0,'c',0,'e',0 //bString iProduct - Mbed Audio
-    };
-    DBG("stringIproductDesc\r\n");
-    return stringIproductDescriptor;
-}
-
-
 uint8_t * USBMSC::configurationDesc() {
     static uint8_t configDescriptor[] = {
         // configuration descriptor
@@ -157,9 +135,8 @@
     static uint8_t deviceDescriptor[] = {
         DEVICE_DESCRIPTOR_LENGTH,       /* bLength */
         DEVICE_DESCRIPTOR,              /* bDescriptorType */
-//        LSB(USB_VERSION_2_0),           /* bcdUSB (LSB) */
-//        MSB(USB_VERSION_2_0),           /* bcdUSB (MSB) */
-        0x01, 0x01,
+        LSB(USB_VERSION_2_0),           /* bcdUSB (LSB) */
+        MSB(USB_VERSION_2_0),           /* bcdUSB (MSB) */
         0x00,                           /* bDeviceClass */
         0x00,                           /* bDeviceSubClass */
         0x00,                           /* bDeviceprotocol */

diff -r 02c293160df3 -r efbcfbae4747 USBMSC.h
--- a/USBMSC.h	Wed Nov 09 17:30:56 2011 +0000
+++ b/USBMSC.h	Thu Nov 10 03:20:42 2011 +0000
@@ -24,20 +24,6 @@
     USBMSC(uint16_t vendor_id = 0x1FC9, uint16_t product_id = 0x1002, uint16_t product_release = 0x0100);
     
     /*
-    * Get string product descriptor
-    *
-    * @returns pointer to the string product descriptor
-    */
-    virtual uint8_t * stringIproductDesc();
-    
-    /*
-    * Get string interface descriptor
-    *
-    * @returns pointer to the string interface descriptor
-    */
-    virtual uint8_t * stringIinterfaceDesc();
-    
-    /*
     * Get configuration descriptor
     *
     * @returns pointer to the configuration descriptor

diff -r 02c293160df3 -r efbcfbae4747 blockdev_sd.cpp
--- a/blockdev_sd.cpp	Wed Nov 09 17:30:56 2011 +0000
+++ b/blockdev_sd.cpp	Thu Nov 10 03:20:42 2011 +0000
@@ -37,7 +37,7 @@
  *      October 3rd, 2010
  */
 
-#define DEBUG
+//#define DEBUG
 #include "dbg.h"
 #include "mbed.h"