kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tested with IAR & keil for device ea4357, fix some warnings

This commit is contained in:
hathach 2014-03-23 17:33:58 +07:00
parent 5d5aa9b213
commit a8d32d81b3
3 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/device/src/tusb_config.h
View File

@ -59,7 +59,7 @@
//------------- CLASS -------------//
#define TUSB_CFG_DEVICE_HID_KEYBOARD 1
#define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_MOUSE 1
#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet
#define TUSB_CFG_DEVICE_MSC 1
#define TUSB_CFG_DEVICE_CDC 1

13
tinyusb/device/dcd_lpc43xx.c
View File

@ -286,11 +286,13 @@ tusb_error_t dcd_init(void)
//--------------------------------------------------------------------+
// PIPE HELPER
//--------------------------------------------------------------------+
#if 0
static inline uint8_t edpt_pos2phy(uint8_t pos) ATTR_CONST ATTR_ALWAYS_INLINE;
static inline uint8_t edpt_pos2phy(uint8_t pos)
{ // 0-5 --> OUT, 16-21 IN
return (pos < DCD_QHD_MAX/2) ? (2*pos) : (2*(pos-16)+1);
}
#endif
static inline uint8_t edpt_phy2pos(uint8_t physical_endpoint) ATTR_CONST ATTR_ALWAYS_INLINE;
static inline uint8_t edpt_phy2pos(uint8_t physical_endpoint)
@ -546,10 +548,11 @@ void dcd_isr(uint8_t coreid)
{
LPC_USB0_Type* const lpc_usb = LPC_USB[coreid];
uint32_t const int_status = lpc_usb->USBSTS_D & lpc_usb->USBINTR_D;
uint32_t const int_enable = lpc_usb->USBINTR_D;
uint32_t const int_status = lpc_usb->USBSTS_D & int_enable;
lpc_usb->USBSTS_D = int_status; // Acknowledge handled interrupt
if (int_status == 0) return; // disabled interrupt sources
if (int_status == 0) return;// disabled interrupt sources
if (int_status & INT_MASK_RESET)
{
@ -588,7 +591,7 @@ void dcd_isr(uint8_t coreid)
if (lpc_usb->ENDPTSETUPSTAT)
{ // 23.10.10.2 Operational model for setup transfers
tusb_control_request_t control_request = p_dcd->qhd[0].setup_request;
lpc_usb->ENDPTSETUPSTAT = lpc_usb->ENDPTSETUPSTAT; // acknowledge
lpc_usb->ENDPTSETUPSTAT = lpc_usb->ENDPTSETUPSTAT;// acknowledge
usbd_setup_received_isr(coreid, &control_request);
}
@ -615,8 +618,8 @@ void dcd_isr(uint8_t coreid)
}
}
if (int_status & INT_MASK_SOF) { }
if (int_status & INT_MASK_NAK) { }
if (int_status & INT_MASK_SOF) {}
if (int_status & INT_MASK_NAK) {}
if (int_status & INT_MASK_ERROR) ASSERT(false, VOID_RETURN);
}

3
tinyusb/device/dcd_lpc_11uxx_13uxx.c
View File

@ -297,7 +297,8 @@ void dcd_isr(uint8_t coreid)
{
(void) coreid;
uint32_t const int_status = LPC_USB->INTSTAT & LPC_USB->INTEN;
uint32_t const int_enable = LPC_USB->INTEN;
uint32_t const int_status = LPC_USB->INTSTAT & int_enable;
LPC_USB->INTSTAT = int_status; // Acknowledge handled interrupt
if (int_status == 0) return;