mirror of
https://github.com/hathach/tinyusb.git
synced 2025-02-19 06:40:45 +00:00
change usbd_init() return to bool for simplicity
This commit is contained in:
parent
3dc0653d70
commit
d887829b4c
@ -189,11 +189,11 @@ bool tud_mounted(void)
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// USBD Task
|
// USBD Task
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
tusb_error_t usbd_init (void)
|
bool usbd_init (void)
|
||||||
{
|
{
|
||||||
// Init device queue & task
|
// Init device queue & task
|
||||||
_usbd_q = osal_queue_create(&_usbd_qdef);
|
_usbd_q = osal_queue_create(&_usbd_qdef);
|
||||||
TU_VERIFY(_usbd_q, TUSB_ERROR_OSAL_QUEUE_FAILED);
|
TU_ASSERT(_usbd_q != NULL);
|
||||||
|
|
||||||
osal_task_create(&_usbd_task_def);
|
osal_task_create(&_usbd_task_def);
|
||||||
|
|
||||||
@ -201,10 +201,10 @@ tusb_error_t usbd_init (void)
|
|||||||
for (uint8_t i = 0; i < USBD_CLASS_DRIVER_COUNT; i++) usbd_class_drivers[i].init();
|
for (uint8_t i = 0; i < USBD_CLASS_DRIVER_COUNT; i++) usbd_class_drivers[i].init();
|
||||||
|
|
||||||
// Init device controller driver
|
// Init device controller driver
|
||||||
dcd_init(TUD_OPT_RHPORT);
|
TU_ASSERT(dcd_init(TUD_OPT_RHPORT));
|
||||||
dcd_int_enable(TUD_OPT_RHPORT);
|
dcd_int_enable(TUD_OPT_RHPORT);
|
||||||
|
|
||||||
return TUSB_ERROR_NONE;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void usbd_reset(uint8_t rhport)
|
static void usbd_reset(uint8_t rhport)
|
||||||
|
@ -51,8 +51,8 @@ extern tud_desc_set_t const* usbd_desc_set;
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// INTERNAL API for stack management
|
// INTERNAL API for stack management
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
tusb_error_t usbd_init (void);
|
bool usbd_init (void);
|
||||||
void usbd_task (void* param);
|
void usbd_task (void* param);
|
||||||
|
|
||||||
|
|
||||||
// Carry out Data and Status stage of control transfer
|
// Carry out Data and Status stage of control transfer
|
||||||
|
@ -97,14 +97,11 @@ ATTR_WEAK void tuh_device_mount_failed_cb(tusb_error_t error, tusb_desc_devic
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
#ifdef _TINY_USB_SOURCE_FILE_
|
#ifdef _TINY_USB_SOURCE_FILE_
|
||||||
|
|
||||||
|
|
||||||
void usbh_enumeration_task(void* param);
|
void usbh_enumeration_task(void* param);
|
||||||
tusb_error_t usbh_init(void);
|
tusb_error_t usbh_init(void);
|
||||||
|
|
||||||
tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,
|
tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,
|
||||||
uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data);
|
uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -47,17 +47,17 @@
|
|||||||
|
|
||||||
static bool _initialized = false;
|
static bool _initialized = false;
|
||||||
|
|
||||||
tusb_error_t tusb_init(void)
|
bool tusb_init(void)
|
||||||
{
|
{
|
||||||
// skip if already initialized
|
// skip if already initialized
|
||||||
if (_initialized) return TUSB_ERROR_NONE;
|
if (_initialized) return true;
|
||||||
|
|
||||||
#if MODE_HOST_SUPPORTED
|
#if MODE_HOST_SUPPORTED
|
||||||
TU_ASSERT_ERR( usbh_init() ); // host stack init
|
TU_VERIFY( usbh_init() == TUSB_ERROR_NONE ); // init host stack
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if TUSB_OPT_DEVICE_ENABLED
|
#if TUSB_OPT_DEVICE_ENABLED
|
||||||
TU_ASSERT_ERR ( usbd_init() ); // device stack init
|
TU_VERIFY ( usbd_init() ); // init device stack
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_initialized = true;
|
_initialized = true;
|
||||||
|
10
src/tusb.h
10
src/tusb.h
@ -101,16 +101,14 @@
|
|||||||
/** \ingroup group_application_api
|
/** \ingroup group_application_api
|
||||||
* @{ */
|
* @{ */
|
||||||
|
|
||||||
/** \brief Initialize the usb stack
|
// Initialize device/host stack according to tusb_config.h
|
||||||
* \return Error Code of the \ref TUSB_ERROR enum
|
// return true if success
|
||||||
* \note Function will initialize the stack according to configuration in the configure file (tusb_config.h)
|
bool tusb_init(void);
|
||||||
*/
|
|
||||||
tusb_error_t tusb_init(void);
|
|
||||||
|
|
||||||
#if CFG_TUSB_OS == OPT_OS_NONE
|
#if CFG_TUSB_OS == OPT_OS_NONE
|
||||||
/** \brief Run all tinyusb's internal tasks (e.g host task, device task).
|
/** \brief Run all tinyusb's internal tasks (e.g host task, device task).
|
||||||
* \note This function is only required when using no RTOS (\ref CFG_TUSB_OS == OPT_OS_NONE). All the stack functions
|
* \note This function is only required when using no RTOS (\ref CFG_TUSB_OS == OPT_OS_NONE). All the stack functions
|
||||||
* & callback are invoked within this function, so it should be called periodically within the mainloop
|
* & callback are invoked within this function. This should be called periodically within the mainloop
|
||||||
*
|
*
|
||||||
@code
|
@code
|
||||||
int main(void)
|
int main(void)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user