8000 Merge pull request #1076 from hathach/samd_usbhid_typo · sparkfun/circuitpython@6333cff · GitHub
[go: up one dir, main page]
Skip to content

Commit 6333cff

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#1076 from hathach/samd_usbhid_typo
fix samd usb hid typo
2 parents 761f9a9 + 533d8dd commit 6333cff

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎ports/atmel-samd/common-hal/usb_hid/Device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ typedef struct {
4545

4646
} usb_hid_device_obj_t;
4747

48-
usb_hid_device_obj_t usb_hid_devices[USB_HID_NUM_DEVICES];
48+
extern usb_hid_device_obj_t usb_hid_devices[USB_HID_NUM_DEVICES];
4949

5050
void usb_hid_init(void);
5151
void usb_hid_reset(void);

‎ports/atmel-samd/common-hal/usb_hid/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "genhdr/autogen_usb_descriptor.h"
3636

3737
// Buffers are report size + 1 to include the Report ID prefix byte if needed.
38-
#ifdef USB_HID_REPORT_LENGTH_KEYBOARD
38+
#ifdef USB_HID_REPORT_ID_KEYBOARD
3939
static uint8_t keyboard_report_buffer[USB_HID_REPORT_LENGTH_KEYBOARD + 1];
4040
#endif
4141
#ifdef USB_HID_REPORT_ID_MOUSE
@@ -55,7 +55,7 @@ static uint8_t digitizer_report_buffer[USB_HID_REPORT_LENGTH_DIGITIZER + 1];
5555
#endif
5656

5757
usb_hid_device_obj_t usb_hid_devices[USB_HID_NUM_DEVICES] = {
58-
#ifdef USB_HID_REPORT_LENGTH_KEYBOARD
58+
#ifdef USB_HID_REPORT_ID_KEYBOARD
5959
{
6060
.base = { .type = &usb_hid_device_type },
6161
.report_buffer = keyboard_report_buffer,

0 commit comments

Comments
 (0)
0