From 9208570d3a40131713995856743aa233f01ebda1 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 2 Mar 2018 22:50:59 +0700
Subject: [PATCH] rename dcd_controller_* to hal_dcd_*

---
 hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c | 6 +++---
 tinyusb/device/dcd.h                       | 8 ++++----
 tinyusb/device/dcd_lpc175x_6x.c            | 6 +++---
 tinyusb/device/dcd_lpc_11uxx_13uxx.c       | 6 +++---
 tinyusb/device/usbd.c                      | 4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c b/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c
index 93ec04d9..6a5117c3 100644
--- a/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c
+++ b/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c
@@ -184,17 +184,17 @@ static dcd_data_t* const dcd_data_ptr[2] = { &dcd_data0, &dcd_data1 };
 //--------------------------------------------------------------------+
 // CONTROLLER API
 //--------------------------------------------------------------------+
-void dcd_controller_connect(uint8_t coreid)
+void hal_dcd_connect(uint8_t coreid)
 {
   LPC_USB[coreid]->USBCMD_D |= BIT_(0);
 }
 
-void dcd_controller_set_address(uint8_t coreid, uint8_t dev_addr)
+void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr)
 {
   LPC_USB[coreid]->DEVICEADDR = (dev_addr << 25) | BIT_(24);
 }
 
-void dcd_controller_set_configuration(uint8_t coreid)
+void hal_dcd_set_config(uint8_t coreid)
 {
 
 }
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index acbcd495..6bbfc821 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -73,10 +73,10 @@ bool hal_dcd_init(uint8_t coreid);
 void dcd_isr(uint8_t coreid);
 
 //------------- Controller API -------------//
-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);
-void dcd_controller_set_configuration (uint8_t coreid);
+void hal_dcd_connect    (uint8_t coreid);
+void hal_dcd_disconnect (uint8_t coreid);
+void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr);
+void hal_dcd_set_config (uint8_t coreid);
 
 //------------- PIPE API -------------//
 tusb_error_t dcd_pipe_control_xfer(uint8_t coreid, tusb_direction_t dir, uint8_t * p_buffer, uint16_t length, bool int_on_complete);
diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c
index 935b1cc3..9131b36c 100644
--- a/tinyusb/device/dcd_lpc175x_6x.c
+++ b/tinyusb/device/dcd_lpc175x_6x.c
@@ -280,19 +280,19 @@ void dcd_isr(uint8_t coreid)
 //--------------------------------------------------------------------+
 // USBD API - CONTROLLER
 //--------------------------------------------------------------------+
-void dcd_controller_connect(uint8_t coreid)
+void hal_dcd_connect(uint8_t coreid)
 {
   (void) coreid;
   sie_write(SIE_CMDCODE_DEVICE_STATUS, 1, 1);
 }
 
-void dcd_controller_set_address(uint8_t coreid, uint8_t dev_addr)
+void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr)
 {
   (void) coreid;
   sie_write(SIE_CMDCODE_SET_ADDRESS, 1, 0x80 | dev_addr); // 7th bit is : device_enable
 }
 
-void dcd_controller_set_configuration(uint8_t coreid)
+void hal_dcd_set_config(uint8_t coreid)
 {
   (void) coreid;
   sie_write(SIE_CMDCODE_CONFIGURE_DEVICE, 1, 1);
diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
index baafc936..cb0ce2ee 100644
--- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c
+++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
@@ -164,18 +164,18 @@ static void queue_xfer_in_next_td(uint8_t ep_id);
 //--------------------------------------------------------------------+
 // CONTROLLER API
 //--------------------------------------------------------------------+
-void dcd_controller_connect(uint8_t coreid)
+void hal_dcd_connect(uint8_t coreid)
 {
   (void) coreid;
   LPC_USB->DEVCMDSTAT |= CMDSTAT_DEVICE_CONNECT_MASK;
 }
 
-void dcd_controller_set_configuration(uint8_t coreid)
+void hal_dcd_set_config(uint8_t coreid)
 {
 
 }
 
-void dcd_controller_set_address(uint8_t coreid, uint8_t dev_addr)
+void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr)
 {
   (void) coreid;
 
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 318446fa..00495f04 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -264,7 +264,7 @@ tusb_error_t usbd_control_request_subtask(uint8_t coreid, tusb_control_request_t
     }
     else if ( TUSB_REQUEST_SET_ADDRESS == p_request->bRequest )
     {
-      dcd_controller_set_address(coreid, (uint8_t) p_request->wValue);
+      hal_dcd_set_address(coreid, (uint8_t) p_request->wValue);
       usbd_devices[coreid].state = TUSB_DEVICE_STATE_ADDRESSED;
     }
     else if ( TUSB_REQUEST_SET_CONFIGURATION == p_request->bRequest )
@@ -321,7 +321,7 @@ tusb_error_t usbd_control_request_subtask(uint8_t coreid, tusb_control_request_t
 // may need to open interface before set configured
 static tusb_error_t usbd_set_configure_received(uint8_t coreid, uint8_t config_number)
 {
-  dcd_controller_set_configuration(coreid);
+  hal_dcd_set_config(coreid);
   usbd_devices[coreid].state = TUSB_DEVICE_STATE_CONFIGURED;
 
   //------------- parse configuration & open drivers -------------//