hal clean up

- replace tusb_hal_int_enable/disable to dcd_int_enable/disable,
hcd_int_enable/disable
- remove tusb_hal_init(), this will be part of dcd_init/hcd_init,
anything beyond dcd/hcd should be inited by bsp

5 files changed, 25 insertions, 47 deletions

diff --git a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
index 26674d9e9..69c2759de 100644
--- a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
+++ b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c
@@ -139,24 +139,18 @@ static inline uint8_t ep_addr2id(uint8_t endpoint_addr)
 //--------------------------------------------------------------------+
 // CONTROLLER API
 //--------------------------------------------------------------------+
-void tusb_hal_int_enable(uint8_t rhport)
+void dcd_int_enable(uint8_t rhport)
 {
-  (void) rhport; // discard compiler's warning
+  (void) rhport;
   NVIC_EnableIRQ(USB0_IRQn);
 }
 
-void tusb_hal_int_disable(uint8_t rhport)
+void dcd_int_disable(uint8_t rhport)
 {
-  (void) rhport; // discard compiler's warning
+  (void) rhport;
   NVIC_DisableIRQ(USB0_IRQn);
 }
 
-bool tusb_hal_init(void)
-{
-  // TODO remove
-  return true;
-}
-
 void dcd_set_config(uint8_t rhport, uint8_t config_num)
 {
 
diff --git a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
index 8763d1e18..84eb0c121 100644
--- a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
+++ b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
@@ -202,6 +202,18 @@ bool dcd_init(uint8_t rhport)
   return TUSB_ERROR_NONE;
 }
 
+void dcd_int_enable(uint8_t rhport)
+{
+  (void) rhport;
+  NVIC_EnableIRQ(USB_IRQn);
+}
+
+void dcd_int_disable(uint8_t rhport)
+{
+  (void) rhport;
+  NVIC_DisableIRQ(USB_IRQn);
+}
+
 void dcd_set_address(uint8_t rhport, uint8_t dev_addr)
 {
   (void) rhport;
diff --git a/src/portable/nxp/lpc17_40/hal_lpc17_40.c b/src/portable/nxp/lpc17_40/hal_lpc17_40.c
index 70df70510..7509dac58 100644
--- a/src/portable/nxp/lpc17_40/hal_lpc17_40.c
+++ b/src/portable/nxp/lpc17_40/hal_lpc17_40.c
@@ -42,26 +42,6 @@
 
 #include "chip.h"
 
-void tusb_hal_int_enable(uint8_t rhport)
-{
-  (void) rhport;
-  NVIC_EnableIRQ(USB_IRQn);
-}
-
-void tusb_hal_int_disable(uint8_t rhport)
-{
-  (void) rhport;
-  NVIC_DisableIRQ(USB_IRQn);
-}
-
-//--------------------------------------------------------------------+
-// IMPLEMENTATION
-//--------------------------------------------------------------------+
-bool tusb_hal_init(void)
-{
-  return true;
-}
-
 void USB_IRQHandler(void)
 {
   extern void hal_dcd_isr(uint8_t rhport);
diff --git a/src/portable/nxp/lpc18_43/dcd_lpc18_43.c b/src/portable/nxp/lpc18_43/dcd_lpc18_43.c
index 9423b64a9..7f6442f8c 100644
--- a/src/portable/nxp/lpc18_43/dcd_lpc18_43.c
+++ b/src/portable/nxp/lpc18_43/dcd_lpc18_43.c
@@ -158,10 +158,17 @@ bool dcd_init(uint8_t rhport)
   lpc_usb->USBCMD_D &= ~0x00FF0000; // Interrupt Threshold Interval = 0
   lpc_usb->USBCMD_D |= BIT_(0); // connect
 
-  // enable interrupt
+  return true;
+}
+
+void dcd_int_enable(uint8_t rhport)
+{
   NVIC_EnableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
+}
 
-  return true;
+void dcd_int_disable(uint8_t rhport)
+{
+  NVIC_DisableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
 }
 
 //--------------------------------------------------------------------+
diff --git a/src/portable/nxp/lpc18_43/hal_lpc18_43.c b/src/portable/nxp/lpc18_43/hal_lpc18_43.c
index 152072cab..2978bebf6 100644
--- a/src/portable/nxp/lpc18_43/hal_lpc18_43.c
+++ b/src/portable/nxp/lpc18_43/hal_lpc18_43.c
@@ -42,21 +42,6 @@
 
 #include "chip.h"
 
-void tusb_hal_int_enable(uint8_t rhport)
-{
-  NVIC_EnableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
-}
-
-void tusb_hal_int_disable(uint8_t rhport)
-{
-  NVIC_DisableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
-}
-
-bool tusb_hal_init(void)
-{
-  return true;
-}
-
 void hal_dcd_isr(uint8_t rhport);
 
 #if CFG_TUSB_RHPORT0_MODE