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

Merged nuttx/arch into master

Browse Source
This commit is contained in:
Lok Tep 2015-09-30 09:11:44 +02:00
commit 2334f7cded
19 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/sama5/chip/sama5d2x_memorymap.h → arch/arm/src/sama5/chip/_sama5d2x_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sama5/sama5d2x_memorymap.h
* arch/arm/src/sama5/_sama5d2x_memorymap.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -884,4 +884,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_MEMORYMAP_H */

8
arch/arm/src/sama5/chip/sama5d2x_pinmap.h → arch/arm/src/sama5/chip/_sama5d2x_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************************
* arch/arm/src/sama5/chip/sama5d2x_pinmap.h
* arch/arm/src/sama5/chip/_sama5d2x_pinmap.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_PINMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PINMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PINMAP_H
/************************************************************************************************************
* Included Files
@ -801,4 +801,4 @@
#define PIO_UTMI_RXERR (PIO_PERIPHC | PIO_CFG_DEFAULT | PIO_PORT_PIOD | PIO_PIN8)
#define PIO_UTMI_RXVAL (PIO_PERIPHC | PIO_CFG_DEFAULT | PIO_PORT_PIOD | PIO_PIN7)
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PINMAP_H */

8
arch/arm/src/sama5/chip/sama5d2x_pio.h → arch/arm/src/sama5/chip/_sama5d2x_pio.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/samv7/chip/sama5d2x_pio.h
* arch/arm/src/samv7/chip/_sama5d2x_pio.h
* Parallel Input/Output (PIO) Controller definitions for the SAMA5D2
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
@ -34,8 +34,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_PIO_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_PIO_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PIO_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PIO_H
/****************************************************************************************
* Included Files
@ -334,4 +334,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D2X_PIO_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PIO_H */

8
arch/arm/src/sama5/chip/sama5d3x4x_pio.h → arch/arm/src/sama5/chip/_sama5d3x4x_pio.h
View File

@ -1,5 +1,5 @@
/****************************************************************************************
* arch/arm/src/sama5/chip/sama5d3x4x_pio.h
* arch/arm/src/sama5/chip/_sama5d3x4x_pio.h
* Parallel Input/Output (PIO) Controller definitions for the SAMA5D3x and SAMA5D4x
*
* Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@ -34,8 +34,8 @@
*
****************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3DX4X_PIO_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3DX4X_PIO_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3DX4X_PIO_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3DX4X_PIO_H
/****************************************************************************************
* Included Files
@ -645,4 +645,4 @@
* Public Functions
****************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3DX4X_PIO_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3DX4X_PIO_H */

8
arch/arm/src/sama5/chip/sama5d3x_memorymap.h → arch/arm/src/sama5/chip/_sama5d3x_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sama5/sama5d3x_memorymap.h
* arch/arm/src/sama5/_sama5d3x_memorymap.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -808,4 +808,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MEMORYMAP_H */

8
arch/arm/src/sama5/chip/sama5d3x_mpddrc.h → arch/arm/src/sama5/chip/_sama5d3x_mpddrc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sama5/chip/sama5d3x_mpddrc.h
* arch/arm/src/sama5/chip/_sama5d3x_mpddrc.h
*
* Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_MPDDRC_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_MPDDRC_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MPDDRC_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MPDDRC_H
/************************************************************************************
* Included Files
@ -402,4 +402,4 @@
#define MPDDRC_WPSR_WPVSRC_SHIFT (8) /* Bits 8-23: Write Protection Violation Source */
#define MPDDRC_WPSR_WPVSRC_MASK (0xffff << MPDDRC_WPSR_WPVSRC_SHIFT)
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_MPDDRC_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MPDDRC_H */

8
arch/arm/src/sama5/chip/sama5d3x_pinmap.h → arch/arm/src/sama5/chip/_sama5d3x_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************************
* arch/arm/src/sama5/chip/sama5d3x_pinmap.h
* arch/arm/src/sama5/chip/_sama5d3x_pinmap.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_PINMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_PINMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_PINMAP_H
/************************************************************************************************************
* Included Files
@ -410,4 +410,4 @@
#define PIO_USART3_SCK (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN15) /* Type: EBI */
#define PIO_USART3_TXD (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN19) /* Type: EBI */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_PINMAP_H */

8
arch/arm/src/sama5/chip/sama5d4x_memorymap.h → arch/arm/src/sama5/chip/_sama5d4x_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/sama5/sama5d4x_memorymap.h
* arch/arm/src/sama5/_sama5d4x_memorymap.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -802,4 +802,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MEMORYMAP_H */

8
arch/arm/src/sama5/chip/sama5d4x_mpddrc.h → arch/arm/src/sama5/chip/_sama5d4x_mpddrc.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/sama5/chip/sama5d4x_mpddrc.h
* arch/arm/src/sama5/chip/_sama5d4x_mpddrc.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_MPDDRC_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_MPDDRC_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MPDDRC_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MPDDRC_H
/********************************************************************************************
* Included Files
@ -687,4 +687,4 @@
#define MPDDRC_DLL_SAD_ADDCNT_MASK (0xff < MPDDRC_DLL_SAD_ADDCNT_SHIFT)
# define MPDDRC_DLL_SAD_ADDCNT(n) ((uint32_t)(n) < MPDDRC_DLL_SAD_ADDCNT_SHIFT)
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_MPDDRC_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MPDDRC_H */

