From 8cb7818bcc048a69b9e2b0a4607c8f75bc35c359 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 23 May 2013 13:22:46 +0700 Subject: - move CMSIS & driver lib for lpc13u to codebase bsp/lpc13xx - change descriptor.c/h able to build device example --- tinyusb/host/usbh.c | 14 ++++---------- tinyusb/host/usbh.h | 10 +--------- 2 files changed, 5 insertions(+), 19 deletions(-) (limited to 'tinyusb/host') diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index 28c114e1e..c5f6ddeb2 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -48,14 +48,6 @@ #include "tusb.h" #include "usbh_hcd.h" -//TODO temporarily -#if TUSB_CFG_OS == TUSB_OS_NONE && !defined(_TEST_) -void tusb_tick_tock(void) -{ - osal_tick_tock(); -} -#endif - //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ @@ -300,7 +292,7 @@ tusb_error_t enumeration_body_subtask(void) #ifndef _TEST_ // TODO hack delay 20 ms for slow device (use retry on the 1st xfer instead later) - osal_task_delay(20); + osal_task_delay(50); #endif //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------// @@ -484,7 +476,7 @@ tusb_error_t enumeration_body_subtask(void) -#endif + //--------------------------------------------------------------------+ // INTERNAL HELPER @@ -512,3 +504,5 @@ static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t* return config_num; } + +#endif diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h index 6e2eb0033..6dcf12066 100644 --- a/tinyusb/host/usbh.h +++ b/tinyusb/host/usbh.h @@ -101,16 +101,8 @@ uint8_t tusbh_device_attached_cb (tusb_descriptor_device_t const *p_desc_de void tusbh_device_mount_succeed_cb (uint8_t dev_addr) ATTR_WEAK; void tusbh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_device_t const *p_desc_device) ATTR_WEAK; // TODO refractor remove desc_device -#if TUSB_CFG_OS == TUSB_OS_NONE // TODO move later -//static inline void tusb_tick_tock(void) ATTR_ALWAYS_INLINE; -//static inline void tusb_tick_tock(void) -//{ -// osal_tick_tock(); -//} -#endif - //--------------------------------------------------------------------+ -// CLASS-USBD & INTERNAL API +// CLASS-USBH & INTERNAL API //--------------------------------------------------------------------+ #ifdef _TINY_USB_SOURCE_FILE_ -- cgit v1.3.1