From b6e337bc12c041969687ee8c13dbe5045c4096f8 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Fri, 2 Mar 2018 15:26:23 +0700
Subject: more hal update

---
 demos/device/device_os_none/.cproject |  3 +-
 hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h  | 56 -----------------------------------
 hw/mcu/nxp/lpc43xx/usb/hal_usb.h      | 56 +++++++++++++++++++++++++++++++++++
 hw/mcu/readme.md                      |  3 --
 hw/readme.md                          |  3 ++
 tinyusb/hal/hal.h                     | 16 +---------
 6 files changed, 62 insertions(+), 75 deletions(-)
 delete mode 100644 hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h
 create mode 100644 hw/mcu/nxp/lpc43xx/usb/hal_usb.h
 delete mode 100644 hw/mcu/readme.md
 create mode 100644 hw/readme.md

diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject
index 98b1e0a1f..7540a09e0 100644
--- a/demos/device/device_os_none/.cproject
+++ b/demos/device/device_os_none/.cproject
@@ -230,8 +230,9 @@
 								</option>
 								<option id="gnu.c.compiler.option.misc.other.2122594924" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
 								<option id="gnu.c.compiler.option.include.paths.1913705177" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/cmsis/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/mcu/nxp/lpc43xx/usb}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/tinyusb}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
diff --git a/hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h b/hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h
deleted file mode 100644
index ecc892d4a..000000000
--- a/hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**************************************************************************/
-/*!
-    @file     hal_lpc43xx.h
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2013, hathach (tinyusb.org)
-    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. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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.
-*/
-/**************************************************************************/
-
-#ifndef _TUSB_HAL_LPC43XX_H_
-#define _TUSB_HAL_LPC43XX_H_
-
-#include "LPC43xx.h"
-#include "lpc43xx_cgu.h"
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_HAL_LPC43XX_H_ */
-
diff --git a/hw/mcu/nxp/lpc43xx/usb/hal_usb.h b/hw/mcu/nxp/lpc43xx/usb/hal_usb.h
new file mode 100644
index 000000000..6b0d9488e
--- /dev/null
+++ b/hw/mcu/nxp/lpc43xx/usb/hal_usb.h
@@ -0,0 +1,56 @@
+/**************************************************************************/
+/*!
+    @file     hal_lpc43xx.h
+    @author   hathach (tinyusb.org)
+
+    @section LICENSE
+
+    Software License Agreement (BSD License)
+
+    Copyright (c) 2013, hathach (tinyusb.org)
+    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. Neither the name of the copyright holders nor the
+    names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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.
+*/
+/**************************************************************************/
+
+#ifndef _TUSB_HAL_USB_H_
+#define _TUSB_HAL_USB_H_
+
+#include "LPC43xx.h"
+#include "lpc43xx_cgu.h"
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_HAL_USB_H_ */
+
diff --git a/hw/mcu/readme.md b/hw/mcu/readme.md
deleted file mode 100644
index 0f4308065..000000000
--- a/hw/mcu/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Supported MCUs #
-
-Currently 
\ No newline at end of file
diff --git a/hw/readme.md b/hw/readme.md
new file mode 100644
index 000000000..0f4308065
--- /dev/null
+++ b/hw/readme.md
@@ -0,0 +1,3 @@
+# Supported MCUs #
+
+Currently 
\ No newline at end of file
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index cdaa3c773..65b219610 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -83,20 +83,7 @@ void hal_interrupt_enable(uint8_t coreid);
  */
 void hal_interrupt_disable(uint8_t coreid);
 
-//--------------------------------------------------------------------+
-// INCLUDE DRIVEN
-//--------------------------------------------------------------------+
-#if TUSB_CFG_MCU == MCU_LPC11UXX
-  #include "hal_lpc11uxx.h"
-#elif TUSB_CFG_MCU == MCU_LPC13UXX
-  #include "hal_lpc13uxx.h"
-#elif TUSB_CFG_MCU == MCU_LPC43XX
-  #include "mcu/nxp/lpc43xx/usb/hal_lpc43xx.h"
-#elif TUSB_CFG_MCU == MCU_LPC175X_6X
-  #include "hal_lpc175x_6x.h"
-#else
-  #error MCU is not defined or supported yet
-#endif
+#include "hal_usb.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,7 +101,6 @@ static inline bool hal_debugger_is_attached(void)
 #endif
 }
 
-static inline void hal_debugger_breakpoint(void) ATTR_ALWAYS_INLINE;
 static inline void hal_debugger_breakpoint(void)
 {
 #ifndef _TEST_
-- 
cgit v1.3.1