diff --git a/hal/src/rtl872x/usbd_driver.cpp b/hal/src/rtl872x/usbd_driver.cpp index 5e5eba4b5e..f8690b53ad 100644 --- a/hal/src/rtl872x/usbd_driver.cpp +++ b/hal/src/rtl872x/usbd_driver.cpp @@ -45,15 +45,15 @@ namespace { SetupRequest sLastUsbSetupRequest = {}; -Speed rtlSpeedToDriver(usbd_speed_type_t speed) { +Speed rtlSpeedToDriver(usb_speed_type_t speed) { switch (speed) { - case USBD_SPEED_HIGH: { + case USB_SPEED_HIGH: { return Speed::HIGH; } - case USBD_SPEED_LOW: { + case USB_SPEED_LOW: { return Speed::LOW; } - case USBD_SPEED_FULL: + case USB_SPEED_FULL: default: { return Speed::FULL; } @@ -310,7 +310,7 @@ unsigned RtlUsbDriver::updateEndpointMask(unsigned mask) const { return mask; } -uint8_t* RtlUsbDriver::getDescriptorCb(usb_setup_req_t *req, usbd_speed_type_t speed, uint16_t* len) { +uint8_t* RtlUsbDriver::getDescriptorCb(usb_setup_req_t *req, usb_speed_type_t speed, uint16_t* len) { auto self = instance(); std::lock_guard lk(*self); diff --git a/hal/src/rtl872x/usbd_driver.h b/hal/src/rtl872x/usbd_driver.h index 511d7dd4bf..795854f5d1 100644 --- a/hal/src/rtl872x/usbd_driver.h +++ b/hal/src/rtl872x/usbd_driver.h @@ -75,7 +75,7 @@ class RtlUsbDriver : public DeviceDriver { RtlUsbDriver(); virtual ~RtlUsbDriver(); - static uint8_t* getDescriptorCb(usb_setup_req_t *req, usbd_speed_type_t speed, uint16_t* len); + static uint8_t* getDescriptorCb(usb_setup_req_t *req, usb_speed_type_t speed, uint16_t* len); static uint8_t setConfigCb(usb_dev_t* dev, uint8_t config); static uint8_t clearConfigCb(usb_dev_t* dev, uint8_t config); static uint8_t setupCb(usb_dev_t* dev, usb_setup_req_t* req); @@ -104,8 +104,7 @@ class RtlUsbDriver : public DeviceDriver { .rx_fifo_size = USBD_MAX_RX_FIFO_SIZE, .nptx_fifo_size = USBD_MAX_NPTX_FIFO_SIZE, .ptx_fifo_size = USBD_MAX_PTX_FIFO_SIZE, - .intr_use_ptx_fifo = 1, // ? - .speed = USBD_SPEED_FULL, + .speed = USB_SPEED_FULL, .dma_enable = 0, // ? .self_powered = 1, .isr_priority = RTL_USBD_ISR_PRIORITY, @@ -116,6 +115,8 @@ class RtlUsbDriver : public DeviceDriver { .set_config = &setConfigCb, .clear_config = &clearConfigCb, .setup = &setupCb, + .get_class_descriptor = nullptr, + .clear_feature = nullptr, .sof = nullptr, // This is not delivered .suspend = &suspendCb, .resume = &resumeCb, diff --git a/third_party/ambd_sdk/ambd_sdk b/third_party/ambd_sdk/ambd_sdk index 7e148162ed..7415d4b438 160000 --- a/third_party/ambd_sdk/ambd_sdk +++ b/third_party/ambd_sdk/ambd_sdk @@ -1 +1 @@ -Subproject commit 7e148162ed6b06a72b1b44332da321d6e26c095f +Subproject commit 7415d4b438f111bf133425d7750321e5177bf467