summaryrefslogtreecommitdiff
path: root/examples/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-04-12 13:23:52 +0700
committerhathach <[email protected]>2018-04-12 13:23:52 +0700
commit4b660175beea2c76a1a761e3840937d9784ab201 (patch)
tree2d3b595aa8bf9e1ffcb7dd1feafd92275e92994e /examples/device
parent3d31f921068d906f6f63f59a3b10784f28e97d4d (diff)
rename CFG_TUSB_DEVICE_* to CFG_TUD_*
Diffstat (limited to 'examples/device')
-rw-r--r--examples/device/device_virtual_com/src/main.c8
-rw-r--r--examples/device/device_virtual_com/src/tusb_config.h12
-rw-r--r--examples/device/device_virtual_com/src/tusb_descriptors.c2
-rw-r--r--examples/device/device_virtual_com/src/tusb_descriptors.h2
-rw-r--r--examples/device/nrf52840/src/main.c8
-rw-r--r--examples/device/nrf52840/src/msc_device_app.c2
-rw-r--r--examples/device/nrf52840/src/msc_device_app.h2
-rw-r--r--examples/device/nrf52840/src/msc_device_ramdisk.c2
-rw-r--r--examples/device/nrf52840/src/tusb_config.h12
-rw-r--r--examples/device/nrf52840/src/tusb_descriptors.c2
-rw-r--r--examples/device/nrf52840/src/tusb_descriptors.h2
11 files changed, 27 insertions, 27 deletions
diff --git a/examples/device/device_virtual_com/src/main.c b/examples/device/device_virtual_com/src/main.c
index 68837e134..531733cdc 100644
--- a/examples/device/device_virtual_com/src/main.c
+++ b/examples/device/device_virtual_com/src/main.c
@@ -147,8 +147,8 @@ void print_greeting(void)
puts("This DEVICE demo is configured to support:");
printf(" - RTOS = %s\n", rtos_name[CFG_TUSB_OS]);
- if (CFG_TUSB_DEVICE_HID_MOUSE ) puts(" - HID Mouse");
- if (CFG_TUSB_DEVICE_HID_KEYBOARD ) puts(" - HID Keyboard");
- if (CFG_TUSB_DEVICE_MSC ) puts(" - Mass Storage");
- if (CFG_TUSB_DEVICE_CDC ) puts(" - Communication Device Class");
+ if (CFG_TUD_HID_MOUSE ) puts(" - HID Mouse");
+ if (CFG_TUD_HID_KEYBOARD ) puts(" - HID Keyboard");
+ if (CFG_TUD_MSC ) puts(" - Mass Storage");
+ if (CFG_TUD_CDC ) puts(" - Communication Device Class");
}
diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h
index 26ed087bc..7d2a9c539 100644
--- a/examples/device/device_virtual_com/src/tusb_config.h
+++ b/examples/device/device_virtual_com/src/tusb_config.h
@@ -54,14 +54,14 @@
//--------------------------------------------------------------------+
// DEVICE CONFIGURATION
//--------------------------------------------------------------------+
-#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUSB_DEVICE_HID_KEYBOARD 0
-#define CFG_TUSB_DEVICE_HID_MOUSE 0
-#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet
-#define CFG_TUSB_DEVICE_MSC 0
-#define CFG_TUSB_DEVICE_CDC 1
+#define CFG_TUD_HID_KEYBOARD 0
+#define CFG_TUD_HID_MOUSE 0
+#define CFG_TUD_HID_GENERIC 0 // not supported yet
+#define CFG_TUD_MSC 0
+#define CFG_TUD_CDC 1
//--------------------------------------------------------------------+
// COMMON CONFIGURATION
diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.c b/examples/device/device_virtual_com/src/tusb_descriptors.c
index 6a057d0a4..09543e0de 100644
--- a/examples/device/device_virtual_com/src/tusb_descriptors.c
+++ b/examples/device/device_virtual_com/src/tusb_descriptors.c
@@ -53,7 +53,7 @@ tusb_desc_device_t const desc_device =
.bDeviceSubClass = MISC_SUBCLASS_COMMON,
.bDeviceProtocol = MISC_PROTOCOL_IAD,
- .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE,
+ .bMaxPacketSize0 = CFG_TUD_ENDOINT0_SIZE,
.idVendor = CFG_VENDORID,
.idProduct = CFG_PRODUCTID,
diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.h b/examples/device/device_virtual_com/src/tusb_descriptors.h
index 2d362bc0b..0c80579e1 100644
--- a/examples/device/device_virtual_com/src/tusb_descriptors.h
+++ b/examples/device/device_virtual_com/src/tusb_descriptors.h
@@ -50,7 +50,7 @@
// each combination of interfaces need to have a unique productid, as windows will bind & remember device driver after the first plug.
// Auto ProductID layout's Bitmap: (MSB) MassStorage | Generic | Mouse | Key | CDC (LSB)
#ifndef CFG_PRODUCTID
- #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUSB_DEVICE_##interface) << (n) )
+ #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUD_##interface) << (n) )
#define CFG_PRODUCTID (0x4000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | \
PRODUCTID_BITMAP(HID_MOUSE, 2) | PRODUCTID_BITMAP(HID_GENERIC, 3) | \
PRODUCTID_BITMAP(MSC, 4) ) )
diff --git a/examples/device/nrf52840/src/main.c b/examples/device/nrf52840/src/main.c
index 42dfaaaa5..9b173c802 100644
--- a/examples/device/nrf52840/src/main.c
+++ b/examples/device/nrf52840/src/main.c
@@ -145,8 +145,8 @@ void print_greeting(void)
printf("This DEVICE demo is configured to support:");
printf(" - RTOS = %s\n", rtos_name[CFG_TUSB_OS]);
- if (CFG_TUSB_DEVICE_HID_MOUSE ) puts(" - HID Mouse");
- if (CFG_TUSB_DEVICE_HID_KEYBOARD ) puts(" - HID Keyboard");
- if (CFG_TUSB_DEVICE_MSC ) puts(" - Mass Storage");
- if (CFG_TUSB_DEVICE_CDC ) puts(" - Communication Device Class");
+ if (CFG_TUD_HID_MOUSE ) puts(" - HID Mouse");
+ if (CFG_TUD_HID_KEYBOARD ) puts(" - HID Keyboard");
+ if (CFG_TUD_MSC ) puts(" - Mass Storage");
+ if (CFG_TUD_CDC ) puts(" - Communication Device Class");
}
diff --git a/examples/device/nrf52840/src/msc_device_app.c b/examples/device/nrf52840/src/msc_device_app.c
index 6609257e2..1730975dd 100644
--- a/examples/device/nrf52840/src/msc_device_app.c
+++ b/examples/device/nrf52840/src/msc_device_app.c
@@ -38,7 +38,7 @@
#include "msc_device_app.h"
-#if CFG_TUSB_DEVICE_MSC
+#if CFG_TUD_MSC
//--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+
diff --git a/examples/device/nrf52840/src/msc_device_app.h b/examples/device/nrf52840/src/msc_device_app.h
index 83b460743..0ed04d285 100644
--- a/examples/device/nrf52840/src/msc_device_app.h
+++ b/examples/device/nrf52840/src/msc_device_app.h
@@ -50,7 +50,7 @@
extern "C" {
#endif
-#if CFG_TUSB_DEVICE_MSC
+#if CFG_TUD_MSC
enum
{
diff --git a/examples/device/nrf52840/src/msc_device_ramdisk.c b/examples/device/nrf52840/src/msc_device_ramdisk.c
index 45932e0c3..bb9c53e4c 100644
--- a/examples/device/nrf52840/src/msc_device_ramdisk.c
+++ b/examples/device/nrf52840/src/msc_device_ramdisk.c
@@ -38,7 +38,7 @@
#include "msc_device_app.h"
-#if CFG_TUSB_DEVICE_MSC && defined (MSCD_APP_RAMDISK)
+#if CFG_TUD_MSC && defined (MSCD_APP_RAMDISK)
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h
index 0f7ff7b8c..c58798040 100644
--- a/examples/device/nrf52840/src/tusb_config.h
+++ b/examples/device/nrf52840/src/tusb_config.h
@@ -54,14 +54,14 @@
//--------------------------------------------------------------------+
// DEVICE CONFIGURATION
//--------------------------------------------------------------------+
-#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUSB_DEVICE_HID_KEYBOARD 0
-#define CFG_TUSB_DEVICE_HID_MOUSE 0
-#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet
-#define CFG_TUSB_DEVICE_MSC 1
-#define CFG_TUSB_DEVICE_CDC 1
+#define CFG_TUD_HID_KEYBOARD 0
+#define CFG_TUD_HID_MOUSE 0
+#define CFG_TUD_HID_GENERIC 0 // not supported yet
+#define CFG_TUD_MSC 1
+#define CFG_TUD_CDC 1
//--------------------------------------------------------------------+
// COMMON CONFIGURATION
diff --git a/examples/device/nrf52840/src/tusb_descriptors.c b/examples/device/nrf52840/src/tusb_descriptors.c
index b8f0a89d9..b7256c2e7 100644
--- a/examples/device/nrf52840/src/tusb_descriptors.c
+++ b/examples/device/nrf52840/src/tusb_descriptors.c
@@ -53,7 +53,7 @@ tusb_desc_device_t const desc_device =
.bDeviceSubClass = MISC_SUBCLASS_COMMON,
.bDeviceProtocol = MISC_PROTOCOL_IAD,
- .bMaxPacketSize0 = CFG_TUSB_DEVICE_ENDOINT0_SIZE,
+ .bMaxPacketSize0 = CFG_TUD_ENDOINT0_SIZE,
.idVendor = CFG_VENDORID,
.idProduct = CFG_PRODUCTID,
diff --git a/examples/device/nrf52840/src/tusb_descriptors.h b/examples/device/nrf52840/src/tusb_descriptors.h
index b8d07357e..03269cca7 100644
--- a/examples/device/nrf52840/src/tusb_descriptors.h
+++ b/examples/device/nrf52840/src/tusb_descriptors.h
@@ -50,7 +50,7 @@
// each combination of interfaces need to have a unique productid, as windows will bind & remember device driver after the first plug.
// Auto ProductID layout's Bitmap: (MSB) MassStorage | Generic | Mouse | Key | CDC (LSB)
#ifndef CFG_PRODUCTID
- #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUSB_DEVICE_##interface) << (n) )
+ #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUD_##interface) << (n) )
#define CFG_PRODUCTID (0x4000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | \
PRODUCTID_BITMAP(HID_MOUSE, 2) | PRODUCTID_BITMAP(HID_GENERIC, 3) | \
PRODUCTID_BITMAP(MSC, 4) ) )