diff options
| author | hathach <[email protected]> | 2018-04-12 13:04:48 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-12 13:04:48 +0700 |
| commit | e1272159d8b32e2f5478b35fa0e727cfc5c417e3 (patch) | |
| tree | ee7e617d7d0e354a25918eaee681c951a2d5c165 /examples | |
| parent | 18f97fef7e35937c017f2b2ad2300a920256f66b (diff) | |
rename MCU_ to OPT_MCU
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/device/device_virtual_com/src/tusb_config.h | 18 | ||||
| -rw-r--r-- | examples/device/nrf52840/src/msc_device_app.h | 2 | ||||
| -rw-r--r-- | examples/device/nrf52840/src/tusb_config.h | 2 | ||||
| -rw-r--r-- | examples/obsolete/device/src/msc_device_app.h | 2 | ||||
| -rw-r--r-- | examples/obsolete/device/src/tusb_config.h | 20 | ||||
| -rw-r--r-- | examples/obsolete/device/src/tusb_descriptors.h | 6 | ||||
| -rw-r--r-- | examples/obsolete/host/src/tusb_config.h | 12 |
7 files changed, 31 insertions, 31 deletions
diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h index b7f7b348e..b09520f6c 100644 --- a/examples/device/device_virtual_com/src/tusb_config.h +++ b/examples/device/device_virtual_com/src/tusb_config.h @@ -76,31 +76,31 @@ //--------------------------------------------------------------------+ #ifdef __CODE_RED // compiled with lpcxpresso - #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_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 + #elif CFG_TUSB_MCU == OPT_MCU_LPC175X_6X #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_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 (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_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) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_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 (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX) #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) - #elif (CFG_TUSB_MCU == MCU_LPC175X_6X) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_ATTR_USBRAM - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC43XX) #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") #endif diff --git a/examples/device/nrf52840/src/msc_device_app.h b/examples/device/nrf52840/src/msc_device_app.h index 185ceb260..83b460743 100644 --- a/examples/device/nrf52840/src/msc_device_app.h +++ b/examples/device/nrf52840/src/msc_device_app.h @@ -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 CFG_TUSB_MCU==MCU_LPC11UXX || CFG_TUSB_MCU==MCU_LPC13UXX +#if CFG_TUSB_MCU==OPT_MCU_LPC11UXX || CFG_TUSB_MCU==OPT_MCU_LPC13UXX #define MSCD_APP_ROMDISK #else // defaults is ram disk #define MSCD_APP_RAMDISK diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h index 6182ed9e1..b9346aaf9 100644 --- a/examples/device/nrf52840/src/tusb_config.h +++ b/examples/device/nrf52840/src/tusb_config.h @@ -76,7 +76,7 @@ #define CFG_TUSB_ATTR_USBRAM // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment -#if CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX +#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX #define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(64) #elif defined NRF52840_XXAA #define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(4) diff --git a/examples/obsolete/device/src/msc_device_app.h b/examples/obsolete/device/src/msc_device_app.h index 185ceb260..83b460743 100644 --- a/examples/obsolete/device/src/msc_device_app.h +++ b/examples/obsolete/device/src/msc_device_app.h @@ -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 CFG_TUSB_MCU==MCU_LPC11UXX || CFG_TUSB_MCU==MCU_LPC13UXX +#if CFG_TUSB_MCU==OPT_MCU_LPC11UXX || CFG_TUSB_MCU==OPT_MCU_LPC13UXX #define MSCD_APP_ROMDISK #else // defaults is ram disk #define MSCD_APP_RAMDISK diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h index c9e81656f..8a7fcabdf 100644 --- a/examples/obsolete/device/src/tusb_config.h +++ b/examples/obsolete/device/src/tusb_config.h @@ -76,31 +76,31 @@ //--------------------------------------------------------------------+ #ifdef __CODE_RED // compiled with lpcxpresso - #if (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_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 + #elif CFG_TUSB_MCU == OPT_MCU_LPC175X_6X #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_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 (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_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) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_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 (CFG_TUSB_MCU == MCU_LPC11UXX) || (CFG_TUSB_MCU == MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX) #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) - #elif (CFG_TUSB_MCU == MCU_LPC175X_6X) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_ATTR_USBRAM - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC43XX) #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") #endif @@ -111,7 +111,7 @@ #endif // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment -#if CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX +#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX #define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(64) #elif defined NRF52840_XXAA #define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(4) diff --git a/examples/obsolete/device/src/tusb_descriptors.h b/examples/obsolete/device/src/tusb_descriptors.h index 274ad00e2..56ba60002 100644 --- a/examples/obsolete/device/src/tusb_descriptors.h +++ b/examples/obsolete/device/src/tusb_descriptors.h @@ -65,7 +65,7 @@ #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 (CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX) && (ITF_TOTAL > 4) +#if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_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 CFG_TUSB_MCU == MCU_LPC175X_6X // MCUs's endpoint number has a fixed type +#if CFG_TUSB_MCU == OPT_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 (CFG_TUSB_MCU == MCU_LPC43XX ? 512 : 64) +#define MSC_EDPT_PACKETSIZE (CFG_TUSB_MCU == OPT_MCU_LPC43XX ? 512 : 64) //--------------------------------------------------------------------+ // CONFIGURATION DESCRIPTOR diff --git a/examples/obsolete/host/src/tusb_config.h b/examples/obsolete/host/src/tusb_config.h index 9a13aa25a..c3e67328e 100644 --- a/examples/obsolete/host/src/tusb_config.h +++ b/examples/obsolete/host/src/tusb_config.h @@ -76,26 +76,26 @@ //--------------------------------------------------------------------+ #ifdef __CODE_RED // make use of code red's support for ram region macros - #if CFG_TUSB_MCU == MCU_LPC175X_6X + #if CFG_TUSB_MCU == OPT_MCU_LPC175X_6X #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC43XX) #define CFG_TUSB_ATTR_USBRAM ATTR_SECTION(.data.$RAM3) #endif #elif defined __CC_ARM // Compiled with Keil armcc - #if (CFG_TUSB_MCU == MCU_LPC175X_6X) + #if (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_ATTR_USBRAM // LPC17xx USB DMA can access all address - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_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 (CFG_TUSB_MCU == MCU_LPC175X_6X) + #if (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) // LP175x_6x can access all but CMSIS-RTX causes overflow in 32KB SRAM --> move to AHB ram #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".sram\"") - #elif (CFG_TUSB_MCU == MCU_LPC43XX) + #elif (CFG_TUSB_MCU == OPT_MCU_LPC43XX) #define CFG_TUSB_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"") #endif |
