kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

clean up

This commit is contained in:
hathach 2018-12-03 18:32:06 +07:00
parent 28d7408b3f
commit 7f55bbaf05
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/portable/nxp/lpc17xx/dcd_lpc175x_6x.c
View File

@ -130,12 +130,11 @@ static void sie_write (uint8_t cmd_code, uint8_t data_len, uint8_t data)
} }
} }
static uint32_t sie_read (uint8_t cmd_code, uint8_t data_len) static uint8_t sie_read (uint8_t cmd_code)
{ {
// TODO multiple read
sie_cmd_code(SIE_CMDPHASE_COMMAND , cmd_code); sie_cmd_code(SIE_CMDPHASE_COMMAND , cmd_code);
sie_cmd_code(SIE_CMDPHASE_READ , cmd_code); sie_cmd_code(SIE_CMDPHASE_READ , cmd_code);
return LPC_USB->CmdData; return (uint8_t) LPC_USB->CmdData;
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
@ -353,8 +352,7 @@ bool dcd_edpt_stalled (uint8_t rhport, uint8_t ep_addr)
{ {
(void) rhport; (void) rhport;
uint32_t const ep_state = sie_read(SIE_CMDCODE_ENDPOINT_SELECT + ep_addr2idx(ep_addr), 1); uint8_t const ep_state = sie_read(SIE_CMDCODE_ENDPOINT_SELECT + ep_addr2idx(ep_addr));
return (ep_state & SIE_SELECT_ENDPOINT_STALL_MASK) ? true : false; return (ep_state & SIE_SELECT_ENDPOINT_STALL_MASK) ? true : false;
} }
@ -407,7 +405,7 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t* buffer, uint16_t t
tu_memclr(dd, sizeof(dma_desc_t)); tu_memclr(dd, sizeof(dma_desc_t));
dd->isochronous = is_iso; dd->isochronous = is_iso;
dd->max_packet_size = ep_size; dd->max_packet_size = ep_size;
dd->buffer = buffer; dd->buffer = (uint32_t) buffer;
dd->buflen = total_bytes; dd->buflen = total_bytes;
_dcd.udca[ep_id] = dd; _dcd.udca[ep_id] = dd;
@ -440,7 +438,7 @@ static void control_xfer_isr(uint8_t rhport, uint32_t ep_int_status)
// Control out complete // Control out complete
if ( ep_int_status & BIT_(0) ) if ( ep_int_status & BIT_(0) )
{ {
bool is_setup = sie_read(SIE_CMDCODE_ENDPOINT_SELECT+0, 1) & SIE_SELECT_ENDPOINT_SETUP_RECEIVED_MASK; bool is_setup = sie_read(SIE_CMDCODE_ENDPOINT_SELECT+0) & SIE_SELECT_ENDPOINT_SETUP_RECEIVED_MASK;
LPC_USB->EpIntClr = BIT_(0); LPC_USB->EpIntClr = BIT_(0);
@ -478,7 +476,7 @@ static void control_xfer_isr(uint8_t rhport, uint32_t ep_int_status)
// handle bus event signal // handle bus event signal
static void bus_event_isr(uint8_t rhport) static void bus_event_isr(uint8_t rhport)
{ {
uint8_t const dev_status = sie_read(SIE_CMDCODE_DEVICE_STATUS, 1); uint8_t const dev_status = sie_read(SIE_CMDCODE_DEVICE_STATUS);
if (dev_status & SIE_DEV_STATUS_RESET_MASK) if (dev_status & SIE_DEV_STATUS_RESET_MASK)
{ {
bus_reset(); bus_reset();
@ -583,7 +581,7 @@ void hal_dcd_isr(uint8_t rhport)
// Errors // Errors
if ( (dev_int_status & DEV_INT_ERROR_MASK) || (dma_int_status & DMA_INT_ERROR_MASK) ) if ( (dev_int_status & DEV_INT_ERROR_MASK) || (dma_int_status & DMA_INT_ERROR_MASK) )
{ {
uint32_t error_status = sie_read(SIE_CMDCODE_READ_ERROR_STATUS, 1); uint32_t error_status = sie_read(SIE_CMDCODE_READ_ERROR_STATUS);
(void) error_status; (void) error_status;
TU_BREAKPOINT(); TU_BREAKPOINT();
} }