remove tusb_isr(), rename hal_hcd_isr() and hal_dcd_isr()

3 files changed, 3 insertions, 6 deletions

diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index a2948af52..c6691fab1 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -68,9 +68,6 @@ static inline bool endpointhandle_is_equal(endpoint_handle_t x, endpoint_handle_
   return (x.coreid == y.coreid) && (x.index == y.index);

 }

 

-

-void dcd_isr(uint8_t coreid);

-

 //------------- Controller API -------------//

 bool hal_dcd_init        (uint8_t coreid);

 void hal_dcd_connect     (uint8_t coreid);

diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c
index 2f5d069a4..e7fbed453 100644
--- a/tinyusb/device/dcd_lpc175x_6x.c
+++ b/tinyusb/device/dcd_lpc175x_6x.c
@@ -216,7 +216,7 @@ static void endpoint_control_isr(void)
   LPC_USB->USBEpIntClr = endpoint_int_status; // acknowledge interrupt TODO cannot immediately acknowledge setup packet

 }

 

-void dcd_isr(uint8_t coreid)

+void hal_dcd_isr(uint8_t coreid)

 {

   (void) coreid;

   uint32_t const device_int_enable = LPC_USB->USBDevIntEn;

@@ -402,7 +402,7 @@ bool hal_dcd_control_xfer(uint8_t coreid, tusb_direction_t dir, uint8_t * p_buff
 

   //------------- Status Phase (opposite direct to Data) -------------//

   if (dir == TUSB_DIR_HOST_TO_DEV)

-  { // only write for CONTROL OUT, CONTROL IN data will be retrieved in dcd_isr // TODO ????

+  { // only write for CONTROL OUT, CONTROL IN data will be retrieved in hal_dcd_isr // TODO ????

     VERIFY_STATUS ( pipe_control_write(NULL, 0), false );

   }

 

diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
index 151abe798..167770b96 100644
--- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c
+++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c
@@ -296,7 +296,7 @@ static void endpoint_control_isr(uint32_t int_status)
   }

 }

 

-void dcd_isr(uint8_t coreid)

+void hal_dcd_isr(uint8_t coreid)

 {

   (void) coreid;