diff options
| author | IngHK <[email protected]> | 2024-01-16 08:20:23 +0100 |
|---|---|---|
| committer | IngHK <[email protected]> | 2024-01-16 08:20:23 +0100 |
| commit | f7ef3c1b1cbf8a19548e9d7ca0a95ae324fcdd5b (patch) | |
| tree | 0afe6500d844d95eb83adb351d1daa2137ae44a5 /src/tusb_option.h | |
| parent | 4e6408ea4940085f66c676772d77e3951e82ea11 (diff) | |
| parent | 57c6f8cfa27f5c7b34a52e20b66cc81fe62c2815 (diff) | |
Merge branch 'cdc_ch34x_support' of https://github.com/IngHK/tinyusb into cdc_ch34x_support
Diffstat (limited to 'src/tusb_option.h')
| -rw-r--r-- | src/tusb_option.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/tusb_option.h b/src/tusb_option.h index 13151a07b..ae7ac2da4 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -453,10 +453,12 @@ #define CFG_TUH_CDC_FTDI 0 #endif -#ifndef CFG_TUH_CDC_FTDI_PID_LIST - // List of product IDs that can use the FTDI CDC driver - #define CFG_TUH_CDC_FTDI_PID_LIST \ - 0x6001, 0x6006, 0x6010, 0x6011, 0x6014, 0x6015, 0x8372, 0xFBFA, 0xCD18 +#ifndef CFG_TUH_CDC_FTDI_VID_PID_LIST + // List of product IDs that can use the FTDI CDC driver. 0x0403 is FTDI's VID + #define CFG_TUH_CDC_FTDI_VID_PID_LIST \ + {0x0403, 0x6001}, {0x0403, 0x6006}, {0x0403, 0x6010}, {0x0403, 0x6011}, \ + {0x0403, 0x6014}, {0x0403, 0x6015}, {0x0403, 0x8372}, {0x0403, 0xFBFA}, \ + {0x0403, 0xCD18} #endif #ifndef CFG_TUH_CDC_CP210X @@ -464,10 +466,10 @@ #define CFG_TUH_CDC_CP210X 0 #endif -#ifndef CFG_TUH_CDC_CP210X_PID_LIST - // List of product IDs that can use the CP210X CDC driver - #define CFG_TUH_CDC_CP210X_PID_LIST \ - 0xEA60, 0xEA70 +#ifndef CFG_TUH_CDC_CP210X_VID_PID_LIST + // List of product IDs that can use the CP210X CDC driver. 0x10C4 is Silicon Labs' VID + #define CFG_TUH_CDC_CP210X_VID_PID_LIST \ + {0x10C4, 0xEA60}, {0x10C4, 0xEA70} #endif #ifndef CFG_TUH_CDC_CH34X @@ -483,8 +485,8 @@ { 0x1a86, 0x5523 }, /* ch341 chip */ \ { 0x1a86, 0xe523 }, /* ch330 chip */ \ { 0x4348, 0x5523 }, /* ch340 custom chip */ \ - { 0x2184, 0x0057 }, /* overtaken from Linux driver /drivers/usb/serial/ch341.c */ \ - { 0x9986, 0x7523 } /* overtaken from Linux driver /drivers/usb/serial/ch341.c */ + { 0x2184, 0x0057 }, /* overtaken from Linux Kernel driver /drivers/usb/serial/ch341.c */ \ + { 0x9986, 0x7523 } /* overtaken from Linux Kernel driver /drivers/usb/serial/ch341.c */ #endif #ifndef CFG_TUH_HID |