sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename arch/arm/src/nrf52/chip to arch/arm/src/nrf52/hardware.

Browse Source
This commit is contained in:
Gregory Nutt 2019-05-25 07:29:41 -06:00
parent cef5e9a08e
commit 5e01e07a4e
22 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/nrf52/chip.h
View File

@ -48,7 +48,7 @@
#include <arch/irq.h>
#include <arch/nrf52/chip.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/* If the common ARMv7-M vector handling logic is used, then it expects the
* following definition in this file that provides the number of supported external

10
arch/arm/src/nrf52/chip/nrf52_clock.h → arch/arm/src/nrf52/hardware/nrf52_clock.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_clock.h
* arch/arm/src/nrf52/hardware/nrf52_clock.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Janne Rosberg <janne@offcode.fi>
@ -33,15 +33,15 @@
*
************************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_CLOCK_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_CLOCK_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_CLOCK_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_CLOCK_H
/************************************************************************************************
* Included Files
************************************************************************************************/
#include <nuttx/config.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/************************************************************************************************
* Pre-processor Definitions
@ -97,4 +97,4 @@
/* Register Bitfield Definitions ****************************************************************/
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_LCD_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_LCD_H */

10
arch/arm/src/nrf52/chip/nrf52_ficr.h → arch/arm/src/nrf52/hardware/nrf52_ficr.h
View File

@ -1,5 +1,5 @@
/***************************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_ficr.h
* arch/arm/src/nrf52/hardware/nrf52_ficr.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Alan Carvalho de Assis <acassis@gmail.com>
@ -33,15 +33,15 @@
*
***************************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_FICR_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_FICR_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_FICR_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_FICR_H
/***************************************************************************************************
* Included Files
***************************************************************************************************/
#include <nuttx/config.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/***************************************************************************************************
* Pre-processor Definitions
@ -160,4 +160,4 @@
/* INTENSET Register */
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_FICR_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_FICR_H */

10
arch/arm/src/nrf52/chip/nrf52_gpio.h → arch/arm/src/nrf52/hardware/nrf52_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_gpio.h
* arch/arm/src/nrf52/hardware/nrf52_gpio.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Janne Rosberg <janne@offcode.fi>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_GPIO_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_GPIO_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_GPIO_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_GPIO_H
/************************************************************************************
* Included Files
@ -42,7 +42,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -84,4 +84,4 @@
# define NRF52_GPIO_CNF_PULL_DOWN (1 << NRF52_GPIO_CNF_PULL_SHIFT)
# define NRF52_GPIO_CNF_PULL_UP (3 << NRF52_GPIO_CNF_PULL_SHIFT)
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_GPIO_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_GPIO_H */

8
arch/arm/src/nrf52/chip/nrf52_memorymap.h → arch/arm/src/nrf52/hardware/nrf52_memorymap.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/nrf52/chip/nrf52_memorymap.h
* arch/arm/src/nrf52/hardware/nrf52_memorymap.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Janne Rosberg <janne@offcode.fi>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_MEMORYMAP_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_MEMORYMAP_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_MEMORYMAP_H
/****************************************************************************
* Included Files
@ -130,4 +130,4 @@
#define NRF52_GPIO_P0_BASE 0x50000000
#define NRF52_GPIO_P1_BASE 0x50003000
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_MEMORYMAP_H */

10
arch/arm/src/nrf52/chip/nrf52_nvmc.h → arch/arm/src/nrf52/hardware/nrf52_nvmc.h
View File

@ -1,5 +1,5 @@
/***************************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_nvmc.h
* arch/arm/src/nrf52/hardware/nrf52_nvmc.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Alan Carvalho de Assis <acassis@gmail.com>
@ -33,15 +33,15 @@
*
***************************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_NVMC_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_NVMC_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_NVMC_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_NVMC_H
/***************************************************************************************************
* Included Files
***************************************************************************************************/
#include <nuttx/config.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/***************************************************************************************************
* Pre-processor Definitions
@ -96,4 +96,4 @@
/* INTENSET Register */
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_NVMC_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_NVMC_H */

10
arch/arm/src/nrf52/chip/nrf52_rng.h → arch/arm/src/nrf52/hardware/nrf52_rng.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_rng.h
* arch/arm/src/nrf52/hardware/nrf52_rng.h
*
* Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Zhiqiang Li <levin.li@outlook.com>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_RNG_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_RNG_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_RNG_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_RNG_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
#include "chip.h"
/************************************************************************************
@ -78,4 +78,4 @@
#define NRF52_RNG_INT_EVENT_RDY (1<<0)
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_STM32_RNG_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_STM32_RNG_H */

10
arch/arm/src/nrf52/chip/nrf52_uarte.h → arch/arm/src/nrf52/hardware/nrf52_uarte.h
View File

@ -1,5 +1,5 @@
/*****************************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_uarte.h
* arch/arm/src/nrf52/hardware/nrf52_uarte.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Janne Rosberg <janne@offcode.fi>
@ -33,15 +33,15 @@
*
*****************************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UARTE_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UARTE_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UARTE_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UARTE_H
/*****************************************************************************************************
* Included Files
*****************************************************************************************************/
#include <nuttx/config.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/*****************************************************************************************************
* Pre-processor Definitions
@ -185,4 +185,4 @@
#define NRF52_UART_INTENSET_RXDRDY (1 << 2)
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UARTE_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UARTE_H */

