V2.0

2024-02-26 13:22:09 +08:00
parent 0ad592325e
commit 9596a13c17
573 changed files with 36301 additions and 23003 deletions
@@ -22,6 +22,9 @@ void HardFault_Handler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
 */
 void NMI_Handler(void)
 {
+  while (1)
+  {
+  }
 }

 /*********************************************************************
@@ -111,10 +111,10 @@ static void SetSysClockTo144_HSI( void );
 void SystemInit (void)
 {
  RCC->CTLR |= (uint32_t)0x00000001;
-  RCC->CFGR0 &= (uint32_t)0xF8FF0000;
+  RCC->CFGR0 &= (uint32_t)0xF0FF0000;
  RCC->CTLR &= (uint32_t)0xFEF6FFFF;
  RCC->CTLR &= (uint32_t)0xFFFBFFFF;
-  RCC->CFGR0 &= (uint32_t)0xFF80FFFF;
+  RCC->CFGR0 &= (uint32_t)0xFF00FFFF;
  RCC->INTR = 0x009F0000;    
  SetSysClock();
 }
@@ -152,5 +152,5 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
+	
 </cproject>
@@ -93,8 +93,6 @@ extern "C" {
 /* Flash Operation Key Variables, Operation with DEF_FLASH_OPERATION_KEY_CODE_x to ensure the correctness of flash operation*/
 extern volatile uint32_t Flash_Operation_Key0;                                   /* IAP Flash operation Key-code Variables 0 */
 extern volatile uint32_t Flash_Operation_Key1;                                   /* IAP Flash operation Key-code Variables 1 */
-extern __attribute__((aligned(4))) uint8_t  USBHD_TX_Buf[ MAX_PACKET_SIZE ] ;  // IN, must even address
-extern __attribute__((aligned(4))) uint8_t  USBHD_RX_Buf[ MAX_PACKET_SIZE ] ;  // OUT, must even address

 /*******************************************************************************/
 /* Data Structures */
@@ -41,7 +41,7 @@ void USBFS_RCC_Init( void )
    {
        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div1 );
    }
-    RCC_AHBPeriphClockCmd( RCC_AHBPeriph_OTG_FS, ENABLE );
+    RCC_AHBPeriphClockCmd( RCC_AHBPeriph_USBFS, ENABLE );
 }
 /*********************************************************************
 * @fn      USBFS_Host_Init
@@ -56,25 +56,25 @@ void USBFS_Host_Init( FunctionalState sta )
 {
    if( sta == ENABLE )
    {
-        USBOTG_H_FS->BASE_CTRL = USBFS_UC_HOST_MODE;
-        USBOTG_H_FS->HOST_CTRL = 0;
-        USBOTG_H_FS->DEV_ADDR = 0;
-        USBOTG_H_FS->HOST_EP_MOD = USBFS_UH_EP_TX_EN | USBFS_UH_EP_RX_EN;
+        USBFSH->BASE_CTRL = USBFS_UC_HOST_MODE;
+        USBFSH->HOST_CTRL = 0;
+        USBFSH->DEV_ADDR = 0;
+        USBFSH->HOST_EP_MOD = USBFS_UH_EP_TX_EN | USBFS_UH_EP_RX_EN;

-        USBOTG_H_FS->HOST_RX_DMA = (uint32_t)USBFS_RX_Buf;
-        USBOTG_H_FS->HOST_TX_DMA = (uint32_t)USBFS_TX_Buf;
+        USBFSH->HOST_RX_DMA = (uint32_t)USBFS_RX_Buf;
+        USBFSH->HOST_TX_DMA = (uint32_t)USBFS_TX_Buf;

-        USBOTG_H_FS->HOST_RX_CTRL = 0;
-        USBOTG_H_FS->HOST_TX_CTRL = 0;
-        USBOTG_H_FS->BASE_CTRL = USBFS_UC_HOST_MODE | USBFS_UC_INT_BUSY | USBFS_UC_DMA_EN;
+        USBFSH->HOST_RX_CTRL = 0;
+        USBFSH->HOST_TX_CTRL = 0;
+        USBFSH->BASE_CTRL = USBFS_UC_HOST_MODE | USBFS_UC_INT_BUSY | USBFS_UC_DMA_EN;

-        USBOTG_H_FS->INT_FG = 0xFF;
+        USBFSH->INT_FG = 0xFF;

-        USBOTG_H_FS->INT_EN = USBFS_UIE_TRANSFER | USBFS_UIE_DETECT;
+        USBFSH->INT_EN = USBFS_UIE_TRANSFER | USBFS_UIE_DETECT;
    }
    else
    {
-        USBOTG_H_FS->BASE_CTRL = USBFS_UC_RESET_SIE | USBFS_UC_CLR_ALL;
+        USBFSH->BASE_CTRL = USBFS_UC_RESET_SIE | USBFS_UC_CLR_ALL;
    }
 }

@@ -90,10 +90,10 @@ void USBFS_Host_Init( FunctionalState sta )
 uint8_t USBFSH_CheckRootHubPortStatus( uint8_t dev_sta )
 {
    /* Check USB device connection or disconnection */
