deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnupg ccid-driver interoperability

Browse Source
This commit is contained in:
NIIBE Yutaka
2010-11-12 23:19:27 +09:00
parent 9ed509951c
commit f849e12d0c
3 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/usb_desc.c
View File

@@ -45,7 +45,11 @@ static const uint8_t gnukConfigDescriptor[] = {
NUM_INTERFACES, /* bNumInterfaces: */
0x01, /* bConfigurationValue: Configuration value */
0x00, /* iConfiguration: Index of string descriptor describing the configuration */
#if defined(USB_SELF_POWERED)
0xC0, /* bmAttributes: self powered */
#else
0x80, /* bmAttributes: bus powered */
#endif
50, /* MaxPower 100 mA */
/* Interface Descriptor */
@@ -76,15 +80,19 @@ static const uint8_t gnukConfigDescriptor[] = {
0, 0, 0, 0, /* dwSynchProtocols: FIXED VALUE */
0, 0, 0, 0, /* dwMechanical: FIXED VALUE */
#ifdef DEBUG
0x80, 0x04, 0x04, 0x00, /* dwFeatures:
0x82, 0x04, 0x04, 0x00, /* dwFeatures:
* Short and extended APDU level: 0x40000
* Automatic IFSD : 0x00400
* Automatic PPS CUR : 0x00080
*
* Automatic conf. based on ATR : 0x00002
*/
#else
0x40, 0x00, 0x04, 0x00, /* dwFeatures:
0x42, 0x00, 0x04, 0x00, /* dwFeatures:
* Short and extended APDU level: 0x40000
* Automatic PPS PROP : 0x00040
*
* Automatic conf. based on ATR : 0x00002
*/
#endif
0x40, 0x00, 0, 0, /* dwMaxCCIDMessageLength: 64 */
@@ -207,7 +215,7 @@ static const uint8_t gnukStringSerial[] = {
8*2+2, /* bLength */
USB_STRING_DESCRIPTOR_TYPE, /* bDescriptorType */
'2', 0, '0', 0, '1', 0, '0', 0,
'1', 0, '1', 0, '0', 0, '9', 0
'1', 0, '1', 0, '1', 0, '2', 0
};
const ONE_DESCRIPTOR Device_Descriptor = {