CHCh Upgrade: Improved FTDI and CP210x support, add PL2303 support, bugfixes

CONTRIBUTORS.rst

@@ -31,6 +31,13 @@ Notable contributors
 -  Most features development
 
 
+`Heiko Kuester <https://github.com/IngHK>`__
+--------------------------------------------
+
+-  Add CH34x and PL2303 support (CDC host)
+-  Improve FTDI and CP210x support (CDC host)
+
+
 `Hristo Gochkov <https://github.com/me-no-dev>`__
 -------------------------------------------------
 

README.rst

@@ -77,7 +77,7 @@ Host Stack
 - Human Interface Device (HID): Keyboard, Mouse, Generic
 - Mass Storage Class (MSC)
 - Communication Device Class: CDC-ACM
-- Vendor serial over USB: FTDI, CP210x
+- Vendor serial over USB: FTDI, CP210x, CH34x, PL2303
 - Hub with multiple-level support
 
 Similar to the Device Stack, if you have a special requirement, `usbh_app_driver_get_cb()` can be used to write your own class driver without modifying the stack.

examples/host/cdc_msc_hid/src/tusb_config.h

@@ -102,10 +102,11 @@
 #define CFG_TUH_ENUMERATION_BUFSIZE 256
 
 #define CFG_TUH_HUB                 1 // number of supported hubs
-#define CFG_TUH_CDC                 1 // CDC ACM
+#define CFG_TUH_CDC                 1 // number of supported CDC devices. also activates CDC ACM
 #define CFG_TUH_CDC_FTDI            1 // FTDI Serial.  FTDI is not part of CDC class, only to re-use CDC driver API
 #define CFG_TUH_CDC_CP210X          1 // CP210x Serial. CP210X is not part of CDC class, only to re-use CDC driver API
 #define CFG_TUH_CDC_CH34X           1 // CH340 or CH341 Serial. CH34X is not part of CDC class, only to re-use CDC driver API
+#define CFG_TUH_CDC_PL2303          1 // PL2303 Serial. PL2303 is not part of CDC class, only to re-use CDC driver API
 #define CFG_TUH_HID                 (3*CFG_TUH_DEVICE_MAX) // typical keyboard + mouse device can have 3-4 HID interfaces
 #define CFG_TUH_MSC                 1
 #define CFG_TUH_VENDOR              0

examples/host/cdc_msc_hid_freertos/src/tusb_config.h

@@ -107,10 +107,11 @@
 #define CFG_TUH_ENUMERATION_BUFSIZE 256
 
 #define CFG_TUH_HUB                 1 // number of supported hubs
-#define CFG_TUH_CDC                 1 // CDC ACM
+#define CFG_TUH_CDC                 1 // number of supported CDC devices. also activates CDC ACM
 #define CFG_TUH_CDC_FTDI            1 // FTDI Serial.  FTDI is not part of CDC class, only to re-use CDC driver API
 #define CFG_TUH_CDC_CP210X          1 // CP210x Serial. CP210X is not part of CDC class, only to re-use CDC driver API
 #define CFG_TUH_CDC_CH34X           1 // CH340 or CH341 Serial. CH34X is not part of CDC class, only to re-use CDC driver API
+#define CFG_TUH_CDC_PL2303          1 // PL2303 Serial. PL2303 is not part of CDC class, only to re-use CDC driver API
 #define CFG_TUH_HID                 (3*CFG_TUH_DEVICE_MAX) // typical keyboard + mouse device can have 3-4 HID interfaces
 #define CFG_TUH_MSC                 1
 #define CFG_TUH_VENDOR              0

src/class/cdc/cdc_host.h

@@ -37,16 +37,6 @@
 // Class Driver Configuration
 //--------------------------------------------------------------------+
 
-// Set Line Control state on enumeration/mounted: DTR ( bit 0), RTS (bit 1)
-#ifndef CFG_TUH_CDC_LINE_CONTROL_ON_ENUM
-#define CFG_TUH_CDC_LINE_CONTROL_ON_ENUM    0
-#endif
-
-// Set Line Coding on enumeration/mounted, value for cdc_line_coding_t
-//#ifndef CFG_TUH_CDC_LINE_CODING_ON_ENUM
-//#define CFG_TUH_CDC_LINE_CODING_ON_ENUM   { 115200, CDC_LINE_CODING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
-//#endif
-
 // RX FIFO size
 #ifndef CFG_TUH_CDC_RX_BUFSIZE
 #define CFG_TUH_CDC_RX_BUFSIZE USBH_EPSIZE_BULK_MAX

