Merge 95579b5f8c78215a04a0da793aae8a895c597ce1 into d0c049cdba4d3ba4c9f277f25182cec53c25eaf3

hw/usb_interface/ch552_fw/encode_usb_strings.py

@@ -57,6 +57,7 @@ if __name__ == "__main__":
         "CdcCtrlInterfaceDesc": "CDC-Ctrl",
         "CdcDataInterfaceDesc": "CDC-Data",
         "FidoInterfaceDesc": "FIDO",
+        "CcidInterfaceDesc": "CCID",
         "DebugInterfaceDesc": "DEBUG"
     }
 

hw/usb_interface/ch552_fw/inc/ch554_usb.h

@@ -94,6 +94,13 @@ Header file for CH554 microcontrollers.
 #define USB_CDC_REQ_TYPE_SET_CONTROL_LINE_STATE  0x22
 #endif
 
+/* USB CCID (Smart Card) class request code */
+#ifndef USB_CCID_REQ_TYPE
+#define USB_CCID_REQ_TYPE_ABORT                  0x01
+#define USB_CCID_REQ_TYPE_GET_CLOCK_FREQUENCIES  0x02
+#define USB_CCID_REQ_TYPE_GET_DATA_RATES         0x03
+#endif
+
 /* USB request type for hub class request */
 #ifndef HUB_GET_HUB_DESCRIPTOR
 #define HUB_CLEAR_HUB_FEATURE   0x20
@@ -200,7 +207,8 @@ Header file for CH554 microcontrollers.
 #define USB_IDX_INTERFACE_CDC_CTRL_STR   0x04
 #define USB_IDX_INTERFACE_CDC_DATA_STR   0x05
 #define USB_IDX_INTERFACE_FIDO_STR       0x06
-#define USB_IDX_INTERFACE_DEBUG_STR      0x07
+#define USB_IDX_INTERFACE_CCID_STR       0x07
+#define USB_IDX_INTERFACE_DEBUG_STR      0x08
 #endif
 
 #ifndef USB_DEVICE_ADDR

hw/usb_interface/ch552_fw/inc/io.h

@@ -8,6 +8,7 @@ enum ioend {
     IO_NONE = 0x00,   // No endpoint
     IO_UART = 0x01,   // Only destination, raw UART access
     IO_QEMU = 0x02,   // Only destination, QEMU debug port
+    IO_CCID = 0x08,   // CCID "smart card" port
     IO_CH552 = 0x10,  // Internal CH552 control port
     IO_DEBUG = 0x20,  // HID debug port
     IO_CDC = 0x40,    // CDC "serial port"
@@ -16,6 +17,7 @@ enum ioend {
 
 enum ch552cmd {
     SET_ENDPOINTS = 0x01, // Config enabled/disabled USB endpoints on the CH552
+    CH552_CMD_MAX,
 };
 
 #endif

hw/usb_interface/ch552_fw/inc/usb_strings.h

@@ -55,6 +55,12 @@ unsigned char FLASH FidoInterfaceDesc[] = {  // "FIDO"
     'F', 0, 'I', 0, 'D', 0, 'O', 0,
 };
 
+unsigned char FLASH CcidInterfaceDesc[] = {  // "CCID"
+    10,    // Length of this descriptor (in bytes)
+    0x03,  // Descriptor type (String)
+    'C', 0, 'C', 0, 'I', 0, 'D', 0,
+};
+
 unsigned char FLASH DebugInterfaceDesc[] = {  // "DEBUG"
     12,    // Length of this descriptor (in bytes)
     0x03,  // Descriptor type (String)