Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / common / usb_cdc.c

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 3d17f81c0a8bfeb9bd6dee17c5c10a0c771ddff2..d33bca7bcbd5dd0e0975c2742470bc47e358b364 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -77,8 +77,8 @@ static const char cfgDescriptor[] = {
        0x02,   // CbNumInterfaces\r
        0x01,   // CbConfigurationValue\r
        0x00,   // CiConfiguration\r
        0x02,   // CbNumInterfaces\r
        0x01,   // CbConfigurationValue\r
        0x00,   // CiConfiguration\r

-       0xC0,   // CbmAttributes (Self Powered - for those with a battery)\r
-       0x4B,   // CMaxPower (150mA max current drawn from bus without battery)\r
+       0x80,   // CbmAttributes (Bus Powered)\r
+       0x4B,   // CMaxPower (150mA max current drawn from bus)\r

 \r
        /* Interface 0 Descriptor: Communication Class Interface */\r
        0x09, // bLength\r
 \r
        /* Interface 0 Descriptor: Communication Class Interface */\r
        0x09, // bLength\r


@@ -183,10 +183,16 @@ static const char StrDescManufacturer[] = {
 };\r
 \r
 static const char StrDescProduct[] = {\r
 };\r
 \r
 static const char StrDescProduct[] = {\r

-  8,                   // Length\r
+  20,                  // Length\r

   0x03,                        // Type is string\r
   0x03,                        // Type is string\r

-  'P', 0x00,\r
-  'M', 0x00,\r
+  'p', 0x00,\r
+  'r', 0x00,\r
+  'o', 0x00,\r
+  'x', 0x00,\r
+  'm', 0x00,\r
+  'a', 0x00,\r
+  'r', 0x00,\r
+  'k', 0x00,\r

   '3', 0x00\r
 };\r
 \r
   '3', 0x00\r
 };\r
 \r