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

arch/arm/src/max326xx: Rename the chip subdirectory to hardware. The include paths were getting too mind boggling with two directories named chip. Should do this for the other architectures as well.

Browse Source
This commit is contained in:
Gregory Nutt 2018-11-20 11:20:58 -06:00
parent b9903dc8c8
commit 86d7f39a42
35 changed files with 146 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/src/max326xx/common/max326_icc.c
View File

@ -44,6 +44,7 @@
#include <assert.h>
#include "up_arch.h"
#include "hardware/max326_icc.h"
#include "max326_periphclks.h"
#include "max326_icc.h"

8
arch/arm/src/max326xx/chip/max32620_30_memorymap.h → arch/arm/src/max326xx/hardware/max32620_30_memorymap.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/max326xx/chip/max32620_30_memorymap.h
* arch/arm/src/max326xx/hardware/max32620_30_memorymap.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32620_30_MEMORYMAP_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32620_30_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32620_30_MEMORYMAP_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32620_30_MEMORYMAP_H
/********************************************************************************************
* Included Files
@ -132,4 +132,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32620_30_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32620_30_MEMORYMAP_H */

10
arch/arm/src/max326xx/chip/max32660_flc.h → arch/arm/src/max326xx/hardware/max32660_flc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_flc.h
* arch/arm/src/max326xx/hardware/max32660_flc.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_FLC_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_FLC_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_FLC_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_FLC_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -111,4 +111,4 @@
/* Flash Controller Data Register 2 (32-bit FLASH data) */
/* Flash Controller Data Register 3 (32-bit FLASH data) */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_FLC_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_FLC_H */

10
arch/arm/src/max326xx/chip/max32660_gpio.h → arch/arm/src/max326xx/hardware/max32660_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_gpio.h
* arch/arm/src/max326xx/hardware/max32660_gpio.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_GPIO_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_GPIO_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_GPIO_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_GPIO_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -184,4 +184,4 @@
* Resistor Select:
* n=0-1, 4-7, 10-13: Pullup select */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_GPIO_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_GPIO_H */

10
arch/arm/src/max326xx/chip/max32660_i2c.h → arch/arm/src/max326xx/hardware/max32660_i2c.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_i2c.h
* arch/arm/src/max326xx/hardware/max32660_i2c.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_I2C_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_I2C_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_I2C_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_I2C_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -298,4 +298,4 @@
#define I2C_DMA_TXEN (1 << 0) /* Bit 0: TX DMA Channel Enable */
#define I2C_DMA_RXEN (1 << 1) /* Bit 1: RX DMA Channel Enable */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_I2C_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_I2C_H */

8
arch/arm/src/max326xx/chip/max32660_memorymap.h → arch/arm/src/max326xx/hardware/max32660_memorymap.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/max326xx/chip/max32660_memorymap.h
* arch/arm/src/max326xx/hardware/max32660_memorymap.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_MEMORYMAP_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_MEMORYMAP_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_MEMORYMAP_H
/********************************************************************************************
* Included Files
@ -89,4 +89,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_MEMORYMAP_H */

8
arch/arm/src/max326xx/chip/max32660_pinmux.h → arch/arm/src/max326xx/hardware/max32660_pinmux.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_pinmux.h
* arch/arm/src/max326xx/hardware/max32660_pinmux.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_PINMUX_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_PINMUX_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_PINMUX_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_PINMUX_H
/************************************************************************************
* Included Files
@ -131,4 +131,4 @@
#define GPIO_UART1_TX_2 (GPIO_ALT3 | GPIO_PORT0 | GPIO_PIN6)
#define GPIO_UART1_TX_3 (GPIO_ALT2 | GPIO_PORT0 | GPIO_PIN10) /* 20-TQFN only */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_PINMUX_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_PINMUX_H */

10
arch/arm/src/max326xx/chip/max32660_rtc.h → arch/arm/src/max326xx/hardware/max32660_rtc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_rtc.h
* arch/arm/src/max326xx/hardware/max32660_rtc.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_RTC_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_RTC_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_RTC_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_RTC_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -124,4 +124,4 @@
#define RTC_OSCCTRL_BYPASS (1 << 4) /* Bit 4: RTC Crystal Bypass */
#define RTC_OSCCTRL_32KOUT (1 << 5) /* Bit 5: RTC Square Wave Output */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_RTC_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_RTC_H */