src/class/cdc/serial/cp210x.h

@@ -28,7 +28,8 @@
 // Protocol details can be found at AN571: CP210x Virtual COM Port Interface
 // https://www.silabs.com/documents/public/application-notes/AN571.pdf
 
-#define TU_CP210X_VID 0x10C4
+// parts are overtaken from vendors driver
+// https://www.silabs.com/documents/public/software/cp210x-3.1.0.tar.gz
 
 /* Config request codes */
 #define CP210X_IFC_ENABLE      0x00
@@ -59,4 +60,64 @@
 #define CP210X_SET_BAUDRATE    0x1E
 #define CP210X_VENDOR_SPECIFIC 0xFF // GPIO, Recipient must be Device
 
+/* SILABSER_IFC_ENABLE_REQUEST_CODE */
+#define CP210X_UART_ENABLE       0x0001
+#define CP210X_UART_DISABLE        0x0000
+
+/* SILABSER_SET_BAUDDIV_REQUEST_CODE */
+#define CP210X_BAUD_RATE_GEN_FREQ      0x384000
+
+/*SILABSER_SET_LINE_CTL_REQUEST_CODE */
+#define CP210X_BITS_DATA_MASK        0x0f00
+#define CP210X_BITS_DATA_5       0x0500
+#define CP210X_BITS_DATA_6       0x0600
+#define CP210X_BITS_DATA_7       0x0700
+#define CP210X_BITS_DATA_8       0x0800
+#define CP210X_BITS_DATA_9       0x0900
+
+#define CP210X_BITS_PARITY_MASK      0x00f0
+#define CP210X_BITS_PARITY_NONE      0x0000
+#define CP210X_BITS_PARITY_ODD       0x0010
+#define CP210X_BITS_PARITY_EVEN      0x0020
+#define CP210X_BITS_PARITY_MARK      0x0030
+#define CP210X_BITS_PARITY_SPACE     0x0040
+
+#define CP210X_BITS_STOP_MASK        0x000f
+#define CP210X_BITS_STOP_1       0x0000
+#define CP210X_BITS_STOP_1_5       0x0001
+#define CP210X_BITS_STOP_2       0x0002
+
+/* SILABSER_SET_BREAK_REQUEST_CODE */
+#define CP210X_BREAK_ON        0x0001
+#define CP210X_BREAK_OFF       0x0000
+
+/* SILABSER_SET_MHS_REQUEST_CODE */
+#define CP210X_MCR_DTR         0x0001
+#define CP210X_MCR_RTS         0x0002
+#define CP210X_MCR_ALL         0x0003
+#define CP210X_MSR_CTS         0x0010
+#define CP210X_MSR_DSR         0x0020
+#define CP210X_MSR_RING        0x0040
+#define CP210X_MSR_DCD         0x0080
+#define CP210X_MSR_ALL         0x00F0
+
+#define CP210X_CONTROL_WRITE_DTR     0x0100
+#define CP210X_CONTROL_WRITE_RTS     0x0200
+
+#define CP210X_LSR_BREAK       0x0001
+#define CP210X_LSR_FRAMING_ERROR     0x0002
+#define CP210X_LSR_HW_OVERRUN        0x0004
+#define CP210X_LSR_QUEUE_OVERRUN     0x0008
+#define CP210X_LSR_PARITY_ERROR      0x0010
+#define CP210X_LSR_ALL         0x001F
+
+// supported baudrates
+// reference: datasheets and AN205 "CP210x Baud Rate Support"
+#define CP210X_SUPPORTED_BAUDRATES_LIST { \
+  300, 600, \
+  1200, 1800, 2400, 4000, 4800, 7200, 9600, \
+  14400, 16000, 19200, 28800, 38400, 51200, 56000, 57600, 64000, 76800, \
+  115200, 128000, 153600, 230400, 250000, 256000, 460800, 500000, 576000, 921600, \
+  0 }
+
 #endif //TUSB_CP210X_H