From fe0e79864b3d3194408aa6efcc35ba403b5427be Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 2 Mar 2018 22:53:26 +0700 Subject: [PATCH] add config number --- hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c | 2 +- tinyusb/device/dcd.h | 2 +- tinyusb/device/dcd_lpc175x_6x.c | 3 ++- tinyusb/device/dcd_lpc_11uxx_13uxx.c | 2 +- tinyusb/device/usbd.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c b/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c index 6a5117c3..27477418 100644 --- a/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c +++ b/hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c @@ -194,7 +194,7 @@ void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr) LPC_USB[coreid]->DEVICEADDR = (dev_addr << 25) | BIT_(24); } -void hal_dcd_set_config(uint8_t coreid) +void hal_dcd_set_config(uint8_t coreid, uint8_t config_num) { } diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h index 6bbfc821..c4cce0db 100644 --- a/tinyusb/device/dcd.h +++ b/tinyusb/device/dcd.h @@ -76,7 +76,7 @@ void dcd_isr(uint8_t coreid); void hal_dcd_connect (uint8_t coreid); void hal_dcd_disconnect (uint8_t coreid); void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr); -void hal_dcd_set_config (uint8_t coreid); +void hal_dcd_set_config (uint8_t coreid, uint8_t config_num); //------------- PIPE API -------------// tusb_error_t dcd_pipe_control_xfer(uint8_t coreid, tusb_direction_t dir, uint8_t * p_buffer, uint16_t length, bool int_on_complete); diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c index 9131b36c..ef9c583e 100644 --- a/tinyusb/device/dcd_lpc175x_6x.c +++ b/tinyusb/device/dcd_lpc175x_6x.c @@ -292,9 +292,10 @@ void hal_dcd_set_address(uint8_t coreid, uint8_t dev_addr) sie_write(SIE_CMDCODE_SET_ADDRESS, 1, 0x80 | dev_addr); // 7th bit is : device_enable } -void hal_dcd_set_config(uint8_t coreid) +void hal_dcd_set_config(uint8_t coreid, uint8_t config_num) { (void) coreid; + (void) config_num; sie_write(SIE_CMDCODE_CONFIGURE_DEVICE, 1, 1); } diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c index cb0ce2ee..3d541d65 100644 --- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c +++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c @@ -170,7 +170,7 @@ void hal_dcd_connect(uint8_t coreid) LPC_USB->DEVCMDSTAT |= CMDSTAT_DEVICE_CONNECT_MASK; } -void hal_dcd_set_config(uint8_t coreid) +void hal_dcd_set_config(uint8_t coreid, uint8_t config_num) { } diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index 00495f04..48dd57eb 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -321,7 +321,7 @@ tusb_error_t usbd_control_request_subtask(uint8_t coreid, tusb_control_request_t // may need to open interface before set configured static tusb_error_t usbd_set_configure_received(uint8_t coreid, uint8_t config_number) { - hal_dcd_set_config(coreid); + hal_dcd_set_config(coreid, config_number); usbd_devices[coreid].state = TUSB_DEVICE_STATE_CONFIGURED; //------------- parse configuration & open drivers -------------//