From d5836751d913e2f7cb90bb1a4cdc95274d585a48 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 29 May 2013 15:23:07 +0700 Subject: keyboard example works with lpc1347 xpresso --- demos/device/keyboard/tusb_config.h | 3 ++- demos/device/keyboard/tusb_descriptors.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'demos') diff --git a/demos/device/keyboard/tusb_config.h b/demos/device/keyboard/tusb_config.h index e7e9207ab..a02f24a1e 100644 --- a/demos/device/keyboard/tusb_config.h +++ b/demos/device/keyboard/tusb_config.h @@ -86,6 +86,7 @@ //------------- CLASS -------------// #define TUSB_CFG_DEVICE_HID_KEYBOARD 1 #define TUSB_CFG_DEVICE_HID_MOUSE 0 +#define TUSB_CFG_DEVICE_HID_GENERIC 0 #define TUSB_CFG_DEVICE_MSC 0 //#define TUSB_CFG_DEVICE_CDC @@ -101,7 +102,7 @@ #ifdef __CODE_RED // make use of code red's support for ram region macros #if (MCU == MCU_LPC11UXX) || (MCU == MCU_LPC13UXX) - #define TUSB_RAM_SECTION ".data.$RAM2" + #define TUSB_RAM_SECTION ".data.$RAM1" #elif (MCU == MCU_LPC43XX) #define TUSB_RAM_SECTION ".data.$RAM3" #endif diff --git a/demos/device/keyboard/tusb_descriptors.h b/demos/device/keyboard/tusb_descriptors.h index a3beb66f2..481256c34 100644 --- a/demos/device/keyboard/tusb_descriptors.h +++ b/demos/device/keyboard/tusb_descriptors.h @@ -76,25 +76,25 @@ typedef ATTR_PACKED_STRUCT(struct) #define INTERFACES_OF_CDC 0 #endif -#ifdef TUSB_CFG_DEVICE_HID_KEYBOARD +#if TUSB_CFG_DEVICE_HID_KEYBOARD #define INTERFACES_OF_HID_KEYBOARD 1 #else #define INTERFACES_OF_HID_KEYBOARD 0 #endif -#ifdef TUSB_CFG_DEVICE_HID_MOUSE +#if TUSB_CFG_DEVICE_HID_MOUSE #define INTERFACES_OF_HID_MOUSE 1 #else #define INTERFACES_OF_HID_MOUSE 0 #endif -#ifdef CFG_USB_HID_GENERIC +#if TUSB_CFG_HOST_HID_GENERIC #define INTERFACES_OF_HID_GENERIC 1 #else #define INTERFACES_OF_HID_GENERIC 0 #endif -#ifdef CFG_USB_MASS_STORAGE +#if CFG_USB_MASS_STORAGE #define INTERFACES_OF_MASS_STORAGE 2 #else #define INTERFACES_OF_MASS_STORAGE 0 -- cgit v1.3.1