From 4b1e98d0588d01bddf01a74ca8579dead028260c Mon Sep 17 00:00:00 2001
From: Christina Quast <chrysh.ng+git@gmail.com>
Date: Mon, 6 Apr 2015 23:28:02 +0200
Subject: [PATCH] cciddriver.c: Directly access configurationDescriptorsArr

---
 sam3s_example/simtrace/cciddriver.c | 2 +-
 sam3s_example/simtrace/simtrace.h   | 3 ++-
 sam3s_example/simtrace/usb.c        | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sam3s_example/simtrace/cciddriver.c b/sam3s_example/simtrace/cciddriver.c
index c3867102..0b06b327 100644
--- a/sam3s_example/simtrace/cciddriver.c
+++ b/sam3s_example/simtrace/cciddriver.c
@@ -123,7 +123,7 @@ static CCIDDriverConfigurationDescriptors *configurationDescriptorsFS;
 //------------------------------------------------------------------------------
 void CCIDDriver_Initialize( void )
 {
-    configurationDescriptorsFS = getConfigDesc(CFG_NUM_CCID);
+    configurationDescriptorsFS = (CCIDDriverConfigurationDescriptors *) configurationDescriptorsArr[CFG_NUM_CCID];
 }
 
 //------------------------------------------------------------------------------
diff --git a/sam3s_example/simtrace/simtrace.h b/sam3s_example/simtrace/simtrace.h
index 38511236..f6c8dfc2 100644
--- a/sam3s_example/simtrace/simtrace.h
+++ b/sam3s_example/simtrace/simtrace.h
@@ -42,8 +42,9 @@ typedef struct {
     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 );
diff --git a/sam3s_example/simtrace/usb.c b/sam3s_example/simtrace/usb.c
index c330db8c..1c3b6642 100644
--- a/sam3s_example/simtrace/usb.c
+++ b/sam3s_example/simtrace/usb.c
@@ -584,10 +584,6 @@ const USBConfigurationDescriptor *configurationDescriptorsArr[] = {
     &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,