summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2012-11-29 15:40:57 +0700
committerhathach <[email protected]>2012-11-29 15:57:44 +0700
commit8f57cb6ccb65c0519d78661cb36be12e6079f965 (patch)
tree5847bc63dfc72cc67a5a963cb6cd769a209e1698
parent360b28b44fa2ad7973f06c7f048a66a68e6cb90f (diff)
house keeping
-rw-r--r--.cproject2
-rw-r--r--tinyusb/common/arch/arch.h3
-rw-r--r--tinyusb/common/arch/arch_lpc134x.h3
-rw-r--r--tinyusb/common/arch/arm_mx.h2
-rw-r--r--tinyusb/common/common.h2
-rw-r--r--tinyusb/common/errors.h4
-rw-r--r--tinyusb/device/dcd.c3
-rw-r--r--tinyusb/tusb.c1
8 files changed, 13 insertions, 7 deletions
diff --git a/.cproject b/.cproject
index 567de51c5..02cdb0877 100644
--- a/.cproject
+++ b/.cproject
@@ -24,7 +24,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Debug build" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="com.crt.advproject.config.lib.debug.341253724" name="Debug" parent="com.crt.advproject.config.lib.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size &quot;lib${BuildArtifactFileName}&quot; ; # arm-none-eabi-objdump -h -S &quot;lib${BuildArtifactFileName}&quot; &gt;&quot;${BuildArtifactFileBaseName}.lss&quot;">
+ <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="Debug build" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="com.crt.advproject.config.lib.debug.341253724" name="Debug" parent="com.crt.advproject.config.lib.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size -t &quot;lib${BuildArtifactFileName}&quot; ; # arm-none-eabi-objdump -h -S &quot;lib${BuildArtifactFileName}&quot; &gt;&quot;${BuildArtifactFileBaseName}.lss&quot;">
<folderInfo id="com.crt.advproject.config.lib.debug.341253724." name="/" resourcePath="">
<toolChain id="com.crt.advproject.toolchain.lib.debug.972883292" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.lib.debug">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.lib.debug.241809325" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.lib.debug"/>
diff --git a/tinyusb/common/arch/arch.h b/tinyusb/common/arch/arch.h
index 79a948330..f83213b7e 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 0ac5d971b..dc2818f21 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 ea4ac5f36..180f0fa91 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 480edde9c..4d4dd1909 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 0d36b56fc..d34b01963 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 84109af2c..f33f7fe98 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -41,8 +41,9 @@
#include "descriptors.h"
#include <cr_section_macros.h>
+// 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 f4acc7ab6..e2aed4d4e 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));