diff options
-rw-r--r-- | example-cdc/usb-cdc.c | 3 | ||||
-rw-r--r-- | example-fs-bb48/usb-cdc.c | 3 | ||||
-rw-r--r-- | mcu/usb-mkl27z.c | 7 | ||||
-rw-r--r-- | mcu/usb-stm32f103.c | 2 | ||||
-rw-r--r-- | usb_lld.h | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/example-cdc/usb-cdc.c b/example-cdc/usb-cdc.c index 073dae8..b132d8d 100644 --- a/example-cdc/usb-cdc.c +++ b/example-cdc/usb-cdc.c @@ -516,12 +516,11 @@ tty_echo_char (struct tty *t, int c) void -usb_cb_tx_done (uint8_t ep_num, uint32_t len, int success) +usb_cb_tx_done (uint8_t ep_num, uint32_t len) { struct tty *t = tty_get (-1, ep_num); (void)len; - (void)success; /* Always, successful. */ if (ep_num == ENDP1) { diff --git a/example-fs-bb48/usb-cdc.c b/example-fs-bb48/usb-cdc.c index 67a6e0e..39c589a 100644 --- a/example-fs-bb48/usb-cdc.c +++ b/example-fs-bb48/usb-cdc.c @@ -512,12 +512,11 @@ tty_echo_char (struct tty *t, int c) } void -usb_cb_tx_done (uint8_t ep_num, uint32_t len, int success) +usb_cb_tx_done (uint8_t ep_num, uint32_t len) { struct tty *t = tty_get (-1, ep_num); (void)len; - (void)success; /* Always, successful. */ if (ep_num == ENDP1) { diff --git a/mcu/usb-mkl27z.c b/mcu/usb-mkl27z.c index 5a21dd8..9f0021a 100644 --- a/mcu/usb-mkl27z.c +++ b/mcu/usb-mkl27z.c @@ -896,11 +896,14 @@ handle_transaction (uint8_t stat) uint32_t len = (BD_table[4*ep_num+2+odd].ctrl >> 16)&0x3ff; if (!success) - USB_CTRL1->ERRSTAT = dmaerr; /* Clear error. */ + { + USB_CTRL1->ERRSTAT = dmaerr; /* Clear error. */ + dev_p->error++; + } dev_p->send++; ep[ep_num].tx_odd ^= 1; - usb_cb_tx_done (ep_num, len, success); + usb_cb_tx_done (ep_num, len); } USB_CTRL1->ISTAT = USB_IS_TOKDNE; diff --git a/mcu/usb-stm32f103.c b/mcu/usb-stm32f103.c index 02be1cf..3d11ef8 100644 --- a/mcu/usb-stm32f103.c +++ b/mcu/usb-stm32f103.c @@ -888,7 +888,7 @@ usb_handle_transfer (uint16_t istr_value) uint32_t len = st103_get_tx_count (ep_index); st103_ep_clear_ctr_tx (ep_index); - usb_cb_tx_done (ep_index, len, 1); + usb_cb_tx_done (ep_index, len); } } } @@ -57,7 +57,7 @@ int usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index, int usb_cb_handle_event (uint8_t event_type, uint16_t value); void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, struct req_args *arg); -void usb_cb_tx_done (uint8_t ep_num, uint32_t len, int success); +void usb_cb_tx_done (uint8_t ep_num, uint32_t len); void usb_cb_rx_ready (uint8_t ep_num); enum { |