diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-07-31 22:51:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 22:51:37 -0400 |
| commit | 6333cffa7dd2b30d343830cadc32051283c21ebf (patch) | |
| tree | f25e313cbd02cdca34f1c51636e2952311237875 | |
| parent | 761f9a938e3b8f8ddadc5b16687126c92a68cdd4 (diff) | |
| parent | 533d8dda96c83764de63d39507d39fc9186f5663 (diff) | |
Merge pull request #1076 from hathach/samd_usbhid_typo
fix samd usb hid typo
| -rw-r--r-- | ports/atmel-samd/common-hal/usb_hid/Device.h | 2 | ||||
| -rw-r--r-- | ports/atmel-samd/common-hal/usb_hid/__init__.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/atmel-samd/common-hal/usb_hid/Device.h b/ports/atmel-samd/common-hal/usb_hid/Device.h index f85522d65..b81c0e709 100644 --- a/ports/atmel-samd/common-hal/usb_hid/Device.h +++ b/ports/atmel-samd/common-hal/usb_hid/Device.h @@ -45,7 +45,7 @@ typedef struct { } usb_hid_device_obj_t; -usb_hid_device_obj_t usb_hid_devices[USB_HID_NUM_DEVICES]; +extern usb_hid_device_obj_t usb_hid_devices[USB_HID_NUM_DEVICES]; void usb_hid_init(void); void usb_hid_reset(void); diff --git a/ports/atmel-samd/common-hal/usb_hid/__init__.c b/ports/atmel-samd/common-hal/usb_hid/__init__.c index c9157519f..770d221c7 100644 --- a/ports/atmel-samd/common-hal/usb_hid/__init__.c +++ b/ports/atmel-samd/common-hal/usb_hid/__init__.c @@ -35,7 +35,7 @@ #include "genhdr/autogen_usb_descriptor.h" // Buffers are report size + 1 to include the Report ID prefix byte if needed. -#ifdef USB_HID_REPORT_LENGTH_KEYBOARD +#ifdef USB_HID_REPORT_ID_KEYBOARD static uint8_t keyboard_report_buffer[USB_HID_REPORT_LENGTH_KEYBOARD + 1]; #endif #ifdef USB_HID_REPORT_ID_MOUSE @@ -55,7 +55,7 @@ static uint8_t digitizer_report_buffer[USB_HID_REPORT_LENGTH_DIGITIZER + 1]; #endif usb_hid_device_obj_t usb_hid_devices[USB_HID_NUM_DEVICES] = { -#ifdef USB_HID_REPORT_LENGTH_KEYBOARD +#ifdef USB_HID_REPORT_ID_KEYBOARD { .base = { .type = &usb_hid_device_type }, .report_buffer = keyboard_report_buffer, |