瀏覽代碼

fix warning

sakumisu 3 年之前
父節點
當前提交
66abda8576
共有 2 個文件被更改,包括 18 次插入18 次删除
  1. 1 1
      core/usbd_core.c
  2. 17 17
      port/musb/usb_musb_reg.h

+ 1 - 1
core/usbd_core.c

@@ -1320,4 +1320,4 @@ __WEAK void usbd_set_feature(uint16_t index, uint16_t value)
 __WEAK void usbd_clear_feature(uint16_t index, uint16_t value)
 __WEAK void usbd_clear_feature(uint16_t index, uint16_t value)
 {
 {
 }
 }
-#endif
+#endif

+ 17 - 17
port/musb/usb_musb_reg.h

@@ -15,42 +15,42 @@ typedef __PACKED_STRUCT {                                    /*!< USB0 Structure
     __IO uint8_t   FIFO0_BYTE;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint8_t   FIFO0_BYTE;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint16_t  FIFO0_HALF;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint16_t  FIFO0_HALF;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint32_t  FIFO0_WORD;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint32_t  FIFO0_WORD;                      /*!< USB FIFO Endpoint 0                                                   */
-  };
+  } FIFO0;
   union {
   union {
     __IO uint8_t   FIFO1_BYTE;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint8_t   FIFO1_BYTE;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint16_t  FIFO1_HALF;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint16_t  FIFO1_HALF;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint32_t  FIFO1_WORD;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint32_t  FIFO1_WORD;                      /*!< USB FIFO Endpoint 1                                                   */
-  };
+  } FIFO1;
   union {
   union {
     __IO uint8_t   FIFO2_BYTE;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint8_t   FIFO2_BYTE;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint16_t  FIFO2_HALF;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint16_t  FIFO2_HALF;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint32_t  FIFO2_WORD;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint32_t  FIFO2_WORD;                      /*!< USB FIFO Endpoint 2                                                   */
-  };
+  } FIFO2;
   union {
   union {
     __IO uint8_t   FIFO3_BYTE;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint8_t   FIFO3_BYTE;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint16_t  FIFO3_HALF;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint16_t  FIFO3_HALF;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint32_t  FIFO3_WORD;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint32_t  FIFO3_WORD;                      /*!< USB FIFO Endpoint 3                                                   */
-  };
+  } FIFO3;
   union {
   union {
     __IO uint8_t   FIFO4_BYTE;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint8_t   FIFO4_BYTE;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint16_t  FIFO4_HALF;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint16_t  FIFO4_HALF;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint32_t  FIFO4_WORD;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint32_t  FIFO4_WORD;                      /*!< USB FIFO Endpoint 4                                                   */
-  };
+  } FIFO4;
   union {
   union {
     __IO uint8_t   FIFO5_BYTE;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint8_t   FIFO5_BYTE;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint16_t  FIFO5_HALF;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint16_t  FIFO5_HALF;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint32_t  FIFO5_WORD;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint32_t  FIFO5_WORD;                      /*!< USB FIFO Endpoint 5                                                   */
-  };
+  } FIFO5;
   union {
   union {
     __IO uint8_t   FIFO6_BYTE;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint8_t   FIFO6_BYTE;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint16_t  FIFO6_HALF;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint16_t  FIFO6_HALF;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint32_t  FIFO6_WORD;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint32_t  FIFO6_WORD;                      /*!< USB FIFO Endpoint 6                                                   */
-  };
+  } FIFO6;
   union {
   union {
     __IO uint8_t   FIFO7_BYTE;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint8_t   FIFO7_BYTE;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint16_t  FIFO7_HALF;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint16_t  FIFO7_HALF;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint32_t  FIFO7_WORD;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint32_t  FIFO7_WORD;                      /*!< USB FIFO Endpoint 7                                                   */
-  };
+  } FIFO7;
   union {
   union {
     __IO uint8_t   FIFO_BYTE;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint8_t   FIFO_BYTE;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint16_t  FIFO_HALF;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint16_t  FIFO_HALF;                      /*!< USB FIFO Endpoint 7                                                   */
@@ -166,42 +166,42 @@ typedef struct {                                    /*!< USB0 Structure
     __IO uint8_t   FIFO0_BYTE;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint8_t   FIFO0_BYTE;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint16_t  FIFO0_HALF;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint16_t  FIFO0_HALF;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint32_t  FIFO0_WORD;                      /*!< USB FIFO Endpoint 0                                                   */
     __IO uint32_t  FIFO0_WORD;                      /*!< USB FIFO Endpoint 0                                                   */
-  };
+  } FIFO0;
   union {
   union {
     __IO uint8_t   FIFO1_BYTE;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint8_t   FIFO1_BYTE;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint16_t  FIFO1_HALF;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint16_t  FIFO1_HALF;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint32_t  FIFO1_WORD;                      /*!< USB FIFO Endpoint 1                                                   */
     __IO uint32_t  FIFO1_WORD;                      /*!< USB FIFO Endpoint 1                                                   */
-  };
+  } FIFO1;
   union {
   union {
     __IO uint8_t   FIFO2_BYTE;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint8_t   FIFO2_BYTE;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint16_t  FIFO2_HALF;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint16_t  FIFO2_HALF;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint32_t  FIFO2_WORD;                      /*!< USB FIFO Endpoint 2                                                   */
     __IO uint32_t  FIFO2_WORD;                      /*!< USB FIFO Endpoint 2                                                   */
-  };
+  } FIFO2;
   union {
   union {
     __IO uint8_t   FIFO3_BYTE;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint8_t   FIFO3_BYTE;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint16_t  FIFO3_HALF;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint16_t  FIFO3_HALF;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint32_t  FIFO3_WORD;                      /*!< USB FIFO Endpoint 3                                                   */
     __IO uint32_t  FIFO3_WORD;                      /*!< USB FIFO Endpoint 3                                                   */
-  };
+  } FIFO3;
   union {
   union {
     __IO uint8_t   FIFO4_BYTE;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint8_t   FIFO4_BYTE;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint16_t  FIFO4_HALF;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint16_t  FIFO4_HALF;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint32_t  FIFO4_WORD;                      /*!< USB FIFO Endpoint 4                                                   */
     __IO uint32_t  FIFO4_WORD;                      /*!< USB FIFO Endpoint 4                                                   */
-  };
+  } FIFO4;
   union {
   union {
     __IO uint8_t   FIFO5_BYTE;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint8_t   FIFO5_BYTE;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint16_t  FIFO5_HALF;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint16_t  FIFO5_HALF;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint32_t  FIFO5_WORD;                      /*!< USB FIFO Endpoint 5                                                   */
     __IO uint32_t  FIFO5_WORD;                      /*!< USB FIFO Endpoint 5                                                   */
-  };
+  } FIFO5;
   union {
   union {
     __IO uint8_t   FIFO6_BYTE;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint8_t   FIFO6_BYTE;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint16_t  FIFO6_HALF;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint16_t  FIFO6_HALF;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint32_t  FIFO6_WORD;                      /*!< USB FIFO Endpoint 6                                                   */
     __IO uint32_t  FIFO6_WORD;                      /*!< USB FIFO Endpoint 6                                                   */
-  };
+  } FIFO6;
   union {
   union {
     __IO uint8_t   FIFO7_BYTE;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint8_t   FIFO7_BYTE;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint16_t  FIFO7_HALF;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint16_t  FIFO7_HALF;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint32_t  FIFO7_WORD;                      /*!< USB FIFO Endpoint 7                                                   */
     __IO uint32_t  FIFO7_WORD;                      /*!< USB FIFO Endpoint 7                                                   */
-  };
+  } FIFO7;
   __I  uint32_t  RESERVED1[8];
   __I  uint32_t  RESERVED1[8];
   __IO uint8_t   DEVCTL;                            /*!< USB Device Control                                                    */
   __IO uint8_t   DEVCTL;                            /*!< USB Device Control                                                    */
   __IO uint8_t   CCONF;                             /*!< USB Common Configuration                                              */
   __IO uint8_t   CCONF;                             /*!< USB Common Configuration                                              */
@@ -3863,4 +3863,4 @@ typedef struct {                                    /*!< USB0 Structure
 #define USB_MODE_DEV            0x00000003
 #define USB_MODE_DEV            0x00000003
 #define USB_MODE_OTG            0x00000000
 #define USB_MODE_OTG            0x00000000
 
 
-#endif
+#endif