diff options
| author | hathach <[email protected]> | 2012-12-04 11:30:34 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2012-12-04 11:30:34 +0700 |
| commit | 8f00307986b71fdc48210e0ee4821a95392be4c3 (patch) | |
| tree | a325f10d67785e897ffd4bdcf514cf15c927acfb /tinyusb | |
| parent | 921561be607a9ec3edd059de8e5d7b7f75dd2f76 (diff) | |
fixed building errors with device example
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/class/hid.c | 2 | ||||
| -rw-r--r-- | tinyusb/common/common.h | 1 | ||||
| -rw-r--r-- | tinyusb/common/compiler/compiler.h | 2 | ||||
| -rw-r--r-- | tinyusb/device/dcd.c | 2 | ||||
| -rw-r--r-- | tinyusb/host/hcd.h | 8 | ||||
| -rw-r--r-- | tinyusb/tusb.h | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/tinyusb/class/hid.c b/tinyusb/class/hid.c index 579860b9e..76a93d572 100644 --- a/tinyusb/class/hid.c +++ b/tinyusb/class/hid.c @@ -37,7 +37,7 @@ #include "hid.h" -#ifdef CLASS_HID +#ifdef TUSB_CLASS_HID #ifdef CFG_CLASS_HID_KEYBOARD USB_HID_KeyboardReport_t hid_keyboard_report; diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index dbe99b2dd..97bc32ae3 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -67,6 +67,7 @@ #include "compiler/compiler.h" #include "errors.h" #include "core/tusb_types.h" +#include "core/std_descriptors.h" /// min value #ifndef MIN diff --git a/tinyusb/common/compiler/compiler.h b/tinyusb/common/compiler/compiler.h index 5a29a2138..b09900a2a 100644 --- a/tinyusb/common/compiler/compiler.h +++ b/tinyusb/common/compiler/compiler.h @@ -53,7 +53,7 @@ #if defined(__GNUC__) #include "compiler_gcc.h" -#elif deinfed __ICCARM__ // IAR compiler +#elif defined __ICCARM__ // IAR compiler #include "compiler_iar.h" #endif diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c index ca6fafe76..480db2119 100644 --- a/tinyusb/device/dcd.c +++ b/tinyusb/device/dcd.c @@ -59,7 +59,7 @@ ErrorCode_t USB_Configure_Event (USBD_HANDLE_T hUsb) USB_CORE_CTRL_T* pCtrl = (USB_CORE_CTRL_T*)hUsb; if (pCtrl->config_value) { - #if defined(CLASS_HID) + #if defined(TUSB_CLASS_HID) ASSERT( tERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED ); #endif diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h index dfe659850..2bb667057 100644 --- a/tinyusb/host/hcd.h +++ b/tinyusb/host/hcd.h @@ -68,10 +68,10 @@ TUSB_Error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT; -TUSB_Error_t hcd_pipe_open( - uint8_t hostid, uint8_t device_address, - - )ATTR_WARN_UNUSED_RESULT; +//TUSB_Error_t hcd_pipe_open( +// uint8_t hostid, uint8_t device_address, +// +// )ATTR_WARN_UNUSED_RESULT; TUSB_Error_t hcd_pipe_close()ATTR_WARN_UNUSED_RESULT; TUSB_Error_t hcd_pipe_transfer()ATTR_WARN_UNUSED_RESULT; TUSB_Error_t hcd_pipe_cancel()ATTR_WARN_UNUSED_RESULT; diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h index 285e6f56e..2bfefbd96 100644 --- a/tinyusb/tusb.h +++ b/tinyusb/tusb.h @@ -58,7 +58,7 @@ #include "device/dcd.h" #endif -#if CLASS_HID +#if TUSB_CLASS_HID #include "class/hid.h" #endif |