From d96347a0f5ec9272088b11425e1a8a3fb4115e8a Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 30 Nov 2018 12:48:06 +0700
Subject: [PATCH] rename OPT_MCU_LPC13UXX to OPT_MCU_LPC13XX

---
 examples/device/device_virtual_com/src/tusb_config.h   | 8 ++++----
 examples/obsolete/device/device_freertos/.cproject     | 2 +-
 examples/obsolete/device/device_os_none/.cproject      | 2 +-
 examples/obsolete/device/src/msc_device_app.h          | 2 +-
 examples/obsolete/device/src/tusb_config.h             | 8 ++++----
 hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c             | 2 +-
 src/class/msc/msc_device.c                             | 2 +-
 src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c | 2 +-
 src/tusb_option.h                                      | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h
index fd3f41b0..77be85df 100644
--- a/examples/device/device_virtual_com/src/tusb_config.h
+++ b/examples/device/device_virtual_com/src/tusb_config.h
@@ -92,7 +92,7 @@
 //--------------------------------------------------------------------+
 #ifdef __CODE_RED // compiled with lpcxpresso
 
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX)
     #define CFG_TUSB_MEM_SECTION  ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned
   #elif CFG_TUSB_MCU == OPT_MCU_LPC175X_6X
     #define CFG_TUSB_MEM_SECTION // LPC17xx USB DMA can access all
@@ -102,7 +102,7 @@
 
 #elif defined  __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files
 
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX)
     #define CFG_TUSB_MEM_SECTION  ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned
   #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X)
     #define CFG_TUSB_MEM_SECTION  // LPC17xx USB DMA can access all address
@@ -112,7 +112,7 @@
 
 #elif defined __ICCARM__ // compiled with IAR
 
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX)
     #define CFG_TUSB_MEM_SECTION _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64)
   #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X)
     #define CFG_TUSB_MEM_SECTION
@@ -132,7 +132,7 @@
 
 
 // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment
-#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX
+#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(64)
 #elif CFG_TUSB_MCU == OPT_MCU_NRF5X
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(4)
diff --git a/examples/obsolete/device/device_freertos/.cproject b/examples/obsolete/device/device_freertos/.cproject
index eb09f25e..53b3552b 100644
--- a/examples/obsolete/device/device_freertos/.cproject
+++ b/examples/obsolete/device/device_freertos/.cproject
@@ -34,7 +34,7 @@
 									<listOptionValue builtIn="false" value="__REDLIB__"/>
 									<listOptionValue builtIn="false" value="CFG_TUSB_OS=OPT_OS_FREERTOS"/>
 									<listOptionValue builtIn="false" value="CFG_TUD_TASK_PRIO=configMAX_PRIORITIES-5"/>
-									<listOptionValue builtIn="false" value="CFG_TUSB_MCU=OPT_MCU_LPC13UXX"/>
+									<listOptionValue builtIn="false" value="CFG_TUSB_MCU=OPT_MCU_LPC13XX"/>
 									<listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1347"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="__CODE_RED"/>
diff --git a/examples/obsolete/device/device_os_none/.cproject b/examples/obsolete/device/device_os_none/.cproject
index fabc46d8..355f8ba9 100644
--- a/examples/obsolete/device/device_os_none/.cproject
+++ b/examples/obsolete/device/device_os_none/.cproject
@@ -33,7 +33,7 @@
 								<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="CFG_TUSB_OS=OPT_OS_NONE"/>
-									<listOptionValue builtIn="false" value="CFG_TUSB_MCU=OPT_MCU_LPC13UXX"/>
+									<listOptionValue builtIn="false" value="CFG_TUSB_MCU=OPT_MCU_LPC13XX"/>
 									<listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1347"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="__CODE_RED"/>
diff --git a/examples/obsolete/device/src/msc_device_app.h b/examples/obsolete/device/src/msc_device_app.h
index cc3caa10..6f2e9563 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==OPT_MCU_LPC11UXX || CFG_TUSB_MCU==OPT_MCU_LPC13UXX
+#if CFG_TUSB_MCU==OPT_MCU_LPC11UXX || CFG_TUSB_MCU==OPT_MCU_LPC13XX
   #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 c5739038..bc9ff27f 100644
--- a/examples/obsolete/device/src/tusb_config.h
+++ b/examples/obsolete/device/src/tusb_config.h
@@ -96,7 +96,7 @@
 //--------------------------------------------------------------------+
 #ifdef __CODE_RED // compiled with lpcxpresso
 
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX)
     #define CFG_TUSB_MEM_SECTION  ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned
   #elif CFG_TUSB_MCU == OPT_MCU_LPC175X_6X
     #define CFG_TUSB_MEM_SECTION // LPC17xx USB DMA can access all
@@ -106,7 +106,7 @@
 
 #elif defined  __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files
 
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX)
     #define CFG_TUSB_MEM_SECTION  ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned
   #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X)
     #define CFG_TUSB_MEM_SECTION  // LPC17xx USB DMA can access all address
@@ -116,7 +116,7 @@
 
 #elif defined __ICCARM__ // compiled with IAR
 
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+  #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX)
     #define CFG_TUSB_MEM_SECTION _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64)
   #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X)
     #define CFG_TUSB_MEM_SECTION
@@ -131,7 +131,7 @@
 #endif
 
 // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment
-#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX
+#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(64)
 #elif CFG_TUSB_MCU == OPT_MCU_NRF5X
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(4)
diff --git a/hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c b/hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c
index c8738701..5c6c2e62 100644
--- a/hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c
+++ b/hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c
@@ -39,7 +39,7 @@
 #include "common/tusb_common.h"
 #include "hal.h"
 
-#if CFG_TUSB_MCU == OPT_MCU_LPC13UXX
+#if CFG_TUSB_MCU == OPT_MCU_LPC13XX
 
 void tusb_hal_int_enable(uint8_t rhport)
 {
diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 4fc3dd1b..83c9990d 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -62,7 +62,7 @@ enum
 typedef struct {
   CFG_TUSB_MEM_ALIGN msc_cbw_t  cbw;
 
-//#if defined (__ICCARM__) && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+//#if defined (__ICCARM__) && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX)
 //  uint8_t padding1[64-sizeof(msc_cbw_t)]; // IAR cannot align struct's member
 //#endif
 
diff --git a/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c b/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
index 4e514d6e..029677e7 100644
--- a/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
+++ b/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX)
+#if TUSB_OPT_DEVICE_ENABLED && (CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX)
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/tusb_option.h b/src/tusb_option.h
index e1aec330..ea15f6c5 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -49,8 +49,8 @@
  * \ref CFG_TUSB_MCU must be defined to one of these
  *  @{ */
 #define OPT_MCU_LPC11UXX       1 ///< NXP LPC11Uxx series
-#define OPT_MCU_LPC13XX        2 ///< NXP LPC13xx (not supported yet)
-#define OPT_MCU_LPC13UXX       3 ///< NXP LPC13xx 12 bit ADC series
+
+#define OPT_MCU_LPC13XX       3 ///< NXP LPC13xx 12 bit ADC series
 #define OPT_MCU_LPC175X_6X     4 ///< NXP LPC175x, LPC176x series
 #define OPT_MCU_LPC177X_8X     5 ///< NXP LPC177x, LPC178x series (not supported yet)
 #define OPT_MCU_LPC18XX        6 ///< NXP LPC18xx series (not supported yet)