From 7302965552a77c1af000e3870848b3cc35670c51 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 29 Sep 2015 16:40:27 +0200 Subject: [PUSB] PUSBCallback struct has been merged into PUSBListNode This slightly simplifies PluggableUSB API. --- libraries/HID/HID.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'libraries/HID/HID.cpp') diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp index 42e0ee5..24e6f5c 100644 --- a/libraries/HID/HID.cpp +++ b/libraries/HID/HID.cpp @@ -133,19 +133,15 @@ bool HID_Setup(USBSetup& setup, uint8_t i) HID_::HID_(void) { static uint8_t endpointType[1]; - endpointType[0] = EP_TYPE_INTERRUPT_IN; - static PUSBCallbacks cb = { - .setup = &HID_Setup, - .getInterface = &HID_GetInterface, - .getDescriptor = &HID_GetDescriptor, - .numEndpoints = 1, - .numInterfaces = 1, - .endpointType = endpointType, - }; - - static PUSBListNode node(&cb); + static PUSBListNode node; + node.setup = &HID_Setup, + node.getInterface = &HID_GetInterface, + node.getDescriptor = &HID_GetDescriptor, + node.numEndpoints = 1, + node.numInterfaces = 1, + node.endpointType = endpointType, HID_ENDPOINT_INT = PUSB_AddFunction(&node, &HID_INTERFACE); } -- cgit v1.2.3-18-g5258