summaryrefslogtreecommitdiff
path: root/tinyusb
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 /tinyusb
parent829c8672bb238e37ba4c2ec9b7a3a3010453e6c0 (diff)
house keeping
Diffstat (limited to 'tinyusb')
-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
5 files changed, 10 insertions, 5 deletions
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