From: Klas Lindfors <klas@yubico.com>
Date: Fri, 30 Nov 2012 19:53:18 +0000 (+0100)
Subject: Merge branch 'master' into feature/usb_mode
X-Git-Tag: v1.10.0~20^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1aa23afe2ca29637c781f3ad36f2abea98ecd92;p=yubikey-personalization

Merge branch 'master' into feature/usb_mode
---

a1aa23afe2ca29637c781f3ad36f2abea98ecd92
diff --cc ykcore/ykdef.h
index 08de9d6,28d1b3b..e210228
--- a/ykcore/ykdef.h
+++ b/ykcore/ykdef.h
@@@ -40,9 -35,9 +35,11 @@@
  #define	SLOT_NDEF		8   /* Write NDEF record */
  #define	SLOT_NDEF2		9   /* Write NDEF record for slot 2 */
  
 +#define SLOT_USB_MODE		0x0b    /* USB mode of operation (NEO) */
 +
  #define SLOT_DEVICE_SERIAL	0x10	/* Device serial number */
+ #define SLOT_DEVICE_CONFIG	0x11	/* Write device configuration record */
+ #define SLOT_SCAN_MAP		0x12	/* Write scancode map */
  
  #define SLOT_CHAL_OTP1		0x20	/* Write 6 byte challenge to slot 1, get Yubico OTP response */
  #define SLOT_CHAL_OTP2		0x28	/* Write 6 byte challenge to slot 2, get Yubico OTP response */