commit 54d0c1fca8030a5ecaa6291017d1b6d8ac806342
author Christina Quast <chrysh.ng+git@gmail.com> Wed Feb 25 16:04:25 2015 +0100
committer Christina Quast <chrysh.ng+git@gmail.com> Wed Feb 25 16:04:25 2015 +0100
tree d0238b1f3789308eb33a1506b0ac219380c2a86e
parent 1161b27e7dcad1d9baadeb58b57d5b2004595a60

USB enum works again, No CCID conf

sam3s_example/simtrace/usb.c

diff --git a/sam3s_example/simtrace/usb.c b/sam3s_example/simtrace/usb.c
index f9c53b0..c2cdda2 100644
--- a/sam3s_example/simtrace/usb.c
+++ b/sam3s_example/simtrace/usb.c
@@ -129,7 +129,7 @@
 };
 
 enum strDescNum {
-    NONE = 1, PRODUCT_STRING, SNIFFER_CONF_STR, CCID_CONF_STR, PHONE_CONF_STR, MITM_CONF_STR, STRING_DESC_CNT
+    PRODUCT_STRING = 1, SNIFFER_CONF_STR, CCID_CONF_STR, PHONE_CONF_STR, MITM_CONF_STR, STRING_DESC_CNT
 };
 
 /** List of string descriptors used by the device */
@@ -171,7 +171,7 @@
         USBGenericDescriptor_CONFIGURATION,
         sizeof(SIMTraceDriverConfigurationDescriptorSniffer),
         1, /* There is one interface in this configuration */
-        0, /* This is configuration #0 */
+        1, /* This is configuration #1 */
         SNIFFER_CONF_STR, /* string descriptor for this configuration */
         USBD_BMATTRIBUTES,
         USBConfigurationDescriptor_POWER(100)
@@ -305,7 +305,7 @@
         USBGenericDescriptor_CONFIGURATION,
         sizeof(SIMTraceDriverConfigurationDescriptorMITM),
         2, /* There are two interfaces in this configuration */
-        4, /* This is configuration #4 */
+        3, /* This is configuration #3 */
         MITM_CONF_STR, /* string descriptor for this configuration */
         USBD_BMATTRIBUTES,
         USBConfigurationDescriptor_POWER(100)
@@ -403,12 +403,12 @@
     0, /* No string descriptor for manufacturer */
     PRODUCT_STRING, /* Index of product string descriptor */
     0, /* No string descriptor for serial number */
-    4 /* Device has 4 possible configurations */
+    3 /* Device has 4 possible configurations */
 };
 
 const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
     &configurationDescriptorSniffer,
-    &configurationDescriptorCCID,
+    //&configurationDescriptorCCID,
     &configurationDescriptorPhone,
     &configurationDescriptorMITM,
 };
@@ -425,7 +425,7 @@
     0, /* No high-speed device qualifier descriptor */
     0, /* No high-speed other speed configuration descriptor */
     stringDescriptors,
-    STRING_DESC_CNT-1 /* cnt string descriptors in list */
+    STRING_DESC_CNT /* cnt string descriptors in list */
 };
 
 /*----------------------------------------------------------------------------