summaryrefslogtreecommitdiff
path: root/tinyusb/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-01-19 00:57:58 +0700
committerhathach <[email protected]>2013-01-19 00:57:58 +0700
commitcfe7a3d23b4639c3578b166fc865450bc439d82c (patch)
tree7a831618538324b04bfd9e0f918a78a0aea92b34 /tinyusb/device
parentd8c8b9e38ad94ab84c24f22c2ecb79ce4d78b7ba (diff)
change error type to lower case for more consistency
change Error Enum to TUSB prefix for more consistency start to add check for OS configure
Diffstat (limited to 'tinyusb/device')
-rw-r--r--tinyusb/device/dcd.c8
-rw-r--r--tinyusb/device/dcd.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index 871da911a..b23f74957 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -57,11 +57,11 @@ ErrorCode_t USB_Configure_Event (USBD_HANDLE_T hUsb)
if (pCtrl->config_value)
{
#if defined(DEVICE_CLASS_HID)
- ASSERT( tERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED );
+ ASSERT( TUSB_ERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED );
#endif
#ifdef TUSB_CFG_DEVICE_CDC
- ASSERT( tERROR_NONE == tusb_cdc_configured(hUsb), ERR_FAILED );
+ ASSERT( TUSB_ERROR_NONE == tusb_cdc_configured(hUsb), ERR_FAILED );
#endif
}
@@ -81,7 +81,7 @@ ErrorCode_t USB_Reset_Event (USBD_HANDLE_T hUsb)
return LPC_OK;
}
-TUSB_Error_t dcd_init(uint8_t coreid)
+tusb_error_t dcd_init(uint8_t coreid)
{
#ifdef DEVICE_ROMDRIVER // TODO refractor later
/* ROM DRIVER INIT */
@@ -138,7 +138,7 @@ TUSB_Error_t dcd_init(uint8_t coreid)
USBD_API->hw->Connect(g_hUsb, 1);
#endif
- return tERROR_NONE;
+ return TUSB_ERROR_NONE;
}
/**************************************************************************/
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index 89eb3fef4..7c976736e 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -71,7 +71,7 @@
* \note
*/
-TUSB_Error_t dcd_init(uint8_t coreid) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t dcd_init(uint8_t coreid) ATTR_WARN_UNUSED_RESULT;
#ifdef __cplusplus
}