-    if( ( USBOTG_H_FS->INT_FG ) & USBFS_UIF_DETECT )
+    if( ( USBFSH->INT_FG ) & USBFS_UIF_DETECT )
    {
-        USBOTG_H_FS->INT_FG = USBFS_UIF_DETECT; // Clear flag
-        if( USBOTG_H_FS->MIS_ST & USBFS_UMS_DEV_ATTACH ) // Check that the USB device has been connected to the port
+        USBFSH->INT_FG = USBFS_UIF_DETECT; // Clear flag
+        if( USBFSH->MIS_ST & USBFS_UMS_DEV_ATTACH ) // Check that the USB device has been connected to the port
        {
            if( ( dev_sta == ROOT_DEV_DISCONNECT ) || ( ( dev_sta != ROOT_DEV_FAILED ) && ( USBFSH_CheckRootHubPortEnable( ) == 0x00 ) ) )
            {
@@ -124,7 +124,7 @@ uint8_t USBFSH_CheckRootHubPortStatus( uint8_t dev_sta )
 */
 uint8_t USBFSH_CheckRootHubPortEnable( void )
 {
-    return ( USBOTG_H_FS->HOST_CTRL & USBFS_UH_PORT_EN );
+    return ( USBFSH->HOST_CTRL & USBFS_UH_PORT_EN );
 }

 /*********************************************************************
@@ -136,7 +136,7 @@ uint8_t USBFSH_CheckRootHubPortEnable( void )
 */
 uint8_t USBFSH_CheckRootHubPortSpeed( void )
 {
-    return ( USBOTG_H_FS->MIS_ST & USBFS_UMS_DM_LEVEL? USB_LOW_SPEED: USB_FULL_SPEED );
+    return ( USBFSH->MIS_ST & USBFS_UMS_DM_LEVEL? USB_LOW_SPEED: USB_FULL_SPEED );
 }

 /*********************************************************************
@@ -150,7 +150,7 @@ uint8_t USBFSH_CheckRootHubPortSpeed( void )
 */
 void USBFSH_SetSelfAddr( uint8_t addr )
 {
-    USBOTG_H_FS->DEV_ADDR = ( USBOTG_H_FS->DEV_ADDR & USBFS_UDA_GP_BIT ) | ( addr & USBFS_USB_ADDR_MASK );
+    USBFSH->DEV_ADDR = ( USBFSH->DEV_ADDR & USBFS_UDA_GP_BIT ) | ( addr & USBFS_USB_ADDR_MASK );
 }

 /*********************************************************************
@@ -166,12 +166,12 @@ void USBFSH_SetSelfSpeed( uint8_t speed )
 {
    if( speed )
    {
-        USBOTG_H_FS->BASE_CTRL &= ~USBFS_UC_LOW_SPEED;
-        USBOTG_H_FS->HOST_SETUP &= ~USBFS_UH_PRE_PID_EN;
+        USBFSH->BASE_CTRL &= ~USBFS_UC_LOW_SPEED;
+        USBFSH->HOST_SETUP &= ~USBFS_UH_PRE_PID_EN;
    }
    else
    {
-        USBOTG_H_FS->BASE_CTRL |= USBFS_UC_LOW_SPEED;
+        USBFSH->BASE_CTRL |= USBFS_UC_LOW_SPEED;
    }
 }

@@ -193,7 +193,7 @@ void USBFSH_ResetRootHubPort( uint8_t mode )
    USBFSH_SetSelfSpeed( 1 );
    if( mode <= 1 )
    {
-        USBOTG_H_FS->HOST_CTRL = ( USBOTG_H_FS->HOST_CTRL & ~USBFS_UH_LOW_SPEED ) | USBFS_UH_BUS_RESET;
+        USBFSH->HOST_CTRL = ( USBFSH->HOST_CTRL & ~USBFS_UH_LOW_SPEED ) | USBFS_UH_BUS_RESET;
    }
    if( mode == 0 )
    {
@@ -201,10 +201,10 @@ void USBFSH_ResetRootHubPort( uint8_t mode )
    }
    if( mode != 1 )
    {
-        USBOTG_H_FS->HOST_CTRL = USBOTG_H_FS->HOST_CTRL & ~USBFS_UH_BUS_RESET; // End Reset
+        USBFSH->HOST_CTRL = USBFSH->HOST_CTRL & ~USBFS_UH_BUS_RESET; // End Reset
    }
    Delay_Ms( 2 );
-    USBOTG_H_FS->INT_FG = USBFS_UIF_DETECT;
+    USBFSH->INT_FG = USBFS_UIF_DETECT;
 }

 /*********************************************************************
@@ -218,18 +218,18 @@ void USBFSH_ResetRootHubPort( uint8_t mode )
 */
 uint8_t USBFSH_EnableRootHubPort( uint8_t *pspeed )
 {
-    if( USBOTG_H_FS->MIS_ST & USBFS_UMS_DEV_ATTACH )
+    if( USBFSH->MIS_ST & USBFS_UMS_DEV_ATTACH )
    {
        if( USBFSH_CheckRootHubPortEnable( ) == 0x00 )
        { 
            *pspeed = USBFSH_CheckRootHubPortSpeed( );
            if( *pspeed == 0 )
            {
-                USBOTG_H_FS->HOST_CTRL |= USBFS_UH_LOW_SPEED;
+                USBFSH->HOST_CTRL |= USBFS_UH_LOW_SPEED;
            }
        }
-        USBOTG_H_FS->HOST_CTRL |= USBFS_UH_PORT_EN;
-        USBOTG_H_FS->HOST_SETUP |= USBFS_UH_SOF_EN;
+        USBFSH->HOST_CTRL |= USBFS_UH_PORT_EN;
+        USBFSH->HOST_SETUP |= USBFS_UH_SOF_EN;

        return ERR_SUCCESS;
    }
@@ -253,29 +253,29 @@ uint8_t USBFSH_Transact( uint8_t endp_pid, uint8_t endp_tog, uint16_t timeout )
    uint8_t  r, trans_rerty;
    uint16_t i;

-    USBOTG_H_FS->HOST_TX_CTRL = USBOTG_H_FS->HOST_RX_CTRL = endp_tog;
+    USBFSH->HOST_TX_CTRL = USBFSH->HOST_RX_CTRL = endp_tog;
    trans_rerty = 0;
    do
    {
-        USBOTG_H_FS->HOST_EP_PID = endp_pid;       // Specify token PID and endpoint number
-        USBOTG_H_FS->INT_FG = USBFS_UIF_TRANSFER;  // Allow transmission
-        for( i = DEF_WAIT_USB_TOUT_200US; ( i != 0 ) && ( ( USBOTG_H_FS->INT_FG & USBFS_UIF_TRANSFER ) == 0 ); i-- )
+        USBFSH->HOST_EP_PID = endp_pid;       // Specify token PID and endpoint number
+        USBFSH->INT_FG = USBFS_UIF_TRANSFER;  // Allow transmission
+        for( i = DEF_WAIT_USB_TOUT_200US; ( i != 0 ) && ( ( USBFSH->INT_FG & USBFS_UIF_TRANSFER ) == 0 ); i-- )
        {
            Delay_Us( 1 );
        }
-        USBOTG_H_FS->HOST_EP_PID = 0x00;  // Stop USB transfer
-        if( ( USBOTG_H_FS->INT_FG & USBFS_UIF_TRANSFER ) == 0 )
+        USBFSH->HOST_EP_PID = 0x00;  // Stop USB transfer
+        if( ( USBFSH->INT_FG & USBFS_UIF_TRANSFER ) == 0 )
        {
            return ERR_USB_UNKNOWN;
        }
        else
        {
            /* Complete transfer */
-            if( USBOTG_H_FS->INT_ST & USBFS_UIS_TOG_OK )
+            if( USBFSH->INT_ST & USBFS_UIS_TOG_OK )
            {
                return ERR_SUCCESS;
            }
-            r = USBOTG_H_FS->INT_ST & USBFS_UIS_H_RES_MASK;  // USB device answer status
+            r = USBFSH->INT_ST & USBFS_UIS_H_RES_MASK;  // USB device answer status
            if( r == USB_PID_STALL )
            {
                return ( r | ERR_USB_TRANSFER );
@@ -316,7 +316,7 @@ uint8_t USBFSH_Transact( uint8_t endp_pid, uint8_t endp_tog, uint16_t timeout )
            }
        } 
        Delay_Us( 15 );
-        if( USBOTG_H_FS->INT_FG & USBFS_UIF_DETECT )
+        if( USBFSH->INT_FG & USBFS_UIF_DETECT )
        {
            Delay_Us( 200 );
            if( USBFSH_CheckRootHubPortEnable( ) == 0 )
@@ -349,14 +349,14 @@ uint8_t USBFSH_CtrlTransfer( uint8_t ep0_size, uint8_t *pbuf, uint16_t *plen )
    {
        *plen = 0;
    }
-    USBOTG_H_FS->HOST_TX_LEN = sizeof( USB_SETUP_REQ );
+    USBFSH->HOST_TX_LEN = sizeof( USB_SETUP_REQ );
    s = USBFSH_Transact( USB_PID_SETUP << 4 | 0x00, 0x00, DEF_CTRL_TRANS_TIMEOVER_CNT );  // SETUP stage, 200mS timeout
    if( s != ERR_SUCCESS )
    {
        return s;
    }
-    USBOTG_H_FS->HOST_TX_CTRL = USBOTG_H_FS->HOST_RX_CTRL = USBFS_UH_T_TOG | USBFS_UH_R_TOG | USBFS_UH_T_AUTO_TOG | USBFS_UH_R_AUTO_TOG; // Default DATA1
-    USBOTG_H_FS->HOST_TX_LEN = 0x01; // The default no-data state stage is IN
+    USBFSH->HOST_TX_CTRL = USBFSH->HOST_RX_CTRL = USBFS_UH_T_TOG | USBFS_UH_R_TOG | USBFS_UH_T_AUTO_TOG | USBFS_UH_R_AUTO_TOG; // Default DATA1
+    USBFSH->HOST_TX_LEN = 0x01; // The default no-data state stage is IN
    rem_len = pUSBFS_SetupRequest->wLength;
    if( rem_len && pbuf )
    {
@@ -366,12 +366,12 @@ uint8_t USBFSH_CtrlTransfer( uint8_t ep0_size, uint8_t *pbuf, uint16_t *plen )
            while( rem_len )
            {
                Delay_Us( 100 );
-                s = USBFSH_Transact( USB_PID_IN << 4 | 0x00, USBOTG_H_FS->HOST_RX_CTRL, DEF_CTRL_TRANS_TIMEOVER_CNT );  // IN
+                s = USBFSH_Transact( USB_PID_IN << 4 | 0x00, USBFSH->HOST_RX_CTRL, DEF_CTRL_TRANS_TIMEOVER_CNT );  // IN
                if( s != ERR_SUCCESS )
                {
                    return s;
                }
-                rx_len = ( USBOTG_H_FS->RX_LEN < rem_len )? USBOTG_H_FS->RX_LEN : rem_len;
+                rx_len = ( USBFSH->RX_LEN < rem_len )? USBFSH->RX_LEN : rem_len;
                rem_len -= rx_len;
                if( plen )
                {
@@ -383,12 +383,12 @@ uint8_t USBFSH_CtrlTransfer( uint8_t ep0_size, uint8_t *pbuf, uint16_t *plen )
                    pbuf++;
                }

-                if( ( USBOTG_H_FS->RX_LEN == 0 ) || ( USBOTG_H_FS->RX_LEN & ( ep0_size - 1 ) ) )
+                if( ( USBFSH->RX_LEN == 0 ) || ( USBFSH->RX_LEN & ( ep0_size - 1 ) ) )
                {
                    break; // Short package
                }
            }
-            USBOTG_H_FS->HOST_TX_LEN = 0x00; // Status stage is OUT
+            USBFSH->HOST_TX_LEN = 0x00; // Status stage is OUT
        }
        else
        {
@@ -396,36 +396,36 @@ uint8_t USBFSH_CtrlTransfer( uint8_t ep0_size, uint8_t *pbuf, uint16_t *plen )
            while( rem_len )
            {
                Delay_Us( 100 );
-                USBOTG_H_FS->HOST_TX_LEN = ( rem_len >= ep0_size )? ep0_size : rem_len;
-                for( tx_cnt = 0; tx_cnt != USBOTG_H_FS->HOST_TX_LEN; tx_cnt++ )
+                USBFSH->HOST_TX_LEN = ( rem_len >= ep0_size )? ep0_size : rem_len;
+                for( tx_cnt = 0; tx_cnt != USBFSH->HOST_TX_LEN; tx_cnt++ )
                {
                    USBFS_TX_Buf[ tx_cnt ] = *pbuf;
                    pbuf++;
                }
-                s = USBFSH_Transact( USB_PID_OUT << 4 | 0x00, USBOTG_H_FS->HOST_TX_CTRL, DEF_CTRL_TRANS_TIMEOVER_CNT ); // OUT
+                s = USBFSH_Transact( USB_PID_OUT << 4 | 0x00, USBFSH->HOST_TX_CTRL, DEF_CTRL_TRANS_TIMEOVER_CNT ); // OUT
                if( s != ERR_SUCCESS )
                {
                    return s;
                }
-                rem_len -= USBOTG_H_FS->HOST_TX_LEN;
+                rem_len -= USBFSH->HOST_TX_LEN;
                if( plen )
                {
-                    *plen += USBOTG_H_FS->HOST_TX_LEN; // The total length of the actual successful transmission and reception
+                    *plen += USBFSH->HOST_TX_LEN; // The total length of the actual successful transmission and reception
                }
            }
        }
    }
    Delay_Us( 100 );
-    s = USBFSH_Transact( ( USBOTG_H_FS->HOST_TX_LEN )? ( USB_PID_IN << 4 | 0x00 ) : ( USB_PID_OUT << 4 | 0x00 ), USBFS_UH_R_TOG | USBFS_UH_T_TOG, DEF_CTRL_TRANS_TIMEOVER_CNT );  /* STATUS½×¶Î */
+    s = USBFSH_Transact( ( USBFSH->HOST_TX_LEN )? ( USB_PID_IN << 4 | 0x00 ) : ( USB_PID_OUT << 4 | 0x00 ), USBFS_UH_R_TOG | USBFS_UH_T_TOG, DEF_CTRL_TRANS_TIMEOVER_CNT );  /* STATUS½×¶Î */
    if( s != ERR_SUCCESS )
    {
        return s;
    }
-    if( USBOTG_H_FS->HOST_TX_LEN == 0 )
+    if( USBFSH->HOST_TX_LEN == 0 )
    {
        return ERR_SUCCESS;
    }
-    if( USBOTG_H_FS->RX_LEN == 0 )
+    if( USBFSH->RX_LEN == 0 )
    {
        return ERR_SUCCESS;
    }
@@ -619,7 +619,7 @@ uint8_t USBFSH_GetEndpData( uint8_t endp_num, uint8_t *pendp_tog, uint8_t *pbuf,
    if( s == ERR_SUCCESS )
    {
        *pendp_tog ^= USBFS_UH_T_TOG | USBFS_UH_R_TOG;
-        *plen = USBOTG_H_FS->RX_LEN;
+        *plen = USBFSH->RX_LEN;
        memcpy( pbuf, USBFS_RX_Buf, *plen );
    }
    
@@ -643,7 +643,7 @@ uint8_t USBFSH_SendEndpData( uint8_t endp_num, uint8_t *pendp_tog, uint8_t *pbuf
    uint8_t  s;
    
    memcpy( USBFS_TX_Buf, pbuf, len );
-    USBOTG_H_FS->HOST_TX_LEN = len;
+    USBFSH->HOST_TX_LEN = len;
    
    s = USBFSH_Transact( ( USB_PID_OUT << 4 ) | endp_num, *pendp_tog, 0 );
    if( s == ERR_SUCCESS )
@@ -3,7 +3,7 @@
 * Author             : WCH
 * Version            : V1.0.0
 * Date               : 2021/06/06
-* Description        : USBOTG full speed host header file
+* Description        : USBFS firmware full speed host header file
 *********************************************************************************
 * Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd.
 * Attention: This software (modified or not) and binary are used for 
@@ -24,6 +24,9 @@ void SW_Handler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
 */
 void NMI_Handler(void)
 {
+  while (1)
+  {
+  }
 }

 /*********************************************************************
@@ -33,7 +33,7 @@ int main(void)
    USART_Printf_Init(115200);
    Delay_Init( );
    printf("SystemClk:%d\r\n",SystemCoreClock);
-    printf("USBFS-OTG HOST,UDisk IAP.\r\n");
+    printf("USBFS HOST,UDisk IAP.\r\n");

    IAP_Initialization( );

@@ -111,10 +111,10 @@ static void SetSysClockTo144_HSI( void );
 void SystemInit (void)
 {
  RCC->CTLR |= (uint32_t)0x00000001;
-  RCC->CFGR0 &= (uint32_t)0xF8FF0000;
+  RCC->CFGR0 &= (uint32_t)0xF0FF0000;
  RCC->CTLR &= (uint32_t)0xFEF6FFFF;
  RCC->CTLR &= (uint32_t)0xFFFBFFFF;
-  RCC->CFGR0 &= (uint32_t)0xFF80FFFF;
+  RCC->CFGR0 &= (uint32_t)0xFF00FFFF;
  RCC->INTR = 0x009F0000;    
  SetSysClock();
 }