字符串描述符现已支持简体中文

iamapig120 · iamapig120 · commit 8a1399d7d74c · 2025-03-12T04:27:06.000+08:00
diff --git a/src/usblib/config/usb_desc.c b/src/usblib/config/usb_desc.c
@@ -249,8 +249,14 @@ const uint8_t USBD_ConfigDescriptor[USBD_SIZE_CONFIG_DESC] = {
 const uint8_t USBD_StringLangID[USBD_SIZE_STRING_LANGID] = {
     USBD_SIZE_STRING_LANGID,
     USB_STRING_DESCRIPTOR_TYPE,
-    0x09,
-    0x04};
+    0x04, 0x08, // LangID = 0x0804: Chinese (Simplified, China Mainland)
+    0x04, 0x10, // LangID = 0x1004: Chinese (Simplified, Singapore)
+    0x04, 0x0C, // LangID = 0x0C04: Chinese (Traditional, HK)
+    0x04, 0x04, // LangID = 0x0404: Chinese (Traditional, Taiwan)
+    0x04, 0x14, // LangID = 0x1404: Chinese (Traditional, Macau)
+    0x11, 0x04, // LangID = 0x0411: Japanese (Japan)
+                // 0x09, 0x04, // LangID = 0x0409: English (United States)
+};
 
 /* USB Device String Vendor */
 const uint8_t USBD_StringVendor[USBD_SIZE_STRING_VENDOR] = {
@@ -262,13 +268,18 @@ const uint8_t USBD_StringVendor[USBD_SIZE_STRING_VENDOR] = {
 const uint8_t USBD_StringProduct[USBD_SIZE_STRING_PRODUCT] = {
     USBD_SIZE_STRING_PRODUCT,
     USB_STRING_DESCRIPTOR_TYPE,
-    'S', 0, 'i', 0, 'm', 0, 'G', 0, 'E', 0, 'K', 0, 'I', 0};
+    0x53, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x47, 0x00, 0x45, 0x00, 0x4b, 0x00, 0x49, 0x00, 0x20, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x74, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x72, 0x00};
+
+const uint8_t USBD_StringProduct_zh_hans[USBD_SIZE_STRING_PRODUCT_zh_hans] = {
+    USBD_SIZE_STRING_PRODUCT_zh_hans,
+    USB_STRING_DESCRIPTOR_TYPE,
+    0x53, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x47, 0x00, 0x45, 0x00, 0x4b, 0x00, 0x49, 0x00, 0x57, 0x88, 0x3a, 0x67, 0xce, 0x98, 0x3c, 0x68, 0xa7, 0x63, 0x36, 0x52, 0x68, 0x56};
 
 /* USB Device String Serial */
 uint8_t USBD_StringSerial[USBD_SIZE_STRING_SERIAL] = {
     USBD_SIZE_STRING_SERIAL,
     USB_STRING_DESCRIPTOR_TYPE,
-    '0', 0, '1', 0, '2', 0, '3', 0, '4', 0, '5', 0, '6', 0, '7', 0, '8', 0, '9', 0, '0', 0, '0', 0};
+    '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0, '0', 0};
 
 const uint8_t USBD_StringConfig[USBD_SIZE_STRING_CONFIG] = {
     USBD_SIZE_STRING_CONFIG,
@@ -285,16 +296,31 @@ const uint8_t USBD_StringLEDIO[USBD_SIZE_STRING_LEDIO] = {
     USB_STRING_DESCRIPTOR_TYPE,
     'L', 0, 'E', 0, 'D', 0, ' ', 0, 'B', 0, 'o', 0, 'a', 0, 'r', 0, 'd', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, '3', 0};
 
+const uint8_t USBD_StringLEDIO_zh_hans[USBD_SIZE_STRING_LEDIO_zh_hans] = {
+    USBD_SIZE_STRING_LEDIO_zh_hans,
+    USB_STRING_DESCRIPTOR_TYPE,
+    0xbe, 0x8b, 0x07, 0x59, 0x6f, 0x70, 0x49, 0x51, 0x20, 0x00, 0x43, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x33, 0x00};
+
 const uint8_t USBD_StringCardIO[USBD_SIZE_STRING_CARDIO] = {
     USBD_SIZE_STRING_CARDIO,
     USB_STRING_DESCRIPTOR_TYPE,
     'C', 0, 'a', 0, 'r', 0, 'd', 0, ' ', 0, 'R', 0, 'e', 0, 'a', 0, 'd', 0, 'e', 0, 'r', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, '1', 0};
 
+const uint8_t USBD_StringCardIO_zh_hans[USBD_SIZE_STRING_CARDIO_zh_hans] = {
+    USBD_SIZE_STRING_CARDIO_zh_hans,
+    USB_STRING_DESCRIPTOR_TYPE,
+    0x4e, 0x00, 0x46, 0x00, 0x43, 0x00, 0xfb, 0x8b, 0x61, 0x53, 0x68, 0x56, 0x20, 0x00, 0x43, 0x00, 0x4f, 0x00, 0x4d, 0x00, 0x31, 0x00};
+
 const uint8_t USBD_StringCustomHID[USBD_SIZE_STRING_CUSTOM_HID] = {
     USBD_SIZE_STRING_CUSTOM_HID,
     USB_STRING_DESCRIPTOR_TYPE,
     'S', 0, 'i', 0, 'm', 0, 'G', 0, 'E', 0, 'K', 0, 'I', 0, ' ', 0, 'C', 0, 'o', 0, 'n', 0, 'f', 0, 'i', 0, 'g', 0};
 
+const uint8_t USBD_StringCustomHID_zh_hans[USBD_SIZE_STRING_CUSTOM_HID_zh_hans] = {
+    USBD_SIZE_STRING_CUSTOM_HID_zh_hans,
+    USB_STRING_DESCRIPTOR_TYPE,
+    0x53, 0x00, 0x69, 0x00, 0x6d, 0x00, 0x47, 0x00, 0x45, 0x00, 0x4b, 0x00, 0x49, 0x00, 0xbe, 0x8b, 0x6e, 0x7f};
+
 /* HID Report Descriptor */
 const uint8_t USBD_HidRepDesc[USBD_SIZE_REPORT_DESC] =
     {
diff --git a/src/usblib/config/usb_desc.h b/src/usblib/config/usb_desc.h
@@ -48,31 +48,48 @@ extern "C" {
 
 #define USBD_NUMOF_STRING_DESC            9
 
-#define USBD_SIZE_STRING_LANGID           4
+#define USBD_SIZE_STRING_LANGID           14
 #define USBD_SIZE_STRING_VENDOR           10
-#define USBD_SIZE_STRING_PRODUCT          16
+#define USBD_SIZE_STRING_PRODUCT          38
 #define USBD_SIZE_STRING_SERIAL           26
 #define USBD_SIZE_STRING_CONFIG           22
 #define USBD_SIZE_STRING_HIDIO            188
 #define USBD_SIZE_STRING_LEDIO            30
 #define USBD_SIZE_STRING_CARDIO           34
 #define USBD_SIZE_STRING_CUSTOM_HID       30
 
+#define USBD_SIZE_STRING_PRODUCT_zh_hans  30
+#define USBD_SIZE_STRING_LEDIO_zh_hans    20
+#define USBD_SIZE_STRING_CARDIO_zh_hans   24
+#define USBD_SIZE_STRING_CUSTOM_HID_zh_hans 20
+
 extern const uint8_t USBD_DeviceDescriptor[USBD_SIZE_DEVICE_DESC];
 extern const uint8_t USBD_ConfigDescriptor[USBD_SIZE_CONFIG_DESC];
 
 extern const uint8_t USBD_HidRepDesc[USBD_SIZE_REPORT_DESC];
 extern const uint8_t USBD_HidCustomDesc[USBD_SIZE_CUSTOM_REPORT_DESC];
 
+// Not for muti-language
 extern const uint8_t USBD_StringLangID[USBD_SIZE_STRING_LANGID];
 extern const uint8_t USBD_StringVendor[USBD_SIZE_STRING_VENDOR];
-extern const uint8_t USBD_StringProduct[USBD_SIZE_STRING_PRODUCT];
 extern uint8_t USBD_StringSerial[USBD_SIZE_STRING_SERIAL];
+
+// For muti-language
+extern const uint8_t USBD_StringProduct[USBD_SIZE_STRING_PRODUCT];
+extern const uint8_t USBD_StringProduct_zh_hans[USBD_SIZE_STRING_PRODUCT_zh_hans];
+
 extern const uint8_t USBD_StringConfig[USBD_SIZE_STRING_CONFIG];
+
 extern const uint8_t USBD_StringHIDIO[USBD_SIZE_STRING_HIDIO];
+
 extern const uint8_t USBD_StringLEDIO[USBD_SIZE_STRING_LEDIO];
+extern const uint8_t USBD_StringLEDIO_zh_hans[USBD_SIZE_STRING_LEDIO_zh_hans];
+
 extern const uint8_t USBD_StringCardIO[USBD_SIZE_STRING_CARDIO];
+extern const uint8_t USBD_StringCardIO_zh_hans[USBD_SIZE_STRING_CARDIO_zh_hans];
+
 extern const uint8_t USBD_StringCustomHID[USBD_SIZE_STRING_CUSTOM_HID];
+extern const uint8_t USBD_StringCustomHID_zh_hans[USBD_SIZE_STRING_CUSTOM_HID_zh_hans];
 
 void USBD_SerialNumUpdate();
 
diff --git a/src/usblib/config/usb_prop.c b/src/usblib/config/usb_prop.c
@@ -39,7 +39,7 @@ DEVICE_PROP Device_Property =
         USBD_Get_Interface_Setting,
         USBD_GetDeviceDescriptor,
         USBD_GetConfigDescriptor,
-        USBD_GetStringDescriptor,
+        USBD_GetStringDescriptor_MutiLang,
         0,
         DEF_USBD_UEP0_SIZE};
 
@@ -78,6 +78,64 @@ ONE_DESCRIPTOR String_Descriptor[USBD_NUMOF_STRING_DESC] =
         {(uint8_t *)USBD_StringCustomHID, USBD_SIZE_STRING_CUSTOM_HID},
 };
 
+MUTI_LANG_DESCRIPTOR Muti_Lang_String_Descriptor[USBD_NUMOF_STRING_DESC] =
+    {
+        {
+            {(uint8_t *)USBD_StringLangID, USBD_SIZE_STRING_LANGID},
+            {(uint8_t *)USBD_StringLangID, USBD_SIZE_STRING_LANGID},
+            {(uint8_t *)USBD_StringLangID, USBD_SIZE_STRING_LANGID},
+            {(uint8_t *)USBD_StringLangID, USBD_SIZE_STRING_LANGID},
+        },
+        {
+            {(uint8_t *)USBD_StringVendor, USBD_SIZE_STRING_VENDOR},
+            {NULL, 0},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringProduct, USBD_SIZE_STRING_PRODUCT},
+            {(uint8_t *)USBD_StringProduct_zh_hans, USBD_SIZE_STRING_PRODUCT_zh_hans},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringSerial, USBD_SIZE_STRING_SERIAL},
+            {NULL, 0},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringConfig, USBD_SIZE_STRING_CONFIG},
+            {NULL, 0},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringHIDIO, USBD_SIZE_STRING_HIDIO},
+            {NULL, 0},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringLEDIO, USBD_SIZE_STRING_LEDIO},
+            {(uint8_t *)USBD_StringLEDIO_zh_hans, USBD_SIZE_STRING_LEDIO_zh_hans},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringCardIO, USBD_SIZE_STRING_CARDIO},
+            {(uint8_t *)USBD_StringCardIO_zh_hans, USBD_SIZE_STRING_CARDIO_zh_hans},
+            {NULL, 0},
+            {NULL, 0},
+        },
+        {
+            {(uint8_t *)USBD_StringCustomHID, USBD_SIZE_STRING_CUSTOM_HID},
+            {(uint8_t *)USBD_StringCustomHID_zh_hans, USBD_SIZE_STRING_CUSTOM_HID_zh_hans},
+            {NULL, 0},
+            {NULL, 0},
+        },
+};
+
 ONE_DESCRIPTOR Report_Descriptor[2] =
     {
         {(uint8_t *)USBD_HidRepDesc, USBD_SIZE_REPORT_DESC},
@@ -295,12 +353,63 @@ uint8_t *USBD_GetConfigDescriptor(uint16_t Length)
  */
 uint8_t *USBD_GetStringDescriptor(uint16_t Length)
 {
-  uint8_t wValue0 = pInformation->USBwValue0;
+  uint8_t stringIndex = pInformation->USBwValue0;
+
+  if (stringIndex >= USBD_NUMOF_STRING_DESC) {
+    return NULL;
+  } else {
+    return Standard_GetDescriptorData(Length, &String_Descriptor[stringIndex]);
+  }
+}
+
+/*********************************************************************
+ * @fn      USBD_GetStringDescriptor_MutiLang
+ *
+ * @brief   Gets the string descriptors according to the needed index & lang id
+ *
+ * @param   Length.
+ *
+ * @return    The address of the string descriptors.
+ */
+uint8_t *USBD_GetStringDescriptor_MutiLang(uint16_t Length)
+{
+  uint8_t stringIndex = pInformation->USBwValue0;
+  uint16_t stringID   = pInformation->USBwIndex;
 
-  if (wValue0 >= USBD_NUMOF_STRING_DESC) {
+  if (stringIndex >= USBD_NUMOF_STRING_DESC) {
     return NULL;
   } else {
-    return Standard_GetDescriptorData(Length, &String_Descriptor[wValue0]);
+    switch (stringID) {
+      case 0x0408:
+      case 0x0410:
+        // Chinese Simplified
+        if (Muti_Lang_String_Descriptor[stringIndex].__zh_hans.Descriptor_Size == 0) {
+          return Standard_GetDescriptorData(Length, &Muti_Lang_String_Descriptor[stringIndex].__en_us);
+        }
+        return Standard_GetDescriptorData(Length, &Muti_Lang_String_Descriptor[stringIndex].__zh_hans);
+        break;
+      case 0x0404:
+      case 0x040c:
+      case 0x0414:
+        // Chinese Traditional
+        if (Muti_Lang_String_Descriptor[stringIndex].__zh_hant.Descriptor_Size == 0) {
+          return Standard_GetDescriptorData(Length, &Muti_Lang_String_Descriptor[stringIndex].__en_us);
+        }
+        return Standard_GetDescriptorData(Length, &Muti_Lang_String_Descriptor[stringIndex].__zh_hant);
+        break;
+      case 0x1104:
+        // Japanese
+        if (Muti_Lang_String_Descriptor[stringIndex].__ja_jp.Descriptor_Size == 0) {
+          return Standard_GetDescriptorData(Length, &Muti_Lang_String_Descriptor[stringIndex].__en_us);
+        }
+        return Standard_GetDescriptorData(Length, &Muti_Lang_String_Descriptor[stringIndex].__ja_jp);
+        break;
+      case 0x0904:
+        return Standard_GetDescriptorData(Length, &(Muti_Lang_String_Descriptor[stringIndex].__en_us));
+        break;
+      default:
+        return Standard_GetDescriptorData(Length, &(Muti_Lang_String_Descriptor[stringIndex].__en_us));
+    }
   }
 }
 
diff --git a/src/usblib/config/usb_prop.h b/src/usblib/config/usb_prop.h
@@ -61,6 +61,7 @@ RESULT USBD_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting);
 uint8_t *USBD_GetDeviceDescriptor(uint16_t );
 uint8_t *USBD_GetConfigDescriptor(uint16_t);
 uint8_t *USBD_GetStringDescriptor(uint16_t);
+uint8_t *USBD_GetStringDescriptor_MutiLang(uint16_t);
 uint8_t USBD_ENDPx_DataUp( uint8_t endp, uint8_t *pbuf, uint16_t len );
 #ifdef __cplusplus
 }
