From b2b53e61fbf7a449f1c3db78df0bb2beddb80984 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 6 Nov 2013 12:15:11 +0700
Subject: refractor dcd_controller_reset & hcd_controller_reset to
 hal_controller_reset

---
 tinyusb/device/dcd.h         |  1 -
 tinyusb/device/dcd_lpc43xx.c | 28 ++++++++++++++--------------
 tinyusb/device/usbd.c        |  2 --
 3 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'tinyusb/device')

diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index b4205d542..149d74f52 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -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);
diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c
index c6231b1c0..fe27862e8 100644
--- a/tinyusb/device/dcd_lpc43xx.c
+++ b/tinyusb/device/dcd_lpc43xx.c
@@ -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)
 {
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 13ea27054..bcdadd72b 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -102,8 +102,6 @@ tusb_error_t usbd_init (void)
 
   ASSERT_STATUS ( dcd_init() );
 
-  dcd_controller_connect(0);  // TODO USB1
-
   return TUSB_ERROR_NONE;
 }
 
-- 
cgit v1.3.1