max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lufa: Update makefile for new LUFA

Browse source
This commit is contained in:
tmk 2020-02-08 19:54:58 +09:00
parent 28662f2978
commit ea1d7ff240
3 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

12
tmk_core/protocol/lufa/descriptor.h
View file

@ -162,18 +162,8 @@ typedef struct
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const uint16_t wIndex,
const void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
/* new API */
#if LUFA_VERSION_INTEGER < 0x140302
#undef VERSION_BCD
#define VERSION_BCD(Major, Minor, Revision) \
CPU_TO_LE16( ((Major & 0xFF) << 8) | \
((Minor & 0x0F) << 4) | \
(Revision & 0x0F) )
#endif
#endif