From d5836751d913e2f7cb90bb1a4cdc95274d585a48 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 29 May 2013 15:23:07 +0700
Subject: [PATCH] keyboard example works with lpc1347 xpresso

---
 demos/device/keyboard/tusb_config.h      | 3 ++-
 demos/device/keyboard/tusb_descriptors.h | 8 ++++----
 tinyusb/device/dcd_nxp_romdriver.c       | 4 ++--
 tinyusb/hal/hal_lpc13uxx.c               | 7 +++++++
 4 files changed, 15 insertions(+), 7 deletions(-)

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
diff --git a/tinyusb/device/dcd_nxp_romdriver.c b/tinyusb/device/dcd_nxp_romdriver.c
index 34dfa5e35..2aa9201be 100644
--- a/tinyusb/device/dcd_nxp_romdriver.c
+++ b/tinyusb/device/dcd_nxp_romdriver.c
@@ -172,12 +172,12 @@ tusb_error_t dcd_controller_reset(uint8_t coreid)
 
 void dcd_controller_connect(uint8_t coreid)
 {
-//  ROM_API->hw->Connect(g_hUsb, 1);
+  ROM_API->hw->Connect(g_hUsb, 1);
 }
 
 void dcd_isr(uint8_t coreid)
 {
-//  ROM_API->hw->ISR(g_hUsb);
+  ROM_API->hw->ISR(g_hUsb);
 }
 
 #endif
diff --git a/tinyusb/hal/hal_lpc13uxx.c b/tinyusb/hal/hal_lpc13uxx.c
index dd59e2c64..8a9503e23 100644
--- a/tinyusb/hal/hal_lpc13uxx.c
+++ b/tinyusb/hal/hal_lpc13uxx.c
@@ -54,7 +54,14 @@ tusb_error_t hal_init()
   LPC_IOCON->PIO0_6   &= ~0x07;
   LPC_IOCON->PIO0_6   |= (0x01<<0);            /* Secondary function SoftConn */
 
+  hal_interrupt_enable(0);
+
   return TUSB_ERROR_NONE;
 }
 
+void USB_IRQHandler(void)
+{
+  tusb_isr(0);
+}
+
 #endif