V2.2

EVT/EXAM/USB/USBFS/HOST_Udisk/User/USB_Host/ch32v20x_usbfs_host.c

@@ -23,24 +23,32 @@ __attribute__((aligned(4))) uint8_t  TxBuffer[ MAX_PACKET_SIZE ];           // O
 /*********************************************************************
  * @fn      USBFS_RCC_Init
  *
- * @brief   Set USB port clock.
+ * @brief   Initializes the usbfs clock configuration.
  *
  * @return  none
  */
 void USBFS_RCC_Init( void )
 {
-    if( SystemCoreClock == 144000000 )
+    RCC_ClocksTypeDef RCC_ClocksStatus={0};
+    RCC_GetClocksFreq(&RCC_ClocksStatus);
+    if( RCC_ClocksStatus.SYSCLK_Frequency == 144000000 )
     {
         RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div3 );
     }
-    else if( SystemCoreClock == 96000000 )
+    else if( RCC_ClocksStatus.SYSCLK_Frequency == 96000000 ) 
     {
         RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div2 );
     }
-    else if( SystemCoreClock == 48000000 )
+    else if( RCC_ClocksStatus.SYSCLK_Frequency == 48000000 ) 
     {
         RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div1 );
     }
+#if defined(CH32V20x_D8W) || defined(CH32V20x_D8)
+    else if ( RCC_ClocksStatus.SYSCLK_Frequency == 240000000 && RCC_USB5PRE_JUDGE() == SET )
+    {
+        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div5 );
+    }
+#endif
     RCC_AHBPeriphClockCmd( RCC_AHBPeriph_USBFS, ENABLE );
 }
 /*********************************************************************

EVT/EXAM/USB/USBFS/HOST_Udisk/User/ch32v20x_it.c

@@ -36,6 +36,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/USB/USBFS/HOST_Udisk/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }