more hal update

This commit is contained in:
hathach 2018-03-02 15:26:23 +07:00
parent 4097d02254
commit b6e337bc12
4 changed files with 6 additions and 19 deletions

View File

@ -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;"/>

View File

@ -36,8 +36,8 @@
*/
/**************************************************************************/
#ifndef _TUSB_HAL_LPC43XX_H_
#define _TUSB_HAL_LPC43XX_H_
#ifndef _TUSB_HAL_USB_H_
#define _TUSB_HAL_USB_H_
#include "LPC43xx.h"
#include "lpc43xx_cgu.h"
@ -52,5 +52,5 @@
}
#endif
#endif /* _TUSB_HAL_LPC43XX_H_ */
#endif /* _TUSB_HAL_USB_H_ */

View File

@ -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_