usb通信成功

src/class/cdc/cdc_device.c

@@ -340,6 +340,7 @@ uint16_t cdcd_open(uint8_t rhport, const tusb_desc_interface_t* itf_desc, uint16
   // Only support ACM subclass
   TU_VERIFY( TUSB_CLASS_CDC                           == itf_desc->bInterfaceClass &&
              CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL == itf_desc->bInterfaceSubClass, 0);
+  TU_LOG(2,"CDC Interface %u\r\n", itf_desc->bInterfaceNumber);
 
   // Find available interface
   cdcd_interface_t* p_cdc;

src/osal/osal_rtthread.h

@@ -35,6 +35,14 @@
 extern "C" {
 #endif
 
+
+// Enable device interrupt
+extern void dcd_int_enable (uint8_t rhport);
+
+// Disable device interrupt
+extern void dcd_int_disable(uint8_t rhport);
+
+
 //--------------------------------------------------------------------+
 // TASK API
 //--------------------------------------------------------------------+
@@ -51,24 +59,21 @@ typedef struct rt_mutex osal_spinlock_t;
   osal_spinlock_t _name
 
 TU_ATTR_ALWAYS_INLINE static inline void osal_spin_init(osal_spinlock_t *ctx) {
-  // rt_spin_lock_init(ctx);
-  rt_mutex_init(ctx, "tusb", RT_IPC_FLAG_PRIO);
+
 }
 
 TU_ATTR_ALWAYS_INLINE static inline void osal_spin_lock(osal_spinlock_t *ctx, bool in_isr) {
   if (!TUP_MCU_MULTIPLE_CORE && in_isr) {
     return; // single core MCU does not need to lock in ISR
   }
-  // rt_spin_lock(ctx);
-  rt_mutex_take(ctx, RT_WAITING_FOREVER);
+  dcd_int_disable(1);
 }
 
 TU_ATTR_ALWAYS_INLINE static inline void osal_spin_unlock(osal_spinlock_t *ctx, bool in_isr) {
   if (!TUP_MCU_MULTIPLE_CORE && in_isr) {
     return; // single core MCU does not need to lock in ISR
   }
-  // rt_spin_unlock(ctx);
-  rt_mutex_release(ctx);
+  dcd_int_enable(1);
 }
 
 //--------------------------------------------------------------------+
@@ -163,7 +168,12 @@ TU_ATTR_ALWAYS_INLINE static inline bool osal_queue_receive(osal_queue_t qhdl, v
 
 TU_ATTR_ALWAYS_INLINE static inline bool osal_queue_send(osal_queue_t qhdl, void const *data, bool in_isr) {
   (void) in_isr;
-  return rt_mq_send(qhdl, (void *)data, qhdl->msg_size) == RT_EOK;
+  int ret;
+  ret = rt_mq_send(qhdl, (void *) data, qhdl->msg_size);
+  if (ret != RT_EOK) {
+    rt_kprintf("osal_queue_send failed ret=%d\n", ret);
+  }
+  return  ret == RT_EOK;
 }
 
 TU_ATTR_ALWAYS_INLINE static inline bool osal_queue_empty(osal_queue_t qhdl) {

src/portable/synopsys/dwc2/dwc2_common.c

@@ -85,9 +85,9 @@ static void phy_fs_init(dwc2_regs_t* dwc2) {
   gusbcfg &= ~GUSBCFG_TRDT_Msk;
   gusbcfg |= 5u << GUSBCFG_TRDT_Pos;
   // force to device mode
-  gusbcfg |= GUSBCFG_FDMOD;
+  // gusbcfg |= GUSBCFG_FDMOD;
   dwc2->gusbcfg = gusbcfg;
-  osal_task_delay(50);
+  // osal_task_delay(50);
 
   // MCU specific PHY update post reset
   dwc2_phy_update(dwc2, GHWCFG2_HSPHY_NOT_SUPPORTED);

src/portable/synopsys/dwc2/dwc2_stm32.h

@@ -273,7 +273,7 @@ static inline void dwc2_phy_update(dwc2_regs_t* dwc2, uint8_t hs_phy_type) {
       turnaround = 0xCu;
     }
     else if (SystemCoreClock >= 16000000u) {
-      turnaround = 0xfu;
+      turnaround = 0xdu;
     }
     else if (SystemCoreClock >= 15000000u) {
       turnaround = 0xEu;