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

SAML21: Rename chip/sam_pm.h to chip/samd_pm.h

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-17 09:18:36 -06:00
parent 469ea85654
commit 3d89476aa2
7 changed files with 187 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/********************************************************************************************
* arch/arm/src/samdl/chip/sam_pm.h
* arch/arm/src/samdl/chip/samd_pm.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* References:
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PM_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PM_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAMD_PM_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAMD_PM_H
/********************************************************************************************
* Included Files
@ -48,6 +48,8 @@
#include "chip.h"
#ifdef CONFIG_ARCH_FAMILY_SAMD20
/********************************************************************************************
* Pre-processor Definitions
********************************************************************************************/
@ -227,4 +229,5 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PM_H */
#endif /* CONFIG_ARCH_FAMILY_SAMD20 */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAMD_PM_H */

85
arch/arm/src/samdl/sam_gclk.h Normal file
View File

@ -0,0 +1,85 @@
/****************************************************************************
* arch/arm/src/samdl/sam_gclk.h
*
* Copyright (C) 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_SAM_GCLK_H
#define __ARCH_ARM_SRC_SAMDL_SAM_GCLK_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "sam_config.h"
#if defined(CONFIG_ARCH_FAMILY_SAMD20)
# include "chip/samd_gclk.h"
#elif defined(CONFIG_ARCH_FAMILY_SAML21)
# include "chip/saml_gclk.h"
#endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Types
****************************************************************************/
/****************************************************************************
* Inline Functions
****************************************************************************/
#ifndef __ASSEMBLY__
/****************************************************************************
* Public Data
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_GCLK_H */

8
arch/arm/src/samdl/sam_lowputc.c
View File

@ -56,15 +56,15 @@
#include "sam_config.h"
#include <arch/board/board.h>
#include "chip/sam_pm.h"
#include "chip/sam_usart.h"
#include "sam_usart.h"
#include "sam_gclk.h"
#include "sam_pm.h"
#include "sam_usart.h"
#include "sam_lowputc.h"
#include <arch/board/board.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/

85
arch/arm/src/samdl/sam_pm.h Normal file
View File

@ -0,0 +1,85 @@
/****************************************************************************
* arch/arm/src/samdl/sam_pm.h
*
* Copyright (C) 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_SAM_PM_H
#define __ARCH_ARM_SRC_SAMDL_SAM_PM_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "sam_config.h"
#if defined(CONFIG_ARCH_FAMILY_SAMD20)
# include "chip/samd_pm.h"
#elif defined(CONFIG_ARCH_FAMILY_SAML21)
# include "chip/saml_pm.h"
#endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Types
****************************************************************************/
/****************************************************************************
* Inline Functions
****************************************************************************/
#ifndef __ASSEMBLY__
/****************************************************************************
* Public Data
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_PM_H */

4
arch/arm/src/samdl/sam_sercom.c
View File

@ -50,9 +50,7 @@
#include "sam_config.h"
#include "chip/sam_pm.h"
#include "chip/sam_sercom.h"
#include "sam_pm.h"
#include "sam_gclk.h"
#include "sam_sercom.h"

4
arch/arm/src/samdl/sam_sercom.h
View File

@ -44,9 +44,11 @@
#include <stdbool.h>
#include "chip/sam_sercom.h"
#include "up_arch.h"
#include "sam_config.h"
#include "chip/sam_pm.h"
#include "sam_pm.h"
/****************************************************************************
* Pre-processor Definitions

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

@ -54,7 +54,7 @@
#include "up_arch.h"
#include "chip/sam_pm.h"
#include "chip/samd_pm.h"
#include "chip/samd_sysctrl.h"
#include "chip/samd_gclk.h"
#include "chip/sam_nvmctrl.h"