commit 4b1e98d0588d01bddf01a74ca8579dead028260c
author Christina Quast <chrysh.ng+git@gmail.com> Mon Apr 06 23:28:02 2015 +0200
committer Christina Quast <chrysh.ng+git@gmail.com> Mon Apr 06 23:28:41 2015 +0200
tree 5c43a8bdd1af046739942c9dffbc5b6befda5adb
parent 3debfd65959a6d343020388f684cdb8171d7ef17

cciddriver.c: Directly access configurationDescriptorsArr

sam3s_example/simtrace/cciddriver.c

diff --git a/sam3s_example/simtrace/cciddriver.c b/sam3s_example/simtrace/cciddriver.c
index c386710..0b06b32 100644
--- a/sam3s_example/simtrace/cciddriver.c
+++ b/sam3s_example/simtrace/cciddriver.c
@@ -123,7 +123,7 @@
 //------------------------------------------------------------------------------
 void CCIDDriver_Initialize( void )
 {
-    configurationDescriptorsFS = getConfigDesc(CFG_NUM_CCID);
+    configurationDescriptorsFS = (CCIDDriverConfigurationDescriptors *) configurationDescriptorsArr[CFG_NUM_CCID];
 }
 
 //------------------------------------------------------------------------------

sam3s_example/simtrace/simtrace.h

diff --git a/sam3s_example/simtrace/simtrace.h b/sam3s_example/simtrace/simtrace.h
index 3851123..f6c8dfc 100644
--- a/sam3s_example/simtrace/simtrace.h
+++ b/sam3s_example/simtrace/simtrace.h
@@ -42,8 +42,9 @@
     USBEndpointDescriptor      interruptIn;
 } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
 
+extern const USBConfigurationDescriptor *configurationDescriptorsArr[];
+
 /*  Helper functions    */
-USBConfigurationDescriptor *getConfigDesc(uint8_t idx);
 
 // FIXME: static function definitions
 extern uint32_t _ISO7816_GetChar( uint8_t *pCharToReceive );

sam3s_example/simtrace/usb.c

diff --git a/sam3s_example/simtrace/usb.c b/sam3s_example/simtrace/usb.c
index c330db8..1c3b664 100644
--- a/sam3s_example/simtrace/usb.c
+++ b/sam3s_example/simtrace/usb.c
@@ -584,10 +584,6 @@
     &configurationDescriptorMITM.configuration,
 };
 
-USBConfigurationDescriptor *getConfigDesc(uint8_t idx) {
-    return configurationDescriptorsArr[idx];
-}
-
 /* AT91SAM3S does only support full speed, but not high speed USB */
 const USBDDriverDescriptors driverDescriptors = {
     &deviceDescriptor,