hal clean up

- replace tusb_hal_int_enable/disable to dcd_int_enable/disable,
hcd_int_enable/disable
- remove tusb_hal_init(), this will be part of dcd_init/hcd_init,
anything beyond dcd/hcd should be inited by bsp
This commit is contained in:
hathach
2018-12-05 13:20:25 +07:00
parent 6048a3bff4
commit a73017fdc2
17 changed files with 125 additions and 290 deletions

View File

@@ -139,24 +139,18 @@ static inline uint8_t ep_addr2id(uint8_t endpoint_addr)
//--------------------------------------------------------------------+
// CONTROLLER API
//--------------------------------------------------------------------+
void tusb_hal_int_enable(uint8_t rhport)
void dcd_int_enable(uint8_t rhport)
{
(void) rhport; // discard compiler's warning
(void) rhport;
NVIC_EnableIRQ(USB0_IRQn);
}
void tusb_hal_int_disable(uint8_t rhport)
void dcd_int_disable(uint8_t rhport)
{
(void) rhport; // discard compiler's warning
(void) rhport;
NVIC_DisableIRQ(USB0_IRQn);
}
bool tusb_hal_init(void)
{
// TODO remove
return true;
}
void dcd_set_config(uint8_t rhport, uint8_t config_num)
{

View File

@@ -202,6 +202,18 @@ bool dcd_init(uint8_t rhport)
return TUSB_ERROR_NONE;
}
void dcd_int_enable(uint8_t rhport)
{
(void) rhport;
NVIC_EnableIRQ(USB_IRQn);
}
void dcd_int_disable(uint8_t rhport)
{
(void) rhport;
NVIC_DisableIRQ(USB_IRQn);
}
void dcd_set_address(uint8_t rhport, uint8_t dev_addr)
{
(void) rhport;

View File

@@ -42,26 +42,6 @@
#include "chip.h"
void tusb_hal_int_enable(uint8_t rhport)
{
(void) rhport;
NVIC_EnableIRQ(USB_IRQn);
}
void tusb_hal_int_disable(uint8_t rhport)
{
(void) rhport;
NVIC_DisableIRQ(USB_IRQn);
}
//--------------------------------------------------------------------+
// IMPLEMENTATION
//--------------------------------------------------------------------+
bool tusb_hal_init(void)
{
return true;
}
void USB_IRQHandler(void)
{
extern void hal_dcd_isr(uint8_t rhport);

View File

@@ -158,12 +158,19 @@ bool dcd_init(uint8_t rhport)
lpc_usb->USBCMD_D &= ~0x00FF0000; // Interrupt Threshold Interval = 0
lpc_usb->USBCMD_D |= BIT_(0); // connect
// enable interrupt
NVIC_EnableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
return true;
}
void dcd_int_enable(uint8_t rhport)
{
NVIC_EnableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
}
void dcd_int_disable(uint8_t rhport)
{
NVIC_DisableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
}
//--------------------------------------------------------------------+
// HELPER
//--------------------------------------------------------------------+

View File

@@ -42,21 +42,6 @@
#include "chip.h"
void tusb_hal_int_enable(uint8_t rhport)
{
NVIC_EnableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
}
void tusb_hal_int_disable(uint8_t rhport)
{
NVIC_DisableIRQ(rhport ? USB1_IRQn : USB0_IRQn);
}
bool tusb_hal_init(void)
{
return true;
}
void hal_dcd_isr(uint8_t rhport);
#if CFG_TUSB_RHPORT0_MODE