From 5f69029dcdaa8cf3120b2d58df56b230dca952d2 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 9 Mar 2018 19:55:01 +0700 Subject: rename hal_usb to hal_tusb.h --- hw/mcu/nxp/lpc43xx/hal/hal_lpc43xx.c | 2 +- hw/mcu/nxp/lpc43xx/hal/hal_tusb.h | 56 ++++++++++++++++++++++++++++++++++++ hw/mcu/nxp/lpc43xx/hal/hal_usb.h | 56 ------------------------------------ tinyusb/tusb_hal.h | 2 +- 4 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 hw/mcu/nxp/lpc43xx/hal/hal_tusb.h delete mode 100644 hw/mcu/nxp/lpc43xx/hal/hal_usb.h diff --git a/hw/mcu/nxp/lpc43xx/hal/hal_lpc43xx.c b/hw/mcu/nxp/lpc43xx/hal/hal_lpc43xx.c index 056448fda..b82829b5a 100644 --- a/hw/mcu/nxp/lpc43xx/hal/hal_lpc43xx.c +++ b/hw/mcu/nxp/lpc43xx/hal/hal_lpc43xx.c @@ -36,7 +36,7 @@ */ /**************************************************************************/ -#include "hal_usb.h" +#include "hal_tusb.h" #include "tusb.h" #if TUSB_CFG_MCU == MCU_LPC43XX diff --git a/hw/mcu/nxp/lpc43xx/hal/hal_tusb.h b/hw/mcu/nxp/lpc43xx/hal/hal_tusb.h new file mode 100644 index 000000000..f4de45b3e --- /dev/null +++ b/hw/mcu/nxp/lpc43xx/hal/hal_tusb.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_MCU_H_ +#define _TUSB_HAL_MCU_H_ + +#include "LPC43xx.h" +#include "lpc43xx_cgu.h" + +#ifdef __cplusplus + extern "C" { +#endif + + + +#ifdef __cplusplus + } +#endif + +#endif /* _TUSB_HAL_MCU_H_ */ + diff --git a/hw/mcu/nxp/lpc43xx/hal/hal_usb.h b/hw/mcu/nxp/lpc43xx/hal/hal_usb.h deleted file mode 100644 index f4de45b3e..000000000 --- a/hw/mcu/nxp/lpc43xx/hal/hal_usb.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_MCU_H_ -#define _TUSB_HAL_MCU_H_ - -#include "LPC43xx.h" -#include "lpc43xx_cgu.h" - -#ifdef __cplusplus - extern "C" { -#endif - - - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_HAL_MCU_H_ */ - diff --git a/tinyusb/tusb_hal.h b/tinyusb/tusb_hal.h index 33d44c873..1dc905dc9 100644 --- a/tinyusb/tusb_hal.h +++ b/tinyusb/tusb_hal.h @@ -54,7 +54,7 @@ extern "C" { #include "common/compiler/compiler.h" // from mcu port -#include "hal_usb.h" +#include "hal_tusb.h" //--------------------------------------------------------------------+ // HAL API -- cgit v1.3.1