sim-card
/
simtrace2
mirror of https://gerrit.osmocom.org/simtrace2
10
0
Fork 0
Code Issues Releases Wiki Activity

cciddriver.c: Directly access configurationDescriptorsArr

This commit is contained in:
Christina Quast 2015-04-06 23:28:02 +02:00
parent 3debfd6595
commit 4b1e98d058
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sam3s_example/simtrace/cciddriver.c
View File

@ -123,7 +123,7 @@ static CCIDDriverConfigurationDescriptors *configurationDescriptorsFS;
//------------------------------------------------------------------------------
void CCIDDriver_Initialize( void )
{
configurationDescriptorsFS = getConfigDesc(CFG_NUM_CCID);
configurationDescriptorsFS = (CCIDDriverConfigurationDescriptors *) configurationDescriptorsArr[CFG_NUM_CCID];
}
//------------------------------------------------------------------------------

3
sam3s_example/simtrace/simtrace.h
View File

@ -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 );

4
sam3s_example/simtrace/usb.c
View File

@ -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,