diff options
| author | hathach <[email protected]> | 2019-09-14 11:28:50 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-14 11:28:50 +0700 |
| commit | cdc0c36c3fd5e61d4aa5a8bfb6eef15be569ff4d (patch) | |
| tree | dafcfccaf77e846401bedd5df485ef712e4bb5ef | |
| parent | de386751b5a0e2823624c41a56b87d866314b838 (diff) | |
| parent | 4ea212a432c32dedfefa79d995d2190462a27a5f (diff) | |
Merge pull request #158 from pigrew/fix_assertion_off_by_one_synopsys
Off-by-one error in Synopsys assertions. (and move some braces to the…
| -rw-r--r-- | src/portable/st/synopsys/dcd_synopsys.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/portable/st/synopsys/dcd_synopsys.c b/src/portable/st/synopsys/dcd_synopsys.c index b0e7e04bd..f15b92edc 100644 --- a/src/portable/st/synopsys/dcd_synopsys.c +++ b/src/portable/st/synopsys/dcd_synopsys.c @@ -268,21 +268,22 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt) uint8_t const epnum = tu_edpt_number(desc_edpt->bEndpointAddress); uint8_t const dir = tu_edpt_dir(desc_edpt->bEndpointAddress); - - // Unsupported endpoint numbers/size. - if((desc_edpt->wMaxPacketSize.size > 64) || (epnum > EP_MAX)) { - return false; - } - + + TU_ASSERT(desc_edpt->wMaxPacketSize.size <= 64); + TU_ASSERT(epnum < EP_MAX); + xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir); xfer->max_size = desc_edpt->wMaxPacketSize.size; - if(dir == TUSB_DIR_OUT) { + if(dir == TUSB_DIR_OUT) + { out_ep[epnum].DOEPCTL |= (1 << USB_OTG_DOEPCTL_USBAEP_Pos) | \ desc_edpt->bmAttributes.xfer << USB_OTG_DOEPCTL_EPTYP_Pos | \ desc_edpt->wMaxPacketSize.size << USB_OTG_DOEPCTL_MPSIZ_Pos; dev->DAINTMSK |= (1 << (USB_OTG_DAINTMSK_OEPM_Pos + epnum)); - } else { + } + else + { // "USB Data FIFOs" section in reference manual // Peripheral FIFO architecture // |