masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update lufa implementation

This commit is contained in:
Jack Humbert 2017-07-07 12:06:59 -04:00
parent 39ece81979
commit 4b37030ad0
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tmk_core/protocol/lufa.mk
View File

@ -1,16 +1,17 @@
LUFA_DIR = protocol/lufa LUFA_DIR = protocol/lufa
# Path to the LUFA library # Path to the LUFA library
LUFA_PATH ?= $(LUFA_DIR)/LUFA-git LUFA_PATH = $(LIB_PATH)/lufa
# Create the LUFA source path variables by including the LUFA makefile # Create the LUFA source path variables by including the LUFA makefile
ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) ifneq (, $(wildcard $(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
# New build system from 20120730 # New build system from 20120730
LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk DMBS_LUFA_PATH = $(LUFA_PATH)/LUFA/Build/LUFA
include $(LUFA_PATH)/LUFA/Build/lufa_sources.mk
else else
include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile include $(LUFA_PATH)/LUFA/makefile
endif endif
LUFA_SRC = lufa.c \ LUFA_SRC = lufa.c \
@ -49,7 +50,7 @@ SRC += $(LUFA_SRC)
# Search Path # Search Path
VPATH += $(TMK_PATH)/$(LUFA_DIR) VPATH += $(TMK_PATH)/$(LUFA_DIR)
VPATH += $(TMK_PATH)/$(LUFA_PATH) VPATH += $(LUFA_PATH)
# Option modules # Option modules
#ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE) #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)

2
tmk_core/protocol/lufa/descriptor.c
View File

@ -868,7 +868,7 @@ const USB_Descriptor_String_t PROGMEM ProductString =
* USB host. * USB host.
*/ */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint16_t wIndex,
const void** const DescriptorAddress) const void** const DescriptorAddress)
{ {
const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorType = (wValue >> 8);

2
tmk_core/protocol/lufa/descriptor.h
View File

@ -254,7 +254,7 @@ typedef struct
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint16_t wIndex,
const void** const DescriptorAddress) const void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);