diff options
| author | hathach <[email protected]> | 2013-03-01 19:32:53 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-03-01 19:32:53 +0700 |
| commit | 68ff7365c5083d693dd4aed9d29385b2fb3a71e2 (patch) | |
| tree | df1a335d671d75f7ea75acaa67eb79cd5e665daf /tinyusb | |
| parent | 795fe7468d35b62987cee07d35c7cf452447ea70 (diff) | |
rename ehci usb_int usb_sts usb/error field
move MCU define to tusb_option.h
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/hal/hal.h | 5 | ||||
| -rw-r--r-- | tinyusb/tusb_option.h | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h index 453fab996..9afad4726 100644 --- a/tinyusb/hal/hal.h +++ b/tinyusb/hal/hal.h @@ -54,11 +54,6 @@ #include "tusb_option.h" #include "common/compiler/compiler.h" -#define MCU_LPC13UXX 1 -#define MCU_LPC11UXX 2 -#define MCU_LPC43XX 3 -#define MCU_LPC18XX 4 - #if MCU == 0 #error MCU is not defined or supported #elif MCU == MCU_LPC11UXX diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index 62a9b8e06..20769a326 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -89,10 +89,17 @@ #warning TUSB_CFG_CONFIGURATION_MAX is not defined, default value is 1 #endif +// TODO may move to other places +#define MCU_LPC13UXX 1 +#define MCU_LPC11UXX 2 +#define MCU_LPC43XX 3 +#define MCU_LPC18XX 4 + //--------------------------------------------------------------------+ // HOST OPTIONS //--------------------------------------------------------------------+ #ifdef TUSB_CFG_HOST + //------------- Controller -------------// #ifndef TUSB_CFG_HOST_CONTROLLER_NUM #define TUSB_CFG_HOST_CONTROLLER_NUM 1 #warning TUSB_CFG_HOST_CONTROLLER_NUM is not defined, default value is 1 @@ -107,6 +114,8 @@ #warning TUSB_CFG_HOST_DEVICE_MAX is not defined, default value is 1 #endif + //------------- HID CLASS -------------// + #define HOST_CLASS_HID ( TUSB_CFG_HOST_HID_KEYBOARD ) #if TUSB_CFG_HOST_HID_KEYBOARD #if !defined(TUSB_CFG_HOST_HID_KEYBOARD_ENDPOINT_SIZE) #define TUSB_CFG_HOST_HID_KEYBOARD_ENDPOINT_SIZE 64 @@ -116,6 +125,8 @@ #if !defined(TUSB_CFG_HOST_HID_KEYBOARD_NO_INSTANCES_PER_DEVICE) #define TUSB_CFG_HOST_HID_KEYBOARD_NO_INSTANCES_PER_DEVICE 1 #endif + + #define HOST_HCD_XFER_INTERRUPT #endif // end TUSB_CFG_HOST_HID_KEYBOARD #ifndef TUSB_CFG_HOST_ENUM_BUFFER_SIZE @@ -123,7 +134,7 @@ #warning TUSB_CFG_HOST_ENUM_BUFFER_SIZE is not defined, default value is 256 #endif - #define HOST_CLASS_HID ( TUSB_CFG_HOST_HID_KEYBOARD ) + //------------- CLASS -------------// #endif // end TUSB_CFG_HOST //--------------------------------------------------------------------+ |