From f88e24d773ef559d1a96df43b4c4f67671bebad7 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 2 Mar 2018 18:22:34 +0700 Subject: [PATCH] hal update --- {tinyusb/hal => hw/mcu/nxp/lpc11uxx/usb}/hal_lpc11uxx.c | 0 .../hal/hal_lpc11uxx.h => hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h | 6 +++--- {tinyusb/hal => hw/mcu/nxp/lpc13uxx/usb}/hal_lpc13uxx.c | 0 .../hal/hal_lpc13uxx.h => hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h | 6 +++--- {tinyusb/hal => hw/mcu/nxp/lpc175x_6x/usb}/hal_lpc175x_6x.c | 0 .../hal_lpc175x_6x.h => hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h | 6 +++--- hw/mcu/nxp/lpc43xx/usb/{hal_usb.h => hal_mcu.h} | 6 +++--- tinyusb/hal/hal.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename {tinyusb/hal => hw/mcu/nxp/lpc11uxx/usb}/hal_lpc11uxx.c (100%) rename tinyusb/hal/hal_lpc11uxx.h => hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h (93%) rename {tinyusb/hal => hw/mcu/nxp/lpc13uxx/usb}/hal_lpc13uxx.c (100%) rename tinyusb/hal/hal_lpc13uxx.h => hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h (93%) rename {tinyusb/hal => hw/mcu/nxp/lpc175x_6x/usb}/hal_lpc175x_6x.c (100%) rename tinyusb/hal/hal_lpc175x_6x.h => hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h (95%) rename hw/mcu/nxp/lpc43xx/usb/{hal_usb.h => hal_mcu.h} (93%) diff --git a/tinyusb/hal/hal_lpc11uxx.c b/hw/mcu/nxp/lpc11uxx/usb/hal_lpc11uxx.c similarity index 100% rename from tinyusb/hal/hal_lpc11uxx.c rename to hw/mcu/nxp/lpc11uxx/usb/hal_lpc11uxx.c diff --git a/tinyusb/hal/hal_lpc11uxx.h b/hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h similarity index 93% rename from tinyusb/hal/hal_lpc11uxx.h rename to hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h index 1fd20aff6..7e17fe53a 100644 --- a/tinyusb/hal/hal_lpc11uxx.h +++ b/hw/mcu/nxp/lpc11uxx/usb/hal_mcu.h @@ -36,8 +36,8 @@ */ /**************************************************************************/ -#ifndef _TUSB_HAL_LPC11UXX_H_ -#define _TUSB_HAL_LPC11UXX_H_ +#ifndef _TUSB_HAL_MCU_H_ +#define _TUSB_HAL_MCU_H_ #include "LPC11Uxx.h" @@ -50,4 +50,4 @@ } #endif -#endif /* _TUSB_HAL_LPC11UXX_H_ */ +#endif /* _TUSB_HAL_MCU_H_ */ diff --git a/tinyusb/hal/hal_lpc13uxx.c b/hw/mcu/nxp/lpc13uxx/usb/hal_lpc13uxx.c similarity index 100% rename from tinyusb/hal/hal_lpc13uxx.c rename to hw/mcu/nxp/lpc13uxx/usb/hal_lpc13uxx.c diff --git a/tinyusb/hal/hal_lpc13uxx.h b/hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h similarity index 93% rename from tinyusb/hal/hal_lpc13uxx.h rename to hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h index 07bf7f2bd..e38b48199 100644 --- a/tinyusb/hal/hal_lpc13uxx.h +++ b/hw/mcu/nxp/lpc13uxx/usb/hal_mcu.h @@ -36,8 +36,8 @@ */ /**************************************************************************/ -#ifndef _TUSB_HAL_LPC13UXX_H_ -#define _TUSB_HAL_LPC13UXX_H_ +#ifndef _TUSB_HAL_MCU_H_ +#define _TUSB_HAL_MCU_H_ #include "LPC13Uxx.h" @@ -50,5 +50,5 @@ } #endif -#endif /* _TUSB_HAL_LPC13UXX_H_ */ +#endif /* _TUSB_HAL_MCU_H_ */ diff --git a/tinyusb/hal/hal_lpc175x_6x.c b/hw/mcu/nxp/lpc175x_6x/usb/hal_lpc175x_6x.c similarity index 100% rename from tinyusb/hal/hal_lpc175x_6x.c rename to hw/mcu/nxp/lpc175x_6x/usb/hal_lpc175x_6x.c diff --git a/tinyusb/hal/hal_lpc175x_6x.h b/hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h similarity index 95% rename from tinyusb/hal/hal_lpc175x_6x.h rename to hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h index 053c34442..be1e71671 100644 --- a/tinyusb/hal/hal_lpc175x_6x.h +++ b/hw/mcu/nxp/lpc175x_6x/usb/hal_mcu.h @@ -36,8 +36,8 @@ */ /**************************************************************************/ -#ifndef _TUSB_HAL_LPC175X_6X_H_ -#define _TUSB_HAL_LPC175X_6X_H_ +#ifndef _TUSB_HAL_MCU_H_ +#define _TUSB_HAL_MCU_H_ #include "LPC17xx.h" #include "lpc17xx_pinsel.h" @@ -51,5 +51,5 @@ } #endif -#endif /* _TUSB_HAL_LPC175X_6X_H_ */ +#endif /* _TUSB_HAL_MCU_H_ */ diff --git a/hw/mcu/nxp/lpc43xx/usb/hal_usb.h b/hw/mcu/nxp/lpc43xx/usb/hal_mcu.h similarity index 93% rename from hw/mcu/nxp/lpc43xx/usb/hal_usb.h rename to hw/mcu/nxp/lpc43xx/usb/hal_mcu.h index 6b0d9488e..f4de45b3e 100644 --- a/hw/mcu/nxp/lpc43xx/usb/hal_usb.h +++ b/hw/mcu/nxp/lpc43xx/usb/hal_mcu.h @@ -36,8 +36,8 @@ */ /**************************************************************************/ -#ifndef _TUSB_HAL_USB_H_ -#define _TUSB_HAL_USB_H_ +#ifndef _TUSB_HAL_MCU_H_ +#define _TUSB_HAL_MCU_H_ #include "LPC43xx.h" #include "lpc43xx_cgu.h" @@ -52,5 +52,5 @@ } #endif -#endif /* _TUSB_HAL_USB_H_ */ +#endif /* _TUSB_HAL_MCU_H_ */ diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h index 696c5d423..ff4c7fca7 100644 --- a/tinyusb/hal/hal.h +++ b/tinyusb/hal/hal.h @@ -83,7 +83,7 @@ void hal_usb_int_enable(uint8_t coreid); */ void hal_usb_int_disable(uint8_t coreid); -#include "hal_usb.h" +#include "hal_mcu.h" #ifdef __cplusplus extern "C" {