rename tuh_isr/hcd_isr to tuh_int_handler/hcd_int_handler

5 files changed, 10 insertions, 12 deletions

diff --git a/src/device/dcd.h b/src/device/dcd.h
index a4635346b..776f782b8 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -87,9 +87,9 @@ typedef struct TU_ATTR_ALIGNED(4)
 
 //TU_VERIFY_STATIC(sizeof(dcd_event_t) <= 12, "size is not correct");
 
-/*------------------------------------------------------------------*/
-/* Device API
- *------------------------------------------------------------------*/
+//--------------------------------------------------------------------+
+// Controller API
+//--------------------------------------------------------------------+
 
 // Initialize controller to device mode
 void dcd_init       (uint8_t rhport);
diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index e2ead7b08..295da4566 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -648,7 +648,7 @@ static void xfer_error_isr(uint8_t hostid)
 }
 
 //------------- Host Controller Driver's Interrupt Handler -------------//
-void hcd_isr(uint8_t rhport)
+void hcd_int_handler(uint8_t rhport)
 {
   ehci_registers_t* regs = ehci_data.regs;
 
diff --git a/src/host/hcd.h b/src/host/hcd.h
index f2ca0a1d6..24cc62501 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -84,10 +84,10 @@ enum {
 #endif
 
 //--------------------------------------------------------------------+
-// HCD API
+// Controller & Port API
 //--------------------------------------------------------------------+
 bool hcd_init(void);
-void hcd_isr(uint8_t hostid);
+void hcd_int_handler(uint8_t rhport);
 void hcd_int_enable (uint8_t rhport);
 void hcd_int_disable(uint8_t rhport);
 
@@ -100,7 +100,6 @@ static inline uint32_t hcd_frame_number(uint8_t rhport)
   return hcd_uframe_number(rhport) >> 3;
 }
 
-// PORT API
 /// return the current connect status of roothub port
 bool hcd_port_connect_status(uint8_t hostid);
 void hcd_port_reset(uint8_t hostid);
@@ -144,9 +143,7 @@ bool hcd_edpt_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr, uint8_t *
 bool hcd_pipe_queue_xfer(uint8_t dev_addr, uint8_t ep_addr, uint8_t buffer[], uint16_t total_bytes); // only queue, not transferring yet
 bool hcd_pipe_xfer(uint8_t dev_addr, uint8_t ep_addr, uint8_t buffer[], uint16_t total_bytes, bool int_on_complete);
 
-#if 0
-tusb_error_t hcd_pipe_cancel();
-#endif
+// tusb_error_t hcd_pipe_cancel();
 
 #ifdef __cplusplus
  }
diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 5ee5fe8c4..114f52e7d 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -606,7 +606,7 @@ static void done_queue_isr(uint8_t hostid)
   }
 }
 
-void hcd_isr(uint8_t hostid)
+void hcd_int_handler(uint8_t hostid)
 {
   uint32_t const int_en     = OHCI_REG->interrupt_enable;
   uint32_t const int_status = OHCI_REG->interrupt_status & int_en;
diff --git a/src/host/usbh.h b/src/host/usbh.h
index 39e7a4e0d..27193d378 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -73,7 +73,8 @@ typedef struct {
 void tuh_task(void);
 
 // Interrupt handler, name alias to HCD
-#define tuh_isr   hcd_isr
+extern void hcd_int_handler(uint8_t rhport);
+#define tuh_int_handler   hcd_int_handler
 
 tusb_device_state_t tuh_device_get_state (uint8_t dev_addr);
 static inline bool tuh_device_is_configured(uint8_t dev_addr)