summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2012-11-27 15:42:53 +0700
committerhathach <[email protected]>2012-11-27 15:42:53 +0700
commita21ca6c0f10b8ed057e10ad7c31ded8eea763d5c (patch)
treecde6cb24eff2782098f5cbbec67634b1b662d24e
parent829c8672bb238e37ba4c2ec9b7a3a3010453e6c0 (diff)
house keeping
-rw-r--r--.cproject2
-rw-r--r--.project3
-rw-r--r--tinyusb/common/arch/arch_lpc134x.h3
-rw-r--r--tinyusb/common/arch/arch_lpc43xx.h4
-rw-r--r--tinyusb/device/dcd.h1
-rw-r--r--tinyusb/tusb.c5
-rw-r--r--tinyusb/tusb_cfg.h2
7 files changed, 12 insertions, 8 deletions
diff --git a/.cproject b/.cproject
index 47c5cf37c..61cf9c9bb 100644
--- a/.cproject
+++ b/.cproject
@@ -28,7 +28,7 @@
<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"/>
- <builder buildPath="${workspace_loc:/tinyusb/Debug}" id="com.crt.advproject.builder.lib.debug.2144305142" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.lib.debug"/>
+ <builder buildPath="${workspace_loc:/tinyusb/Debug}" enableAutoBuild="true" id="com.crt.advproject.builder.lib.debug.2144305142" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.lib.debug"/>
<tool id="com.crt.advproject.cpp.lib.debug.1524252612" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.lib.debug"/>
<tool id="com.crt.advproject.gcc.lib.debug.858148136" name="MCU C Compiler" superClass="com.crt.advproject.gcc.lib.debug">
<option id="com.crt.advproject.gcc.arch.704503495" name="Architecture" superClass="com.crt.advproject.gcc.arch" value="com.crt.advproject.gcc.target.cm3" valueType="enumerated"/>
diff --git a/.project b/.project
index 5f50377a8..3ca7ab493 100644
--- a/.project
+++ b/.project
@@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
- <triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
+ <value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
diff --git a/tinyusb/common/arch/arch_lpc134x.h b/tinyusb/common/arch/arch_lpc134x.h
index 050fb3148..988c562e3 100644
--- a/tinyusb/common/arch/arch_lpc134x.h
+++ b/tinyusb/common/arch/arch_lpc134x.h
@@ -43,8 +43,9 @@
#endif
#include "arm_mx.h"
+#include "LPC13Uxx.h"
-#define ARM ARM_M3
+#define ARM_M3
#define DEVICE_ROMDRIVER
diff --git a/tinyusb/common/arch/arch_lpc43xx.h b/tinyusb/common/arch/arch_lpc43xx.h
index aa137036d..f04dc4f74 100644
--- a/tinyusb/common/arch/arch_lpc43xx.h
+++ b/tinyusb/common/arch/arch_lpc43xx.h
@@ -42,8 +42,8 @@
extern "C" {
#endif
-#define ARM ARM_M4
-//#define ARM ARM_M0
+#define ARM_M4
+//#define ARM_M0
#include "arm_mx.h"
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index fbcae447a..d9cf2fc85 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -48,6 +48,7 @@
#include "romdriver/mw_usbd_rom_api.h"
#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/tinyusb/tusb.c b/tinyusb/tusb.c
index e74f6d16d..c503876cb 100644
--- a/tinyusb/tusb.c
+++ b/tinyusb/tusb.c
@@ -36,7 +36,10 @@
*/
#include "tusb.h"
-#include "LPC13Uxx.h" // TODO HAL
+
+#ifdef CFG_TUSB_DEVICE
+ #include "device/dcd.h"
+#endif
ErrorCode_t tusb_init(void)
{
diff --git a/tinyusb/tusb_cfg.h b/tinyusb/tusb_cfg.h
index 3d876b86f..6b991842c 100644
--- a/tinyusb/tusb_cfg.h
+++ b/tinyusb/tusb_cfg.h
@@ -47,7 +47,7 @@
#define CFG_TUSB_HOST
#define CFG_TUSB_DEVICE
-
+// TODO APP
#define USB_MAX_IF_NUM 8
#define USB_MAX_EP_NUM 5