From 012ff1bc54ae3dc7aa79c875772eac27a064f173 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 28 Sep 2015 15:40:40 +0200 Subject: [PATCH 1/5] [HID] HID.SendReport now use unsigned int for size --- hardware/arduino/avr/libraries/HID/HID.cpp | 2 +- hardware/arduino/avr/libraries/HID/HID.h | 2 +- hardware/arduino/sam/libraries/HID/HID.cpp | 4 ++-- hardware/arduino/sam/libraries/HID/HID.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/HID.cpp index 8533f08ed40..e9f62879a35 100644 --- a/hardware/arduino/avr/libraries/HID/HID.cpp +++ b/hardware/arduino/avr/libraries/HID/HID.cpp @@ -85,7 +85,7 @@ void HID_::AppendDescriptor(HIDDescriptorListNode *node) sizeof_hidReportDescriptor += (uint16_t)node->length; } -void HID_::SendReport(u8 id, const void* data, int len) +void HID_::SendReport(uint8_t id, const void* data, const uint16_t len) { USB_Send(HID_TX, &id, 1); USB_Send(HID_TX | TRANSFER_RELEASE,data,len); diff --git a/hardware/arduino/avr/libraries/HID/HID.h b/hardware/arduino/avr/libraries/HID/HID.h index f4ca7ae9a7b..ad9c9e5ca68 100644 --- a/hardware/arduino/avr/libraries/HID/HID.h +++ b/hardware/arduino/avr/libraries/HID/HID.h @@ -58,7 +58,7 @@ class HID_ public: HID_(void); int begin(void); - void SendReport(uint8_t id, const void* data, int len); + void SendReport(uint8_t id, const void* data, const uint16_t len); void AppendDescriptor(HIDDescriptorListNode* node); }; diff --git a/hardware/arduino/sam/libraries/HID/HID.cpp b/hardware/arduino/sam/libraries/HID/HID.cpp index b2a79423e35..06b08c843e9 100644 --- a/hardware/arduino/sam/libraries/HID/HID.cpp +++ b/hardware/arduino/sam/libraries/HID/HID.cpp @@ -92,13 +92,13 @@ void HID_::AppendDescriptor(HIDDescriptorListNode *node) sizeof_hidReportDescriptor += node->length; } -void HID_::SendReport(uint8_t id, const void* data, int len) +void HID_::SendReport(uint8_t id, const void* data, const uint16_t len) { uint8_t p[64]; const uint8_t *d = reinterpret_cast(data); p[0] = id; - for (uint32_t i=0; i Date: Mon, 28 Sep 2015 15:44:32 +0200 Subject: [PATCH 2/5] [HID] Changed 'u8' to 'uint8_t' in definitions --- hardware/arduino/avr/libraries/HID/HID.cpp | 16 +++++++-------- hardware/arduino/avr/libraries/HID/HID.h | 24 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/HID.cpp index e9f62879a35..78b2a5f480f 100644 --- a/hardware/arduino/avr/libraries/HID/HID.cpp +++ b/hardware/arduino/avr/libraries/HID/HID.cpp @@ -23,13 +23,13 @@ HID_ HID; -static u8 HID_ENDPOINT_INT; +static uint8_t HID_ENDPOINT_INT; //================================================================================ //================================================================================ // HID Interface -static u8 HID_INTERFACE; +static uint8_t HID_INTERFACE; HIDDescriptor _hidInterface; @@ -40,10 +40,10 @@ static uint8_t modules_count = 0; //================================================================================ // Driver -u8 _hid_protocol = 1; -u8 _hid_idle = 1; +uint8_t _hid_protocol = 1; +uint8_t _hid_idle = 1; -int HID_GetInterface(u8* interfaceNum) +int HID_GetInterface(uint8_t* interfaceNum) { interfaceNum[0] += 1; // uses 1 _hidInterface = @@ -91,13 +91,13 @@ void HID_::SendReport(uint8_t id, const void* data, const uint16_t len) USB_Send(HID_TX | TRANSFER_RELEASE,data,len); } -bool HID_Setup(USBSetup& setup, u8 i) +bool HID_Setup(USBSetup& setup, uint8_t i) { if (HID_INTERFACE != i) { return false; } else { - u8 r = setup.bRequest; - u8 requestType = setup.bmRequestType; + uint8_t r = setup.bRequest; + uint8_t requestType = setup.bmRequestType; if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType) { if (HID_GET_REPORT == r) diff --git a/hardware/arduino/avr/libraries/HID/HID.h b/hardware/arduino/avr/libraries/HID/HID.h index ad9c9e5ca68..e0572a6dc99 100644 --- a/hardware/arduino/avr/libraries/HID/HID.h +++ b/hardware/arduino/avr/libraries/HID/HID.h @@ -64,22 +64,22 @@ class HID_ typedef struct { - u8 len; // 9 - u8 dtype; // 0x21 - u8 addr; - u8 versionL; // 0x101 - u8 versionH; // 0x101 - u8 country; - u8 desctype; // 0x22 report - u8 descLenL; - u8 descLenH; + uint8_t len; // 9 + uint8_t dtype; // 0x21 + uint8_t addr; + uint8_t versionL; // 0x101 + uint8_t versionH; // 0x101 + uint8_t country; + uint8_t desctype; // 0x22 report + uint8_t descLenL; + uint8_t descLenH; } HIDDescDescriptor; typedef struct { - InterfaceDescriptor hid; - HIDDescDescriptor desc; - EndpointDescriptor in; + InterfaceDescriptor hid; + HIDDescDescriptor desc; + EndpointDescriptor in; } HIDDescriptor; #define HID_TX HID_ENDPOINT_INT From 8163fe53e0dcfcc5d1874a2762257a4c7b14272e Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 28 Sep 2015 15:49:49 +0200 Subject: [PATCH 3/5] [HID] Removed unused PUSBReturn structure --- hardware/arduino/avr/cores/arduino/PluggableUSB.h | 6 ------ hardware/arduino/sam/cores/arduino/USB/PluggableUSB.h | 6 ------ 2 files changed, 12 deletions(-) diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.h b/hardware/arduino/avr/cores/arduino/PluggableUSB.h index d89040eb41d..23013eb7844 100644 --- a/hardware/arduino/avr/cores/arduino/PluggableUSB.h +++ b/hardware/arduino/avr/cores/arduino/PluggableUSB.h @@ -35,12 +35,6 @@ typedef struct __attribute__((packed)) uint8_t *endpointType; } PUSBCallbacks; -typedef struct -{ - u8 interface; - u8 firstEndpoint; -} PUSBReturn; - class PUSBListNode { public: PUSBListNode *next = NULL; diff --git a/hardware/arduino/sam/cores/arduino/USB/PluggableUSB.h b/hardware/arduino/sam/cores/arduino/USB/PluggableUSB.h index 502da9ebcf0..75793fa32b4 100644 --- a/hardware/arduino/sam/cores/arduino/USB/PluggableUSB.h +++ b/hardware/arduino/sam/cores/arduino/USB/PluggableUSB.h @@ -35,12 +35,6 @@ typedef struct __attribute__((packed)) uint32_t *endpointType; } PUSBCallbacks; -typedef struct -{ - uint8_t interface; - uint8_t firstEndpoint; -} PUSBReturn; - class PUSBListNode { public: PUSBListNode *next = NULL; From 790fdbb26a118c46ecae983ebd19758b1f1534f2 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 28 Sep 2015 15:53:59 +0200 Subject: [PATCH 4/5] [HID] Added missing const in length --- hardware/arduino/sam/libraries/HID/HID.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hardware/arduino/sam/libraries/HID/HID.h b/hardware/arduino/sam/libraries/HID/HID.h index c19726fdcb8..382c7f24935 100644 --- a/hardware/arduino/sam/libraries/HID/HID.h +++ b/hardware/arduino/sam/libraries/HID/HID.h @@ -46,8 +46,9 @@ class HIDDescriptorListNode { public: HIDDescriptorListNode *next = NULL; HIDDescriptorListNode(const void *d, const uint16_t l) : data(d), length(l) { } - uint16_t length; + const void* data; + const uint16_t length; }; class HID_ From 8514224bc58deb5c1783533f1e20769f0c9495ec Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 28 Sep 2015 15:58:16 +0200 Subject: [PATCH 5/5] [HID] Added missing return in HID.begin() --- hardware/arduino/avr/libraries/HID/HID.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/HID.cpp index 78b2a5f480f..3362886a36a 100644 --- a/hardware/arduino/avr/libraries/HID/HID.cpp +++ b/hardware/arduino/avr/libraries/HID/HID.cpp @@ -152,6 +152,7 @@ HID_::HID_(void) int HID_::begin(void) { + return 0; } #endif /* if defined(USBCON) */