From c16632da0bf8d042388018c667cfbc176ed56436 Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Thu, 17 Jan 2013 14:40:46 +0700
Subject: add UART support for ea4357 (tested)

---
 tinyusb/hal/hal_lpc11uxx.h | 1 +
 tinyusb/hal/hal_lpc13uxx.h | 2 +-
 tinyusb/hal/hal_lpc43xx.c  | 2 +-
 tinyusb/hal/hal_lpc43xx.h  | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'tinyusb/hal')

diff --git a/tinyusb/hal/hal_lpc11uxx.h b/tinyusb/hal/hal_lpc11uxx.h
index b984afbc1..3d44d8742 100644
--- a/tinyusb/hal/hal_lpc11uxx.h
+++ b/tinyusb/hal/hal_lpc11uxx.h
@@ -54,6 +54,7 @@
 #include "LPC11Uxx.h"
 
 #define DEVICE_ROMDRIVER
+#define DEVICE_ROM_REG_BASE LPC_USB_BASE
 
 #ifdef __cplusplus
  extern "C" {
diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h
index c360f2909..b24d774b6 100644
--- a/tinyusb/hal/hal_lpc13uxx.h
+++ b/tinyusb/hal/hal_lpc13uxx.h
@@ -54,7 +54,7 @@
 #include "LPC13Uxx.h"
 
 #define DEVICE_ROMDRIVER
-
+#define DEVICE_ROM_REG_BASE LPC_USB_BASE
 
 #ifdef __cplusplus
  extern "C" {
diff --git a/tinyusb/hal/hal_lpc43xx.c b/tinyusb/hal/hal_lpc43xx.c
index 2fcd885f5..2b60d29c3 100644
--- a/tinyusb/hal/hal_lpc43xx.c
+++ b/tinyusb/hal/hal_lpc43xx.c
@@ -43,7 +43,7 @@ TUSB_Error_t hal_init()
 {
   /* Set up USB0 clock */
   CGU_EnableEntity(CGU_CLKSRC_PLL0, DISABLE); /* Disable PLL first */
-  ASSERT_MESSAGE( CGU_SetPLL0() == CGU_ERROR_SUCCESS, tERROR_FAILED, "set PLL failed"); /* the usb core require output clock = 480MHz */
+  ASSERT_INT( CGU_ERROR_SUCCESS, CGU_SetPLL0(), tERROR_FAILED); /* the usb core require output clock = 480MHz */
   CGU_EntityConnect(CGU_CLKSRC_XTAL_OSC, CGU_CLKSRC_PLL0);
   CGU_EnableEntity(CGU_CLKSRC_PLL0, ENABLE);   /* Enable PLL after all setting is done */
   LPC_CREG->CREG0 &= ~(1<<5); /* Turn on the phy */
diff --git a/tinyusb/hal/hal_lpc43xx.h b/tinyusb/hal/hal_lpc43xx.h
index 2efd6da81..6fba59dfb 100644
--- a/tinyusb/hal/hal_lpc43xx.h
+++ b/tinyusb/hal/hal_lpc43xx.h
@@ -59,6 +59,7 @@
 #endif
 
 #define DEVICE_ROMDRIVER
+#define DEVICE_ROM_REG_BASE LPC_USB0_BASE // TODO USB1
 
 static inline void hal_interrupt_enable()
 {
-- 
cgit v1.3.1