diff options
| author | Cristian Maglie <c.maglie@arduino.cc> | 2015-09-29 17:59:54 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-10-02 11:59:22 +0200 |
| commit | 34a75d94163b385d20b37f5cffd2ffe241c6dd7d (patch) | |
| tree | 7dca425305a447f3470213f9ddcb1a64408ad94f /libraries | |
| parent | 7811c2ceed8827cd79811f90bc82781326de957f (diff) | |
[PUSB] Selected interface and endpoint are now part of PUSBListNode
The method
int8_t PluggableUSB::addFunction(PUSBListNode *, uint8_t *)
has been changed to
bool PluggableUSB::plug(PUSBListNode *node)
since both EP and Interfaces are now saved directly into node
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/HID/HID.cpp | 16 | ||||
| -rw-r--r-- | libraries/HID/HID.h | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp index 0658711..7e4d991 100644 --- a/libraries/HID/HID.cpp +++ b/libraries/HID/HID.cpp @@ -23,14 +23,10 @@ HID_ HID; -static uint8_t HID_ENDPOINT_INT; - //================================================================================ //================================================================================ // HID Interface -static uint8_t HID_INTERFACE; - HIDDescriptor _hidInterface; static HIDDescriptorListNode* rootNode = NULL; @@ -50,9 +46,9 @@ int HID_GetInterface(uint8_t* interfaceNum) interfaceNum[0] += 1; // uses 1 _hidInterface = { - D_INTERFACE(HID_INTERFACE,1,3,0,0), + D_INTERFACE(HID.interface(), 1, 3, 0, 0), D_HIDREPORT(sizeof_hidReportDescriptor), - D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,USB_EP_SIZE,0x01) + D_ENDPOINT(USB_ENDPOINT_IN(HID.endpoint()), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x01) }; return USB_SendControl(0,&_hidInterface,sizeof(_hidInterface)); } @@ -89,13 +85,13 @@ void HID_::AppendDescriptor(HIDDescriptorListNode *node) void HID_::SendReport(u8 id, const void* data, int len) { - USB_Send(HID_TX, &id, 1); - USB_Send(HID_TX | TRANSFER_RELEASE,data,len); + USB_Send(HID.endpoint(), &id, 1); + USB_Send(HID.endpoint() | TRANSFER_RELEASE,data,len); } bool HID_Setup(USBSetup& setup, uint8_t i) { - if (HID_INTERFACE != i) { + if (HID.interface() != i) { return false; } else { uint8_t r = setup.bRequest; @@ -141,7 +137,7 @@ HID_::HID_(void) numInterfaces = 1; endpointType = epType; - HID_ENDPOINT_INT = PluggableUSB.addFunction(this, &HID_INTERFACE); + PluggableUSB.plug(this); } int HID_::begin(void) diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h index b7ad457..d0fe265 100644 --- a/libraries/HID/HID.h +++ b/libraries/HID/HID.h @@ -83,8 +83,6 @@ typedef struct EndpointDescriptor in; } HIDDescriptor; -#define HID_TX HID_ENDPOINT_INT - #define D_HIDREPORT(_descriptorLength) \ { 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength & 0xFF, _descriptorLength >> 8 } |