jesus/tinyusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refractor dcd_controller_reset & hcd_controller_reset to hal_controller_reset

Browse Source
This commit is contained in:
hathach
2013-11-06 12:15:11 +07:00
parent 024858a605
commit b2b53e61fb
9 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tinyusb/device/dcd.h
-1
View File
@@ -75,7 +75,6 @@ tusb_error_t dcd_init(void) ATTR_WARN_UNUSED_RESULT;
void dcd_isr(uint8_t coreid);
//------------- Controller API -------------//
tusb_error_t dcd_controller_reset(uint8_t coreid) ATTR_WARN_UNUSED_RESULT;
void dcd_controller_connect(uint8_t coreid);
void dcd_controller_disconnect(uint8_t coreid);
void dcd_controller_set_address(uint8_t coreid, uint8_t dev_addr);
tinyusb/device/dcd_lpc43xx.c
+14 -14
View File
@@ -166,21 +166,21 @@ ATTR_ALIGNED(2048) dcd_data_t dcd_data TUSB_CFG_ATTR_USBRAM;
//--------------------------------------------------------------------+
// CONTROLLER API
//--------------------------------------------------------------------+
tusb_error_t dcd_controller_reset(uint8_t coreid)
{
volatile uint32_t * p_reg_usbcmd;
p_reg_usbcmd = (coreid ? &LPC_USB1->USBCMD_D : &LPC_USB0->USBCMD_D);
// NXP chip powered with non-host mode --> sts bit is not correctly reflected
(*p_reg_usbcmd) |= BIT_(1); // TODO refractor reset controller
// timeout_timer_t timeout;
// timeout_set(&timeout, 2); // should not take longer the time to stop controller
while( ((*p_reg_usbcmd) & BIT_(1)) /*&& !timeout_expired(&timeout)*/) {}
//tusb_error_t dcd_controller_reset(uint8_t coreid)
//{
// volatile uint32_t * p_reg_usbcmd;
//
// return timeout_expired(&timeout) ? TUSB_ERROR_OSAL_TIMEOUT : TUSB_ERROR_NONE;
return TUSB_ERROR_NONE;
}
// p_reg_usbcmd = (coreid ? &LPC_USB1->USBCMD_D : &LPC_USB0->USBCMD_D);
//// NXP chip powered with non-host mode --> sts bit is not correctly reflected
// (*p_reg_usbcmd) |= BIT_(1); // TODO refractor reset controller
//
//// timeout_timer_t timeout;
//// timeout_set(&timeout, 2); // should not take longer the time to stop controller
// while( ((*p_reg_usbcmd) & BIT_(1)) /*&& !timeout_expired(&timeout)*/) {}
////
//// return timeout_expired(&timeout) ? TUSB_ERROR_OSAL_TIMEOUT : TUSB_ERROR_NONE;
// return TUSB_ERROR_NONE;
//}
void dcd_controller_connect(uint8_t coreid)
{
tinyusb/device/usbd.c
-2
View File
@@ -102,8 +102,6 @@ tusb_error_t usbd_init (void)
ASSERT_STATUS ( dcd_init() );
dcd_controller_connect(0); // TODO USB1
return TUSB_ERROR_NONE;
}