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

fixed wrong direction to enable EP in dcd_edpt_open.

Browse Source 
fixed incorrect handling of STALL other than EP0
convert tabs to spaces
removed unused symbols
This commit is contained in:
kkitayam
2020-12-23 20:32:29 +09:00
parent 2bbfc56bd8
commit 2737166d2b
1 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/portable/nxp/khci/dcd_khci.c
View File

@@ -49,25 +49,24 @@ typedef struct TU_ATTR_PACKED
uint32_t head; uint32_t head;
struct { struct {
union { union {
uint16_t ctl;
struct { struct {
uint16_t zeros : 2; uint16_t : 2;
uint16_t tok_pid : 4; uint16_t tok_pid : 4;
uint16_t data : 1; uint16_t data : 1;
uint16_t own : 1; uint16_t own : 1;
uint16_t rsvd0 : 8; uint16_t : 8;
}; };
struct { struct {
uint16_t dmy0 : 2; uint16_t : 2;
uint16_t bdt_stall: 1; uint16_t bdt_stall: 1;
uint16_t dts : 1; uint16_t dts : 1;
uint16_t ninc : 1; uint16_t ninc : 1;
uint16_t keep : 1; uint16_t keep : 1;
uint16_t dmy1 : 10; uint16_t : 10;
}; };
}; };
uint16_t bc : 10; uint16_t bc : 10;
uint16_t rsvd1 : 6; uint16_t : 6;
}; };
}; };
uint8_t *addr; uint8_t *addr;
@@ -81,9 +80,9 @@ typedef struct TU_ATTR_PACKED
uint32_t state; uint32_t state;
struct { struct {
uint32_t max_packet_size :11; uint32_t max_packet_size :11;
uint32_t reserved0 : 5; uint32_t : 5;
uint32_t odd : 1; uint32_t odd : 1;
uint32_t reserved1 :15; uint32_t :15;
}; };
}; };
uint16_t length; uint16_t length;
@@ -137,7 +136,6 @@ static void process_stall(uint8_t rhport)
/* clear stall condition of the control pipe */ /* clear stall condition of the control pipe */
prepare_next_setup_packet(rhport); prepare_next_setup_packet(rhport);
KHCI->ENDPOINT[0].ENDPT &= ~USB_ENDPT_EPSTALL_MASK; KHCI->ENDPOINT[0].ENDPT &= ~USB_ENDPT_EPSTALL_MASK;
KHCI->ENDPOINT[1].ENDPT &= ~USB_ENDPT_EPSTALL_MASK;
} }
} }
@@ -163,6 +161,9 @@ static void process_tokdne(uint8_t rhport)
KHCI->CTL &= ~USB_CTL_TXSUSPENDTOKENBUSY_MASK; KHCI->CTL &= ~USB_CTL_TXSUSPENDTOKENBUSY_MASK;
return; return;
} }
if (s >> 4) {
TU_LOG1("TKDNE %x\r\n", s);
}
const unsigned bc = bd->bc; const unsigned bc = bd->bc;
const unsigned remaining = ep->remaining - bc; const unsigned remaining = ep->remaining - bc;
@@ -319,7 +320,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
const unsigned ep_addr = ep_desc->bEndpointAddress; const unsigned ep_addr = ep_desc->bEndpointAddress;
const unsigned epn = ep_addr & 0xFu; const unsigned epn = ep_addr & 0xFu;
const unsigned dir = ep_addr & TUSB_DIR_IN_MASK ? 1 : 0; const unsigned dir = (ep_addr & TUSB_DIR_IN_MASK) ? TUSB_DIR_IN : TUSB_DIR_OUT;
const unsigned xfer = ep_desc->bmAttributes.xfer; const unsigned xfer = ep_desc->bmAttributes.xfer;
endpoint_state_t *ep = &_dcd.endpoint[epn][dir]; endpoint_state_t *ep = &_dcd.endpoint[epn][dir];
const unsigned odd = ep->odd; const unsigned odd = ep->odd;
@@ -331,7 +332,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
ep->max_packet_size = ep_desc->wMaxPacketSize.size; ep->max_packet_size = ep_desc->wMaxPacketSize.size;
unsigned val = USB_ENDPT_EPCTLDIS_MASK; unsigned val = USB_ENDPT_EPCTLDIS_MASK;
val |= (xfer != TUSB_XFER_ISOCHRONOUS) ? USB_ENDPT_EPHSHK_MASK: 0; val |= (xfer != TUSB_XFER_ISOCHRONOUS) ? USB_ENDPT_EPHSHK_MASK: 0;
val |= dir ? USB_ENDPT_EPRXEN_MASK : USB_ENDPT_EPTXEN_MASK; val |= dir ? USB_ENDPT_EPTXEN_MASK : USB_ENDPT_EPRXEN_MASK;
KHCI->ENDPOINT[epn].ENDPT |= val; KHCI->ENDPOINT[epn].ENDPT |= val;
if (xfer != TUSB_XFER_ISOCHRONOUS) { if (xfer != TUSB_XFER_ISOCHRONOUS) {
@@ -340,6 +341,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
bd[odd ^ 1].dts = 1; bd[odd ^ 1].dts = 1;
bd[odd ^ 1].data = 1; bd[odd ^ 1].data = 1;
} }
return true; return true;
} }
@@ -348,11 +350,11 @@ void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr)
(void) rhport; (void) rhport;
const unsigned epn = ep_addr & 0xFu; const unsigned epn = ep_addr & 0xFu;
const unsigned dir = ep_addr & TUSB_DIR_IN_MASK ? 1 : 0; const unsigned dir = (ep_addr & TUSB_DIR_IN_MASK) ? TUSB_DIR_IN : TUSB_DIR_OUT;
endpoint_state_t *ep = &_dcd.endpoint[epn][dir]; endpoint_state_t *ep = &_dcd.endpoint[epn][dir];
buffer_descriptor_t *bd = &_dcd.bdt[epn][dir][0]; buffer_descriptor_t *bd = &_dcd.bdt[epn][dir][0];
const unsigned msk = dir ? USB_ENDPT_EPTXEN_MASK : USB_ENDPT_EPRXEN_MASK;
KHCI->ENDPOINT[epn].ENDPT = 0; KHCI->ENDPOINT[epn].ENDPT &= ~msk;
ep->max_packet_size = 0; ep->max_packet_size = 0;
ep->length = 0; ep->length = 0;
ep->remaining = 0; ep->remaining = 0;
@@ -396,14 +398,30 @@ void dcd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
{ {
(void) rhport; (void) rhport;
const unsigned epn = ep_addr & 0xFu; const unsigned epn = ep_addr & 0xFu;
if (0 == epn) {
KHCI->ENDPOINT[epn].ENDPT |= USB_ENDPT_EPSTALL_MASK; KHCI->ENDPOINT[epn].ENDPT |= USB_ENDPT_EPSTALL_MASK;
} else {
const unsigned dir = (ep_addr & TUSB_DIR_IN_MASK) ? TUSB_DIR_IN : TUSB_DIR_OUT;
buffer_descriptor_t *bd = _dcd.bdt[epn][dir];
bd[0].bdt_stall = 1;
bd[1].bdt_stall = 1;
}
} }
void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr) void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
{ {
(void) rhport; (void) rhport;
const unsigned epn = ep_addr & 0xFu; const unsigned epn = ep_addr & 0xFu;
KHCI->ENDPOINT[epn].ENDPT &= ~USB_ENDPT_EPSTALL_MASK; const unsigned dir = (ep_addr & TUSB_DIR_IN_MASK) ? TUSB_DIR_IN : TUSB_DIR_OUT;
const unsigned odd = _dcd.endpoint[epn][dir].odd;
buffer_descriptor_t *bd = _dcd.bdt[epn][dir];
bd[odd ^ 1].own = 0;
bd[odd ^ 1].data = 1;
bd[odd ^ 1].bdt_stall = 0;
bd[odd].own = 0;
bd[odd].data = 0;
bd[odd].bdt_stall = 0;
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+