diff options
Diffstat (limited to 'examples')
47 files changed, 264 insertions, 264 deletions
diff --git a/examples/device/device_virtual_com/segger/device_virtual_com.emProject b/examples/device/device_virtual_com/segger/device_virtual_com.emProject index c52698a89..63927ff9d 100644 --- a/examples/device/device_virtual_com/segger/device_virtual_com.emProject +++ b/examples/device/device_virtual_com/segger/device_virtual_com.emProject @@ -201,7 +201,7 @@ </folder> <configuration Name="EA4357" - c_preprocessor_definitions="BOARD=BOARD_EA4357;TUSB_CFG_MCU=MCU_LPC43XX" /> + c_preprocessor_definitions="BOARD=BOARD_EA4357;CFG_TUSB_MCU=MCU_LPC43XX" /> </project> <configuration Name="Debug" diff --git a/examples/device/device_virtual_com/src/main.c b/examples/device/device_virtual_com/src/main.c index 3ee3a74d3..8d4065194 100644 --- a/examples/device/device_virtual_com/src/main.c +++ b/examples/device/device_virtual_com/src/main.c @@ -146,9 +146,9 @@ void print_greeting(void) ); puts("This DEVICE demo is configured to support:"); - printf(" - RTOS = %s\n", rtos_name[TUSB_CFG_OS]); - if (TUSB_CFG_DEVICE_HID_MOUSE ) puts(" - HID Mouse"); - if (TUSB_CFG_DEVICE_HID_KEYBOARD ) puts(" - HID Keyboard"); - if (TUSB_CFG_DEVICE_MSC ) puts(" - Mass Storage"); - if (TUSB_CFG_DEVICE_CDC ) puts(" - Communication Device Class"); + 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"); } diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h index be2aaf71a..d0737de13 100644 --- a/examples/device/device_virtual_com/src/tusb_config.h +++ b/examples/device/device_virtual_com/src/tusb_config.h @@ -46,70 +46,70 @@ //--------------------------------------------------------------------+ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ -//#define TUSB_CFG_MCU will be passed from IDE/command line for easy board/mcu switching +//#define CFG_TUSB_MCU will be passed from IDE/command line for easy board/mcu switching -#define TUSB_CFG_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) -//#define TUSB_CFG_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) +//#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 //------------- CLASS -------------// -#define TUSB_CFG_DEVICE_HID_KEYBOARD 0 -#define TUSB_CFG_DEVICE_HID_MOUSE 0 -#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet -#define TUSB_CFG_DEVICE_MSC 0 -#define TUSB_CFG_DEVICE_CDC 1 +#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 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEBUG 2 +#define CFG_TUSB_DEBUG 2 -//#define TUSB_CFG_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching -//#define TUSB_CFG_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching -#define TUSB_CFG_TICKS_HZ 1000 +//#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching +//#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching +#define CFG_TUSB_TICKS_HZ 1000 -//#define TUSB_CFG_OS TUSB_OS_NONE +//#define CFG_TUSB_OS TUSB_OS_NONE //--------------------------------------------------------------------+ // USB RAM PLACEMENT //--------------------------------------------------------------------+ #ifdef __CODE_RED // compiled with lpcxpresso - #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned - #elif TUSB_CFG_MCU == MCU_LPC175X_6X - #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) + #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned + #elif CFG_TUSB_MCU == MCU_LPC175X_6X + #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) #endif #elif defined __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files - #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned - #elif (TUSB_CFG_MCU == MCU_LPC175X_6X) - #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory + #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned + #elif (CFG_TUSB_MCU == MCU_LPC175X_6X) + #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory #endif #elif defined __ICCARM__ // compiled with IAR - #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX) - #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) - #elif (TUSB_CFG_MCU == MCU_LPC175X_6X) - #define TUSB_CFG_ATTR_USBRAM - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") + #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) + #elif (CFG_TUSB_MCU == MCU_LPC175X_6X) + #define CFG_TUSB_ATTR_USBRAM + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") #endif #elif defined __SES_ARM -#define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.bss2) +#define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.bss2) #else diff --git a/examples/device/device_virtual_com/src/tusb_descriptors.c b/examples/device/device_virtual_com/src/tusb_descriptors.c index 74954ba1c..f0867585a 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 = TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_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 af200946c..2d362bc0b 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) ( (TUSB_CFG_DEVICE_##interface) << (n) ) + #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUSB_DEVICE_##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/device_virtual_com/xpresso/.cproject b/examples/device/device_virtual_com/xpresso/.cproject index 346f46d92..ffe0a240e 100644 --- a/examples/device/device_virtual_com/xpresso/.cproject +++ b/examples/device/device_virtual_com/xpresso/.cproject @@ -31,7 +31,7 @@ <listOptionValue builtIn="false" value="__LPC43XX__"/> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> </option> <option id="gnu.c.compiler.option.misc.other.1756693195" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -fsingle-precision-constant" valueType="string"/> diff --git a/examples/device/nrf52840/src/main.c b/examples/device/nrf52840/src/main.c index 203cd3f18..bb26f3a4e 100644 --- a/examples/device/nrf52840/src/main.c +++ b/examples/device/nrf52840/src/main.c @@ -144,9 +144,9 @@ void print_greeting(void) printf("--------------------------------------------------------------------\n\n"); printf("This DEVICE demo is configured to support:"); - printf(" - RTOS = %s\n", rtos_name[TUSB_CFG_OS]); - if (TUSB_CFG_DEVICE_HID_MOUSE ) puts(" - HID Mouse"); - if (TUSB_CFG_DEVICE_HID_KEYBOARD ) puts(" - HID Keyboard"); - if (TUSB_CFG_DEVICE_MSC ) puts(" - Mass Storage"); - if (TUSB_CFG_DEVICE_CDC ) puts(" - Communication Device Class"); + 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"); } diff --git a/examples/device/nrf52840/src/msc_device_app.c b/examples/device/nrf52840/src/msc_device_app.c index 401a32d1d..6609257e2 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 TUSB_CFG_DEVICE_MSC +#if CFG_TUSB_DEVICE_MSC //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ diff --git a/examples/device/nrf52840/src/msc_device_app.h b/examples/device/nrf52840/src/msc_device_app.h index cd087b8a3..185ceb260 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 TUSB_CFG_DEVICE_MSC +#if CFG_TUSB_DEVICE_MSC enum { @@ -63,7 +63,7 @@ enum If you find any bugs or get any questions, feel free to file an\r\n\ issue at github.com/hathach/tinyusb" -#if TUSB_CFG_MCU==MCU_LPC11UXX || TUSB_CFG_MCU==MCU_LPC13UXX +#if CFG_TUSB_MCU==MCU_LPC11UXX || CFG_TUSB_MCU==MCU_LPC13UXX #define MSCD_APP_ROMDISK #else // defaults is ram disk #define MSCD_APP_RAMDISK diff --git a/examples/device/nrf52840/src/msc_device_ramdisk.c b/examples/device/nrf52840/src/msc_device_ramdisk.c index fefbfdf79..b19b37252 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 TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_RAMDISK) +#if CFG_TUSB_DEVICE_MSC && defined (MSCD_APP_RAMDISK) //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -47,7 +47,7 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT +CFG_TUSB_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] = { //------------- Boot Sector -------------// diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h index e517376c3..54ec51cce 100644 --- a/examples/device/nrf52840/src/tusb_config.h +++ b/examples/device/nrf52840/src/tusb_config.h @@ -46,41 +46,41 @@ //--------------------------------------------------------------------+ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ -//#define TUSB_CFG_MCU will be passed from IDE/command line for easy board/mcu switching +//#define CFG_TUSB_MCU will be passed from IDE/command line for easy board/mcu switching -#define TUSB_CFG_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) -//#define TUSB_CFG_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) +//#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 //------------- CLASS -------------// -#define TUSB_CFG_DEVICE_HID_KEYBOARD 0 -#define TUSB_CFG_DEVICE_HID_MOUSE 0 -#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet -#define TUSB_CFG_DEVICE_MSC 1 -#define TUSB_CFG_DEVICE_CDC 1 +#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 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEBUG 2 +#define CFG_TUSB_DEBUG 2 -#define TUSB_CFG_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching -//#define TUSB_CFG_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching -#define TUSB_CFG_TICKS_HZ 1000 +#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching +//#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching +#define CFG_TUSB_TICKS_HZ 1000 -//#define TUSB_CFG_OS TUSB_OS_NONE +//#define CFG_TUSB_OS TUSB_OS_NONE //--------------------------------------------------------------------+ // USB RAM PLACEMENT //--------------------------------------------------------------------+ -#define TUSB_CFG_ATTR_USBRAM +#define CFG_TUSB_ATTR_USBRAM // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment -#if TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC13UXX +#if CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX #define ATTR_USB_MIN_ALIGNMENT ATTR_ALIGNED(64) #elif defined NRF52840_XXAA #define ATTR_USB_MIN_ALIGNMENT ATTR_ALIGNED(4) diff --git a/examples/device/nrf52840/src/tusb_descriptors.c b/examples/device/nrf52840/src/tusb_descriptors.c index a36786961..99a47618a 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 = TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_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 cf291e25e..b8d07357e 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) ( (TUSB_CFG_DEVICE_##interface) << (n) ) + #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUSB_DEVICE_##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/obsolete/device/device_freertos/.cproject b/examples/obsolete/device/device_freertos/.cproject index e3c134ea3..9a17de18e 100644 --- a/examples/obsolete/device/device_freertos/.cproject +++ b/examples/obsolete/device/device_freertos/.cproject @@ -32,9 +32,9 @@ <option id="com.crt.advproject.gcc.thumb.697143257" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.371325215" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC13UXX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC13UXX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1347"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -129,10 +129,10 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.690334585" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC11UXX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC11UXX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO11U68"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -226,10 +226,10 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.211439980" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -330,10 +330,10 @@ <option id="com.crt.advproject.gcc.thumb.530159727" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.216849614" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X "/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC175X_6X "/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -428,10 +428,10 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -527,10 +527,10 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.2019019201" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC11UXX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC11UXX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO11U14"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> diff --git a/examples/obsolete/device/device_os_none/.cproject b/examples/obsolete/device/device_os_none/.cproject index b09c3d9cd..a8cd67cf2 100644 --- a/examples/obsolete/device/device_os_none/.cproject +++ b/examples/obsolete/device/device_os_none/.cproject @@ -32,8 +32,8 @@ <option id="com.crt.advproject.gcc.thumb.697143257" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.371325215" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC13UXX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC13UXX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1347"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -125,9 +125,9 @@ <option id="com.crt.advproject.gcc.thumb.1429919562" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.690334585" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC11UXX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC11UXX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO11U68"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -218,10 +218,10 @@ <option id="com.crt.advproject.gcc.arch.1901283003" name="Architecture" superClass="com.crt.advproject.gcc.arch" useByScannerDiscovery="false" value="com.crt.advproject.gcc.target.cm4" valueType="enumerated"/> <option id="com.crt.advproject.gcc.thumb.1993301691" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.211439980" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -323,8 +323,8 @@ <option id="com.crt.advproject.gcc.thumb.530159727" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.216849614" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC175X_6X"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -418,10 +418,10 @@ <option id="com.crt.advproject.gcc.thumb.1913988235" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.752273048" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> @@ -515,9 +515,9 @@ <option id="com.crt.advproject.gcc.thumb.2139107433" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.2019019201" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC11UXX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC11UXX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO11U14"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> diff --git a/examples/obsolete/device/src/app_os_prio.h b/examples/obsolete/device/src/app_os_prio.h index 5d932a41e..e75b942ce 100644 --- a/examples/obsolete/device/src/app_os_prio.h +++ b/examples/obsolete/device/src/app_os_prio.h @@ -46,16 +46,16 @@ #include "tusb.h" -#if TUSB_CFG_OS == TUSB_OS_NONE +#if CFG_TUSB_OS == TUSB_OS_NONE #define LOWER_PRIO(x) 0 // does not matter -#elif TUSB_CFG_OS == TUSB_OS_FREERTOS +#elif CFG_TUSB_OS == TUSB_OS_FREERTOS #define LOWER_PRIO(x) ((x)-1) // freeRTOS lower number --> lower priority #else #error Priority is not configured for this RTOS #endif enum { - STANDARD_APP_TASK_PRIO = LOWER_PRIO(TUSB_CFG_OS_TASK_PRIO), // Application Task is lower than usb system task + STANDARD_APP_TASK_PRIO = LOWER_PRIO(CFG_TUSB_OS_TASK_PRIO), // Application Task is lower than usb system task LED_BLINKING_APP_TASK_PRIO = LOWER_PRIO(STANDARD_APP_TASK_PRIO), // Blinking task is lower than normal task KEYBOARD_APP_TASK_PRIO = STANDARD_APP_TASK_PRIO, diff --git a/examples/obsolete/device/src/cdc_device_app.c b/examples/obsolete/device/src/cdc_device_app.c index 7f448de05..d72e6bcd9 100644 --- a/examples/obsolete/device/src/cdc_device_app.c +++ b/examples/obsolete/device/src/cdc_device_app.c @@ -38,7 +38,7 @@ #include "cdc_device_app.h" -#if TUSB_CFG_DEVICE_CDC +#if CFG_TUSB_DEVICE_CDC #include "common/tusb_fifo.h" // TODO refractor #include "app_os_prio.h" diff --git a/examples/obsolete/device/src/cdc_device_app.h b/examples/obsolete/device/src/cdc_device_app.h index a2cd70eb7..45f02baef 100644 --- a/examples/obsolete/device/src/cdc_device_app.h +++ b/examples/obsolete/device/src/cdc_device_app.h @@ -53,7 +53,7 @@ extern "C" { #endif -#if TUSB_CFG_DEVICE_CDC +#if CFG_TUSB_DEVICE_CDC void cdc_serial_app_init(void); void cdc_serial_app_task(void* param); diff --git a/examples/obsolete/device/src/keyboard_device_app.c b/examples/obsolete/device/src/keyboard_device_app.c index 64087053a..a4ae81a46 100644 --- a/examples/obsolete/device/src/keyboard_device_app.c +++ b/examples/obsolete/device/src/keyboard_device_app.c @@ -38,7 +38,7 @@ #include "keyboard_device_app.h" -#if TUSB_CFG_DEVICE_HID_KEYBOARD +#if CFG_TUSB_DEVICE_HID_KEYBOARD //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ @@ -51,7 +51,7 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM hid_keyboard_report_t keyboard_report; +CFG_TUSB_ATTR_USBRAM hid_keyboard_report_t keyboard_report; //--------------------------------------------------------------------+ // tinyusb callbacks diff --git a/examples/obsolete/device/src/keyboard_device_app.h b/examples/obsolete/device/src/keyboard_device_app.h index 4d069ae39..1d2a8b39e 100644 --- a/examples/obsolete/device/src/keyboard_device_app.h +++ b/examples/obsolete/device/src/keyboard_device_app.h @@ -53,7 +53,7 @@ extern "C" { #endif -#if TUSB_CFG_DEVICE_HID_KEYBOARD +#if CFG_TUSB_DEVICE_HID_KEYBOARD void keyboard_app_init(void); void keyboard_app_task(void* param); diff --git a/examples/obsolete/device/src/main.c b/examples/obsolete/device/src/main.c index 0cd9eb3bc..802883ce4 100644 --- a/examples/obsolete/device/src/main.c +++ b/examples/obsolete/device/src/main.c @@ -64,7 +64,7 @@ void led_blinking_init(void); void led_blinking_task(void* param); -#if TUSB_CFG_OS == TUSB_OS_NONE +#if CFG_TUSB_OS == TUSB_OS_NONE // like a real RTOS, this function is a main loop invoking each task in application and never return void os_none_start_scheduler(void) { @@ -97,9 +97,9 @@ int main(void) cdc_serial_app_init(); //------------- start OS scheduler (never return) -------------// -#if TUSB_CFG_OS == TUSB_OS_FREERTOS +#if CFG_TUSB_OS == TUSB_OS_FREERTOS vTaskStartScheduler(); -#elif TUSB_CFG_OS == TUSB_OS_NONE +#elif CFG_TUSB_OS == TUSB_OS_NONE os_none_start_scheduler(); #else #error need to start RTOS schduler @@ -193,9 +193,9 @@ void print_greeting(void) ); puts("This DEVICE demo is configured to support:"); - printf(" - RTOS = %s\n", rtos_name[TUSB_CFG_OS]); - if (TUSB_CFG_DEVICE_HID_MOUSE ) puts(" - HID Mouse"); - if (TUSB_CFG_DEVICE_HID_KEYBOARD ) puts(" - HID Keyboard"); - if (TUSB_CFG_DEVICE_MSC ) puts(" - Mass Storage"); - if (TUSB_CFG_DEVICE_CDC ) puts(" - Communication Device Class"); + 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"); } diff --git a/examples/obsolete/device/src/mouse_device_app.c b/examples/obsolete/device/src/mouse_device_app.c index b04ef7133..3cc2e0d68 100644 --- a/examples/obsolete/device/src/mouse_device_app.c +++ b/examples/obsolete/device/src/mouse_device_app.c @@ -38,7 +38,7 @@ #include "mouse_device_app.h" -#if TUSB_CFG_DEVICE_HID_MOUSE +#if CFG_TUSB_DEVICE_HID_MOUSE //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ @@ -51,7 +51,7 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM hid_mouse_report_t mouse_report; +CFG_TUSB_ATTR_USBRAM hid_mouse_report_t mouse_report; //--------------------------------------------------------------------+ // tinyusb callbacks diff --git a/examples/obsolete/device/src/mouse_device_app.h b/examples/obsolete/device/src/mouse_device_app.h index f39f8e30f..48bfb3315 100644 --- a/examples/obsolete/device/src/mouse_device_app.h +++ b/examples/obsolete/device/src/mouse_device_app.h @@ -53,7 +53,7 @@ extern "C" { #endif -#if TUSB_CFG_DEVICE_HID_MOUSE +#if CFG_TUSB_DEVICE_HID_MOUSE void mouse_app_init(void); void mouse_app_task(void * param); diff --git a/examples/obsolete/device/src/msc_device_app.c b/examples/obsolete/device/src/msc_device_app.c index 5650d8b71..df78ccd6e 100644 --- a/examples/obsolete/device/src/msc_device_app.c +++ b/examples/obsolete/device/src/msc_device_app.c @@ -38,7 +38,7 @@ #include "msc_device_app.h" -#if TUSB_CFG_DEVICE_MSC +#if CFG_TUSB_DEVICE_MSC //--------------------------------------------------------------------+ // INCLUDE //--------------------------------------------------------------------+ diff --git a/examples/obsolete/device/src/msc_device_app.h b/examples/obsolete/device/src/msc_device_app.h index cd087b8a3..185ceb260 100644 --- a/examples/obsolete/device/src/msc_device_app.h +++ b/examples/obsolete/device/src/msc_device_app.h @@ -50,7 +50,7 @@ extern "C" { #endif -#if TUSB_CFG_DEVICE_MSC +#if CFG_TUSB_DEVICE_MSC enum { @@ -63,7 +63,7 @@ enum If you find any bugs or get any questions, feel free to file an\r\n\ issue at github.com/hathach/tinyusb" -#if TUSB_CFG_MCU==MCU_LPC11UXX || TUSB_CFG_MCU==MCU_LPC13UXX +#if CFG_TUSB_MCU==MCU_LPC11UXX || CFG_TUSB_MCU==MCU_LPC13UXX #define MSCD_APP_ROMDISK #else // defaults is ram disk #define MSCD_APP_RAMDISK diff --git a/examples/obsolete/device/src/msc_device_ramdisk.c b/examples/obsolete/device/src/msc_device_ramdisk.c index 294e0b792..e2a7a110f 100644 --- a/examples/obsolete/device/src/msc_device_ramdisk.c +++ b/examples/obsolete/device/src/msc_device_ramdisk.c @@ -38,7 +38,7 @@ #include "msc_device_app.h" -#if TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_RAMDISK) +#if CFG_TUSB_DEVICE_MSC && defined (MSCD_APP_RAMDISK) //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -47,7 +47,7 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM +CFG_TUSB_ATTR_USBRAM uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] = { //------------- Boot Sector -------------// diff --git a/examples/obsolete/device/src/msc_device_romdisk.c b/examples/obsolete/device/src/msc_device_romdisk.c index 16c8fe518..9f80c8001 100644 --- a/examples/obsolete/device/src/msc_device_romdisk.c +++ b/examples/obsolete/device/src/msc_device_romdisk.c @@ -38,7 +38,7 @@ #include "msc_device_app.h" -#if TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_ROMDISK) +#if CFG_TUSB_DEVICE_MSC && defined (MSCD_APP_ROMDISK) //--------------------------------------------------------------------+ // INCLUDE @@ -91,7 +91,7 @@ const uint8_t msc_device_app_rommdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] = [3] = README_CONTENTS }; -TUSB_CFG_ATTR_USBRAM +CFG_TUSB_ATTR_USBRAM static uint8_t sector_buffer[DISK_BLOCK_SIZE]; //--------------------------------------------------------------------+ diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h index f33fb46ba..6a841d28c 100644 --- a/examples/obsolete/device/src/tusb_config.h +++ b/examples/obsolete/device/src/tusb_config.h @@ -46,62 +46,62 @@ //--------------------------------------------------------------------+ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ -//#define TUSB_CFG_MCU will be passed from IDE/command line for easy board/mcu switching +//#define CFG_TUSB_MCU will be passed from IDE/command line for easy board/mcu switching -#define TUSB_CFG_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) -//#define TUSB_CFG_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_DEVICE) +//#define CFG_TUSB_CONTROLLER_1_MODE (TUSB_MODE_DEVICE) //--------------------------------------------------------------------+ // DEVICE CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE 64 +#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE 64 //------------- CLASS -------------// -#define TUSB_CFG_DEVICE_HID_KEYBOARD 1 -#define TUSB_CFG_DEVICE_HID_MOUSE 1 -#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet -#define TUSB_CFG_DEVICE_MSC 1 -#define TUSB_CFG_DEVICE_CDC 1 +#define CFG_TUSB_DEVICE_HID_KEYBOARD 1 +#define CFG_TUSB_DEVICE_HID_MOUSE 1 +#define CFG_TUSB_DEVICE_HID_GENERIC 0 // not supported yet +#define CFG_TUSB_DEVICE_MSC 1 +#define CFG_TUSB_DEVICE_CDC 1 //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEBUG 2 +#define CFG_TUSB_DEBUG 2 -//#define TUSB_CFG_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching -//#define TUSB_CFG_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching +//#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching +//#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching //--------------------------------------------------------------------+ // USB RAM PLACEMENT //--------------------------------------------------------------------+ #ifdef __CODE_RED // compiled with lpcxpresso - #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned - #elif TUSB_CFG_MCU == MCU_LPC175X_6X - #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) + #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned + #elif CFG_TUSB_MCU == MCU_LPC175X_6X + #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) #endif #elif defined __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files - #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned - #elif (TUSB_CFG_MCU == MCU_LPC175X_6X) - #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory + #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned + #elif (CFG_TUSB_MCU == MCU_LPC175X_6X) + #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory #endif #elif defined __ICCARM__ // compiled with IAR - #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX) - #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) - #elif (TUSB_CFG_MCU == MCU_LPC175X_6X) - #define TUSB_CFG_ATTR_USBRAM - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") + #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) + #elif (CFG_TUSB_MCU == MCU_LPC175X_6X) + #define CFG_TUSB_ATTR_USBRAM + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") #endif #else @@ -111,7 +111,7 @@ #endif // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment -#if TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC13UXX +#if CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX #define ATTR_USB_MIN_ALIGNMENT ATTR_ALIGNED(64) #elif defined NRF52840_XXAA #define ATTR_USB_MIN_ALIGNMENT ATTR_ALIGNED(4) diff --git a/examples/obsolete/device/src/tusb_descriptors.c b/examples/obsolete/device/src/tusb_descriptors.c index bd279dc93..ca71d60e3 100644 --- a/examples/obsolete/device/src/tusb_descriptors.c +++ b/examples/obsolete/device/src/tusb_descriptors.c @@ -41,7 +41,7 @@ //--------------------------------------------------------------------+ // Keyboard Report Descriptor //--------------------------------------------------------------------+ -#if TUSB_CFG_DEVICE_HID_KEYBOARD +#if CFG_TUSB_DEVICE_HID_KEYBOARD uint8_t const desc_keyboard_report[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ), @@ -87,7 +87,7 @@ uint8_t const desc_keyboard_report[] = { //--------------------------------------------------------------------+ // Mouse Report Descriptor //--------------------------------------------------------------------+ -#if TUSB_CFG_DEVICE_HID_MOUSE +#if CFG_TUSB_DEVICE_HID_MOUSE uint8_t const desc_mouse_report[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ), @@ -140,7 +140,7 @@ tusb_desc_device_t const desc_device = .bLength = sizeof(tusb_desc_device_t), .bDescriptorType = TUSB_DESC_DEVICE, .bcdUSB = 0x0200, - #if TUSB_CFG_DEVICE_CDC + #if CFG_TUSB_DEVICE_CDC // Use Interface Association Descriptor (IAD) for CDC // As required by USB Specs IAD's subclass must be common class (2) and protocol must be IAD (1) .bDeviceClass = TUSB_CLASS_MISC, @@ -152,7 +152,7 @@ tusb_desc_device_t const desc_device = .bDeviceProtocol = 0x00, #endif - .bMaxPacketSize0 = TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE, + .bMaxPacketSize0 = CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE, .idVendor = CFG_VENDORID, .idProduct = CFG_PRODUCTID, @@ -184,7 +184,7 @@ app_descriptor_configuration_t const desc_configuration = .bMaxPower = TUSB_DESC_CONFIG_POWER_MA(500) }, - #if TUSB_CFG_DEVICE_CDC + #if CFG_TUSB_DEVICE_CDC // IAD points to CDC Interfaces .cdc_iad = { @@ -296,7 +296,7 @@ app_descriptor_configuration_t const desc_configuration = #endif //------------- HID Keyboard -------------// - #if TUSB_CFG_DEVICE_HID_KEYBOARD + #if CFG_TUSB_DEVICE_HID_KEYBOARD .keyboard_interface = { .bLength = sizeof(tusb_desc_interface_t), @@ -333,7 +333,7 @@ app_descriptor_configuration_t const desc_configuration = #endif //------------- HID Mouse -------------// - #if TUSB_CFG_DEVICE_HID_MOUSE + #if CFG_TUSB_DEVICE_HID_MOUSE .mouse_interface = { .bLength = sizeof(tusb_desc_interface_t), @@ -370,7 +370,7 @@ app_descriptor_configuration_t const desc_configuration = #endif //------------- Mass Storage -------------// - #if TUSB_CFG_DEVICE_MSC + #if CFG_TUSB_DEVICE_MSC .msc_interface = { .bLength = sizeof(tusb_desc_interface_t), @@ -465,11 +465,11 @@ tusbd_descriptor_pointer_t tusbd_descriptor_pointers = .p_configuration = (uint8_t const * ) &desc_configuration, .p_string_arr = (uint8_t const **) string_descriptor_arr, - #if TUSB_CFG_DEVICE_HID_KEYBOARD + #if CFG_TUSB_DEVICE_HID_KEYBOARD .p_hid_keyboard_report = (uint8_t const *) desc_keyboard_report, #endif - #if TUSB_CFG_DEVICE_HID_MOUSE + #if CFG_TUSB_DEVICE_HID_MOUSE .p_hid_mouse_report = (uint8_t const *) desc_mouse_report, #endif }; diff --git a/examples/obsolete/device/src/tusb_descriptors.h b/examples/obsolete/device/src/tusb_descriptors.h index 0ef98e695..274ad00e2 100644 --- a/examples/obsolete/device/src/tusb_descriptors.h +++ b/examples/obsolete/device/src/tusb_descriptors.h @@ -50,22 +50,22 @@ // 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) ( (TUSB_CFG_DEVICE_##interface) << (n) ) + #define PRODUCTID_BITMAP(interface, n) ( (CFG_TUSB_DEVICE_##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) ) ) #endif #define ITF_NUM_CDC 0 -#define INTERFACE_NO_HID_KEYBOARD (ITF_NUM_CDC + 2*(TUSB_CFG_DEVICE_CDC ? 1 : 0) ) -#define INTERFACE_NO_HID_MOUSE (INTERFACE_NO_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_KEYBOARD ) -#define INTERFACE_NO_HID_GENERIC (INTERFACE_NO_HID_MOUSE + TUSB_CFG_DEVICE_HID_MOUSE ) -#define ITF_NUM_MSC (INTERFACE_NO_HID_GENERIC + TUSB_CFG_DEVICE_HID_GENERIC ) +#define INTERFACE_NO_HID_KEYBOARD (ITF_NUM_CDC + 2*(CFG_TUSB_DEVICE_CDC ? 1 : 0) ) +#define INTERFACE_NO_HID_MOUSE (INTERFACE_NO_HID_KEYBOARD + CFG_TUSB_DEVICE_HID_KEYBOARD ) +#define INTERFACE_NO_HID_GENERIC (INTERFACE_NO_HID_MOUSE + CFG_TUSB_DEVICE_HID_MOUSE ) +#define ITF_NUM_MSC (INTERFACE_NO_HID_GENERIC + CFG_TUSB_DEVICE_HID_GENERIC ) -#define ITF_TOTAL (2*TUSB_CFG_DEVICE_CDC + TUSB_CFG_DEVICE_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_MOUSE + \ - TUSB_CFG_DEVICE_HID_GENERIC + TUSB_CFG_DEVICE_MSC) +#define ITF_TOTAL (2*CFG_TUSB_DEVICE_CDC + CFG_TUSB_DEVICE_HID_KEYBOARD + CFG_TUSB_DEVICE_HID_MOUSE + \ + CFG_TUSB_DEVICE_HID_GENERIC + CFG_TUSB_DEVICE_MSC) -#if (TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC13UXX) && (ITF_TOTAL > 4) +#if (CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX) && (ITF_TOTAL > 4) #error These MCUs do not have enough number of endpoints for the current configuration #endif @@ -75,7 +75,7 @@ #define EDPT_IN(x) (0x80 | (x)) #define EDPT_OUT(x) (x) -#if TUSB_CFG_MCU == MCU_LPC175X_6X // MCUs's endpoint number has a fixed type +#if CFG_TUSB_MCU == MCU_LPC175X_6X // MCUs's endpoint number has a fixed type //------------- CDC -------------// #define CDC_EDPT_NOTIF EDPT_IN (1) @@ -125,7 +125,7 @@ #endif -#define MSC_EDPT_PACKETSIZE (TUSB_CFG_MCU == MCU_LPC43XX ? 512 : 64) +#define MSC_EDPT_PACKETSIZE (CFG_TUSB_MCU == MCU_LPC43XX ? 512 : 64) //--------------------------------------------------------------------+ // CONFIGURATION DESCRIPTOR @@ -135,7 +135,7 @@ typedef struct ATTR_PACKED tusb_desc_configuration_t configuration; //------------- CDC -------------// -#if TUSB_CFG_DEVICE_CDC +#if CFG_TUSB_DEVICE_CDC tusb_desc_interface_assoc_t cdc_iad; //CDC Control Interface @@ -153,21 +153,21 @@ typedef struct ATTR_PACKED #endif //------------- HID Keyboard -------------// -#if TUSB_CFG_DEVICE_HID_KEYBOARD +#if CFG_TUSB_DEVICE_HID_KEYBOARD tusb_desc_interface_t keyboard_interface; tusb_hid_descriptor_hid_t keyboard_hid; tusb_desc_endpoint_t keyboard_endpoint; #endif //------------- HID Mouse -------------// -#if TUSB_CFG_DEVICE_HID_MOUSE +#if CFG_TUSB_DEVICE_HID_MOUSE tusb_desc_interface_t mouse_interface; tusb_hid_descriptor_hid_t mouse_hid; tusb_desc_endpoint_t mouse_endpoint; #endif //------------- Mass Storage -------------// -#if TUSB_CFG_DEVICE_MSC +#if CFG_TUSB_DEVICE_MSC tusb_desc_interface_t msc_interface; tusb_desc_endpoint_t msc_endpoint_in; tusb_desc_endpoint_t msc_endpoint_out; diff --git a/examples/obsolete/host/host_freertos/.cproject b/examples/obsolete/host/host_freertos/.cproject index fe0ec307f..fc0a70c7b 100644 --- a/examples/obsolete/host/host_freertos/.cproject +++ b/examples/obsolete/host/host_freertos/.cproject @@ -35,10 +35,10 @@ <listOptionValue builtIn="false" value="__FPU_PRESENT"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -134,10 +134,10 @@ <listOptionValue builtIn="false" value="__FPU_PRESENT"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=configMAX_PRIORITIES-5"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -231,9 +231,9 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.1650588201" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC175X_6X"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> </option> @@ -305,10 +305,10 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.1650588201" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC175X_6X"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -422,10 +422,10 @@ <listOptionValue builtIn="false" value="__FPU_PRESENT"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_MCB4300"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_FREERTOS"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> diff --git a/examples/obsolete/host/host_os_none/.cproject b/examples/obsolete/host/host_os_none/.cproject index 3852d5d35..f282a4abe 100644 --- a/examples/obsolete/host/host_os_none/.cproject +++ b/examples/obsolete/host/host_os_none/.cproject @@ -34,9 +34,9 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -128,9 +128,9 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -223,9 +223,9 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_MCB4300"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> @@ -315,9 +315,9 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.1650588201" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS"/> - <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X"/> + <listOptionValue builtIn="false" value="CFG_TUSB_MCU=MCU_LPC175X_6X"/> <listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/> - <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> + <listOptionValue builtIn="false" value="CFG_TUSB_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> <listOptionValue builtIn="false" value="__MULTICORE_NONE"/> diff --git a/examples/obsolete/host/src/app_os_prio.h b/examples/obsolete/host/src/app_os_prio.h index 99be2de0c..5eacd4c1e 100644 --- a/examples/obsolete/host/src/app_os_prio.h +++ b/examples/obsolete/host/src/app_os_prio.h @@ -53,18 +53,18 @@ #include "tusb.h" -#if TUSB_CFG_OS == TUSB_OS_NONE +#if CFG_TUSB_OS == TUSB_OS_NONE #define LOWER_PRIO(x) 0 // does not matter -#elif TUSB_CFG_OS == TUSB_OS_FREERTOS +#elif CFG_TUSB_OS == TUSB_OS_FREERTOS #define LOWER_PRIO(x) ((x)-1) // freeRTOS lower number --> lower priority -#elif TUSB_CFG_OS == TUSB_OS_CMSIS_RTX +#elif CFG_TUSB_OS == TUSB_OS_CMSIS_RTX #define LOWER_PRIO(x) ((x)-1) // CMSIS-RTOS lower number --> lower priority #else #error Priority is not configured for this RTOS #endif enum { - STANDARD_APP_TASK_PRIO = LOWER_PRIO(TUSB_CFG_OS_TASK_PRIO), // Application Task is lower than usb system task + STANDARD_APP_TASK_PRIO = LOWER_PRIO(CFG_TUSB_OS_TASK_PRIO), // Application Task is lower than usb system task LED_BLINKING_APP_TASK_PRIO = LOWER_PRIO(STANDARD_APP_TASK_PRIO), // Blinking task is lower than normal task KEYBOARD_APP_TASK_PRIO = STANDARD_APP_TASK_PRIO, diff --git a/examples/obsolete/host/src/cdc_serial_host_app.c b/examples/obsolete/host/src/cdc_serial_host_app.c index 1ab3f409b..0782d0518 100644 --- a/examples/obsolete/host/src/cdc_serial_host_app.c +++ b/examples/obsolete/host/src/cdc_serial_host_app.c @@ -39,7 +39,7 @@ #include "cdc_serial_host_app.h" #include "app_os_prio.h" -#if TUSB_CFG_HOST_CDC +#if CFG_TUSB_HOST_CDC #define QUEUE_SERIAL_DEPTH 100 @@ -49,8 +49,8 @@ static osal_semaphore_t sem_hdl; enum { SERIAL_BUFFER_SIZE = 64 }; -TUSB_CFG_ATTR_USBRAM static uint8_t serial_in_buffer[SERIAL_BUFFER_SIZE]; -TUSB_CFG_ATTR_USBRAM static uint8_t serial_out_buffer[SERIAL_BUFFER_SIZE]; +CFG_TUSB_ATTR_USBRAM static uint8_t serial_in_buffer[SERIAL_BUFFER_SIZE]; +CFG_TUSB_ATTR_USBRAM static uint8_t serial_out_buffer[SERIAL_BUFFER_SIZE]; static uint8_t received_bytes; // set by transfer complete callback @@ -126,7 +126,7 @@ void cdc_serial_host_app_task( void* param ) OSAL_TASK_BEGIN //------------- send characters got from uart terminal to the first CDC device -------------// - for(uint8_t dev_addr=1; dev_addr <= TUSB_CFG_HOST_DEVICE_MAX; dev_addr++) + for(uint8_t dev_addr=1; dev_addr <= CFG_TUSB_HOST_DEVICE_MAX; dev_addr++) { if ( tuh_cdc_serial_is_mounted(dev_addr) ) { @@ -152,7 +152,7 @@ void cdc_serial_host_app_task( void* param ) { for(uint8_t i=0; i<received_bytes; i++) putchar(serial_in_buffer[i]); - for(uint8_t dev_addr=1; dev_addr <= TUSB_CFG_HOST_DEVICE_MAX; dev_addr++) + for(uint8_t dev_addr=1; dev_addr <= CFG_TUSB_HOST_DEVICE_MAX; dev_addr++) { if ( tuh_cdc_serial_is_mounted(dev_addr) ) { diff --git a/examples/obsolete/host/src/cdc_serial_host_app.h b/examples/obsolete/host/src/cdc_serial_host_app.h index 4efc6cb8c..eef00bb55 100644 --- a/examples/obsolete/host/src/cdc_serial_host_app.h +++ b/examples/obsolete/host/src/cdc_serial_host_app.h @@ -53,7 +53,7 @@ extern "C" { #endif -#if TUSB_CFG_HOST_CDC +#if CFG_TUSB_HOST_CDC void cdc_serial_host_app_init(void); void cdc_serial_host_app_task(void* param); diff --git a/examples/obsolete/host/src/keyboard_host_app.c b/examples/obsolete/host/src/keyboard_host_app.c index b55c062ea..130df0feb 100644 --- a/examples/obsolete/host/src/keyboard_host_app.c +++ b/examples/obsolete/host/src/keyboard_host_app.c @@ -42,7 +42,7 @@ #include "keyboard_host_app.h" #include "app_os_prio.h" -#if TUSB_CFG_HOST_HID_KEYBOARD +#if CFG_TUSB_HOST_HID_KEYBOARD //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -53,7 +53,7 @@ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ static osal_queue_t queue_kbd_hdl; -TUSB_CFG_ATTR_USBRAM static hid_keyboard_report_t usb_keyboard_report; +CFG_TUSB_ATTR_USBRAM static hid_keyboard_report_t usb_keyboard_report; static inline uint8_t keycode_to_ascii(uint8_t modifier, uint8_t keycode) ATTR_CONST ATTR_ALWAYS_INLINE; static inline void process_kbd_report(hid_keyboard_report_t const * report); diff --git a/examples/obsolete/host/src/keyboard_host_app.h b/examples/obsolete/host/src/keyboard_host_app.h index 2b99373a3..ff20d75df 100644 --- a/examples/obsolete/host/src/keyboard_host_app.h +++ b/examples/obsolete/host/src/keyboard_host_app.h @@ -59,7 +59,7 @@ extern "C" { #endif -#if TUSB_CFG_HOST_HID_KEYBOARD +#if CFG_TUSB_HOST_HID_KEYBOARD void keyboard_host_app_init(void); void keyboard_host_app_task(void* param); diff --git a/examples/obsolete/host/src/main.c b/examples/obsolete/host/src/main.c index bb0dcd2b3..6f108c441 100644 --- a/examples/obsolete/host/src/main.c +++ b/examples/obsolete/host/src/main.c @@ -64,7 +64,7 @@ void print_greeting(void); // IMPLEMENTATION //--------------------------------------------------------------------+ -#if TUSB_CFG_OS == TUSB_OS_NONE +#if CFG_TUSB_OS == TUSB_OS_NONE // like a real RTOS, this function is a main loop invoking each task in application and never return void os_none_start_scheduler(void) { @@ -83,7 +83,7 @@ void os_none_start_scheduler(void) int main(void) { -#if TUSB_CFG_OS == TUSB_OS_CMSIS_RTX +#if CFG_TUSB_OS == TUSB_OS_CMSIS_RTX osKernelInitialize(); // CMSIS RTX requires kernel init before any other OS functions #endif @@ -101,11 +101,11 @@ int main(void) cdc_serial_host_app_init(); //------------- start OS scheduler (never return) -------------// -#if TUSB_CFG_OS == TUSB_OS_FREERTOS +#if CFG_TUSB_OS == TUSB_OS_FREERTOS vTaskStartScheduler(); -#elif TUSB_CFG_OS == TUSB_OS_NONE +#elif CFG_TUSB_OS == TUSB_OS_NONE os_none_start_scheduler(); -#elif TUSB_CFG_OS == TUSB_OS_CMSIS_RTX +#elif CFG_TUSB_OS == TUSB_OS_CMSIS_RTX osKernelStart(); #else #error need to start RTOS schduler @@ -134,10 +134,10 @@ void print_greeting(void) ); puts("This HOST demo is configured to support:"); - printf(" - RTOS = %s\n", rtos_name[TUSB_CFG_OS]); - if (TUSB_CFG_HOST_HUB ) puts(" - Hub (1 level only)"); - if (TUSB_CFG_HOST_HID_MOUSE ) puts(" - HID Mouse"); - if (TUSB_CFG_HOST_HID_KEYBOARD ) puts(" - HID Keyboard"); - if (TUSB_CFG_HOST_MSC ) puts(" - Mass Storage"); - if (TUSB_CFG_HOST_CDC ) puts(" - Communication Device Class"); + printf(" - RTOS = %s\n", rtos_name[CFG_TUSB_OS]); + if (CFG_TUSB_HOST_HUB ) puts(" - Hub (1 level only)"); + if (CFG_TUSB_HOST_HID_MOUSE ) puts(" - HID Mouse"); + if (CFG_TUSB_HOST_HID_KEYBOARD ) puts(" - HID Keyboard"); + if (CFG_TUSB_HOST_MSC ) puts(" - Mass Storage"); + if (CFG_TUSB_HOST_CDC ) puts(" - Communication Device Class"); } diff --git a/examples/obsolete/host/src/mouse_host_app.c b/examples/obsolete/host/src/mouse_host_app.c index 6464b5e8e..e9ee482d8 100644 --- a/examples/obsolete/host/src/mouse_host_app.c +++ b/examples/obsolete/host/src/mouse_host_app.c @@ -42,7 +42,7 @@ #include "mouse_host_app.h" #include "app_os_prio.h" -#if TUSB_CFG_HOST_HID_MOUSE +#if CFG_TUSB_HOST_HID_MOUSE //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -53,7 +53,7 @@ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ static osal_queue_t queue_mouse_hdl; -TUSB_CFG_ATTR_USBRAM static hid_mouse_report_t usb_mouse_report; +CFG_TUSB_ATTR_USBRAM static hid_mouse_report_t usb_mouse_report; static inline void process_mouse_report(hid_mouse_report_t const * p_report); diff --git a/examples/obsolete/host/src/mouse_host_app.h b/examples/obsolete/host/src/mouse_host_app.h index 967444454..c5e9977ae 100644 --- a/examples/obsolete/host/src/mouse_host_app.h +++ b/examples/obsolete/host/src/mouse_host_app.h @@ -62,7 +62,7 @@ extern "C" { #endif -#if TUSB_CFG_HOST_HID_MOUSE +#if CFG_TUSB_HOST_HID_MOUSE void mouse_host_app_init(void); void mouse_host_app_task(void* param); diff --git a/examples/obsolete/host/src/msc_cli.c b/examples/obsolete/host/src/msc_cli.c index e4cb2cb28..aeadb4933 100644 --- a/examples/obsolete/host/src/msc_cli.c +++ b/examples/obsolete/host/src/msc_cli.c @@ -37,7 +37,7 @@ #include "msc_cli.h" #include "ctype.h" -#if TUSB_CFG_HOST_MSC +#if CFG_TUSB_HOST_MSC #include "ff.h" #include "diskio.h" @@ -139,7 +139,7 @@ static cli_cmdfunc_t cli_command_tbl[] = //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM uint8_t fileread_buffer[CLI_FILE_READ_BUFFER]; +CFG_TUSB_ATTR_USBRAM uint8_t fileread_buffer[CLI_FILE_READ_BUFFER]; static char cli_buffer[CLI_MAX_BUFFER]; static char volume_label[20]; diff --git a/examples/obsolete/host/src/msc_host_app.c b/examples/obsolete/host/src/msc_host_app.c index 6faac68c3..957db2fad 100644 --- a/examples/obsolete/host/src/msc_host_app.c +++ b/examples/obsolete/host/src/msc_host_app.c @@ -42,7 +42,7 @@ #include "msc_host_app.h" #include "app_os_prio.h" -#if TUSB_CFG_HOST_MSC +#if CFG_TUSB_HOST_MSC #include "msc_cli.h" #include "ff.h" @@ -55,7 +55,7 @@ //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION //--------------------------------------------------------------------+ -TUSB_CFG_ATTR_USBRAM static FATFS fatfs[TUSB_CFG_HOST_DEVICE_MAX]; +CFG_TUSB_ATTR_USBRAM static FATFS fatfs[CFG_TUSB_HOST_DEVICE_MAX]; //--------------------------------------------------------------------+ // tinyusb callbacks @@ -117,7 +117,7 @@ void tuh_msc_unmounted_cb(uint8_t dev_addr) if ( phy_disk == f_get_current_drive() ) { // active drive is unplugged --> change to other drive - for(uint8_t i=0; i<TUSB_CFG_HOST_DEVICE_MAX; i++) + for(uint8_t i=0; i<CFG_TUSB_HOST_DEVICE_MAX; i++) { if ( disk_is_ready(i) ) { @@ -158,7 +158,7 @@ void msc_host_app_task(void* param) is_any_disk_mounted = false; - for(uint8_t phy_disk=0; phy_disk < TUSB_CFG_HOST_DEVICE_MAX; phy_disk++) + for(uint8_t phy_disk=0; phy_disk < CFG_TUSB_HOST_DEVICE_MAX; phy_disk++) { if ( disk_is_ready(phy_disk) ) { diff --git a/examples/obsolete/host/src/msc_host_app.h b/examples/obsolete/host/src/msc_host_app.h index 25ece8816..c6e508e6c 100644 --- a/examples/obsolete/host/src/msc_host_app.h +++ b/examples/obsolete/host/src/msc_host_app.h @@ -54,7 +54,7 @@ extern "C" { #endif -#if TUSB_CFG_HOST_MSC +#if CFG_TUSB_HOST_MSC void msc_host_app_init(void); void msc_host_app_task(void* param); diff --git a/examples/obsolete/host/src/rndis_host_app.c b/examples/obsolete/host/src/rndis_host_app.c index e6b37e4d3..5bb60182c 100644 --- a/examples/obsolete/host/src/rndis_host_app.c +++ b/examples/obsolete/host/src/rndis_host_app.c @@ -39,7 +39,7 @@ #include "rndis_host_app.h" #include "app_os_prio.h" -#if TUSB_CFG_HOST_CDC && TUSB_CFG_HOST_CDC_RNDIS +#if CFG_TUSB_HOST_CDC && CFG_TUSB_HOST_CDC_RNDIS //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF diff --git a/examples/obsolete/host/src/rndis_host_app.h b/examples/obsolete/host/src/rndis_host_app.h index e4fcacf46..9fa19351e 100644 --- a/examples/obsolete/host/src/rndis_host_app.h +++ b/examples/obsolete/host/src/rndis_host_app.h @@ -53,7 +53,7 @@ extern "C" { #endif -#if TUSB_CFG_HOST_CDC && TUSB_CFG_HOST_CDC_RNDIS +#if CFG_TUSB_HOST_CDC && CFG_TUSB_HOST_CDC_RNDIS void rndis_host_app_init(void); void rndis_host_app_task(void* param); diff --git a/examples/obsolete/host/src/tusb_config.h b/examples/obsolete/host/src/tusb_config.h index be1d5c7ed..501f6304d 100644 --- a/examples/obsolete/host/src/tusb_config.h +++ b/examples/obsolete/host/src/tusb_config.h @@ -46,57 +46,57 @@ //--------------------------------------------------------------------+ // CONTROLLER CONFIGURATION //--------------------------------------------------------------------+ -//#define TUSB_CFG_MCU will be passed from IDE for easy board/mcu switching -#define TUSB_CFG_CONTROLLER_0_MODE (TUSB_MODE_HOST) +//#define CFG_TUSB_MCU will be passed from IDE for easy board/mcu switching +#define CFG_TUSB_CONTROLLER_0_MODE (TUSB_MODE_HOST) //--------------------------------------------------------------------+ // HOST CONFIGURATION //--------------------------------------------------------------------+ //------------- CLASS -------------// -#define TUSB_CFG_HOST_HUB 1 -#define TUSB_CFG_HOST_HID_KEYBOARD 1 -#define TUSB_CFG_HOST_HID_MOUSE 1 -#define TUSB_CFG_HOST_HID_GENERIC 0 // (not yet supported) -#define TUSB_CFG_HOST_MSC 1 -#define TUSB_CFG_HOST_CDC 1 +#define CFG_TUSB_HOST_HUB 1 +#define CFG_TUSB_HOST_HID_KEYBOARD 1 +#define CFG_TUSB_HOST_HID_MOUSE 1 +#define CFG_TUSB_HOST_HID_GENERIC 0 // (not yet supported) +#define CFG_TUSB_HOST_MSC 1 +#define CFG_TUSB_HOST_CDC 1 -#define TUSB_CFG_HOST_DEVICE_MAX (TUSB_CFG_HOST_HUB ? 5 : 1) // normal hub has 4 ports +#define CFG_TUSB_HOST_DEVICE_MAX (CFG_TUSB_HOST_HUB ? 5 : 1) // normal hub has 4 ports //--------------------------------------------------------------------+ // COMMON CONFIGURATION //--------------------------------------------------------------------+ -#define TUSB_CFG_DEBUG 2 +#define CFG_TUSB_DEBUG 2 -//#define TUSB_CFG_OS TUSB_OS_NONE // defined using eclipse build -//#define TUSB_CFG_OS_TASK_PRIO 0 // defined using eclipse build +//#define CFG_TUSB_OS TUSB_OS_NONE // defined using eclipse build +//#define CFG_TUSB_OS_TASK_PRIO 0 // defined using eclipse build //--------------------------------------------------------------------+ // USB RAM PLACEMENT //--------------------------------------------------------------------+ #ifdef __CODE_RED // make use of code red's support for ram region macros - #if TUSB_CFG_MCU == MCU_LPC175X_6X - #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) + #if CFG_TUSB_MCU == MCU_LPC175X_6X + #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) #endif #elif defined __CC_ARM // Compiled with Keil armcc - #if (TUSB_CFG_MCU == MCU_LPC175X_6X) - #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory + #if (CFG_TUSB_MCU == MCU_LPC175X_6X) + #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory #endif #elif defined __ICCARM__ // compiled with IAR - #if (TUSB_CFG_MCU == MCU_LPC175X_6X) + #if (CFG_TUSB_MCU == MCU_LPC175X_6X) // LP175x_6x can access all but CMSIS-RTX causes overflow in 32KB SRAM --> move to AHB ram - #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".sram\"") - #elif (TUSB_CFG_MCU == MCU_LPC43XX) - #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") + #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".sram\"") + #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") #endif #else diff --git a/examples/readme.md b/examples/readme.md index 6e87b4f45..407638da7 100644 --- a/examples/readme.md +++ b/examples/readme.md @@ -55,7 +55,7 @@ IAR is just as easy as Keil ## Configure demo -Application demo is written to have the code excluded if its required option is not enabled in [tusb_config.h](). Some of combination may exceed the 32KB limit of IAR/Keil so you may want to re-configure to disable some class support, decrease TUSB_CFG_DEBUG or increase the compiler optimization level. +Application demo is written to have the code excluded if its required option is not enabled in [tusb_config.h](). Some of combination may exceed the 32KB limit of IAR/Keil so you may want to re-configure to disable some class support, decrease CFG_TUSB_DEBUG or increase the compiler optimization level. In addition, there are some configuration you can change such as |