diff options
| author | Werner Koch <[email protected]> | 2013-08-30 07:28:17 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-08-30 07:28:17 +0000 |
| commit | fc31d730d8506b069de1d3529ed26660856bf07f (patch) | |
| tree | e6b5061688beb1e7504722c01489df2b89877d21 /scd/ccid-driver.c | |
| parent | scd: PC/SC pinpad input improvement. (diff) | |
| download | gnupg-fc31d730d8506b069de1d3529ed26660856bf07f.tar.gz gnupg-fc31d730d8506b069de1d3529ed26660856bf07f.zip | |
scd: Use vendor and product id macros also in apdu.c
* scd/ccid-driver.c: Move vendor and product ids to ...
* scd/ccid-driver.h: here.
* scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
(pcsc_vendor_specific_init): Use vendor and product id macros.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'scd/ccid-driver.c')
| -rw-r--r-- | scd/ccid-driver.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index 478d8c6c0..0ac5aaf90 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -91,6 +91,7 @@ #include "scdaemon.h" #include "iso7816.h" +#define CCID_DRIVER_INCLUDE_USB_IDS 1 #include "ccid-driver.h" #define DRVNAME "ccid-driver: " @@ -203,29 +204,6 @@ enum { #define CCID_ERROR_CODE(buf) (((unsigned char *)(buf))[8]) -/* We need to know the vendor to do some hacks. */ -enum { - VENDOR_CHERRY = 0x046a, - VENDOR_SCM = 0x04e6, - VENDOR_OMNIKEY= 0x076b, - VENDOR_GEMPC = 0x08e6, - VENDOR_VEGA = 0x0982, - VENDOR_KAAN = 0x0d46, - VENDOR_FSIJ = 0x234b, - VENDOR_VASCO = 0x1a44 -}; - -/* Some product ids. */ -#define SCM_SCR331 0xe001 -#define SCM_SCR331DI 0x5111 -#define SCM_SCR335 0x5115 -#define SCM_SCR3320 0x5117 -#define SCM_SPR532 0xe003 -#define CHERRY_ST2000 0x003e -#define VASCO_920 0x0920 -#define GEMPC_PINPAD 0x3478 -#define VEGA_ALPHA 0x0008 - /* A list and a table with special transport descriptions. */ enum { TRANSPORT_USB = 0, /* Standard USB transport. */ |