andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename tuh_isr/hcd_isr to tuh_int_handler/hcd_int_handler

Browse Source
This commit is contained in:
hathach
2020-09-03 13:12:09 +07:00
parent 1cee2da7b9
commit 1d83ad0ebb
18 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/dcd.h
View File

@@ -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);

2
src/host/ehci/ehci.c
View File

@@ -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;

9
src/host/hcd.h
View File

@@ -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
}

2
src/host/ohci/ohci.c
View File

@@ -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;

3
src/host/usbh.h
View File

@@ -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)