8
arch/arm/src/sama5/chip/sama5d4x_pinmap.h → arch/arm/src/sama5/chip/_sama5d4x_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************************************
* arch/arm/src/sama5/chip/sama5d4x_pinmap.h
* arch/arm/src/sama5/chip/_sama5d4x_pinmap.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_PINMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_PINMAP_H
#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_PINMAP_H
/************************************************************************************************************
* Included Files
@ -473,4 +473,4 @@
#define PIO_USART4_SCK (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN25)
#define PIO_USART4_TXD (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN27)
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_PINMAP_H */

6
arch/arm/src/sama5/chip/sam_memorymap.h
View File

@ -44,11 +44,11 @@
#include <arch/sama5/chip.h>
#if defined(ATSAMA5D2)
# include "chip/sama5d2x_memorymap.h"
# include "chip/_sama5d2x_memorymap.h"
#elif defined(ATSAMA5D3)
# include "chip/sama5d3x_memorymap.h"
# include "chip/_sama5d3x_memorymap.h"
#elif defined(ATSAMA5D4)
# include "chip/sama5d4x_memorymap.h"
# include "chip/_sama5d4x_memorymap.h"
#else
# error Unrecognized SAMA5 architecture
#endif

4
arch/arm/src/sama5/chip/sam_mpddrc.h
View File

@ -44,9 +44,9 @@
#include <arch/sama5/chip.h>
#if defined(ATSAMA5D3)
# include "chip/sama5d3x_mpddrc.h"
# include "chip/_sama5d3x_mpddrc.h"
#elif defined(ATSAMA5D4)
# include "chip/sama5d4x_mpddrc.h"
# include "chip/_sama5d4x_mpddrc.h"
#else
# error Unrecognized SAMA5 architecture
#endif

6
arch/arm/src/sama5/chip/sam_pinmap.h
View File

@ -44,11 +44,11 @@
#include <arch/sama5/chip.h>
#if defined(ATSAMA5D2)
# include "chip/sama5d2x_pinmap.h"
# include "chip/_sama5d2x_pinmap.h"
#elif defined(ATSAMA5D3)
# include "chip/sama5d3x_pinmap.h"
# include "chip/_sama5d3x_pinmap.h"
#elif defined(ATSAMA5D4)
# include "chip/sama5d4x_pinmap.h"
# include "chip/_sama5d4x_pinmap.h"
#else
# error Unrecognized SAMA5 architecture
#endif

4
arch/arm/src/sama5/chip/sam_pio.h
View File

@ -44,9 +44,9 @@
#include <arch/sama5/chip.h>
#if defined(ATSAMA5D2)
# include "chip/sama5d2x_pio.h"
# include "chip/_sama5d2x_pio.h"
#elif defined(ATSAMA5D3) || defined(ATSAMA5D4)
# include "chip/sama5d3x4x_pio.h"
# include "chip/_sama5d3x4x_pio.h"
#else
# error Unrecognized SAMA5 architecture
#endif

8
arch/arm/src/sama5/sam_config.h
View File

@ -73,7 +73,7 @@
# undef CONFIG_USART3_SERIAL_CONSOLE
#endif
#ifndef CONFIG_USART4_ISUART
# undef CONFIG_SAMA4_USART4
# undef CONFIG_SAMA5_USART4
# undef CONFIG_SAMA5_FLEXCOM4_USART
# undef CONFIG_USART4_SERIAL_CONSOLE
#endif
@ -86,9 +86,9 @@
# define SAMA5_HAVE_UART
#endif
#if defined(CONFIG_SAMA0_USART4) || defined(CONFIG_SAMA1_USART4) || \
defined(CONFIG_SAMA2_USART4) || defined(CONFIG_SAMA3_USART4) || \
defined(CONFIG_SAMA4_USART4)
#if defined(CONFIG_SAMA5_USART0) || defined(CONFIG_SAMA5_USART1) || \
defined(CONFIG_SAMA5_USART2) || defined(CONFIG_SAMA5_USART3) || \
defined(CONFIG_SAMA5_USART4)
# define SAMA5_HAVE_USART
#endif

2
arch/arm/src/sama5/sam_serial.c
View File

@ -892,7 +892,7 @@ static uart_dev_t g_usart3port =
#ifdef CONFIG_USART4_ISUART
static struct up_dev_s g_usart4priv =
{
.handler = up_uart4_interrupt,
.handler = up_usart4_interrupt,
.usartbase = SAM_USART4_VBASE,
.baud = CONFIG_USART4_BAUD,
.irq = SAM_IRQ_USART4,

6
arch/arm/src/sama5/sam_serialinit.c
View File

@ -68,7 +68,7 @@ void sam_earlyserialinit(void)
#if defined(SAMA5_HAVE_UART) || defined(SAMA5_HAVE_USART)
/* Initialize UART/USART drivers */
uart_serialinit();
uart_earlyserialinit();
#endif
#ifdef SAMA5_HAVE_FLEXCOM_USART
@ -96,9 +96,9 @@ void up_serialinit(void)
#endif
#ifdef SAMA5_HAVE_FLEXCOM_USART
/* Register Flexcom USARTs */
/* Register Flexcom USART drivers */
flexus_earlyserialinit();
flexus_serialinit();
#endif
/* Register the DBGU as well */

2
arch/arm/src/sama5/sama5d2x_pio.c
View File

@ -51,7 +51,7 @@
#include "up_internal.h"
#include "up_arch.h"
#include "chip/sama5d2x_pio.h"
#include "chip/_sama5d2x_pio.h"
#include "chip.h"
#include "sam_periphclks.h"

2
arch/arm/src/sama5/sama5d3x4x_pio.c
View File

@ -51,7 +51,7 @@
#include "up_internal.h"
#include "up_arch.h"
#include "chip/sama5d3x4x_pio.h"
#include "chip/_sama5d3x4x_pio.h"
#include "chip.h"
#include "sam_periphclks.h"