[rtl872x] Fixes USB serial port not being connectable on AMD based Windows

bootloader/src/rtl872x/osdep_service.cpp

@@ -30,7 +30,7 @@ particle::StaticRecursiveCriticalSectionLock sCsLock;
 thread_func_t sFunc = nullptr;
 void *sCtx = nullptr;
 
-const size_t RTW_USBD_TASK_MAIN_LOOP_SEMAPHORE_OFFSET = 364;
+const size_t RTW_USBD_TASK_MAIN_LOOP_SEMAPHORE_OFFSET = 400;
 const uint32_t RTW_USBD_TASK_MAIN_LOOP_PERIOD_MS = 1;
 
 class AtomicCountingSemaphore {

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;
     }
@@ -78,8 +78,10 @@ uint8_t endpointTypeToRtl(EndpointType type) {
     return 0;
 }
 
-const size_t RTL_USB_DEV_PCD_OFFSET = 0xd8;
-const size_t RTL_USB_PCD_SPINLOCK_OFFSET = 0x15c;
+// FIXME: it should be fine to directly use rtlDev_->pcd or &usbd_pcd, but for now keeping things as-is to keep
+// changes to a minimum
+const size_t RTL_USB_DEV_PCD_OFFSET = offsetof(usb_dev_t, pcd);
+const size_t RTL_USB_PCD_SPINLOCK_OFFSET = 0x180;
 
 } // anonymous
 
@@ -310,7 +312,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<RtlUsbDriver> lk(*self);
 

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,