10
arch/arm/src/max326xx/chip/max32660_spi.h → arch/arm/src/max326xx/hardware/max32660_spi.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_spi.h
* arch/arm/src/max326xx/hardware/max32660_spi.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_SPI_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_SPI_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_SPI_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_SPI_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -195,4 +195,4 @@
#define SPI_STAT_BUSY (1 << 0) /* Bit 0: SPI Active Status */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_SPI_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_SPI_H */

10
arch/arm/src/max326xx/chip/max32660_spimss.h → arch/arm/src/max326xx/hardware/max32660_spimss.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_spimss.h
* arch/arm/src/max326xx/hardware/max32660_spimss.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_SPIMSS_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_SPIMSS_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_SPIMSS_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_SPIMSS_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -138,4 +138,4 @@
#define SPIMSS_I2SCTRL_I2SMONO (1 << 3) /* Bit 3: I2S Monophonic Audio Mode */
#define SPIMSS_I2SCTRL_I2SLJ (1 << 4) /* Bit 4: I2S Left Justify */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_SPIMSS_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_SPIMSS_H */

10
arch/arm/src/max326xx/chip/max32660_tmr.h → arch/arm/src/max326xx/hardware/max32660_tmr.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_tmr.h
* arch/arm/src/max326xx/hardware/max32660_tmr.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_TMR_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_TMR_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_TMR_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_TMR_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -127,4 +127,4 @@
#define TMR_CN_NOLLPOL (1 << 11) /* Bit 11: PWM Output phase A' Polarity */
#define TMR_CN_PWMCKBD (1 << 12) /* Bit 12: PWM Output phase A' Disable */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_TMR_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_TMR_H */

10
arch/arm/src/max326xx/chip/max32660_uart.h → arch/arm/src/max326xx/hardware/max32660_uart.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_uart.h
* arch/arm/src/max326xx/hardware/max32660_uart.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_UART_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_UART_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_UART_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_UART_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -197,4 +197,4 @@
#define UART_TXFIFO_MASK (0xff) /* Bits 0-7: TX FIFO Data Output Peek Register */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_UART_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_UART_H */

10
arch/arm/src/max326xx/chip/max32660_wdt.h → arch/arm/src/max326xx/hardware/max32660_wdt.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max32660_wdt.h
* arch/arm/src/max326xx/hardware/max32660_wdt.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_WDT_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_WDT_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_WDT_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_WDT_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -110,4 +110,4 @@
# define WDT0_RST_SEQ1 (0xa5 << WDT0_RST_SHIFT)
# define WDT0_RST_SEQ2 (0x5a << WDT0_RST_SHIFT)
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX32660_WDT_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX32660_WDT_H */

10
arch/arm/src/max326xx/chip/max326_dma.h → arch/arm/src/max326xx/hardware/max326_dma.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_dma.h
* arch/arm/src/max326xx/hardware/max326_dma.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_DMA_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_DMA_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_DMA_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_DMA_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -275,4 +275,4 @@
* Value */
#define DMACH_CNTRLD_RLDEN (1 << 31) /* Bit 31: Reload Enable */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_DMA_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_DMA_H */

10
arch/arm/src/max326xx/chip/max326_fcr.h → arch/arm/src/max326xx/hardware/max326_fcr.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_fcr.h
* arch/arm/src/max326xx/hardware/max326_fcr.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_FCR_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_FCR_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_FCR_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_FCR_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -64,4 +64,4 @@
#define FCR_REG0_I2C1_SDA_FILTER (1 << 22) /* Bit 22: I2C1 SDA Filter Enable */
#define FCR_REG0_I2C1_SCL_FILTER (1 << 23) /* Bit 23: I2C1 SCL Filter Enable */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_FCR_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_FCR_H */

12
arch/arm/src/max326xx/chip/max326_flc.h → arch/arm/src/max326xx/hardware/max326_flc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_flc.h
* arch/arm/src/max326xx/hardware/max326_flc.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_FLC_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_FLC_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_FLC_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_FLC_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_flc.h"
# include "hardware/max32620_30_flc.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_flc.h"
# include "hardware/max32660_flc.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_FLC_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_FLC_H */

