summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-07-19 16:23:56 +0700
committerhathach <[email protected]>2019-07-19 16:23:56 +0700
commitb0678e1050a8f64116194c2a75d5e8c3fbf03be6 (patch)
treea011f417b03d81bdbb77cf0863298a227012c4f0
parent83f7aacbb1f3335b968da02c1e3b554bb9f35c86 (diff)
rename CFG_TUD_CUSTOM_CLASS to CFG_TUD_VENDOR
-rw-r--r--examples/device/cdc_msc_hid/src/tusb_config.h20
-rw-r--r--examples/device/cdc_msc_hid_freertos/src/tusb_config.h20
-rw-r--r--examples/device/hid_generic_inout/src/tusb_config.h14
-rw-r--r--examples/device/midi_test/src/tusb_config.h16
-rw-r--r--examples/device/msc_dual_lun/src/tusb_config.h14
-rw-r--r--examples/device/webusb/src/tusb_config.h16
-rw-r--r--examples/host/cdc_msc_hid/src/tusb_config.h2
-rw-r--r--src/class/custom/custom_device.c2
-rw-r--r--src/device/usbd.c2
-rw-r--r--src/tusb.h2
-rw-r--r--src/tusb_option.h4
-rw-r--r--test/test/support/tusb_config.h2
12 files changed, 57 insertions, 57 deletions
diff --git a/examples/device/cdc_msc_hid/src/tusb_config.h b/examples/device/cdc_msc_hid/src/tusb_config.h
index 31ae2b883..1c0ee349c 100644
--- a/examples/device/cdc_msc_hid/src/tusb_config.h
+++ b/examples/device/cdc_msc_hid/src/tusb_config.h
@@ -69,25 +69,25 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
-#define CFG_TUD_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUD_CDC 1
-#define CFG_TUD_MSC 1
-#define CFG_TUD_HID 1
+#define CFG_TUD_CDC 1
+#define CFG_TUD_MSC 1
+#define CFG_TUD_HID 1
-#define CFG_TUD_MIDI 0
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_MIDI 0
+#define CFG_TUD_VENDOR 0
// CDC FIFO size of TX and RX
-#define CFG_TUD_CDC_RX_BUFSIZE 64
-#define CFG_TUD_CDC_TX_BUFSIZE 64
+#define CFG_TUD_CDC_RX_BUFSIZE 64
+#define CFG_TUD_CDC_TX_BUFSIZE 64
// MSC Buffer size of Device Mass storage
-#define CFG_TUD_MSC_BUFSIZE 512
+#define CFG_TUD_MSC_BUFSIZE 512
// HID buffer size Should be sufficient to hold ID (if any) + Data
-#define CFG_TUD_HID_BUFSIZE 16
+#define CFG_TUD_HID_BUFSIZE 16
#ifdef __cplusplus
}
diff --git a/examples/device/cdc_msc_hid_freertos/src/tusb_config.h b/examples/device/cdc_msc_hid_freertos/src/tusb_config.h
index 2a250ac83..bb31eac06 100644
--- a/examples/device/cdc_msc_hid_freertos/src/tusb_config.h
+++ b/examples/device/cdc_msc_hid_freertos/src/tusb_config.h
@@ -69,25 +69,25 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
-#define CFG_TUD_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUD_CDC 1
-#define CFG_TUD_MSC 1
-#define CFG_TUD_HID 1
+#define CFG_TUD_CDC 1
+#define CFG_TUD_MSC 1
+#define CFG_TUD_HID 1
-#define CFG_TUD_MIDI 0
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_MIDI 0
+#define CFG_TUD_VENDOR 0
// CDC FIFO size of TX and RX
-#define CFG_TUD_CDC_RX_BUFSIZE 64
-#define CFG_TUD_CDC_TX_BUFSIZE 64
+#define CFG_TUD_CDC_RX_BUFSIZE 64
+#define CFG_TUD_CDC_TX_BUFSIZE 64
// MSC Buffer size of Device Mass storage
-#define CFG_TUD_MSC_BUFSIZE 512
+#define CFG_TUD_MSC_BUFSIZE 512
// HID buffer size Should be sufficient to hold ID (if any) + Data
-#define CFG_TUD_HID_BUFSIZE 16
+#define CFG_TUD_HID_BUFSIZE 16
#ifdef __cplusplus
}
diff --git a/examples/device/hid_generic_inout/src/tusb_config.h b/examples/device/hid_generic_inout/src/tusb_config.h
index d97cd533e..c55529fcb 100644
--- a/examples/device/hid_generic_inout/src/tusb_config.h
+++ b/examples/device/hid_generic_inout/src/tusb_config.h
@@ -69,17 +69,17 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
-#define CFG_TUD_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUD_CDC 0
-#define CFG_TUD_MSC 0
-#define CFG_TUD_HID 1
-#define CFG_TUD_MIDI 0
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_CDC 0
+#define CFG_TUD_MSC 0
+#define CFG_TUD_HID 1
+#define CFG_TUD_MIDI 0
+#define CFG_TUD_VENDOR 0
// HID buffer size Should be sufficient to hold ID (if any) + Data
-#define CFG_TUD_HID_BUFSIZE 64
+#define CFG_TUD_HID_BUFSIZE 64
#ifdef __cplusplus
}
diff --git a/examples/device/midi_test/src/tusb_config.h b/examples/device/midi_test/src/tusb_config.h
index a6e3ad710..d588b4df9 100644
--- a/examples/device/midi_test/src/tusb_config.h
+++ b/examples/device/midi_test/src/tusb_config.h
@@ -69,18 +69,18 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
-#define CFG_TUD_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUD_CDC 0
-#define CFG_TUD_MSC 0
-#define CFG_TUD_HID 0
-#define CFG_TUD_MIDI 1
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_CDC 0
+#define CFG_TUD_MSC 0
+#define CFG_TUD_HID 0
+#define CFG_TUD_MIDI 1
+#define CFG_TUD_VENDOR 0
// MIDI FIFO size of TX and RX
-#define CFG_TUD_MIDI_RX_BUFSIZE 64
-#define CFG_TUD_MIDI_TX_BUFSIZE 64
+#define CFG_TUD_MIDI_RX_BUFSIZE 64
+#define CFG_TUD_MIDI_TX_BUFSIZE 64
#ifdef __cplusplus
}
diff --git a/examples/device/msc_dual_lun/src/tusb_config.h b/examples/device/msc_dual_lun/src/tusb_config.h
index 3b87d9f21..2e40b9e86 100644
--- a/examples/device/msc_dual_lun/src/tusb_config.h
+++ b/examples/device/msc_dual_lun/src/tusb_config.h
@@ -69,17 +69,17 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
-#define CFG_TUD_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUD_CDC 0
-#define CFG_TUD_MSC 1
-#define CFG_TUD_HID 0
-#define CFG_TUD_MIDI 0
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_CDC 0
+#define CFG_TUD_MSC 1
+#define CFG_TUD_HID 0
+#define CFG_TUD_MIDI 0
+#define CFG_TUD_VENDOR 0
// MSC Buffer size of Device Mass storage
-#define CFG_TUD_MSC_BUFSIZE 512
+#define CFG_TUD_MSC_BUFSIZE 512
#ifdef __cplusplus
}
diff --git a/examples/device/webusb/src/tusb_config.h b/examples/device/webusb/src/tusb_config.h
index 6c126a82f..8aefe8695 100644
--- a/examples/device/webusb/src/tusb_config.h
+++ b/examples/device/webusb/src/tusb_config.h
@@ -69,18 +69,18 @@
// DEVICE CONFIGURATION
//--------------------------------------------------------------------
-#define CFG_TUD_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUD_CDC 1
-#define CFG_TUD_MSC 0
-#define CFG_TUD_HID 0
-#define CFG_TUD_MIDI 0
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_CDC 1
+#define CFG_TUD_MSC 0
+#define CFG_TUD_HID 0
+#define CFG_TUD_MIDI 0
+#define CFG_TUD_VENDOR 0
// CDC FIFO size of TX and RX
-#define CFG_TUD_CDC_RX_BUFSIZE 64
-#define CFG_TUD_CDC_TX_BUFSIZE 64
+#define CFG_TUD_CDC_RX_BUFSIZE 64
+#define CFG_TUD_CDC_TX_BUFSIZE 64
#ifdef __cplusplus
}
diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index 1a9c8fa5c..56208e771 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -82,7 +82,7 @@
//------------- CLASS -------------//
#define CFG_TUD_CDC 0
#define CFG_TUD_MSC 0
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_VENDOR 0
#define CFG_TUD_HID 0
#define CFG_TUD_HID_KEYBOARD 0
diff --git a/src/class/custom/custom_device.c b/src/class/custom/custom_device.c
index 02a711621..cf9aa3b3f 100644
--- a/src/class/custom/custom_device.c
+++ b/src/class/custom/custom_device.c
@@ -26,7 +26,7 @@
#include "tusb_option.h"
-#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CUSTOM_CLASS)
+#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_VENDOR)
#include "common/tusb_common.h"
#include "custom_device.h"
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 6f2a72143..54fd070b8 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -130,7 +130,7 @@ static usbd_class_driver_t const usbd_class_drivers[] =
},
#endif
- #if CFG_TUD_CUSTOM_CLASS
+ #if CFG_TUD_VENDOR
{
.class_code = TUSB_CLASS_VENDOR_SPECIFIC,
.init = cusd_init,
diff --git a/src/tusb.h b/src/tusb.h
index 30642c00d..6072218de 100644
--- a/src/tusb.h
+++ b/src/tusb.h
@@ -80,7 +80,7 @@
#include "class/midi/midi_device.h"
#endif
- #if CFG_TUD_CUSTOM_CLASS
+ #if CFG_TUD_VENDOR
#include "class/custom/custom_device.h"
#endif
#endif
diff --git a/src/tusb_option.h b/src/tusb_option.h
index da9bc70fa..a1c5b757d 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -161,8 +161,8 @@
#define CFG_TUD_MIDI 0
#endif
-#ifndef CFG_TUD_CUSTOM_CLASS
- #define CFG_TUD_CUSTOM_CLASS 0
+#ifndef CFG_TUD_VENDOR
+ #define CFG_TUD_VENDOR 0
#endif
diff --git a/test/test/support/tusb_config.h b/test/test/support/tusb_config.h
index d49576850..eaa63b958 100644
--- a/test/test/support/tusb_config.h
+++ b/test/test/support/tusb_config.h
@@ -78,7 +78,7 @@
#define CFG_TUD_HID 1
#define CFG_TUD_MIDI 1
-#define CFG_TUD_CUSTOM_CLASS 0
+#define CFG_TUD_VENDOR 0
//------------- CDC -------------//