From aeea6754af258bafa138f6bff894ee2b617c9f13 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 1 Sep 2019 16:44:40 +0700
Subject: [PATCH] rename lpc_usbd to lpc_ip3511

---
 hw/bsp/lpcxpresso11u68/board.mk                                 | 2 +-
 hw/bsp/lpcxpresso1347/board.mk                                  | 2 +-
 hw/bsp/lpcxpresso51u68/board.mk                                 | 2 +-
 hw/bsp/lpcxpresso54114/board.mk                                 | 2 +-
 src/class/msc/msc_device.c                                      | 1 +
 .../{lpc_usbd/dcd_lpc_usbd.c => lpc_ip3511/dcd_lpc_ip3511.c}    | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename src/portable/nxp/{lpc_usbd/dcd_lpc_usbd.c => lpc_ip3511/dcd_lpc_ip3511.c} (99%)

diff --git a/hw/bsp/lpcxpresso11u68/board.mk b/hw/bsp/lpcxpresso11u68/board.mk
index 29287692e..b2899a2e0 100644
--- a/hw/bsp/lpcxpresso11u68/board.mk
+++ b/hw/bsp/lpcxpresso11u68/board.mk
@@ -26,7 +26,7 @@ INC += \
 
 # For TinyUSB port source
 VENDOR = nxp
-CHIP_FAMILY = lpc_usbd
+CHIP_FAMILY = lpc_ip3511
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
diff --git a/hw/bsp/lpcxpresso1347/board.mk b/hw/bsp/lpcxpresso1347/board.mk
index f7600f427..7e620f97a 100644
--- a/hw/bsp/lpcxpresso1347/board.mk
+++ b/hw/bsp/lpcxpresso1347/board.mk
@@ -25,7 +25,7 @@ INC += \
 
 # For TinyUSB port source
 VENDOR = nxp
-CHIP_FAMILY = lpc_usbd
+CHIP_FAMILY = lpc_ip3511
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM3
diff --git a/hw/bsp/lpcxpresso51u68/board.mk b/hw/bsp/lpcxpresso51u68/board.mk
index fe150dddb..d1e9533f5 100644
--- a/hw/bsp/lpcxpresso51u68/board.mk
+++ b/hw/bsp/lpcxpresso51u68/board.mk
@@ -32,7 +32,7 @@ LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower.a
 
 # For TinyUSB port source
 VENDOR = nxp
-CHIP_FAMILY = lpc_usbd
+CHIP_FAMILY = lpc_ip3511
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
diff --git a/hw/bsp/lpcxpresso54114/board.mk b/hw/bsp/lpcxpresso54114/board.mk
index 71c227f9f..1d2bf9531 100644
--- a/hw/bsp/lpcxpresso54114/board.mk
+++ b/hw/bsp/lpcxpresso54114/board.mk
@@ -34,7 +34,7 @@ LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower_cm4_hardabi.a
 
 # For TinyUSB port source
 VENDOR = nxp
-CHIP_FAMILY = lpc_usbd
+CHIP_FAMILY = lpc_ip3511
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM4
diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 2ec8962ae..a77282ed5 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -44,6 +44,7 @@ enum
 
 typedef struct
 {
+  // TODO optimize alignment
   CFG_TUSB_MEM_ALIGN msc_cbw_t cbw;
   CFG_TUSB_MEM_ALIGN msc_csw_t csw;
 
diff --git a/src/portable/nxp/lpc_usbd/dcd_lpc_usbd.c b/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
similarity index 99%
rename from src/portable/nxp/lpc_usbd/dcd_lpc_usbd.c
rename to src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
index d8e4de5a5..101698f17 100644
--- a/src/portable/nxp/lpc_usbd/dcd_lpc_usbd.c
+++ b/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
@@ -26,7 +26,7 @@
 
 #include "tusb_option.h"
 
-/* Since 2012 starting with LPC11uxx, NXP start to use common USB Device Controller
+/* Since 2012 starting with LPC11uxx, NXP start to use common USB Device Controller with code name LPC IP3511
  * for almost their new MCUs. Currently supported and tested families are
  * - LPC11Uxx
  * - LPC13xx