Merge pull request #220 from hathach/develop

Port NXP iMX RT10XX

5 files changed, 8 insertions, 4 deletions

diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index 63e87dd54..18123a497 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -170,7 +170,7 @@ void hcd_device_close(uint8_t rhport, uint8_t dev_addr)
   list_remove_qhd_by_addr( (ehci_link_t*) qhd_async_head(rhport), dev_addr );

 

   // Remove from all interval period list

-  for(uint8_t i = 0; i < TU_ARRAY_SZIE(ehci_data.period_head_arr); i++)

+  for(uint8_t i = 0; i < TU_ARRAY_SIZE(ehci_data.period_head_arr); i++)

   {

     list_remove_qhd_by_addr( (ehci_link_t*) &ehci_data.period_head_arr[i], dev_addr);

   }

@@ -623,7 +623,7 @@ static void xfer_error_isr(uint8_t hostid)
 }

 

 //------------- Host Controller Driver's Interrupt Handler -------------//

-void hal_hcd_isr(uint8_t rhport)

+void hcd_isr(uint8_t rhport)

 {

   ehci_registers_t* regs = ehci_data.regs;

 

diff --git a/src/host/hcd.h b/src/host/hcd.h
index 86e7d664b..97dc3ebfd 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -87,6 +87,7 @@ enum {
 // HCD API

 //--------------------------------------------------------------------+

 bool hcd_init(void);

+void hcd_isr(uint8_t hostid);

 void hcd_int_enable (uint8_t rhport);

 void hcd_int_disable(uint8_t rhport);

 

diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index ea553baa2..9fa861ac9 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -599,7 +599,7 @@ static void done_queue_isr(uint8_t hostid)
   }

 }

 

-void hal_hcd_isr(uint8_t hostid)

+void hcd_isr(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.c b/src/host/usbh.c
index 42a99f3d2..9e1861f87 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -95,7 +95,7 @@ static host_class_driver_t const usbh_class_drivers[] =
   #endif

 };

 

-enum { USBH_CLASS_DRIVER_COUNT = TU_ARRAY_SZIE(usbh_class_drivers) };

+enum { USBH_CLASS_DRIVER_COUNT = TU_ARRAY_SIZE(usbh_class_drivers) };

 

 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

diff --git a/src/host/usbh.h b/src/host/usbh.h
index 311b2514d..42a2bd095 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -68,6 +68,9 @@ typedef struct {
 //--------------------------------------------------------------------+
 void tuh_task(void);
 
+// Interrupt handler, name alias to HCD
+#define tuh_isr   hcd_isr
+
 tusb_device_state_t tuh_device_get_state (uint8_t dev_addr);
 static inline bool tuh_device_is_configured(uint8_t dev_addr)
 {