diff --git a/src/usblib/usb_driver/inc/usb_core.h b/src/usblib/usb_driver/inc/usb_core.h
@@ -41,6 +41,15 @@ typedef struct OneDescriptor
 }
 ONE_DESCRIPTOR, *PONE_DESCRIPTOR;
 
+typedef struct MutiLanguagesDescriptor
+{
+  ONE_DESCRIPTOR __en_us; // English (United States)
+  ONE_DESCRIPTOR __zh_hans; // Chinese (Simplified)
+  ONE_DESCRIPTOR __zh_hant; // Chinese (Traditional)
+  ONE_DESCRIPTOR __ja_jp; // Japanese (Japan)
+}
+MUTI_LANG_DESCRIPTOR;
+
 typedef enum _RESULT
 {
   USB_SUCCESS = 0,    /* Process successfully */

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ RESULT USBD_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting);`
`61`	`61`	`uint8_t *USBD_GetDeviceDescriptor(uint16_t );`
`62`	`62`	`uint8_t *USBD_GetConfigDescriptor(uint16_t);`
`63`	`63`	`uint8_t *USBD_GetStringDescriptor(uint16_t);`
	`64`	`+uint8_t *USBD_GetStringDescriptor_MutiLang(uint16_t);`
`64`	`65`	`uint8_t USBD_ENDPx_DataUp( uint8_t endp, uint8_t *pbuf, uint16_t len );`
`65`	`66`	`#ifdef __cplusplus`
`66`	`67`	`}`