From c92b03edfb33deadc06c81206452270f23f2cf17 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 12 Mar 2014 12:49:59 +0700 Subject: added scatter file for lpc11u & lpc13u for it to run with keil --- tinyusb/device/dcd_lpc_11uxx_13uxx.c | 2 +- tinyusb/hal/hal_lpc11uxx.c | 1 + tinyusb/hal/hal_lpc13uxx.h | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'tinyusb') diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c index d87c80ad2..4eef8f7dd 100644 --- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c +++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c @@ -113,7 +113,7 @@ typedef struct { uint16_t total_bytes; }next_td[DCD_11U_13U_QHD_COUNT]; - uint32_t current_ioc; ///< interrupt on complete mask for current TD + uint32_t current_ioc; ///< interrupt on complete mask for current TD uint32_t next_ioc; ///< interrupt on complete mask for next TD // should start from 128 diff --git a/tinyusb/hal/hal_lpc11uxx.c b/tinyusb/hal/hal_lpc11uxx.c index 60177485d..d1ee35e2c 100644 --- a/tinyusb/hal/hal_lpc11uxx.c +++ b/tinyusb/hal/hal_lpc11uxx.c @@ -46,6 +46,7 @@ tusb_error_t hal_init(void) // TODO remove magic number /* Enable AHB clock to the USB block and USB RAM. */ LPC_SYSCON->SYSAHBCLKCTRL |= ((0x1<<14) | (0x1<<27)); + LPC_SYSCON->PDRUNCFG &= ~( BIT_(8) | BIT_(10) ); // enable USB PLL & USB transceiver /* Pull-down is needed, or internally, VBUS will be floating. This is to address the wrong status in VBUSDebouncing bit in CmdStatus register. */ diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h index fefa58d20..51d17ca59 100644 --- a/tinyusb/hal/hal_lpc13uxx.h +++ b/tinyusb/hal/hal_lpc13uxx.h @@ -36,12 +36,6 @@ */ /**************************************************************************/ -/** \file - * \brief TBD - * - * \note TBD - */ - /** \ingroup TBD * \defgroup TBD * \brief TBD -- cgit v1.3.1