hal update

7 files changed, 1 insertions, 435 deletions

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" {

diff --git a/tinyusb/hal/hal_lpc11uxx.c b/tinyusb/hal/hal_lpc11uxx.c
deleted file mode 100644
index 066679a27..000000000
--- a/tinyusb/hal/hal_lpc11uxx.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/**************************************************************************/

-/*!

-    @file     hal_lpc11uxx.c

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

-*/

-/**************************************************************************/

-

-#include "common/common.h"

-#include "hal.h"

-

-#if TUSB_CFG_MCU == MCU_LPC11UXX

-

-void hal_usb_int_enable(uint8_t coreid)

-{

-  (void) coreid; // discard compiler's warning

-  NVIC_EnableIRQ(USB_IRQn);

-}

-

-void hal_usb_int_disable(uint8_t coreid)

-{

-  (void) coreid; // discard compiler's warning

-  NVIC_DisableIRQ(USB_IRQn);

-}

-

-bool hal_init(void)

-{

-	// TODO remove magic number

-  /* Enable AHB clock to the USB block and USB RAM. */

-  LPC_SYSCON->SYSAHBCLKCTRL |= ((0x1<<14) | (0x1<<27));

-  LPC_SYSCON->PDRUNCFG &= ~( BIT_(8) | BIT_(10) ); // enable USB PLL & USB transceiver

-

-  /* Pull-down is needed, or internally, VBUS will be floating. This is to

-  address the wrong status in VBUSDebouncing bit in CmdStatus register.  */

-  // set PIO0_3 as USB_VBUS

-  LPC_IOCON->PIO0_3   &= ~0x1F;

-  LPC_IOCON->PIO0_3   |= (0x01<<0)  | (1 << 3);            /* Secondary function VBUS */

-

-  // set PIO0_6 as usb connect

-  LPC_IOCON->PIO0_6   &= ~0x07;

-  LPC_IOCON->PIO0_6   |= (0x01<<0);            /* Secondary function SoftConn */

-

-  return true;

-}

-

-void USB_IRQHandler(void)

-{

-  tusb_isr(0);

-}

-

-#endif

diff --git a/tinyusb/hal/hal_lpc11uxx.h b/tinyusb/hal/hal_lpc11uxx.h
deleted file mode 100644
index 1fd20aff6..000000000
--- a/tinyusb/hal/hal_lpc11uxx.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************/

-/*!

-    @file     hal_lpc11uxx.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_LPC11UXX_H_

-#define _TUSB_HAL_LPC11UXX_H_

-

-#include "LPC11Uxx.h"

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-

-#ifdef __cplusplus

- }

-#endif

-

-#endif /* _TUSB_HAL_LPC11UXX_H_ */

diff --git a/tinyusb/hal/hal_lpc13uxx.c b/tinyusb/hal/hal_lpc13uxx.c
deleted file mode 100644
index 9de859e6f..000000000
--- a/tinyusb/hal/hal_lpc13uxx.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************/

-/*!

-    @file     hal_lpc13uxx.c

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

-*/

-/**************************************************************************/

-

-#include "common/common.h"

-#include "hal.h"

-

-#if TUSB_CFG_MCU == MCU_LPC13UXX

-

-void hal_usb_int_enable(uint8_t coreid)

-{

-  (void) coreid; // discard compiler's warning

-  NVIC_EnableIRQ(USB_IRQ_IRQn);

-}

-

-void hal_usb_int_disable(uint8_t coreid)

-{

-  (void) coreid; // discard compiler's warning

-  NVIC_DisableIRQ(USB_IRQ_IRQn);

-}

-

-bool hal_init(void)

-{

-	// TODO remove magic number

-  LPC_SYSCON->SYSAHBCLKCTRL |= ((0x1<<14) | (0x1<<27)); /* Enable AHB clock to the USB block and USB RAM. */

-  LPC_SYSCON->PDRUNCFG &= ~( BIT_(8) | BIT_(10) ); // enable USB PLL & USB transceiver

-

-  /* Pull-down is needed, or internally, VBUS will be floating. This is to

-  address the wrong status in VBUSDebouncing bit in CmdStatus register.  */

-  // set PIO0_3 as USB_VBUS

-  LPC_IOCON->PIO0_3   &= ~0x1F;

-  LPC_IOCON->PIO0_3   |= (0x01<<0) | (1 << 3);            /* Secondary function VBUS */

-

-  // set PIO0_6 as usb connect

-  LPC_IOCON->PIO0_6   &= ~0x07;

-  LPC_IOCON->PIO0_6   |= (0x01<<0);            /* Secondary function SoftConn */

-

-  return true;

-}

-

