Changeset 224 for rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/USB/HID.cpp

Timestamp:

Apr 30, 2016, 11:29:25 PM (8 years ago)

Author:

ertl-honda

Message:

1.7.10のファイルに更新

File:

• rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/USB/HID.cpp (modified) (4 diffs)

rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/USB/HID.cpp

@@ -21 +21 @@
 #include "USBDesc.h"
 #include "sam.h"
-#include "USB/USB_device.h"
 
 
@@ -45 +44 @@
 //      HID report descriptor
 _Pragma("pack(1)")
-extern const uint8_t _hidReportDescriptor[] = {
+extern const uint32_t _hidReportDescriptor[] = {
         //      Mouse
     0x05, 0x01,                    //   USAGE_PAGE (Generic Desktop)    // 54
@@ -162 +161 @@
 uint32_t WEAK HID_GetDescriptor(void)
 {
-        return USBD_SendControl(0,_hidReportDescriptor,sizeof(_hidReportDescriptor));
+        return USBD_SendControl(_hidReportDescriptor,sizeof(_hidReportDescriptor));
 }
 
@@ -197 +196 @@
                 if (HID_GET_IDLE == r)
                 {
-                        UDD_Send(0, &_hid_idle, 1);
-                        UDD_ClearIN();
+                        USBD_Send(0, &_hid_idle, 1);
+                        USB->DEVICE.DeviceEndpoint[EP0].EPSTATUSSET.reg = USB_DEVICE_EPSTATUSSET_BK1RDY;
                         return true;
                 }