From b03717a10ce84c906e149c9f673fa3ffa686ef80 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 29 Apr 2014 19:45:01 +0900 Subject: Unused endpoint of console OUT is commentout'd --- protocol/lufa/descriptor.h | 6 +++++- protocol/lufa/lufa.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/protocol/lufa/descriptor.h b/protocol/lufa/descriptor.h index a2db4bfd7..42af07917 100644 --- a/protocol/lufa/descriptor.h +++ b/protocol/lufa/descriptor.h @@ -137,13 +137,17 @@ typedef struct #ifdef CONSOLE_ENABLE # define CONSOLE_IN_EPNUM (EXTRAKEY_IN_EPNUM + 1) -# define CONSOLE_OUT_EPNUM (EXTRAKEY_IN_EPNUM + 2) +# define CONSOLE_OUT_EPNUM (EXTRAKEY_IN_EPNUM + 1) +//# define CONSOLE_OUT_EPNUM (EXTRAKEY_IN_EPNUM + 2) #else # define CONSOLE_OUT_EPNUM EXTRAKEY_IN_EPNUM #endif #ifdef NKRO_ENABLE # define NKRO_IN_EPNUM (CONSOLE_OUT_EPNUM + 1) +# if defined(__AVR_ATmega32U2__) && NKRO_IN_EPNUM > 4 +# error "Endpoints are not available enough to support all functions. Remove some in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO)" +# endif #endif diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index db05702aa..9f8e50c4e 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -208,9 +208,11 @@ void EVENT_USB_Device_ConfigurationChanged(void) /* Setup Console HID Report Endpoints */ ConfigSuccess &= ENDPOINT_CONFIG(CONSOLE_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, CONSOLE_EPSIZE, ENDPOINT_BANK_DOUBLE); +#if 0 ConfigSuccess &= ENDPOINT_CONFIG(CONSOLE_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT, CONSOLE_EPSIZE, ENDPOINT_BANK_SINGLE); #endif +#endif #ifdef NKRO_ENABLE /* Setup NKRO HID Report Endpoints */ -- cgit v1.2.3-24-g4f1b