From 2435abb0a8496361fb08cdaa4234e9d205add186 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 12 Mar 2018 23:46:58 +0700 Subject: rename hal to tusb_port --- examples/device/nrf52840/segger/nrf52840.emProject | 4 +- examples/device/nrf52840/segger/nrf52840.emSession | 21 ++--- hw/mcu/nordic/nrf52/hal/hal_nrf52.c | 98 ---------------------- hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c | 98 ++++++++++++++++++++++ 4 files changed, 105 insertions(+), 116 deletions(-) delete mode 100644 hw/mcu/nordic/nrf52/hal/hal_nrf52.c create mode 100644 hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c diff --git a/examples/device/nrf52840/segger/nrf52840.emProject b/examples/device/nrf52840/segger/nrf52840.emProject index 01e683c85..0cda6467b 100644 --- a/examples/device/nrf52840/segger/nrf52840.emProject +++ b/examples/device/nrf52840/segger/nrf52840.emProject @@ -80,8 +80,8 @@ - - + + - - - - - - - - - - - - @@ -73,9 +61,10 @@ - - - + + + + - + diff --git a/hw/mcu/nordic/nrf52/hal/hal_nrf52.c b/hw/mcu/nordic/nrf52/hal/hal_nrf52.c deleted file mode 100644 index c2fb42dc5..000000000 --- a/hw/mcu/nordic/nrf52/hal/hal_nrf52.c +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************/ -/*! - @file hal_nrf52.c - @author hathach - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2018, 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. -*/ -/**************************************************************************/ - -#include -#include "nrf.h" -#include "nrf_gpio.h" -#include "nrf_drv_systick.h" - -/*------------------------------------------------------------------*/ -/* MACRO TYPEDEF CONSTANT ENUM - *------------------------------------------------------------------*/ - - -/*------------------------------------------------------------------*/ -/* VARIABLE DECLARATION - *------------------------------------------------------------------*/ - -/*------------------------------------------------------------------*/ -/* FUNCTION DECLARATION - *------------------------------------------------------------------*/ - -volatile uint32_t system_ticks = 0; - -void SysTick_Handler (void) -{ - system_ticks++; -} - - -bool tusb_hal_init(void) -{ - -} - -void tusb_hal_init_enable(uint8_t port) -{ - (void) port; - NVIC_EnableIRQ(USBD_IRQn); -} - -void tusb_hal_init_disable(uint8_t port) -{ - (void) port; - NVIC_DisableIRQ(USBD_IRQn); -} - -uint32_t tusb_hal_tick_get(void) -{ - //#define tick2ms(tck) ( ( ((uint64_t)(tck)) * 1000) / configTICK_RATE_HZ ) - //return tick2ms( app_timer_cnt_get() ); - - return system_ticks; -} - -void tusb_hal_dbg_breakpoint(void) -{ - // M0 cannot check if debugger is attached or not -#if defined(__CORTEX_M) && (__CORTEX_M > 0) - // check if debugger is attached - if ( (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk) == CoreDebug_DHCSR_C_DEBUGEN_Msk) - { - __asm("BKPT #0\n"); - } -#endif -} diff --git a/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c b/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c new file mode 100644 index 000000000..c2fb42dc5 --- /dev/null +++ b/hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c @@ -0,0 +1,98 @@ +/**************************************************************************/ +/*! + @file hal_nrf52.c + @author hathach + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2018, 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. +*/ +/**************************************************************************/ + +#include +#include "nrf.h" +#include "nrf_gpio.h" +#include "nrf_drv_systick.h" + +/*------------------------------------------------------------------*/ +/* MACRO TYPEDEF CONSTANT ENUM + *------------------------------------------------------------------*/ + + +/*------------------------------------------------------------------*/ +/* VARIABLE DECLARATION + *------------------------------------------------------------------*/ + +/*------------------------------------------------------------------*/ +/* FUNCTION DECLARATION + *------------------------------------------------------------------*/ + +volatile uint32_t system_ticks = 0; + +void SysTick_Handler (void) +{ + system_ticks++; +} + + +bool tusb_hal_init(void) +{ + +} + +void tusb_hal_init_enable(uint8_t port) +{ + (void) port; + NVIC_EnableIRQ(USBD_IRQn); +} + +void tusb_hal_init_disable(uint8_t port) +{ + (void) port; + NVIC_DisableIRQ(USBD_IRQn); +} + +uint32_t tusb_hal_tick_get(void) +{ + //#define tick2ms(tck) ( ( ((uint64_t)(tck)) * 1000) / configTICK_RATE_HZ ) + //return tick2ms( app_timer_cnt_get() ); + + return system_ticks; +} + +void tusb_hal_dbg_breakpoint(void) +{ + // M0 cannot check if debugger is attached or not +#if defined(__CORTEX_M) && (__CORTEX_M > 0) + // check if debugger is attached + if ( (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk) == CoreDebug_DHCSR_C_DEBUGEN_Msk) + { + __asm("BKPT #0\n"); + } +#endif +} -- cgit v1.3.1