Merge branch 'fix_layer_delay'

[max/tmk_keyboard.git] / pjrc / usb.h

diff --git a/pjrc/usb.h b/pjrc/usb.h
index 4f0fd8f1e838b98ccbc856ea5341984ca35c573e..0eb58fc3955c73879ba3a400966e247ff95e515b 100644 (file)
--- a/pjrc/usb.h
+++ b/pjrc/usb.h
@@ -1,3 +1,26 @@
+/* USB Keyboard Plus Debug Channel Example for Teensy USB Development Board
+ * http://www.pjrc.com/teensy/usb_keyboard.html
+ * Copyright (c) 2009 PJRC.COM, LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef USB_H
 #define  USB_H 1
 
@@ -30,7 +53,13 @@ void usb_remote_wakeup(void);
                        ((s) == 16 ? 0x10 :     \
                                     0x00)))
 
-#define MAX_ENDPOINT           4
+#if defined (__AVR_AT90USB162__) || defined (__AVR_AT90USB82__)
+#   define MAX_ENDPOINT     4
+#   define UERST_MASK       0x1E
+#else
+#   define MAX_ENDPOINT     6
+#   define UERST_MASK       0x7E
+#endif
 
 #define LSB(n) (n & 255)
 #define MSB(n) ((n >> 8) & 255)
@@ -97,7 +126,7 @@ void usb_remote_wakeup(void);
 #define KBD_REPORT_KEYS                (KBD_SIZE - 2)
 
 // secondary keyboard
-#ifdef USB_NKRO_ENABLE
+#ifdef NKRO_ENABLE
 #define KBD2_INTERFACE         4
 #define KBD2_ENDPOINT          5
 #define KBD2_SIZE              16