From 9a487a238a6c3fb99383c05fd1bb15ae16bf3349 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 21 Mar 2018 15:36:44 +0700 Subject: [PATCH] remove int_on_complete for tusb_dcd_control_xfer --- hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c | 2 +- hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c | 2 +- tinyusb/device/usbd.c | 2 +- tinyusb/device/usbd.h | 2 +- tinyusb/tusb_dcd.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c b/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c index 03d3a2e97..f1a9d5492 100644 --- a/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c +++ b/hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c @@ -330,7 +330,7 @@ static void control_xact_start(void) //} -bool tusb_dcd_control_xfer (uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length, bool int_on_complete) +bool tusb_dcd_control_xfer (uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length) { (void) port; diff --git a/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c b/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c index 8fa0d6f4e..e44fb8cdd 100644 --- a/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c +++ b/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c @@ -237,7 +237,7 @@ void tusb_dcd_control_stall(uint8_t port) // control transfer does not need to use qtd find function // follows UM 24.10.8.1.1 Setup packet handling using setup lockout mechanism -bool tusb_dcd_control_xfer(uint8_t port, tusb_dir_t dir, uint8_t * p_buffer, uint16_t length, bool int_on_complete) +bool tusb_dcd_control_xfer(uint8_t port, tusb_dir_t dir, uint8_t * p_buffer, uint16_t length) { LPC_USB0_Type* const lpc_usb = LPC_USB[port]; dcd_data_t* const p_dcd = dcd_data_ptr[port]; diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index eddd29a1d..5ff677b97 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -295,7 +295,7 @@ tusb_error_t usbd_control_xfer_substak(uint8_t port, tusb_dir_t dir, uint8_t * b // Data if ( length ) { - tusb_dcd_control_xfer(port, dir, buffer, length, true); + tusb_dcd_control_xfer(port, dir, buffer, length); osal_semaphore_wait( usbd_control_xfer_sem_hdl, 100, &error ); SUBTASK_ASSERT_STATUS( error ); diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h index 6585020c2..f86a3b0a8 100644 --- a/tinyusb/device/usbd.h +++ b/tinyusb/device/usbd.h @@ -134,7 +134,7 @@ tusb_error_t usbd_control_xfer_substak(uint8_t port, tusb_dir_t dir, uint8_t * b static inline bool usbd_control_status(uint8_t port, tusb_dir_t dir) { - return tusb_dcd_control_xfer(port, dir, NULL, 0, false); + return tusb_dcd_control_xfer(port, dir, NULL, 0); } tusb_error_t usbd_init(void); diff --git a/tinyusb/tusb_dcd.h b/tinyusb/tusb_dcd.h index 5f79693ca..077c4db29 100644 --- a/tinyusb/tusb_dcd.h +++ b/tinyusb/tusb_dcd.h @@ -80,7 +80,7 @@ void tusb_dcd_xfer_complete (uint8_t port, uint8_t edpt_addr, uint32_t xferre *------------------------------------------------------------------*/ //------------- Control Endpoint -------------// -bool tusb_dcd_control_xfer (uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length, bool int_on_complete); +bool tusb_dcd_control_xfer (uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length); void tusb_dcd_control_stall (uint8_t port); //------------- Other Endpoints -------------//