10
arch/arm/src/max326xx/chip/max326_gcr.h → arch/arm/src/max326xx/hardware/max326_gcr.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_gcr.h
* arch/arm/src/max326xx/hardware/max326_gcr.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_GCR_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_GCR_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H
/************************************************************************************
* Included Files
@ -48,7 +48,7 @@
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -196,4 +196,4 @@
#define GCR_SYSIE_ICEULIE (1 << 0) /* Bit 0: Arm ICE Unlocked Interrupt Enable */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_GCR_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GCR_H */

12
arch/arm/src/max326xx/chip/max326_gpio.h → arch/arm/src/max326xx/hardware/max326_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_gpio.h
* arch/arm/src/max326xx/hardware/max326_gpio.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_GPIO_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_GPIO_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GPIO_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GPIO_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_gpio.h"
# include "hardware/max32620_30_gpio.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_gpio.h"
# include "hardware/max32660_gpio.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_GPIO_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_GPIO_H */

10
arch/arm/src/max326xx/chip/max326_icc.h → arch/arm/src/max326xx/hardware/max326_icc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_icc.h
* arch/arm/src/max326xx/hardware/max326_icc.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_ICC_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_ICC_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_ICC_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_ICC_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -92,4 +92,4 @@
* the cache
*/
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_ICC_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_ICC_H */

12
arch/arm/src/max326xx/chip/max326_memorymap.h → arch/arm/src/max326xx/hardware/max326_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_memorymap.h
* arch/arm/src/max326xx/hardware/max326_memorymap.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_MEMORYMAP_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_MEMORYMAP_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_memorymap.h"
# include "hardware/max32620_30_memorymap.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_memorymap.h"
# include "hardware/max32660_memorymap.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_MEMORYMAP_H */

12
arch/arm/src/max326xx/chip/max326_pinmux.h → arch/arm/src/max326xx/hardware/max326_pinmux.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_pinmux.h
* arch/arm/src/max326xx/hardware/max326_pinmux.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_PINMUX_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_PINMUX_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_PINMUX_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_PINMUX_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_pinmux.h"
# include "hardware/max32620_30_pinmux.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_pinmux.h"
# include "hardware/max32660_pinmux.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_PINMUX_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_PINMUX_H */

10
arch/arm/src/max326xx/chip/max326_pwrseq.h → arch/arm/src/max326xx/hardware/max326_pwrseq.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_pwrseq.h
* arch/arm/src/max326xx/hardware/max326_pwrseq.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_PWRSEQ_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_PWRSEQ_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_PWRSEQ_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_PWRSEQ_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -116,4 +116,4 @@
#define PWRSEQ_LPMEMSD_SRAM3OFF (1 << 3) /* Bit 3: System RAM 3 Shut Down
* (0x20010000-0x20017fff) */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_PWRSEQ_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_PWRSEQ_H */

12
arch/arm/src/max326xx/chip/max326_rtc.h → arch/arm/src/max326xx/hardware/max326_rtc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_rtc.h
* arch/arm/src/max326xx/hardware/max326_rtc.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_RTC_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_RTC_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_RTC_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_RTC_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_rtc.h"
# include "hardware/max32620_30_rtc.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_rtc.h"
# include "hardware/max32660_rtc.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_RTC_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_RTC_H */

10
arch/arm/src/max326xx/chip/max326_sir.h → arch/arm/src/max326xx/hardware/max326_sir.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_sir.h
* arch/arm/src/max326xx/hardware/max326_sir.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_SIR_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_SIR_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_SIR_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_SIR_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include "chip/max326_memorymap.h"
#include "hardware/max326_memorymap.h"
/************************************************************************************
* Pre-processor Definitions
@ -66,4 +66,4 @@
/* System Initialization Address Error Register (32-bit Configuration Error Address) */
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_SIR_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_SIR_H */

12
arch/arm/src/max326xx/chip/max326_tmr.h → arch/arm/src/max326xx/hardware/max326_tmr.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_tmr.h
* arch/arm/src/max326xx/hardware/max326_tmr.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_TMR_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_TMR_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_TMR_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_TMR_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_tmr.h"
# include "hardware/max32620_30_tmr.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_tmr.h"
# include "hardware/max32660_tmr.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_TMR_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_TMR_H */

