summaryrefslogtreecommitdiff
path: root/demos/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-11-11 14:02:55 +0700
committerhathach <[email protected]>2013-11-11 14:02:55 +0700
commitd8f32a79fc9e04136afcd8f4d79abe7a9b0c2eb9 (patch)
treeb9d7548e4b6bf6d09e4472270a78d6a73602c233 /demos/device
parent9a81cbcd59cb64bce4c24cbffed2b02eaea5d2b2 (diff)
technically, mouse + keyboard device demo also work on lpc13uxx
Diffstat (limited to 'demos/device')
-rw-r--r--demos/device/device_os_none/keyboardd_app.c2
-rw-r--r--demos/device/device_os_none/moused_app.c2
-rw-r--r--demos/device/device_os_none/tusb_config.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/demos/device/device_os_none/keyboardd_app.c b/demos/device/device_os_none/keyboardd_app.c
index a60e41194..130a9fa30 100644
--- a/demos/device/device_os_none/keyboardd_app.c
+++ b/demos/device/device_os_none/keyboardd_app.c
@@ -46,7 +46,7 @@
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
-hid_keyboard_report_t keyboard_report TUSB_CFG_ATTR_USBRAM;
+ATTR_USB_MIN_ALIGNMENT hid_keyboard_report_t keyboard_report TUSB_CFG_ATTR_USBRAM;
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
diff --git a/demos/device/device_os_none/moused_app.c b/demos/device/device_os_none/moused_app.c
index cca11b249..eb8814f7f 100644
--- a/demos/device/device_os_none/moused_app.c
+++ b/demos/device/device_os_none/moused_app.c
@@ -50,7 +50,7 @@
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
-hid_mouse_report_t mouse_report TUSB_CFG_ATTR_USBRAM;
+ATTR_USB_MIN_ALIGNMENT hid_mouse_report_t mouse_report TUSB_CFG_ATTR_USBRAM;
//--------------------------------------------------------------------+
// IMPLEMENTATION
diff --git a/demos/device/device_os_none/tusb_config.h b/demos/device/device_os_none/tusb_config.h
index 247f8ebf9..35ea5ee72 100644
--- a/demos/device/device_os_none/tusb_config.h
+++ b/demos/device/device_os_none/tusb_config.h
@@ -89,11 +89,11 @@
#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE 64
//------------- CLASS -------------//
-#define TUSB_CFG_DEVICE_HID_KEYBOARD 0
-#define TUSB_CFG_DEVICE_HID_MOUSE 0
+#define TUSB_CFG_DEVICE_HID_KEYBOARD 1
+#define TUSB_CFG_DEVICE_HID_MOUSE 1
#define TUSB_CFG_DEVICE_HID_GENERIC 0
#define TUSB_CFG_DEVICE_MSC 0
-#define TUSB_CFG_DEVICE_CDC 1
+#define TUSB_CFG_DEVICE_CDC 0
//--------------------------------------------------------------------+
// COMMON CONFIGURATION