From 8f57cb6ccb65c0519d78661cb36be12e6079f965 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 29 Nov 2012 15:40:57 +0700 Subject: [PATCH] house keeping --- .cproject | 2 +- tinyusb/common/arch/arch.h | 3 ++- tinyusb/common/arch/arch_lpc134x.h | 3 +++ tinyusb/common/arch/arm_mx.h | 2 +- tinyusb/common/common.h | 2 +- tinyusb/common/errors.h | 4 ++-- tinyusb/device/dcd.c | 3 ++- tinyusb/tusb.c | 1 + 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cproject b/.cproject index 567de51c..02cdb087 100644 --- a/.cproject +++ b/.cproject @@ -24,7 +24,7 @@ - + diff --git a/tinyusb/common/arch/arch.h b/tinyusb/common/arch/arch.h index 79a94833..f83213b7 100644 --- a/tinyusb/common/arch/arch.h +++ b/tinyusb/common/arch/arch.h @@ -66,4 +66,5 @@ #endif /* _TUSB_ARCH_H_ */ -/** @{ */ +/** @} */ + diff --git a/tinyusb/common/arch/arch_lpc134x.h b/tinyusb/common/arch/arch_lpc134x.h index 0ac5d971..dc2818f2 100644 --- a/tinyusb/common/arch/arch_lpc134x.h +++ b/tinyusb/common/arch/arch_lpc134x.h @@ -57,3 +57,6 @@ #define DEVICE_ROMDRIVER #endif /* _TUSB_ARCH_LPC134_X_H_ */ + +/** @} */ + diff --git a/tinyusb/common/arch/arm_mx.h b/tinyusb/common/arch/arm_mx.h index ea4ac5f3..180f0fa9 100644 --- a/tinyusb/common/arch/arm_mx.h +++ b/tinyusb/common/arch/arm_mx.h @@ -53,4 +53,4 @@ #define ALIGNMENT (4) #endif /* _TUSB_ARM_MX_H_ */ -/// @} +/** @} */ diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index 480edde9..4d4dd190 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -91,4 +91,4 @@ #endif /* _TUSB_COMMON_H_ */ -/** @{ */ +/** @} */ diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h index 0d36b56f..d34b0196 100644 --- a/tinyusb/common/errors.h +++ b/tinyusb/common/errors.h @@ -49,7 +49,7 @@ #ifndef _TUSB_ERRORS_H_ #define _TUSB_ERRORS_H_ -/** \enum TUSB_Error +/** \enum TUSB_Error_t * \brief Error Code returned */ @@ -73,4 +73,4 @@ extern char const* const TUSB_ErrorStr[]; #endif /* _TUSB_ERRORS_H_ */ - /** @{ */ + /** @} */ diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c index 84109af2..f33f7fe9 100644 --- a/tinyusb/device/dcd.c +++ b/tinyusb/device/dcd.c @@ -41,8 +41,9 @@ #include "descriptors.h" #include +// TODO dcd abstract later #define USB_ROM_SIZE (1024*2) -uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) __BSS(RAM2); +uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) __DATA(RAM2); USBD_HANDLE_T g_hUsb; volatile static bool isConfigured = false; diff --git a/tinyusb/tusb.c b/tinyusb/tusb.c index f4acc7ab..e2aed4d4 100644 --- a/tinyusb/tusb.c +++ b/tinyusb/tusb.c @@ -41,6 +41,7 @@ TUSB_Error_t tusb_init(void) { /* HARDWARE INIT */ + // TODO usb abstract later /* Enable AHB clock to the USB block and USB RAM. */ LPC_SYSCON->SYSAHBCLKCTRL |= ((0x1<<14) | (0x1<<27));