summaryrefslogtreecommitdiff
path: root/tinyusb/class
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-01-22 18:09:58 +0700
committerhathach <[email protected]>2013-01-22 18:09:58 +0700
commit3ffda2033a55093a1b1667ed22f523a9a8a6a3d4 (patch)
tree5630457978c47300bc200f7bb8660b6dbc1d61b8 /tinyusb/class
parent38ce3f7534ec9e3e0b10b8923d7d17e437463e86 (diff)
clear 19.1
Diffstat (limited to 'tinyusb/class')
-rw-r--r--tinyusb/class/hid.h22
-rw-r--r--tinyusb/class/hid_host.c2
-rw-r--r--tinyusb/class/hid_host.h2
3 files changed, 12 insertions, 14 deletions
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h
index f6848be6d..8b3696114 100644
--- a/tinyusb/class/hid.h
+++ b/tinyusb/class/hid.h
@@ -58,6 +58,16 @@
// TODO refractor
#include "common/common.h"
+#ifdef TUSB_CFG_DEVICE
+ #include "device/dcd.h"
+ #include "hid_device.h"
+#endif
+
+#ifdef TUSB_CFG_HOST
+ #include "host/usbd_host.h"
+ #include "hid_host.h"
+#endif
+
/** \struct tusb_mouse_report_t
* \brief Standard HID Boot Protocol Mouse Report.
*
@@ -160,18 +170,6 @@ enum USB_HID_LOCAL_CODE
HID_Local_Turkish_F
};
-#ifdef TUSB_CFG_DEVICE
- #include "device/dcd.h"
- #include "hid_device.h"
-#endif
-
-#ifdef TUSB_CFG_HOST
- #include "host/usbd_host.h"
- #include "hid_host.h"
-#endif
-
-
-
#ifdef __cplusplus
}
#endif
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index d0c3f13ea..dbf19b9f9 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -35,7 +35,7 @@
* This file is part of the tiny usb stack.
*/
-#include "hid.h"
+#include "hid_host.h"
#if defined DEVICE_CLASS_HID && defined TUSB_CFG_HOST
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index d0dda7a93..d6be47e1e 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -60,7 +60,7 @@
tusb_error_t tusbh_keyboard_get(tusb_handle_configure_t const handle, tusb_keyboard_report_t * const report);
#ifdef __cplusplus
- }
+}
#endif
#endif /* _TUSB_HID_HOST_H_ */