From: Klas Lindfors Date: Tue, 4 Dec 2012 19:01:07 +0000 (+0100) Subject: remove duplicate VID/PID mappings X-Git-Tag: v1.10.0~12 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aed61641e6fa180e29919ccfd2ed43af9fb2d59;p=yubikey-personalization remove duplicate VID/PID mappings --- diff --git a/ykcore/ykdef.h b/ykcore/ykdef.h index 36650a9..b9657af 100644 --- a/ykcore/ykdef.h +++ b/ykcore/ykdef.h @@ -255,14 +255,8 @@ struct status_st { #define YUBICO_VID 0x1050 /* Global vendor ID */ #define YUBIKEY_PID 0x0010 /* Yubikey (version 1 and 2) */ #define NEO_OTP_PID 0x0110 /* Yubikey NEO - OTP only */ -#define NEO_OTP_CCID_PID 0x0111 // Yubikey NEO - OTP and CCID -/* USB Identity */ - -#define YUBICO_VID 0x1050 -#define YUBIKEY_PID 0x0010 -#define YUBIKEY_NEO_PID 0x0110 - -#define NEO_CCID_PID 0x0112 // Yubikey NEO - CCID only +#define NEO_OTP_CCID_PID 0x0111 // Yubikey NEO - OTP and CCID +#define NEO_CCID_PID 0x0112 // Yubikey NEO - CCID only #if defined(_WIN32) || defined(__GNUC__) #pragma pack(pop)