house keeping

2 files changed, 58 insertions, 56 deletions

diff --git a/src/class/cdc/serial/ftdi_sio.h b/src/class/cdc/serial/ftdi_sio.h
index f621b3912..8abf74f11 100644
--- a/src/class/cdc/serial/ftdi_sio.h
+++ b/src/class/cdc/serial/ftdi_sio.h
@@ -165,48 +165,48 @@ enum ftdi_sio_baudrate {
 #define FTDI_RS_FIFO  (1 << 7)
 
 // chip types and names
-enum ftdi_chip_type {
-  SIO = 0,
-//  FT232A,
-  FT232B,
-  FT2232C,
-  FT232R,
-  FT232H,
-  FT2232H,
-  FT4232H,
-  FT4232HA,
-  FT232HP,
-  FT233HP,
-  FT2232HP,
-  FT2233HP,
-  FT4232HP,
-  FT4233HP,
-  FTX,
-  UNKNOWN
-};
+typedef enum ftdi_chip_type {
+  FTDI_SIO = 0,
+//  FTDI_FT232A,
+  FTDI_FT232B,
+  FTDI_FT2232C,
+  FTDI_FT232R,
+  FTDI_FT232H,
+  FTDI_FT2232H,
+  FTDI_FT4232H,
+  FTDI_FT4232HA,
+  FTDI_FT232HP,
+  FTDI_FT233HP,
+  FTDI_FT2232HP,
+  FTDI_FT2233HP,
+  FTDI_FT4232HP,
+  FTDI_FT4233HP,
+  FTDI_FTX,
+  FTDI_UNKNOWN
+} ftdi_chip_type_t;
 
 #define FTDI_CHIP_NAMES \
-  [SIO]       = (uint8_t const*) "SIO", /* the serial part of FT8U100AX */ \
-/*  [FT232A]    = (uint8_t const*) "FT232A", */ \
-  [FT232B]    = (uint8_t const*) "FT232B", \
-  [FT2232C]   = (uint8_t const*) "FT2232C/D", \
-  [FT232R]    = (uint8_t const*) "FT232R", \
-  [FT232H]    = (uint8_t const*) "FT232H", \
-  [FT2232H]   = (uint8_t const*) "FT2232H", \
-  [FT4232H]   = (uint8_t const*) "FT4232H", \
-  [FT4232HA]  = (uint8_t const*) "FT4232HA", \
-  [FT232HP]   = (uint8_t const*) "FT232HP", \
-  [FT233HP]   = (uint8_t const*) "FT233HP", \
-  [FT2232HP]  = (uint8_t const*) "FT2232HP", \
-  [FT2233HP]  = (uint8_t const*) "FT2233HP", \
-  [FT4232HP]  = (uint8_t const*) "FT4232HP", \
-  [FT4233HP]  = (uint8_t const*) "FT4233HP", \
-  [FTX]       = (uint8_t const*) "FT-X", \
-  [UNKNOWN]   = (uint8_t const*) "UNKNOWN"
+  [FTDI_SIO]       = "SIO", /* the serial part of FT8U100AX */ \
+/*  [FTDI_FT232A]    = "FT232A", */ \
+  [FTDI_FT232B]    = "FT232B", \
+  [FTDI_FT2232C]   = "FT2232C/D", \
+  [FTDI_FT232R]    = "FT232R", \
+  [FTDI_FT232H]    = "FT232H", \
+  [FTDI_FT2232H]   = "FTDI_FT2232H", \
+  [FTDI_FT4232H]   = "FT4232H", \
+  [FTDI_FT4232HA]  = "FT4232HA", \
+  [FTDI_FT232HP]   = "FT232HP", \
+  [FTDI_FT233HP]   = "FT233HP", \
+  [FTDI_FT2232HP]  = "FT2232HP", \
+  [FTDI_FT2233HP]  = "FT2233HP", \
+  [FTDI_FT4232HP]  = "FT4232HP", \
+  [FTDI_FT4233HP]  = "FT4233HP", \
+  [FTDI_FTX]       = "FT-X", \
+  [FTDI_UNKNOWN]   = "UNKNOWN"
 
 // private interface data
 typedef struct ftdi_private {
-  enum    ftdi_chip_type chip_type;
+  ftdi_chip_type_t chip_type;
   uint8_t channel;                  // channel index, or 0 for legacy types
 } ftdi_private_t;
 
diff --git a/src/class/cdc/serial/pl2303.h b/src/class/cdc/serial/pl2303.h
index d69bdbfae..40311260d 100644
--- a/src/class/cdc/serial/pl2303.h
+++ b/src/class/cdc/serial/pl2303.h
@@ -96,51 +96,53 @@
 #define PL2303_HXN_FLOWCTRL_XON_XOFF      0x0c
 
 // type data
-enum pl2303_type {
-  TYPE_H,
-  TYPE_HX,
-  TYPE_TA,
-  TYPE_TB,
-  TYPE_HXD,
-  TYPE_HXN,
-  TYPE_COUNT
-};
+typedef enum pl2303_type {
+  PL2303_TYPE_H,
+  PL2303_TYPE_HX,
+  PL2303_TYPE_TA,
+  PL2303_TYPE_TB,
+  PL2303_TYPE_HXD,
+  PL2303_TYPE_HXN,
+  // PL2303_TYPE_NEED_SUPPORTS_HX_STATUS,
+  // PL2303_TYPE_UNKNOWN,
+  PL2303_TYPE_COUNT
+} pl2303_type_t;
 
-struct pl2303_type_data {
+typedef struct pl2303_type_data {
   uint8_t  const *name;
   uint32_t const max_baud_rate;
   uint8_t  const quirks;
   uint16_t const no_autoxonxoff:1;
   uint16_t const no_divisors:1;
   uint16_t const alt_divisors:1;
-};
+} pl2303_type_data_t;
 
 #define PL2303_TYPE_DATA \
-  [TYPE_H] = { \
+  [PL2303_TYPE_H] = { \
     .name = (uint8_t const*)"H", \
     .max_baud_rate = 1228800, \
     .quirks = PL2303_QUIRK_LEGACY, \
     .no_autoxonxoff = true, \
   }, \
-  [TYPE_HX] = { \
+  [PL2303_TYPE_HX] = { \
     .name = (uint8_t const*)"HX", \
     .max_baud_rate = 6000000, \
   }, \
-  [TYPE_TA] = { \
+  [PL2303_TYPE_TA] = { \
     .name = (uint8_t const*)"TA", \
     .max_baud_rate = 6000000, \
     .alt_divisors = true, \
   }, \
-  [TYPE_TB] = { \
+  [PL2303_TYPE_TB] = { \
     .name = (uint8_t const*)"TB", \
     .max_baud_rate = 12000000, \
     .alt_divisors = true, \
   }, \
-  [TYPE_HXD] = { \
+  [PL2303_TYPE_HXD] = { \
     .name = (uint8_t const*)"HXD", \
     .max_baud_rate = 12000000, \
   }, \
-  [TYPE_HXN] = { \
+  [PL2303_TYPE_HXN] = { \
     .name = (uint8_t const*)"G (HXN)", \
     .max_baud_rate = 12000000, \
     .no_divisors = true, \
@@ -166,7 +168,7 @@ typedef struct TU_ATTR_PACKED {
 #define PL2303_IN_EP                        0x83
 
 // return values of pl2303_detect_type()
-#define PL2303_SUPPORTS_HX_STATUS_TRIGGERED -1
-#define PL2303_DETECT_TYPE_FAILED           -2
+#define PL2303_TYPE_NEED_SUPPORTS_HX_STATUS -1
+#define PL2303_TYPE_UNKNOWN                 -2
 
 #endif // TUSB_PL2303_H