-void USB_IRQHandler(void)

-{

-  tusb_isr(0);

-}

-

-

-

-

-#endif

diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h
deleted file mode 100644
index 07bf7f2bd..000000000
--- a/tinyusb/hal/hal_lpc13uxx.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**************************************************************************/

-/*!

-    @file     hal_lpc13uxx.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_LPC13UXX_H_

-#define _TUSB_HAL_LPC13UXX_H_

-

-#include "LPC13Uxx.h"

-

-#ifdef __cplusplus

- extern "C" {

-#endif

-

-

-#ifdef __cplusplus

- }

-#endif

-

-#endif /* _TUSB_HAL_LPC13UXX_H_ */

-

diff --git a/tinyusb/hal/hal_lpc175x_6x.c b/tinyusb/hal/hal_lpc175x_6x.c
deleted file mode 100644
index 3463a70db..000000000
--- a/tinyusb/hal/hal_lpc175x_6x.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************/

-/*!

-    @file     hal_lpc175x_6x.c

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

-*/

-/**************************************************************************/

-

-#include "common/common.h"

-#include "hal.h"

-

-#if TUSB_CFG_MCU == MCU_LPC175X_6X

-

-void hal_usb_int_enable(uint8_t coreid)

-{

-  (void) coreid; // discard compiler's warning

-  NVIC_EnableIRQ(USB_IRQn);

-}

-

-void hal_usb_int_disable(uint8_t coreid)

-{

-  (void) coreid; // discard compiler's warning

-  NVIC_DisableIRQ(USB_IRQn);

-}

-

-//--------------------------------------------------------------------+

-// IMPLEMENTATION

-//--------------------------------------------------------------------+

-bool hal_init(void)

-{

-  enum {

-    USBCLK_DEVCIE = 0x12,     // AHB + Device

-    USBCLK_HOST   = 0x19,     // AHB + Host + OTG (!)

-

-    PCONP_PCUSB   = BIT_(31)

-  };

-

-  LPC_SC->PCONP |= PCONP_PCUSB; // enable USB Peripherals

-

-  //------------- user manual 11.13 usb device controller initialization -------------//

-  PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 0, .Pinnum = 29, .Funcnum = 1} ); // P0.29 as D+

-  PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 0, .Pinnum = 30, .Funcnum = 1} ); // P0.30 as D-

-

-#if MODE_HOST_SUPPORTED

-  PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 1, .Pinnum = 22, .Funcnum = 2} ); // P1.22 as USB_PWRD

-  PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 1, .Pinnum = 19, .Funcnum = 2} ); // P1.19 as USB_PPWR

-

-  LPC_USB->USBClkCtrl = USBCLK_HOST;

-  while ((LPC_USB->USBClkSt & USBCLK_HOST) != USBCLK_HOST);

-  LPC_USB->OTGStCtrl = 0x3;

-#endif

-

-#if MODE_DEVICE_SUPPORTED

-  LPC_PINCON->PINSEL4 = bit_set_range(LPC_PINCON->PINSEL4, 18, 19, BIN8(01)); // P2_9 as USB Connect

-

-  // P1_30 as VBUS, ignore if it is already in VBUS mode

-  if ( !(!BIT_TEST_(LPC_PINCON->PINSEL3, 28) && BIT_TEST_(LPC_PINCON->PINSEL3, 29)) )

-  {

-    // some board like lpcxpresso1769 does not connect VBUS signal to pin P1_30, this allow those board to overwrite

-    // by always pulling P1_30 to high

-    PINSEL_ConfigPin( &(PINSEL_CFG_Type) {

-      .Portnum = 1, .Pinnum = 30,

-      .Funcnum = 2, .Pinmode = PINSEL_PINMODE_PULLDOWN} );

-  }

-

-  LPC_USB->USBClkCtrl = USBCLK_DEVCIE;

-  while ((LPC_USB->USBClkSt & USBCLK_DEVCIE) != USBCLK_DEVCIE);

-#endif

-

-  return true;

-}

-

-void USB_IRQHandler(void)

-{

-  tusb_isr(0);

-}

-

-#endif

diff --git a/tinyusb/hal/hal_lpc175x_6x.h b/tinyusb/hal/hal_lpc175x_6x.h
deleted file mode 100644
index 053c34442..000000000
--- a/tinyusb/hal/hal_lpc175x_6x.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************/
-/*!
-    @file     hal_lpc175x_6x.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_LPC175X_6X_H_
-#define _TUSB_HAL_LPC175X_6X_H_
-
-#include "LPC17xx.h"
-#include "lpc17xx_pinsel.h"
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_HAL_LPC175X_6X_H_ */
-