12
arch/arm/src/max326xx/chip/max326_uart.h → arch/arm/src/max326xx/hardware/max326_uart.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_uart.h
* arch/arm/src/max326xx/hardware/max326_uart.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_UART_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_UART_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_UART_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_UART_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_uart.h"
# include "hardware/max32620_30_uart.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_uart.h"
# include "hardware/max32660_uart.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_UART_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_UART_H */

12
arch/arm/src/max326xx/chip/max326_wdt.h → arch/arm/src/max326xx/hardware/max326_wdt.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/max326xx/chip/max326_wdt.h
* arch/arm/src/max326xx/hardware/max326_wdt.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_WDT_H
#define __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_WDT_H
#ifndef __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_WDT_H
#define __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_WDT_H
/************************************************************************************
* Included Files
@ -43,11 +43,11 @@
#include <nuttx/config.h>
#if defined(CONFIG_ARCH_FAMILY_MAX32620) || defined(CONFIG_ARCH_FAMILY_MAX32630)
# include "chip/max32620_30_wdt.h"
# include "hardware/max32620_30_wdt.h"
#elif defined(CONFIG_ARCH_FAMILY_MAX32660)
# include "chip/max32660_wdt.h"
# include "hardware/max32660_wdt.h"
#else
# error "Unsupported MAX326XX family"
#endif
#endif /* __ARCH_ARM_SRC_MAX326XX_CHIP_MAX326_WDT_H */
#endif /* __ARCH_ARM_SRC_MAX326XX_HARDWARE_MAX326_WDT_H */

6
arch/arm/src/max326xx/max32660/max32660_clockconfig.c
View File

@ -45,9 +45,9 @@
#include "up_arch.h"
#include "chip/max326_gcr.h"
#include "chip/max326_pwrseq.h"
#include "chip/max326_flc.h"
#include "hardware/max326_gcr.h"
#include "hardware/max326_pwrseq.h"
#include "hardware/max326_flc.h"
#include "max326_clockconfig.h"
#include <arch/board/board.h>

1
arch/arm/src/max326xx/max32660/max32660_dma.c
View File

@ -47,6 +47,7 @@
#include "up_arch.h"
#include "hardware/max326_dma.h"
#include "max326_dma.h"
#ifdef CONFIG_MAX326XX_DMA

6
arch/arm/src/max326xx/max32660/max32660_lowputc.c
View File

@ -45,9 +45,9 @@
#include "up_arch.h"
#include "up_internal.h"
#include "chip/max326_memorymap.h"
#include "chip/max326_pinmux.h"
#include "chip/max326_uart.h"
#include "hardware/max326_memorymap.h"
#include "hardware/max326_pinmux.h"
#include "hardware/max326_uart.h"
#include "max326_config.h"
#include "max326_periphclks.h"

2
arch/arm/src/max326xx/max32660/max32660_periphclks.h
View File

@ -46,7 +46,7 @@
#include <stdbool.h>
#include "up_arch.h"
#include "chip/max326_gcr.h"
#include "hardware/max326_gcr.h"
/************************************************************************************
* Pre-processor Definitions

2
arch/arm/src/max326xx/max32660/max32660_serial.c
View File

@ -59,7 +59,7 @@
#include "chip.h"
#include "max326_config.h"
#include "chip/max326_uart.h"
#include "hardware/max326_uart.h"
#include "max326_clockconfig.h"
#include "max326_lowputc.h"
#include "max326_serial.h"

1
arch/arm/src/max326xx/max326_dma.h
View File

@ -45,7 +45,6 @@
/* Standard DMA is only available for the MAX32660 */
#ifdef CONFIG_ARCH_FAMILY_MAX32660
# include "chip/max326_dma.h"
# include "max32660/max32660_dma.h"
#endif

2
arch/arm/src/max326xx/max326_gpio.h
View File

@ -45,7 +45,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "chip/max326_gpio.h"
#include "hardware/max326_gpio.h"
/************************************************************************************
* Pre-processor Definitions

2
arch/arm/src/max326xx/max326_icc.h
View File

@ -43,8 +43,6 @@
#include <nuttx/config.h>
#include <stdbool.h>
#include "chip/max326_icc.h"
/************************************************************************************
* Public Function Prototypes
************************************************************************************/