9 files changed, 13 insertions, 252 deletions
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index 7d003d57b..a17fb62dc 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -66,7 +66,6 @@
 #include "errors.h"
 #include "assertion.h"
 #include "binary.h"
-#include "mcu/mcu.h"
 
 #include "hal/hal.h"
 #include "core/tusb_types.h"
diff --git a/tinyusb/common/mcu/mcu.h b/tinyusb/common/mcu/mcu.h
deleted file mode 100644
index 14adb0b61..000000000
--- a/tinyusb/common/mcu/mcu.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * mcu.h
- *
- *  Created on: Nov 26, 2012
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tinyUSB stack.
- */
-
-/** \file
- *  \brief Architecture Header
- *
- *  \note TBD
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_MCU MicroController
- *  \brief Group_MCU brief
- *
- *  @{
- */
-
-#ifndef _TUSB_MCU_H_
-#define _TUSB_MCU_H_
-
-#define ENDIAN_LITTLE ///< MCU Endian
-#define ALIGNMENT (4) ///< MCU Alignment
-
-#define MCU_LPC13UXX 0
-#define MCU_LPC11UXX 1
-#define MCU_LPC43XX  2
-
-#if MCU == MCU_LPC13UXX
-  #include "mcu_lpc13uxx.h"
-#elif MCU == MCU_LPC43XX
-  #include "mcu_lpc43xx.h"
-#elif MCU == MCU_LPC11UXX
-  #include "mcu_lpc11uxx.h"
-#else
-  #error MCU is not defined or supported yet
-#endif
-
-#endif /* _TUSB_MCU_H_ */
-
-/** @} */
-
diff --git a/tinyusb/common/mcu/mcu_lpc11uxx.h b/tinyusb/common/mcu/mcu_lpc11uxx.h
deleted file mode 100644
index 327bf4e04..000000000
--- a/tinyusb/common/mcu/mcu_lpc11uxx.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * mcu_lpc11xx.h
- *
- *  Created on: Nov 29, 2012
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tinyUSB stack.
- */
-
-/** \file
- *  \brief LPC11xx Header File
- *
- *  \note TBD
- */
-
-/** \ingroup Group_MCU
- *
- *  @{
- */
-
-#ifndef _TUSB_MCU_LPC11UXX_H_
-#define _TUSB_MCU_LPC11UXX_H_
-
-#include "LPC11Uxx.h"
-
-#define DEVICE_ROMDRIVER
-
-#endif /* _TUSB_MCU_LPC11UXX_H_ */
-
-/** @} */
diff --git a/tinyusb/common/mcu/mcu_lpc13uxx.h b/tinyusb/common/mcu/mcu_lpc13uxx.h
deleted file mode 100644
index 615ac4ed7..000000000
--- a/tinyusb/common/mcu/mcu_lpc13uxx.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * mcu_lpc13uxx.h
- *
- *  Created on: Nov 26, 2012
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tinyUSB stack.
- */
-
-/** \file
- *  \brief LPC13Uxx Header
- *
- *  \note TBD
- */
-
-/** \ingroup Group_MCU
- *
- *  @{
- */
-
-#ifndef _TUSB_MCU_LPC13UXX_H_
-#define _TUSB_MCU_LPC13UXX_H_
-
-#include "LPC13Uxx.h"
-
-#define DEVICE_ROMDRIVER
-
-#endif /* _TUSB_MCU_LPC13UXX_H_ */
-
-/** @} */
-
diff --git a/tinyusb/common/mcu/mcu_lpc43xx.h b/tinyusb/common/mcu/mcu_lpc43xx.h
deleted file mode 100644
index fc022c4cb..000000000
--- a/tinyusb/common/mcu/mcu_lpc43xx.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * mcu_lpc43xx.h
- *
- *  Created on: Nov 26, 2012
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2012, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tinyUSB stack.
- */
-
-/** \file
- *  \brief LPC43xx Header
- *
- *  \note TBD
- */
-
-/** \ingroup Group_MCU
- *
- *  @{
- */
-
-#ifndef _TUSB_MCU_LPC43XX_H_
-#define _TUSB_MCU_LPC43XX_H_
-
-#include "LPC43xx.h"
-#include "lpc43xx_cgu.h"
-
-#endif /* _TUSB_MCU_LPC43XX_H_ */
-
-/// @}
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index 467f75f37..36fe9c5a3 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -58,6 +58,10 @@
 #include "common/compiler/compiler.h"
 #include "common/errors.h"
 
+#define MCU_LPC13UXX 0
+#define MCU_LPC11UXX 1
+#define MCU_LPC43XX  2
+
 /** \brief USB hardware init
  *
  * \param[in]  para1
diff --git a/tinyusb/hal/hal_lpc11uxx.h b/tinyusb/hal/hal_lpc11uxx.h
index 1f1d6779e..b984afbc1 100644
--- a/tinyusb/hal/hal_lpc11uxx.h
+++ b/tinyusb/hal/hal_lpc11uxx.h
@@ -51,7 +51,9 @@
 #ifndef _TUSB_HAL_LPC11UXX_H_
 #define _TUSB_HAL_LPC11UXX_H_
 
-#include "common/mcu/mcu.h"
+#include "LPC11Uxx.h"
+
+#define DEVICE_ROMDRIVER
 
 #ifdef __cplusplus
  extern "C" {
diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h
index f29bab7b9..c360f2909 100644
--- a/tinyusb/hal/hal_lpc13uxx.h
+++ b/tinyusb/hal/hal_lpc13uxx.h
@@ -51,7 +51,10 @@
 #ifndef _TUSB_HAL_LPC13UXX_H_
 #define _TUSB_HAL_LPC13UXX_H_
 
-#include "common/mcu/mcu.h"
+#include "LPC13Uxx.h"
+
+#define DEVICE_ROMDRIVER
+
 
 #ifdef __cplusplus
  extern "C" {
diff --git a/tinyusb/hal/hal_lpc43xx.h b/tinyusb/hal/hal_lpc43xx.h
index a0648d8f4..d00d9fa42 100644
--- a/tinyusb/hal/hal_lpc43xx.h
+++ b/tinyusb/hal/hal_lpc43xx.h
@@ -51,7 +51,8 @@
 #ifndef _TUSB_HAL_LPC43XX_H_
 #define _TUSB_HAL_LPC43XX_H_
 
-#include "common/mcu/mcu.h"
+#include "LPC43xx.h"
+#include "lpc43xx_cgu.h"
 
 #ifdef __cplusplus
  extern "C" {