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

SAMD/L: Move content of chip/sam_memorymap.h to chip.h; move chip/sam_pinmap. to sam_pinmap.h for consistency with other header files

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-17 15:34:51 -06:00
parent 2725e382dc
commit 07e1e8b40b
6 changed files with 16 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/samdl/chip.h
View File

@ -54,7 +54,13 @@
* this file for the proper setup.
*/
#include "chip/sam_memorymap.h"
#if defined(CONFIG_ARCH_FAMILY_SAMD20)
# include "chip/samd20_memorymap.h"
#elif defined(CONFIG_ARCH_FAMILY_SAML21)
# include "chip/saml21_memorymap.h"
#else
# error Unrecognized SAMD/L architecture
#endif
/************************************************************************************
* Pre-processor Definitions

54
arch/arm/src/samdl/chip/sam_memorymap.h
View File

@ -1,54 +0,0 @@
/************************************************************************************
* arch/arm/src/samdl/chip/sam_memorymap.h
*
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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 NuttX 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 AND CONTRIBUTORS
* "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 OWNER OR CONTRIBUTORS 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.
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_MEMORYMAP_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <arch/samdl/chip.h>
#if defined(SAMD20)
# include "chip/samd20_memorymap.h"
#elif defined(SAML21)
# include "chip/saml21_memorymap.h"
#else
# error Unrecognized SAMD/L architecture
#endif
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_MEMORYMAP_H */

13
arch/arm/src/samdl/chip/sam_pinmap.h → arch/arm/src/samdl/sam_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samdl/chip/sam_pinmap.h
* arch/arm/src/samdl/sam_pinmap.h
*
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,22 +33,21 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PINMAP_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_PINMAP_H
#define __ARCH_ARM_SRC_SAMDL_SAM_PINMAP_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <arch/samdl/chip.h>
#if defined(SAMD20)
#if defined(CONFIG_ARCH_FAMILY_SAMD20)
# include "chip/samd20_pinmap.h"
#elif defined(SAML21)
#elif defined(CONFIG_ARCH_FAMILY_SAML21)
# include "chip/saml21_pinmap.h"
#else
# error Unrecognized SAMD/L architecture
#endif
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_PINMAP_H */

2
arch/arm/src/samdl/sam_spi.c
View File

@ -63,10 +63,10 @@
#include "chip.h"
#include "chip/sam_port.h"
#include "chip/sam_pinmap.h"
#include <arch/board/board.h>
#include "sam_pinmap.h"
#include "sam_gclk.h"
#include "sam_port.h"
#include "sam_sercom.h"

3
arch/arm/src/samdl/sam_usart.c
View File

@ -42,8 +42,7 @@
#include <stdint.h>
#include <assert.h>
#include "chip/sam_pinmap.h"
#include "sam_pinmap.h"
#include "sam_gclk.h"
#include "sam_usart.h"

2
configs/samd20-xplained/src/samd20-xplained.h
View File

@ -49,7 +49,7 @@
#include <nuttx/irq.h>
#include "sam_config.h"
#include "chip/sam_pinmap.h"
#include "sam_pinmap.h"
/************************************************************************************
* Pre-processor Definitions