andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename CFG_TUSB_DEVICE_* to CFG_TUD_*

Browse Source
This commit is contained in:
hathach
2018-04-12 13:23:52 +07:00
parent 3d31f92106
commit 4b660175be
40 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/device/nrf52840/src/main.c
View File

@@ -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");
}

2
examples/device/nrf52840/src/msc_device_app.c
View File

@@ -38,7 +38,7 @@
#include "msc_device_app.h"
#if CFG_TUSB_DEVICE_MSC
#if CFG_TUD_MSC
//--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+

2
examples/device/nrf52840/src/msc_device_app.h
View File

@@ -50,7 +50,7 @@
extern "C" {
#endif
#if CFG_TUSB_DEVICE_MSC
#if CFG_TUD_MSC
enum
{

2
examples/device/nrf52840/src/msc_device_ramdisk.c
View File

@@ -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

12
examples/device/nrf52840/src/tusb_config.h
View File

@@ -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

2
examples/device/nrf52840/src/tusb_descriptors.c
View File

@@ -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,

2
examples/device/nrf52840/src/tusb_descriptors.h
View File

@@ -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) ) )