8
arch/arm/src/nrf52/chip/nrf52_utils.h → arch/arm/src/nrf52/hardware/nrf52_utils.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/nrf52/nrf52_utils.h
* arch/arm/src/nrf52/hardware/nrf52_utils.h
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Zhiqiang Li <levin.li@outlook.com>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UTILS_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UTILS_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UTILS_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UTILS_H
/****************************************************************************
* Included Files
@ -122,5 +122,5 @@ static inline void nrf52_interrupt_disable(uint32_t reg_intenclr,
putreg32(bitfield, reg_intenclr);
}
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UTILS_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UTILS_H */

10
arch/arm/src/nrf52/chip/nrf52_wdt.h → arch/arm/src/nrf52/hardware/nrf52_wdt.h
View File

@ -1,5 +1,5 @@
/***************************************************************************************************
* arch/arm/src/nrf52/chip/nrf52_wdt.h
* arch/arm/src/nrf52/hardware/nrf52_wdt.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Alan Carvalho de Assis <acassis@gmail.com>
@ -33,15 +33,15 @@
*
***************************************************************************************************/
#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_WDT_H
#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_WDT_H
#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_WDT_H
#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_WDT_H
/***************************************************************************************************
* Included Files
***************************************************************************************************/
#include <nuttx/config.h>
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
/***************************************************************************************************
* Pre-processor Definitions
@ -100,4 +100,4 @@
#define NRF52_UART_INTENSET_RXDRDY (1 << 2)
#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_WDT_H */
#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_WDT_H */

4
arch/arm/src/nrf52/nrf52832_errdata.c
View File

@ -53,8 +53,8 @@
#include "up_arch.h"
#include "chip.h"
#include "chip/nrf52_utils.h"
#include "chip/nrf52_rng.h"
#include "hardware/nrf52_utils.h"
#include "hardware/nrf52_rng.h"
#include "up_internal.h"
/****************************************************************************

2
arch/arm/src/nrf52/nrf52_allocateheap.c
View File

@ -52,7 +52,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip/nrf52_memorymap.h"
#include "hardware/nrf52_memorymap.h"
#include <arch/board/board.h>

4
arch/arm/src/nrf52/nrf52_flash.c
View File

@ -54,8 +54,8 @@
#include "up_arch.h"
#include "chip/nrf52_ficr.h"
#include "chip/nrf52_nvmc.h"
#include "hardware/nrf52_ficr.h"
#include "hardware/nrf52_nvmc.h"
#include "nrf52_nvmc.h"
/****************************************************************************

2
arch/arm/src/nrf52/nrf52_gpio.c
View File

@ -48,7 +48,7 @@
#include <arch/irq.h>
#include "up_arch.h"
#include "chip/nrf52_gpio.h"
#include "hardware/nrf52_gpio.h"
#include "nrf52_gpio.h"
/****************************************************************************

2
arch/arm/src/nrf52/nrf52_gpio.h
View File

@ -48,7 +48,7 @@
#endif
#include <arch/nrf52/chip.h>
#include "chip/nrf52_gpio.h"
#include "hardware/nrf52_gpio.h"
/************************************************************************************
* Pre-processor Definitions

4
arch/arm/src/nrf52/nrf52_lowputc.c
View File

@ -44,8 +44,8 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip/nrf52_memorymap.h"
#include "chip/nrf52_uarte.h"
#include "hardware/nrf52_memorymap.h"
#include "hardware/nrf52_uarte.h"
#include "nrf52_config.h"
#include "nrf52_clockconfig.h"

4
arch/arm/src/nrf52/nrf52_nvmc.c
View File

@ -48,8 +48,8 @@
#include "up_arch.h"
#include "barriers.h"
#include "chip/nrf52_ficr.h"
#include "chip/nrf52_nvmc.h"
#include "hardware/nrf52_ficr.h"
#include "hardware/nrf52_nvmc.h"
#include "nrf52_nvmc.h"
/****************************************************************************

4
arch/arm/src/nrf52/nrf52_rng.c
View File

@ -53,8 +53,8 @@
#include "up_arch.h"
#include "chip.h"
#include "chip/nrf52_utils.h"
#include "chip/nrf52_rng.h"
#include "hardware/nrf52_utils.h"
#include "hardware/nrf52_rng.h"
#include "up_internal.h"
#if defined(CONFIG_NRF52_RNG)

2
arch/arm/src/nrf52/nrf52_serial.c
View File

@ -59,7 +59,7 @@
#include "chip.h"
#include "nrf52_config.h"
#include "chip/nrf52_uarte.h"
#include "hardware/nrf52_uarte.h"
#include "nrf52_clockconfig.h"
#include "nrf52_lowputc.h"
#include "nrf52_serial.h"

2
arch/arm/src/nrf52/nrf52_start.c
View File

@ -48,7 +48,7 @@
#include "nvic.h"
#include "nrf52_clockconfig.h"
#include "chip/nrf52_utils.h"
#include "hardware/nrf52_utils.h"
#include "nrf52_lowputc.h"
#include "nrf52_start.h"
#include "nrf52_gpio.h"

2
arch/arm/src/nrf52/nrf52_utils.c
View File

@ -45,7 +45,7 @@
#include "up_arch.h"
#include "nrf52_irq.h"
#include "chip/nrf52_utils.h"
#include "hardware/nrf52_utils.h"
/****************************************************************************
* Public Functions

2
arch/arm/src/nrf52/nrf52_wdt.c
View File

@ -54,7 +54,7 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip/nrf52_wdt.h"
#include "hardware/nrf52_wdt.h"
#include "nrf52_wdt.h"
#if defined(CONFIG_WATCHDOG) && defined(CONFIG_NRF52_WDT)