diff options
| author | hathach <[email protected]> | 2024-01-16 12:00:28 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2024-01-16 12:00:28 +0700 |
| commit | 57c6f8cfa27f5c7b34a52e20b66cc81fe62c2815 (patch) | |
| tree | c6b50cacb4baf706da40791ca03fcdf66e5f0581 /src/tusb_option.h | |
| parent | 1f2901e8b12258c953e3c338897f188c98b5eaed (diff) | |
| parent | 938cae818f5f53887ad12e34189e6746dbce4889 (diff) | |
Merge branch 'master' into cdc_ch34x_support
# Conflicts:
# src/class/cdc/cdc_host.c
Diffstat (limited to 'src/tusb_option.h')
| -rw-r--r-- | src/tusb_option.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/tusb_option.h b/src/tusb_option.h index 13151a07b..7d0e6755e 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 |