Rename SAMD directories and configuration variables to SAMDL so that the same build environment can support the SAML

This commit is contained in:
Gregory Nutt 2015-05-14 12:25:09 -06:00
parent f1c51eea57
commit 3ec627b02d
47 changed files with 563 additions and 540 deletions

View File

@ -159,6 +159,13 @@ config ARCH_CHIP_SAMD
---help---
Atmel SAMD (ARM Cortex-M0+)
config ARCH_CHIP_SAML
bool "Atmel SAML"
select ARCH_CORTEXM0
select ARCH_HAVE_CMNVECTOR
---help---
Atmel SAML (ARM Cortex-M0+)
config ARCH_CHIP_SAM34
bool "Atmel SAM3/SAM4"
select ARCH_HAVE_CMNVECTOR
@ -281,7 +288,7 @@ config ARCH_CHIP
default "lpc43xx" if ARCH_CHIP_LPC43XX
default "nuc1xx" if ARCH_CHIP_NUC1XX
default "sama5" if ARCH_CHIP_SAMA5
default "samd" if ARCH_CHIP_SAMD
default "samd" if ARCH_CHIP_SAMD || ARCH_CHIP_SAML
default "sam34" if ARCH_CHIP_SAM34
default "samv7" if ARCH_CHIP_SAMV7
default "stm32" if ARCH_CHIP_STM32
@ -474,8 +481,8 @@ endif
if ARCH_CHIP_SAMA5
source arch/arm/src/sama5/Kconfig
endif
if ARCH_CHIP_SAMD
source arch/arm/src/samd/Kconfig
if ARCH_CHIP_SAMD || ARCH_CHIP_SAML
source arch/arm/src/samdl/Kconfig
endif
if ARCH_CHIP_SAM34
source arch/arm/src/sam34/Kconfig

View File

@ -1,7 +1,7 @@
/************************************************************************************
* arch/arm/include/samd/chip.h
* arch/arm/include/samdl/chip.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* 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
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_INCLUDE_SAMD_CHIP_H
#define __ARCH_ARM_INCLUDE_SAMD_CHIP_H
#ifndef __ARCH_ARM_INCLUDE_SAMDL_CHIP_H
#define __ARCH_ARM_INCLUDE_SAMDL_CHIP_H
/************************************************************************************
* Included Files
@ -82,8 +82,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (16*1024) /* 16KB */
# define SAMD_SRAM0_SIZE (2*1024) /* 2KB */
# define SAMDL_FLASH_SIZE (16*1024) /* 16KB */
# define SAMDL_SRAM0_SIZE (2*1024) /* 2KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20E15)
@ -94,8 +94,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (32*1024) /* 32KB */
# define SAMD_SRAM0_SIZE (4*1024) /* 4KB */
# define SAMDL_FLASH_SIZE (32*1024) /* 32KB */
# define SAMDL_SRAM0_SIZE (4*1024) /* 4KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20E16)
@ -106,8 +106,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (64*1024) /* 64KB */
# define SAMD_SRAM0_SIZE (8*1024) /* 8KB */
# define SAMDL_FLASH_SIZE (64*1024) /* 64KB */
# define SAMDL_SRAM0_SIZE (8*1024) /* 8KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20E17)
@ -118,8 +118,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (128*1024) /* 128KB */
# define SAMD_SRAM0_SIZE (16*1024) /* 16KB */
# define SAMDL_FLASH_SIZE (128*1024) /* 128KB */
# define SAMDL_SRAM0_SIZE (16*1024) /* 16KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20E18)
@ -130,8 +130,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (256*1024) /* 256KB */
# define SAMD_SRAM0_SIZE (32*1024) /* 32KB */
# define SAMDL_FLASH_SIZE (256*1024) /* 256KB */
# define SAMDL_SRAM0_SIZE (32*1024) /* 32KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20G14)
@ -142,8 +142,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (16*1024) /* 16KB */
# define SAMD_SRAM0_SIZE (2*1024) /* 2KB */
# define SAMDL_FLASH_SIZE (16*1024) /* 16KB */
# define SAMDL_SRAM0_SIZE (2*1024) /* 2KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20G15)
@ -154,8 +154,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (32*1024) /* 32KB */
# define SAMD_SRAM0_SIZE (4*1024) /* 4KB */
# define SAMDL_FLASH_SIZE (32*1024) /* 32KB */
# define SAMDL_SRAM0_SIZE (4*1024) /* 4KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20G16)
@ -166,8 +166,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (64*1024) /* 64KB */
# define SAMD_SRAM0_SIZE (8*1024) /* 8KB */
# define SAMDL_FLASH_SIZE (64*1024) /* 64KB */
# define SAMDL_SRAM0_SIZE (8*1024) /* 8KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20G17)
@ -178,8 +178,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (128*1024) /* 128KB */
# define SAMD_SRAM0_SIZE (16*1024) /* 16KB */
# define SAMDL_FLASH_SIZE (128*1024) /* 128KB */
# define SAMDL_SRAM0_SIZE (16*1024) /* 16KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20G18)
@ -190,8 +190,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (256*1024) /* 256KB */
# define SAMD_SRAM0_SIZE (32*1024) /* 32KB */
# define SAMDL_FLASH_SIZE (256*1024) /* 256KB */
# define SAMDL_SRAM0_SIZE (32*1024) /* 32KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20J14)
@ -202,8 +202,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (16*1024) /* 16KB */
# define SAMD_SRAM0_SIZE (2*1024) /* 2KB */
# define SAMDL_FLASH_SIZE (16*1024) /* 16KB */
# define SAMDL_SRAM0_SIZE (2*1024) /* 2KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20J15)
@ -214,8 +214,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (32*1024) /* 32KB */
# define SAMD_SRAM0_SIZE (4*1024) /* 4KB */
# define SAMDL_FLASH_SIZE (32*1024) /* 32KB */
# define SAMDL_SRAM0_SIZE (4*1024) /* 4KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20J16)
@ -226,8 +226,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (64*1024) /* 64KB */
# define SAMD_SRAM0_SIZE (8*1024) /* 8KB */
# define SAMDL_FLASH_SIZE (64*1024) /* 64KB */
# define SAMDL_SRAM0_SIZE (8*1024) /* 8KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20J17)
@ -238,8 +238,8 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (128*1024) /* 128KB */
# define SAMD_SRAM0_SIZE (16*1024) /* 16KB */
# define SAMDL_FLASH_SIZE (128*1024) /* 128KB */
# define SAMDL_SRAM0_SIZE (16*1024) /* 16KB */
#elif defined(CONFIG_ARCH_CHIP_SAMD20J18)
@ -250,58 +250,58 @@
/* Internal memory */
# define SAMD_FLASH_SIZE (256*1024) /* 256KB */
# define SAMD_SRAM0_SIZE (32*1024) /* 32KB */
# define SAMDL_FLASH_SIZE (256*1024) /* 256KB */
# define SAMDL_SRAM0_SIZE (32*1024) /* 32KB */
#endif
/* SAMD20 Peripherals */
#if defined(SAMD20E)
# define SAMD_NEVENTS 8 /* 8 event channels */
# define SAMD_NTC 6 /* 6 Timer/counters */
# define SAMD_NTCOUT 2 /* 2 TC output channels */
# define SAMD_NSERCOM 4 /* 4 SERCOM */
# define SAMD_NADC 10 /* 10 ADC channels */
# define SAMD_NCMP 2 /* 2 Comparators */
# define SAMD_NDAC 1 /* 1 DAC channel */
# define SAMD_RTC 1 /* Have RTC */
# define SAMD_NALARMS 1 /* 1 RTC alarm */
# define SAMD_NRTCMP 1 /* RTC compare: 1 32-bit/2 16-bit */
# define SAMD_NEXTINT 16 /* 16 External interrupts */
# define SAMD_NPTCX 10 /* PTC X */
# define SAMD_NPTCY 6 /* PTC Y */
# define SAMD_WDT /* Have watchdog timer */
# define SAMDL_NEVENTS 8 /* 8 event channels */
# define SAMDL_NTC 6 /* 6 Timer/counters */
# define SAMDL_NTCOUT 2 /* 2 TC output channels */
# define SAMDL_NSERCOM 4 /* 4 SERCOM */
# define SAMDL_NADC 10 /* 10 ADC channels */
# define SAMDL_NCMP 2 /* 2 Comparators */
# define SAMDL_NDAC 1 /* 1 DAC channel */
# define SAMDL_RTC 1 /* Have RTC */
# define SAMDL_NALARMS 1 /* 1 RTC alarm */
# define SAMDL_NRTCMP 1 /* RTC compare: 1 32-bit/2 16-bit */
# define SAMDL_NEXTINT 16 /* 16 External interrupts */
# define SAMDL_NPTCX 10 /* PTC X */
# define SAMDL_NPTCY 6 /* PTC Y */
# define SAMDL_WDT /* Have watchdog timer */
#elif defined(SAMD20G)
# define SAMD_NEVENTS 8 /* 8 event channels */
# define SAMD_NTC 6 /* 6 Timer/counters */
# define SAMD_NTCOUT 2 /* 2 TC output channels */
# define SAMD_NSERCOM 6 /* 6 SERCOM */
# define SAMD_NADC 15 /* 14 ADC channels */
# define SAMD_NCMP 2 /* 2 Comparators */
# define SAMD_NDAC 1 /* 1 DAC channel */
# define SAMD_RTC 1 /* Have RTC */
# define SAMD_NALARMS 1 /* 1 RTC alarm */
# define SAMD_NRTCMP 1 /* RTC compare: 1 32-bit/2 16-bit */
# define SAMD_NEXTINT 16 /* 16 External interrupts */
# define SAMD_NPTCX 12 /* PTC X */
# define SAMD_NPTCY 10 /* PTC Y */
# define SAMD_WDT /* Have watchdog timer */
# define SAMDL_NEVENTS 8 /* 8 event channels */
# define SAMDL_NTC 6 /* 6 Timer/counters */
# define SAMDL_NTCOUT 2 /* 2 TC output channels */
# define SAMDL_NSERCOM 6 /* 6 SERCOM */
# define SAMDL_NADC 15 /* 14 ADC channels */
# define SAMDL_NCMP 2 /* 2 Comparators */
# define SAMDL_NDAC 1 /* 1 DAC channel */
# define SAMDL_RTC 1 /* Have RTC */
# define SAMDL_NALARMS 1 /* 1 RTC alarm */
# define SAMDL_NRTCMP 1 /* RTC compare: 1 32-bit/2 16-bit */
# define SAMDL_NEXTINT 16 /* 16 External interrupts */
# define SAMDL_NPTCX 12 /* PTC X */
# define SAMDL_NPTCY 10 /* PTC Y */
# define SAMDL_WDT /* Have watchdog timer */
#elif defined(SAMD20J)
# define SAMD_NEVENTS 8 /* 8 event channels */
# define SAMD_NTC 8 /* 8 Timer/counters */
# define SAMD_NTCOUT 2 /* 2 TC output channels */
# define SAMD_NSERCOM 6 /* 6 SERCOM */
# define SAMD_NADC 20 /* 20 ADC channels */
# define SAMD_NCMP 2 /* 2 Comparators */
# define SAMD_NDAC 1 /* 1 DAC channel */
# define SAMD_RTC 1 /* Have RTC */
# define SAMD_NALARMS 1 /* 1 RTC alarm */
# define SAMD_NRTCMP 1 /* RTC compare: 1 32-bit/2 16-bit */
# define SAMD_NEXTINT 16 /* 16 External interrupts */
# define SAMD_NPTCX 16 /* PTC X */
# define SAMD_NPTCY 16 /* PTC Y */
# define SAMD_WDT /* Have watchdog timer */
# define SAMDL_NEVENTS 8 /* 8 event channels */
# define SAMDL_NTC 8 /* 8 Timer/counters */
# define SAMDL_NTCOUT 2 /* 2 TC output channels */
# define SAMDL_NSERCOM 6 /* 6 SERCOM */
# define SAMDL_NADC 20 /* 20 ADC channels */
# define SAMDL_NCMP 2 /* 2 Comparators */
# define SAMDL_NDAC 1 /* 1 DAC channel */
# define SAMDL_RTC 1 /* Have RTC */
# define SAMDL_NALARMS 1 /* 1 RTC alarm */
# define SAMDL_NRTCMP 1 /* RTC compare: 1 32-bit/2 16-bit */
# define SAMDL_NEXTINT 16 /* 16 External interrupts */
# define SAMDL_NPTCX 16 /* PTC X */
# define SAMDL_NPTCY 16 /* PTC Y */
# define SAMDL_WDT /* Have watchdog timer */
#endif
/* NVIC priority levels *************************************************************/
@ -327,4 +327,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_INCLUDE_SAMD_CHIP_H */
#endif /* __ARCH_ARM_INCLUDE_SAMDL_CHIP_H */

View File

@ -1,7 +1,7 @@
/****************************************************************************************
* arch/arm/include/samd/irq.h
* arch/arm/include/samdl/irq.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* 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
@ -37,15 +37,15 @@
* nuttx/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_SAMD_IRQ_H
#define __ARCH_ARM_INCLUDE_SAMD_IRQ_H
#ifndef __ARCH_ARM_INCLUDE_SAMDL_IRQ_H
#define __ARCH_ARM_INCLUDE_SAMDL_IRQ_H
/****************************************************************************************
* Included Files
****************************************************************************************/
#include <nuttx/config.h>
#include <arch/samd/chip.h>
#include <arch/samdl/chip.h>
/****************************************************************************************
* Pre-processor Definitions
@ -76,9 +76,9 @@
/* Chip-Specific External interrupts */
#if defined(SAMD20)
# include <arch/samd/samd20_irq.h>
# include <arch/samdl/samd20_irq.h>
#else
# error "Unrecognized/unsupported SAMD chip"
# error "Unrecognized/unsupported SAMD/L chip"
#endif
/****************************************************************************************
@ -109,4 +109,4 @@ extern "C"
#endif
#endif
#endif /* __ARCH_ARM_INCLUDE_SAMD_IRQ_H */
#endif /* __ARCH_ARM_INCLUDE_SAMDL_IRQ_H */

View File

@ -37,8 +37,8 @@
* nuttx/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_SAMD_SAMD20_IRQ_H
#define __ARCH_ARM_INCLUDE_SAMD_SAMD20_IRQ_H
#ifndef __ARCH_ARM_INCLUDE_SAMDL_SAMD20_IRQ_H
#define __ARCH_ARM_INCLUDE_SAMDL_SAMD20_IRQ_H
/****************************************************************************************
* Included Files
@ -138,4 +138,4 @@ extern "C" {
#endif
#endif
#endif /* __ARCH_ARM_INCLUDE_SAMD_SAMD20_IRQ_H */
#endif /* __ARCH_ARM_INCLUDE_SAMDL_SAMD20_IRQ_H */

View File

@ -3,15 +3,17 @@
# see misc/tools/kconfig-language.txt.
#
comment "Atmel SAMD Configuration Options"
comment "Atmel SAMD/L Configuration Options"
choice
prompt "Atmel SAMD Chip Selection"
default ARCH_CHIP_SAMD20J18
depends on ARCH_CHIP_SAMD
prompt "Atmel SAMD/L Chip Selection"
default ARCH_CHIP_SAMD20J18 if ARCH_CHIP_SAMD
default ARCH_CHIP_SAMD21J18 if ARCH_CHIP_SAML
depends on ARCH_CHIP_SAMD || ARCH_CHIP_SAMDL
config ARCH_CHIP_SAMD20E14
bool "SAMD20E14"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20E
---help---
@ -19,6 +21,7 @@ config ARCH_CHIP_SAMD20E14
config ARCH_CHIP_SAMD20E15
bool "SAMD20E15"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20E
---help---
@ -26,6 +29,7 @@ config ARCH_CHIP_SAMD20E15
config ARCH_CHIP_SAMD20E16
bool "SAMD20E16"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20E
---help---
@ -33,6 +37,7 @@ config ARCH_CHIP_SAMD20E16
config ARCH_CHIP_SAMD20E17
bool "SAMD20E17"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20E
---help---
@ -40,6 +45,7 @@ config ARCH_CHIP_SAMD20E17
config ARCH_CHIP_SAMD20E18
bool "SAMD20E18"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20E
---help---
@ -47,6 +53,7 @@ config ARCH_CHIP_SAMD20E18
config ARCH_CHIP_SAMD20G14
bool "SAMD20G14"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20G
---help---
@ -54,6 +61,7 @@ config ARCH_CHIP_SAMD20G14
config ARCH_CHIP_SAMD20G15
bool "SAMD20G15"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20G
---help---
@ -61,6 +69,7 @@ config ARCH_CHIP_SAMD20G15
config ARCH_CHIP_SAMD20G16
bool "SAMD20G16"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20G
---help---
@ -68,6 +77,7 @@ config ARCH_CHIP_SAMD20G16
config ARCH_CHIP_SAMD20G17
bool "SAMD20G17"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20G
---help---
@ -75,6 +85,7 @@ config ARCH_CHIP_SAMD20G17
config ARCH_CHIP_SAMD20G18
bool "SAMD20G18"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20G
---help---
@ -82,6 +93,7 @@ config ARCH_CHIP_SAMD20G18
config ARCH_CHIP_SAMD20J14
bool "SAMD20J14"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20J
---help---
@ -89,6 +101,7 @@ config ARCH_CHIP_SAMD20J14
config ARCH_CHIP_SAMD20J15
bool "SAMD20J15"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20J
---help---
@ -96,6 +109,7 @@ config ARCH_CHIP_SAMD20J15
config ARCH_CHIP_SAMD20J16
bool "SAMD20J16"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20J
---help---
@ -103,6 +117,7 @@ config ARCH_CHIP_SAMD20J16
config ARCH_CHIP_SAMD20J17
bool "SAMD20J17"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20J
---help---
@ -110,6 +125,7 @@ config ARCH_CHIP_SAMD20J17
config ARCH_CHIP_SAMD20J18
bool "SAMD20J18"
depends on ARCH_CHIP_SAMD
select ARCH_FAMILY_SAMD20
select ARCH_FAMILY_SAMD20J
---help---
@ -128,124 +144,124 @@ config ARCH_FAMILY_SAMD20E
config ARCH_FAMILY_SAMD20G
bool
default n
select SAMD_HAVE_SERCOM4
select SAMD_HAVE_SERCOM5
select SAMDL_HAVE_SERCOM4
select SAMDL_HAVE_SERCOM5
config ARCH_FAMILY_SAMD20J
bool
default n
select SAMD_HAVE_SERCOM4
select SAMD_HAVE_SERCOM5
select SAMD_HAVE_TC6
select SAMD_HAVE_TC7
select SAMDL_HAVE_SERCOM4
select SAMDL_HAVE_SERCOM5
select SAMDL_HAVE_TC6
select SAMDL_HAVE_TC7
config SAMD_HAVE_SERCOM4
config SAMDL_HAVE_SERCOM4
bool
default n
config SAMD_HAVE_SERCOM5
config SAMDL_HAVE_SERCOM5
bool
default n
config SAMD_HAVE_TC6
config SAMDL_HAVE_TC6
bool
default n
config SAMD_HAVE_TC7
config SAMDL_HAVE_TC7
bool
default n
menu "SAMD Peripheral Support"
menu "SAMD/L Peripheral Support"
config SAMD_WDT
config SAMDL_WDT
bool "Watchdog Timer"
default n
config SAMD_RTC
config SAMDL_RTC
bool "Real Time Counter"
default n
config SAMD_NVMCTRL
config SAMDL_NVMCTRL
bool "Non-Volatile Memory Controller"
default n
config SAMD_EVSYS
config SAMDL_EVSYS
bool "Event System"
default n
config SAMD_SERCOM0
config SAMDL_SERCOM0
bool "Serial Communication Interface 0"
default n
config SAMD_SERCOM1
config SAMDL_SERCOM1
bool "Serial Communication Interface 1"
default n
config SAMD_SERCOM2
config SAMDL_SERCOM2
bool "Serial Communication Interface 2"
default n
config SAMD_SERCOM3
config SAMDL_SERCOM3
bool "Serial Communication Interface 3"
default n
config SAMD_SERCOM4
config SAMDL_SERCOM4
bool "Serial Communication Interface 4"
default n
depends on SAMD_HAVE_SERCOM4
depends on SAMDL_HAVE_SERCOM4
config SAMD_SERCOM5
config SAMDL_SERCOM5
bool "Serial Communication Interface 5"
default n
depends on SAMD_HAVE_SERCOM5
depends on SAMDL_HAVE_SERCOM5
config SAMD_TC0
config SAMDL_TC0
bool "Timer/Counter 0"
default n
config SAMD_TC1
config SAMDL_TC1
bool "Timer/Counter 1"
default n
config SAMD_TC2
config SAMDL_TC2
bool "Timer/Counter 2"
default n
config SAMD_TC3
config SAMDL_TC3
bool "Timer/Counter 3"
default n
config SAMD_TC4
config SAMDL_TC4
bool "Timer/Counter 4"
default n
config SAMD_TC5
config SAMDL_TC5
bool "Timer/Counter 5"
default n
config SAMD_TC6
config SAMDL_TC6
bool "Timer/Counter 6"
default n
depends on SAMD_HAVE_TC6
depends on SAMDL_HAVE_TC6
config SAMD_TC7
config SAMDL_TC7
bool "Timer/Counter 7"
default n
depends on SAMD_HAVE_TC7
depends on SAMDL_HAVE_TC7
config SAMD_ADC
config SAMDL_ADC
bool "Analog-to-Digital Converter"
default n
config SAMD_AC
config SAMDL_AC
bool "Analog Comparator"
default n
config SAMD_DAC
config SAMDL_DAC
bool "Digital-to-Analog Converter"
default n
config SAMD_PTC
config SAMDL_PTC
bool "Peripheral Touch Controller"
default n
@ -253,18 +269,18 @@ endmenu
choice
prompt "SERCOM0 mode"
default SAMD_SERCOM0_ISUSART
depends on SAMD_SERCOM0
default SAMDL_SERCOM0_ISUSART
depends on SAMDL_SERCOM0
config SAMD_SERCOM0_ISI2C
config SAMDL_SERCOM0_ISI2C
bool "I2C"
select I2C
config SAMD_SERCOM0_ISSPI
config SAMDL_SERCOM0_ISSPI
bool "SPI"
select SAMD_HAVE_SPI
select SAMDL_HAVE_SPI
config SAMD_SERCOM0_ISUSART
config SAMDL_SERCOM0_ISUSART
bool "USART"
select ARCH_HAVE_USART0
@ -272,18 +288,18 @@ endchoice
choice
prompt "SERCOM1 mode"
default SAMD_SERCOM1_ISUSART
depends on SAMD_SERCOM1
default SAMDL_SERCOM1_ISUSART
depends on SAMDL_SERCOM1
config SAMD_SERCOM1_ISI2C
config SAMDL_SERCOM1_ISI2C
bool "I2C"
select I2C
config SAMD_SERCOM1_ISSPI
config SAMDL_SERCOM1_ISSPI
bool "SPI"
select SAMD_HAVE_SPI
select SAMDL_HAVE_SPI
config SAMD_SERCOM1_ISUSART
config SAMDL_SERCOM1_ISUSART
bool "USART"
select ARCH_HAVE_USART1
@ -291,18 +307,18 @@ endchoice
choice
prompt "SERCOM2 mode"
default SAMD_SERCOM2_ISUSART
depends on SAMD_SERCOM2
default SAMDL_SERCOM2_ISUSART
depends on SAMDL_SERCOM2
config SAMD_SERCOM2_ISI2C
config SAMDL_SERCOM2_ISI2C
bool "I2C"
select I2C
config SAMD_SERCOM2_ISSPI
config SAMDL_SERCOM2_ISSPI
bool "SPI"
select SAMD_HAVE_SPI
select SAMDL_HAVE_SPI
config SAMD_SERCOM2_ISUSART
config SAMDL_SERCOM2_ISUSART
bool "USART"
select ARCH_HAVE_USART2
@ -310,18 +326,18 @@ endchoice
choice
prompt "SERCOM3 mode"
default SAMD_SERCOM3_ISUSART
depends on SAMD_SERCOM3
default SAMDL_SERCOM3_ISUSART
depends on SAMDL_SERCOM3
config SAMD_SERCOM3_ISI2C
config SAMDL_SERCOM3_ISI2C
bool "I2C"
select I2C
config SAMD_SERCOM3_ISSPI
config SAMDL_SERCOM3_ISSPI
bool "SPI"
select SAMD_HAVE_SPI
select SAMDL_HAVE_SPI
config SAMD_SERCOM3_ISUSART
config SAMDL_SERCOM3_ISUSART
bool "USART"
select ARCH_HAVE_USART3
@ -329,18 +345,18 @@ endchoice
choice
prompt "SERCOM4 mode"
default SAMD_SERCOM4_ISUSART
depends on SAMD_SERCOM4
default SAMDL_SERCOM4_ISUSART
depends on SAMDL_SERCOM4
config SAMD_SERCOM4_ISI2C
config SAMDL_SERCOM4_ISI2C
bool "I2C"
select I2C
config SAMD_SERCOM4_ISSPI
config SAMDL_SERCOM4_ISSPI
bool "SPI"
select SAMD_HAVE_SPI
select SAMDL_HAVE_SPI
config SAMD_SERCOM4_ISUSART
config SAMDL_SERCOM4_ISUSART
bool "USART"
select ARCH_HAVE_USART4
@ -348,34 +364,34 @@ endchoice
choice
prompt "SERCOM5 mode"
default SAMD_SERCOM5_ISUSART
depends on SAMD_SERCOM5
default SAMDL_SERCOM5_ISUSART
depends on SAMDL_SERCOM5
config SAMD_SERCOM5_ISI2C
config SAMDL_SERCOM5_ISI2C
bool "I2C"
select I2C
config SAMD_SERCOM5_ISSPI
config SAMDL_SERCOM5_ISSPI
bool "SPI"
select SAMD_HAVE_SPI
select SAMDL_HAVE_SPI
config SAMD_SERCOM5_ISUSART
config SAMDL_SERCOM5_ISUSART
bool "USART"
select ARCH_HAVE_USART5
endchoice
config SAMD_HAVE_SPI
config SAMDL_HAVE_SPI
bool
select SPI
if SAMD_HAVE_SPI
if SAMDL_HAVE_SPI
config SAMD_SPI_REGDEBUG
config SAMDL_SPI_REGDEBUG
bool "SPI register-Level Debug"
default n
depends on DEBUG_SPI
---help---
Enable very low-level register access debug. Depends on DEBUG_SPI.
endif # SAMD_HAVE_SPI
endif # SAMDL_HAVE_SPI

View File

@ -1,5 +1,5 @@
############################################################################
# arch/arm/src/samd/Make.defs
# arch/arm/src/samdl/Make.defs
#
# Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -84,6 +84,6 @@ ifeq ($(CONFIG_ARCH_IRQPRIO),y)
CHIP_CSRCS += sam_irqprio.c
endif
ifeq ($(CONFIG_SAMD_HAVE_SPI),y)
ifeq ($(CONFIG_SAMDL_HAVE_SPI),y)
CHIP_CSRCS += sam_spi.c
endif

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/chip.h
* arch/arm/src/samdl/chip.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_H
#define __ARCH_ARM_SRC_SAMD_CHIP_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_H
/************************************************************************************
* Included Files
@ -44,7 +44,7 @@
/* Include the chip capabilities file */
#include <arch/samd/chip.h>
#include <arch/samdl/chip.h>
/* Define the number of interrupt vectors that need to be supported for this chip */
@ -72,4 +72,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_evsys.h
* arch/arm/src/samdl/chip/sam_evsys.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_EVSYS_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_EVSYS_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_EVSYS_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_EVSYS_H
/********************************************************************************************
* Included Files
@ -228,4 +228,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_EVSYS_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_EVSYS_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_fuses.h
* arch/arm/src/samdl/chip/sam_fuses.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,8 +42,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_NVMCTRL_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_NVMCTRL_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_NVMCTRL_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_NVMCTRL_H
/********************************************************************************************
* Included Files
@ -255,4 +255,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_NVMCTRL_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_NVMCTRL_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_gclk.h
* arch/arm/src/samdl/chip/sam_gclk.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_GCLK_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_GCLK_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_GCLK_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_GCLK_H
/********************************************************************************************
* Included Files
@ -185,4 +185,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_GCLK_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_GCLK_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_i2c_master.h
* arch/arm/src/samdl/chip/sam_i2c_master.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_I2C_MASTER_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_I2C_MASTER_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_I2C_MASTER_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_I2C_MASTER_H
/********************************************************************************************
* Included Files
@ -231,4 +231,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_I2C_MASTER_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_I2C_MASTER_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_i2c_slave.h
* arch/arm/src/samdl/chip/sam_i2c_slave.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_I2C_SLAVE_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_I2C_SLAVE_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_I2C_SLAVE_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_I2C_SLAVE_H
/********************************************************************************************
* Included Files
@ -220,4 +220,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_I2C_SLAVE_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_I2C_SLAVE_H */

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/chip/sam_memorymap.h
* arch/arm/src/samdl/chip/sam_memorymap.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,20 +33,20 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_MEMORYMAP_H
#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/samd/chip.h>
#include <arch/samdl/chip.h>
#if defined(SAMD20)
# include "chip/samd20_memorymap.h"
#else
# error Unrecognized SAMD architecture
# error Unrecognized SAMD/L architecture
#endif
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_MEMORYMAP_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_nvmctrl.h
* arch/arm/src/samdl/chip/sam_nvmctrl.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_NVMCTRL_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_NVMCTRL_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_NVMCTRL_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_NVMCTRL_H
/********************************************************************************************
* Included Files
@ -166,4 +166,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_NVMCTRL_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_NVMCTRL_H */

View File

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

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_pm.h
* arch/arm/src/samdl/chip/sam_pm.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_PM_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_PM_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PM_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PM_H
/********************************************************************************************
* Included Files
@ -227,4 +227,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_PM_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PM_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_port.h
* arch/arm/src/samdl/chip/sam_port.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_PORT_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_PORT_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PORT_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PORT_H
/********************************************************************************************
* Included Files
@ -325,4 +325,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_PORT_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_PORT_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_sercom.h
* arch/arm/src/samdl/chip/sam_sercom.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_SERCOM_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_SERCOM_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SERCOM_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SERCOM_H
/********************************************************************************************
* Included Files
@ -81,4 +81,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_SERCOM_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SERCOM_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_spi.h
* arch/arm/src/samdl/chip/sam_spi.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_SPI_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_SPI_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SPI_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SPI_H
/********************************************************************************************
* Included Files
@ -229,4 +229,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_SPI_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SPI_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_sysctrl.h
* arch/arm/src/samdl/chip/sam_sysctrl.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_SYSCTRL_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_SYSCTRL_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SYSCTRL_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SYSCTRL_H
/********************************************************************************************
* Included Files
@ -315,4 +315,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_SYSCTRL_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_SYSCTRL_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_usart.h
* arch/arm/src/samdl/chip/sam_usart.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_USART_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_USART_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_USART_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_USART_H
/********************************************************************************************
* Included Files
@ -220,4 +220,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_USART_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_USART_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/sam_wdt.h
* arch/arm/src/samdl/chip/sam_wdt.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAM_WDT_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAM_WDT_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAM_WDT_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAM_WDT_H
/********************************************************************************************
* Included Files
@ -157,4 +157,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAM_WDT_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAM_WDT_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/samd20_memorymap.h
* arch/arm/src/samdl/chip/samd20_memorymap.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAMD20_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAMD20_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAMD20_MEMORYMAP_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAMD20_MEMORYMAP_H
/********************************************************************************************
* Included Files
@ -122,4 +122,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAMD20_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAMD20_MEMORYMAP_H */

View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/samd/chip/samd20_pinmap.h
* arch/arm/src/samdl/chip/samd20_pinmap.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_CHIP_SAMD20_PINMAP_H
#define __ARCH_ARM_SRC_SAMD_CHIP_SAMD20_PINMAP_H
#ifndef __ARCH_ARM_SRC_SAMDL_CHIP_SAMD20_PINMAP_H
#define __ARCH_ARM_SRC_SAMDL_CHIP_SAMD20_PINMAP_H
/********************************************************************************************
* Included Files
@ -362,4 +362,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_CHIP_SAMD20_PINMAP_H */
#endif /* __ARCH_ARM_SRC_SAMDL_CHIP_SAMD20_PINMAP_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_clockconfig.c
* arch/arm/src/samdl/sam_clockconfig.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/sam_clockconfig.h
* arch/arm/src/samdl/sam_clockconfig.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_CLOCKCONFIG_H
#define __ARCH_ARM_SRC_SAMD_SAM_CLOCKCONFIG_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_CLOCKCONFIG_H
#define __ARCH_ARM_SRC_SAMDL_SAM_CLOCKCONFIG_H
/************************************************************************************
* Included Files
@ -90,4 +90,4 @@ void sam_clockconfig(void);
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMD_SAM_CLOCKCONFIG_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_CLOCKCONFIG_H */

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/sam_config.h
* arch/arm/src/samdl/sam_config.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,82 +33,82 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_CONFIG_H
#define __ARCH_ARM_SRC_SAMD_SAM_CONFIG_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_CONFIG_H
#define __ARCH_ARM_SRC_SAMDL_SAM_CONFIG_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <arch/samd/chip.h>
#include <arch/samdl/chip.h>
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/* How many SERCOM peripherals are configured as USART peripherals? */
#define SAMD_HAVE_USART0 1
#define SAMD_HAVE_USART1 1
#define SAMD_HAVE_USART2 1
#define SAMD_HAVE_USART3 1
#define SAMD_HAVE_USART4 1
#define SAMD_HAVE_USART5 1
#define SAMDL_HAVE_USART0 1
#define SAMDL_HAVE_USART1 1
#define SAMDL_HAVE_USART2 1
#define SAMDL_HAVE_USART3 1
#define SAMDL_HAVE_USART4 1
#define SAMDL_HAVE_USART5 1
#if !defined(CONFIG_SAMD_SERCOM0) || !defined(CONFIG_SAMD_SERCOM0_ISUSART) || \
#if !defined(CONFIG_SAMDL_SERCOM0) || !defined(CONFIG_SAMDL_SERCOM0_ISUSART) || \
!defined(CONFIG_USART0_ISUART)
# undef SAMD_HAVE_USART0
# undef CONFIG_SAMD_SERCOM0_ISUSART
# undef SAMDL_HAVE_USART0
# undef CONFIG_SAMDL_SERCOM0_ISUSART
# undef CONFIG_USART0_SERIAL_CONSOLE
# undef CONFIG_USART0_FLOW_CONTROL
# undef CONFIG_USART0_IRDAMODE
# undef CONFIG_USART0_RS485MODE
#endif
#if !defined(CONFIG_SAMD_SERCOM1) || !defined(CONFIG_SAMD_SERCOM1_ISUSART) || \
#if !defined(CONFIG_SAMDL_SERCOM1) || !defined(CONFIG_SAMDL_SERCOM1_ISUSART) || \
!defined(CONFIG_USART1_ISUART)
# undef SAMD_HAVE_USART1
# undef CONFIG_SAMD_SERCOM1_ISUSART
# undef SAMDL_HAVE_USART1
# undef CONFIG_SAMDL_SERCOM1_ISUSART
# undef CONFIG_USART1_SERIAL_CONSOLE
# undef CONFIG_USART1_FLOW_CONTROL
# undef CONFIG_USART1_IRDAMODE
# undef CONFIG_USART1_RS485MODE
#endif
#if !defined(CONFIG_SAMD_SERCOM2) || !defined(CONFIG_SAMD_SERCOM2_ISUSART) || \
#if !defined(CONFIG_SAMDL_SERCOM2) || !defined(CONFIG_SAMDL_SERCOM2_ISUSART) || \
!defined(CONFIG_USART2_ISUART)
# undef SAMD_HAVE_USART2
# undef CONFIG_SAMD_SERCOM2_ISUSART
# undef SAMDL_HAVE_USART2
# undef CONFIG_SAMDL_SERCOM2_ISUSART
# undef CONFIG_USART2_SERIAL_CONSOLE
# undef CONFIG_USART2_FLOW_CONTROL
# undef CONFIG_USART2_IRDAMODE
# undef CONFIG_USART2_RS485MODE
#endif
#if !defined(CONFIG_SAMD_SERCOM3) || !defined(CONFIG_SAMD_SERCOM3_ISUSART) || \
#if !defined(CONFIG_SAMDL_SERCOM3) || !defined(CONFIG_SAMDL_SERCOM3_ISUSART) || \
!defined(CONFIG_USART3_ISUART)
# undef SAMD_HAVE_USART3
# undef CONFIG_SAMD_SERCOM3_ISUSART
# undef SAMDL_HAVE_USART3
# undef CONFIG_SAMDL_SERCOM3_ISUSART
# undef CONFIG_USART3_SERIAL_CONSOLE
# undef CONFIG_USART3_FLOW_CONTROL
# undef CONFIG_USART3_IRDAMODE
# undef CONFIG_USART3_RS485MODE
#endif
#if !defined(CONFIG_SAMD_SERCOM4) || !defined(CONFIG_SAMD_SERCOM4_ISUSART) || \
#if !defined(CONFIG_SAMDL_SERCOM4) || !defined(CONFIG_SAMDL_SERCOM4_ISUSART) || \
!defined(CONFIG_USART4_ISUART)
# undef SAMD_HAVE_USART4
# undef CONFIG_SAMD_SERCOM4_ISUSART
# undef SAMDL_HAVE_USART4
# undef CONFIG_SAMDL_SERCOM4_ISUSART
# undef CONFIG_USART4_SERIAL_CONSOLE
# undef CONFIG_USART4_FLOW_CONTROL
# undef CONFIG_USART4_IRDAMODE
# undef CONFIG_USART4_RS485MODE
#endif
#if !defined(CONFIG_SAMD_SERCOM5) || !defined(CONFIG_SAMD_SERCOM5_ISUSART) || \
#if !defined(CONFIG_SAMDL_SERCOM5) || !defined(CONFIG_SAMDL_SERCOM5_ISUSART) || \
!defined(CONFIG_USART5_ISUART)
# undef SAMD_HAVE_USART5
# undef CONFIG_SAMD_SERCOM5_ISUSART
# undef SAMDL_HAVE_USART5
# undef CONFIG_SAMDL_SERCOM5_ISUSART
# undef CONFIG_USART5_SERIAL_CONSOLE
# undef CONFIG_USART5_FLOW_CONTROL
# undef CONFIG_USART5_IRDAMODE
@ -117,11 +117,11 @@
/* Are any USARTs enabled? */
#undef SAMD_HAVE_USART
#if defined(SAMD_HAVE_USART0) || defined(SAMD_HAVE_USART1) || \
defined(SAMD_HAVE_USART2) || defined(SAMD_HAVE_USART3) || \
defined(SAMD_HAVE_USART4) || defined(SAMD_HAVE_USART5)
# define SAMD_HAVE_USART 1
#undef SAMDL_HAVE_USART
#if defined(SAMDL_HAVE_USART0) || defined(SAMDL_HAVE_USART1) || \
defined(SAMDL_HAVE_USART2) || defined(SAMDL_HAVE_USART3) || \
defined(SAMDL_HAVE_USART4) || defined(SAMDL_HAVE_USART5)
# define SAMDL_HAVE_USART 1
#endif
/* Is there a serial console? There should be at most one defined. It could be on
@ -182,98 +182,98 @@
/* Are any SERCOM peripherals are configured as SPI peripherals? */
#define SAMD_HAVE_SPI0 1
#define SAMD_HAVE_SPI1 1
#define SAMD_HAVE_SPI2 1
#define SAMD_HAVE_SPI3 1
#define SAMD_HAVE_SPI4 1
#define SAMD_HAVE_SPI5 1
#define SAMDL_HAVE_SPI0 1
#define SAMDL_HAVE_SPI1 1
#define SAMDL_HAVE_SPI2 1
#define SAMDL_HAVE_SPI3 1
#define SAMDL_HAVE_SPI4 1
#define SAMDL_HAVE_SPI5 1
#if !defined(CONFIG_SAMD_SERCOM0) || !defined(CONFIG_SAMD_SERCOM0_ISSPI)
# undef SAMD_HAVE_SPI0
# undef CONFIG_SAMD_SERCOM0_ISSPI
#if !defined(CONFIG_SAMDL_SERCOM0) || !defined(CONFIG_SAMDL_SERCOM0_ISSPI)
# undef SAMDL_HAVE_SPI0
# undef CONFIG_SAMDL_SERCOM0_ISSPI
#endif
#if !defined(CONFIG_SAMD_SERCOM1) || !defined(CONFIG_SAMD_SERCOM1_ISSPI)
# undef SAMD_HAVE_SPI1
# undef CONFIG_SAMD_SERCOM1_ISSPI
#if !defined(CONFIG_SAMDL_SERCOM1) || !defined(CONFIG_SAMDL_SERCOM1_ISSPI)
# undef SAMDL_HAVE_SPI1
# undef CONFIG_SAMDL_SERCOM1_ISSPI
#endif
#if !defined(CONFIG_SAMD_SERCOM2) || !defined(CONFIG_SAMD_SERCOM2_ISSPI)
# undef SAMD_HAVE_SPI2
# undef CONFIG_SAMD_SERCOM2_ISSPI
#if !defined(CONFIG_SAMDL_SERCOM2) || !defined(CONFIG_SAMDL_SERCOM2_ISSPI)
# undef SAMDL_HAVE_SPI2
# undef CONFIG_SAMDL_SERCOM2_ISSPI
#endif
#if !defined(CONFIG_SAMD_SERCOM3) || !defined(CONFIG_SAMD_SERCOM3_ISSPI)
# undef SAMD_HAVE_SPI3
# undef CONFIG_SAMD_SERCOM3_ISSPI
#if !defined(CONFIG_SAMDL_SERCOM3) || !defined(CONFIG_SAMDL_SERCOM3_ISSPI)
# undef SAMDL_HAVE_SPI3
# undef CONFIG_SAMDL_SERCOM3_ISSPI
#endif
#if !defined(CONFIG_SAMD_SERCOM4) || !defined(CONFIG_SAMD_SERCOM4_ISSPI)
# undef SAMD_HAVE_SPI4
# undef CONFIG_SAMD_SERCOM4_ISSPI
#if !defined(CONFIG_SAMDL_SERCOM4) || !defined(CONFIG_SAMDL_SERCOM4_ISSPI)
# undef SAMDL_HAVE_SPI4
# undef CONFIG_SAMDL_SERCOM4_ISSPI
#endif
#if !defined(CONFIG_SAMD_SERCOM5) || !defined(CONFIG_SAMD_SERCOM5_ISSPI)
# undef SAMD_HAVE_SPI5
# undef CONFIG_SAMD_SERCOM5_ISSPI
#if !defined(CONFIG_SAMDL_SERCOM5) || !defined(CONFIG_SAMDL_SERCOM5_ISSPI)
# undef SAMDL_HAVE_SPI5
# undef CONFIG_SAMDL_SERCOM5_ISSPI
#endif
/* Are any SERCOMs configured for SPI? */
#undef SAMD_HAVE_SPI
#if defined(SAMD_HAVE_SPI0) || defined(SAMD_HAVE_SPI1) || \
defined(SAMD_HAVE_SPI2) || defined(SAMD_HAVE_SPI3) || \
defined(SAMD_HAVE_SPI4) || defined(SAMD_HAVE_SPI5)
# define SAMD_HAVE_SPI 1
#undef SAMDL_HAVE_SPI
#if defined(SAMDL_HAVE_SPI0) || defined(SAMDL_HAVE_SPI1) || \
defined(SAMDL_HAVE_SPI2) || defined(SAMDL_HAVE_SPI3) || \
defined(SAMDL_HAVE_SPI4) || defined(SAMDL_HAVE_SPI5)
# define SAMDL_HAVE_SPI 1
#endif
/* Are any SERCOM peripherals are configured as I2C peripherals? */
#define SAMD_HAVE_I2C0 1
#define SAMD_HAVE_I2C1 1
#define SAMD_HAVE_I2C2 1
#define SAMD_HAVE_I2C3 1
#define SAMD_HAVE_I2C4 1
#define SAMD_HAVE_I2C5 1
#define SAMDL_HAVE_I2C0 1
#define SAMDL_HAVE_I2C1 1
#define SAMDL_HAVE_I2C2 1
#define SAMDL_HAVE_I2C3 1
#define SAMDL_HAVE_I2C4 1
#define SAMDL_HAVE_I2C5 1
#if !defined(CONFIG_SAMD_SERCOM0) || !defined(CONFIG_SAMD_SERCOM0_ISI2C)
# undef SAMD_HAVE_I2C0
# undef CONFIG_SAMD_SERCOM0_ISI2C
#if !defined(CONFIG_SAMDL_SERCOM0) || !defined(CONFIG_SAMDL_SERCOM0_ISI2C)
# undef SAMDL_HAVE_I2C0
# undef CONFIG_SAMDL_SERCOM0_ISI2C
#endif
#if !defined(CONFIG_SAMD_SERCOM1) || !defined(CONFIG_SAMD_SERCOM1_ISI2C)
# undef SAMD_HAVE_I2C1
# undef CONFIG_SAMD_SERCOM1_ISI2C
#if !defined(CONFIG_SAMDL_SERCOM1) || !defined(CONFIG_SAMDL_SERCOM1_ISI2C)
# undef SAMDL_HAVE_I2C1
# undef CONFIG_SAMDL_SERCOM1_ISI2C
#endif
#if !defined(CONFIG_SAMD_SERCOM2) || !defined(CONFIG_SAMD_SERCOM2_ISI2C)
# undef SAMD_HAVE_I2C2
# undef CONFIG_SAMD_SERCOM2_ISI2C
#if !defined(CONFIG_SAMDL_SERCOM2) || !defined(CONFIG_SAMDL_SERCOM2_ISI2C)
# undef SAMDL_HAVE_I2C2
# undef CONFIG_SAMDL_SERCOM2_ISI2C
#endif
#if !defined(CONFIG_SAMD_SERCOM3) || !defined(CONFIG_SAMD_SERCOM3_ISI2C)
# undef SAMD_HAVE_I2C3
# undef CONFIG_SAMD_SERCOM3_ISI2C
#if !defined(CONFIG_SAMDL_SERCOM3) || !defined(CONFIG_SAMDL_SERCOM3_ISI2C)
# undef SAMDL_HAVE_I2C3
# undef CONFIG_SAMDL_SERCOM3_ISI2C
#endif
#if !defined(CONFIG_SAMD_SERCOM4) || !defined(CONFIG_SAMD_SERCOM4_ISI2C)
# undef SAMD_HAVE_I2C4
# undef CONFIG_SAMD_SERCOM4_ISI2C
#if !defined(CONFIG_SAMDL_SERCOM4) || !defined(CONFIG_SAMDL_SERCOM4_ISI2C)
# undef SAMDL_HAVE_I2C4
# undef CONFIG_SAMDL_SERCOM4_ISI2C
#endif
#if !defined(CONFIG_SAMD_SERCOM5) || !defined(CONFIG_SAMD_SERCOM5_ISI2C)
# undef SAMD_HAVE_I2C5
# undef CONFIG_SAMD_SERCOM5_ISI2C
#if !defined(CONFIG_SAMDL_SERCOM5) || !defined(CONFIG_SAMDL_SERCOM5_ISI2C)
# undef SAMDL_HAVE_I2C5
# undef CONFIG_SAMDL_SERCOM5_ISI2C
#endif
/* Are any SERCOMs configured for I2C? */
#undef SAMD_HAVE_I2C
#if defined(SAMD_HAVE_I2C0) || defined(SAMD_HAVE_I2C1) || \
defined(SAMD_HAVE_I2C2) || defined(SAMD_HAVE_I2C3) || \
defined(SAMD_HAVE_I2C4) || defined(SAMD_HAVE_I2C5)
# define SAMD_HAVE_I2C 1
#undef SAMDL_HAVE_I2C
#if defined(SAMDL_HAVE_I2C0) || defined(SAMDL_HAVE_I2C1) || \
defined(SAMDL_HAVE_I2C2) || defined(SAMDL_HAVE_I2C3) || \
defined(SAMDL_HAVE_I2C4) || defined(SAMDL_HAVE_I2C5)
# define SAMDL_HAVE_I2C 1
#endif
/************************************************************************************
@ -288,4 +288,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_SAM_CONFIG_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_CONFIG_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_idle.c
* arch/arm/src/samdl/sam_idle.c
*
* Copyright (C) 2014, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_irq.c
* arch/arm/src/samdl/sam_irq.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/sam_irq.h
* arch/arm/src/samdl/sam_irq.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_IRQ_H
#define __ARCH_ARM_SRC_SAMD_SAM_IRQ_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_IRQ_H
#define __ARCH_ARM_SRC_SAMDL_SAM_IRQ_H
/************************************************************************************
* Included Files
@ -76,4 +76,4 @@ void sam_dumpnvic(const char *msg, int irq);
# define sam_dumpnvic(msg, irq)
#endif
#endif /* __ARCH_ARM_SRC_SAMD_SAM_IRQ_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_IRQ_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_irqprio.c
* arch/arm/src/samdl/sam_irqprio.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_lowputc.c
* arch/arm/src/samdl/sam_lowputc.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -89,7 +89,7 @@
*
****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
static void
sam_wait_synchronization(const struct sam_usart_config_s * const config)
{
@ -105,7 +105,7 @@ sam_wait_synchronization(const struct sam_usart_config_s * const config)
*
****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
static inline int
sam_usart_configure(const struct sam_usart_config_s * const config)
{
@ -253,7 +253,7 @@ sam_usart_configure(const struct sam_usart_config_s * const config)
*
****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
static inline void
sam_pad_configure(const struct sam_usart_config_s * const config)
{
@ -291,7 +291,7 @@ sam_pad_configure(const struct sam_usart_config_s * const config)
*
*****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
int sam_usart_internal(const struct sam_usart_config_s * const config)
{
int ret;
@ -327,7 +327,7 @@ int sam_usart_internal(const struct sam_usart_config_s * const config)
*
****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
static inline void
sam_usart_enable(const struct sam_usart_config_s * const config)
{
@ -380,7 +380,7 @@ void sam_lowsetup(void)
*
*****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
int sam_usart_initialize(const struct sam_usart_config_s * const config)
{
irqstate_t flags;
@ -410,7 +410,7 @@ int sam_usart_initialize(const struct sam_usart_config_s * const config)
*
*****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
void sam_usart_reset(const struct sam_usart_config_s * const config)
{
uintptr_t regaddr = config->base + SAM_USART_CTRLA_OFFSET;

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_lowputc.h
* arch/arm/src/samdl/sam_lowputc.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_LOWPUTC_H
#define __ARCH_ARM_SRC_SAMD_SAM_LOWPUTC_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_LOWPUTC_H
#define __ARCH_ARM_SRC_SAMDL_SAM_LOWPUTC_H
/****************************************************************************
* Included Files
@ -91,7 +91,7 @@ void sam_lowsetup(void);
*
****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
struct sam_usart_config_s;
int sam_usart_initialize(const struct sam_usart_config_s * const config);
#endif
@ -105,7 +105,7 @@ int sam_usart_initialize(const struct sam_usart_config_s * const config);
*
****************************************************************************/
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
struct sam_usart_config_s;
void sam_usart_reset(const struct sam_usart_config_s * const config);
#endif
@ -127,4 +127,4 @@ void sam_lowputc(uint32_t ch);
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMD_SAM_LOWPUTC_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_LOWPUTC_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_port.c
* arch/arm/src/samdl/sam_port.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_port.h
* arch/arm/src/samdl/sam_port.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_PORT_H
#define __ARCH_ARM_SRC_SAMD_SAM_PORT_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_PORT_H
#define __ARCH_ARM_SRC_SAMDL_SAM_PORT_H
/****************************************************************************
* Included Files
@ -367,4 +367,4 @@ void sam_dumpport(port_pinset_t pinset, const char *msg);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMD_SAM_PORT_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_PORT_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_lowputc.c
* arch/arm/src/samdl/sam_lowputc.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_sercom.h
* arch/arm/src/samdl/sam_sercom.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_SERCOM_H
#define __ARCH_ARM_SRC_SAMD_SAM_SERCOM_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_SERCOM_H
#define __ARCH_ARM_SRC_SAMDL_SAM_SERCOM_H
/****************************************************************************
* Included Files
@ -141,4 +141,4 @@ void sercom_slowclk_configure(int gclkgen);
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMD_SAM_SERCOM_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_SERCOM_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_serial.c
* arch/arm/src/samdl/sam_serial.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -65,7 +65,7 @@
#include "sam_lowputc.h"
#include "sam_serial.h"
#ifdef SAMD_HAVE_USART
#ifdef SAMDL_HAVE_USART
/****************************************************************************
* Pre-processor Definitions
@ -105,22 +105,22 @@
# define TTYS5_DEV g_usart5port /* USART5 is ttyS0 */
#else
# undef CONSOLE_DEV /* No console */
# if defined(SAMD_HAVE_USART0)
# if defined(SAMDL_HAVE_USART0)
# define TTYS0_DEV g_usart0port /* USART0 is ttyS0 */
# define USART0_ASSIGNED 1
# elif defined(SAMD_HAVE_USART1)
# elif defined(SAMDL_HAVE_USART1)
# define TTYS0_DEV g_usart1port /* USART1 is ttyS0 */
# define USART1_ASSIGNED 1
# elif defined(SAMD_HAVE_USART2)
# elif defined(SAMDL_HAVE_USART2)
# define TTYS0_DEV g_usart2port /* USART2 is ttyS0 */
# define USART2_ASSIGNED 1
# elif defined(SAMD_HAVE_USART3)
# elif defined(SAMDL_HAVE_USART3)
# define TTYS0_DEV g_usart3port /* USART3 is ttyS0 */
# define USART3_ASSIGNED 1
# elif defined(SAMD_HAVE_USART4)
# elif defined(SAMDL_HAVE_USART4)
# define TTYS0_DEV g_usart4port /* USART4 is ttyS0 */
# define USART4_ASSIGNED 1
# elif defined(SAMD_HAVE_USART5)
# elif defined(SAMDL_HAVE_USART5)
# define TTYS0_DEV g_usart5port /* USART5 is ttyS0 */
# define USART5_ASSIGNED 1
# endif
@ -128,22 +128,22 @@
/* Pick ttys1. This could be any of USART0-5 excluding the console USART. */
#if defined(SAMD_HAVE_USART0) && !defined(USART0_ASSIGNED)
#if defined(SAMDL_HAVE_USART0) && !defined(USART0_ASSIGNED)
# define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */
# define USART0_ASSIGNED 1
#elif defined(SAMD_HAVE_USART1) && !defined(USART1_ASSIGNED)
#elif defined(SAMDL_HAVE_USART1) && !defined(USART1_ASSIGNED)
# define TTYS1_DEV g_usart1port /* USART1 is ttyS1 */
# define USART1_ASSIGNED 1
#elif defined(SAMD_HAVE_USART2) && !defined(USART2_ASSIGNED)
#elif defined(SAMDL_HAVE_USART2) && !defined(USART2_ASSIGNED)
# define TTYS1_DEV g_usart2port /* USART2 is ttyS1 */
# define USART2_ASSIGNED 1
#elif defined(SAMD_HAVE_USART3) && !defined(USART3_ASSIGNED)
#elif defined(SAMDL_HAVE_USART3) && !defined(USART3_ASSIGNED)
# define TTYS1_DEV g_usart3port /* USART3 is ttyS1 */
# define USART3_ASSIGNED 1
#elif defined(SAMD_HAVE_USART4) && !defined(USART4_ASSIGNED)
#elif defined(SAMDL_HAVE_USART4) && !defined(USART4_ASSIGNED)
# define TTYS1_DEV g_usart4port /* USART4 is ttyS1 */
# define USART4_ASSIGNED 1
#elif defined(SAMD_HAVE_USART5) && !defined(USART5_ASSIGNED)
#elif defined(SAMDL_HAVE_USART5) && !defined(USART5_ASSIGNED)
# define TTYS1_DEV g_usart5port /* USART5 is ttyS1 */
# define USART5_ASSIGNED 1
#endif
@ -153,19 +153,19 @@
* could also be the console.
*/
#if defined(SAMD_HAVE_USART1) && !defined(USART1_ASSIGNED)
#if defined(SAMDL_HAVE_USART1) && !defined(USART1_ASSIGNED)
# define TTYS2_DEV g_usart1port /* USART1 is ttyS2 */
# define USART1_ASSIGNED 1
#elif defined(SAMD_HAVE_USART2) && !defined(USART2_ASSIGNED)
#elif defined(SAMDL_HAVE_USART2) && !defined(USART2_ASSIGNED)
# define TTYS2_DEV g_usart2port /* USART2 is ttyS2 */
# define USART2_ASSIGNED 1
#elif defined(SAMD_HAVE_USART3) && !defined(USART3_ASSIGNED)
#elif defined(SAMDL_HAVE_USART3) && !defined(USART3_ASSIGNED)
# define TTYS2_DEV g_usart3port /* USART3 is ttyS2 */
# define USART3_ASSIGNED 1
#elif defined(SAMD_HAVE_USART4) && !defined(USART4_ASSIGNED)
#elif defined(SAMDL_HAVE_USART4) && !defined(USART4_ASSIGNED)
# define TTYS2_DEV g_usart4port /* USART4 is ttyS2 */
# define USART4_ASSIGNED 1
#elif defined(SAMD_HAVE_USART5) && !defined(USART5_ASSIGNED)
#elif defined(SAMDL_HAVE_USART5) && !defined(USART5_ASSIGNED)
# define TTYS2_DEV g_usart5port /* USART5 is ttyS2 */
# define USART5_ASSIGNED 1
#endif
@ -175,16 +175,16 @@
* USART2-5 could also be the console.
*/
#if defined(SAMD_HAVE_USART2) && !defined(USART2_ASSIGNED)
#if defined(SAMDL_HAVE_USART2) && !defined(USART2_ASSIGNED)
# define TTYS3_DEV g_usart2port /* USART2 is ttyS3 */
# define USART2_ASSIGNED 1
#elif defined(SAMD_HAVE_USART3) && !defined(USART3_ASSIGNED)
#elif defined(SAMDL_HAVE_USART3) && !defined(USART3_ASSIGNED)
# define TTYS3_DEV g_usart3port /* USART3 is ttyS3 */
# define USART3_ASSIGNED 1
#elif defined(SAMD_HAVE_USART4) && !defined(USART4_ASSIGNED)
#elif defined(SAMDL_HAVE_USART4) && !defined(USART4_ASSIGNED)
# define TTYS3_DEV g_usart4port /* USART4 is ttyS3 */
# define USART4_ASSIGNED 1
#elif defined(SAMD_HAVE_USART5) && !defined(USART5_ASSIGNED)
#elif defined(SAMDL_HAVE_USART5) && !defined(USART5_ASSIGNED)
# define TTYS3_DEV g_usart5port /* USART5 is ttyS3 */
# define USART5_ASSIGNED 1
#endif
@ -194,13 +194,13 @@
* USART3-5 could also be the console.
*/
#if defined(SAMD_HAVE_USART3) && !defined(USART3_ASSIGNED)
#if defined(SAMDL_HAVE_USART3) && !defined(USART3_ASSIGNED)
# define TTYS4_DEV g_usart3port /* USART3 is ttyS4 */
# define USART3_ASSIGNED 1
#elif defined(SAMD_HAVE_USART4) && !defined(USART4_ASSIGNED)
#elif defined(SAMDL_HAVE_USART4) && !defined(USART4_ASSIGNED)
# define TTYS4_DEV g_usart4port /* USART4 is ttyS4 */
# define USART4_ASSIGNED 1
#elif defined(SAMD_HAVE_USART5) && !defined(USART5_ASSIGNED)
#elif defined(SAMDL_HAVE_USART5) && !defined(USART5_ASSIGNED)
# define TTYS4_DEV g_usart5port /* USART5 is ttyS4 */
# define USART5_ASSIGNED 1
#endif
@ -210,10 +210,10 @@
* One of USART4-5 could also be the console.
*/
#if defined(SAMD_HAVE_USART4) && !defined(USART4_ASSIGNED)
#if defined(SAMDL_HAVE_USART4) && !defined(USART4_ASSIGNED)
# define TTYS5_DEV g_usart4port /* USART4 is ttyS5 */
# define USART4_ASSIGNED 1
#elif defined(SAMD_HAVE_USART5) && !defined(USART5_ASSIGNED)
#elif defined(SAMDL_HAVE_USART5) && !defined(USART5_ASSIGNED)
# define TTYS5_DEV g_usart5port /* USART5 is ttyS5 */
# define USART5_ASSIGNED 1
#endif
@ -252,22 +252,22 @@ static inline void
static void sam_disableallints(struct sam_dev_s *priv);
static int sam_interrupt(struct uart_dev_s *dev);
#ifdef SAMD_HAVE_USART0
#ifdef SAMDL_HAVE_USART0
static int sam_usart0_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_USART1
#ifdef SAMDL_HAVE_USART1
static int sam_usart1_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_USART2
#ifdef SAMDL_HAVE_USART2
static int sam_usart2_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_USART3
#ifdef SAMDL_HAVE_USART3
static int sam_usart3_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_USART4
#ifdef SAMDL_HAVE_USART4
static int sam_usart4_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_USART5
#ifdef SAMDL_HAVE_USART5
static int sam_usart5_interrupt(int irq, void *context);
#endif
@ -310,34 +310,34 @@ static const struct uart_ops_s g_uart_ops =
/* I/O buffers */
#ifdef SAMD_HAVE_USART0
#ifdef SAMDL_HAVE_USART0
static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE];
static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE];
#endif
#ifdef SAMD_HAVE_USART1
#ifdef SAMDL_HAVE_USART1
static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
#endif
#ifdef SAMD_HAVE_USART2
#ifdef SAMDL_HAVE_USART2
static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
#endif
#ifdef SAMD_HAVE_USART3
#ifdef SAMDL_HAVE_USART3
static char g_usart3rxbuffer[CONFIG_USART3_RXBUFSIZE];
static char g_usart3txbuffer[CONFIG_USART3_TXBUFSIZE];
#endif
#ifdef SAMD_HAVE_USART4
#ifdef SAMDL_HAVE_USART4
static char g_usart4rxbuffer[CONFIG_USART4_RXBUFSIZE];
static char g_usart4txbuffer[CONFIG_USART4_TXBUFSIZE];
#endif
#ifdef SAMD_HAVE_USART5
#ifdef SAMDL_HAVE_USART5
static char g_usart5rxbuffer[CONFIG_USART5_RXBUFSIZE];
static char g_usart5txbuffer[CONFIG_USART5_TXBUFSIZE];
#endif
/* This describes the state of the USART0 port. */
#ifdef SAMD_HAVE_USART0
#ifdef SAMDL_HAVE_USART0
static struct sam_dev_s g_usart0priv =
{
.config = &g_usart0config,
@ -363,7 +363,7 @@ static uart_dev_t g_usart0port =
/* This describes the state of the USART1 port. */
#ifdef SAMD_HAVE_USART1
#ifdef SAMDL_HAVE_USART1
static struct sam_dev_s g_usart1priv =
{
.config = &g_usart1config,
@ -389,7 +389,7 @@ static uart_dev_t g_usart1port =
/* This describes the state of the USART2 port. */
#ifdef SAMD_HAVE_USART2
#ifdef SAMDL_HAVE_USART2
static struct sam_dev_s g_usart2priv =
{
.config = &g_usart2config,
@ -415,7 +415,7 @@ static uart_dev_t g_usart2port =
/* This describes the state of the USART3 port. */
#ifdef SAMD_HAVE_USART3
#ifdef SAMDL_HAVE_USART3
static struct sam_dev_s g_usart3priv =
{
.config = &g_usart3config,
@ -441,7 +441,7 @@ static uart_dev_t g_usart3port =
/* This describes the state of the USART4 port. */
#ifdef SAMD_HAVE_USART4
#ifdef SAMDL_HAVE_USART4
static struct sam_dev_s g_usart4priv =
{
.config = &g_usart4config,
@ -467,7 +467,7 @@ static uart_dev_t g_usart4port =
/* This describes the state of the USART5 port. */
#ifdef SAMD_HAVE_USART5
#ifdef SAMDL_HAVE_USART5
static struct sam_dev_s g_usart5priv =
{
.config = &g_usart5config,
@ -609,42 +609,42 @@ static int sam_interrupt(struct uart_dev_s *dev)
*
****************************************************************************/
#ifdef SAMD_HAVE_USART0
#ifdef SAMDL_HAVE_USART0
static int sam_usart0_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart0port);
}
#endif
#ifdef SAMD_HAVE_USART1
#ifdef SAMDL_HAVE_USART1
static int sam_usart1_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart1port);
}
#endif
#ifdef SAMD_HAVE_USART2
#ifdef SAMDL_HAVE_USART2
static int sam_usart2_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart2port);
}
#endif
#ifdef SAMD_HAVE_USART3
#ifdef SAMDL_HAVE_USART3
static int sam_usart3_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart3port);
}
#endif
#ifdef SAMD_HAVE_USART4
#ifdef SAMDL_HAVE_USART4
static int sam_usart4_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart4port);
}
#endif
#ifdef SAMD_HAVE_USART5
#ifdef SAMDL_HAVE_USART5
static int sam_usart5_interrupt(int irq, void *context)
{
return sam_interrupt(&g_usart5port);
@ -1084,5 +1084,5 @@ int up_putc(int ch)
}
#endif /* USE_SERIALDRIVER */
#endif /* SAMD_HAVE_USART */
#endif /* SAMDL_HAVE_USART */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_serial.h
* arch/arm/src/samdl/sam_serial.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_SERIAL_H
#define __ARCH_ARM_SRC_SAMD_SAM_SERIAL_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_SERIAL_H
#define __ARCH_ARM_SRC_SAMDL_SAM_SERIAL_H
/****************************************************************************
* Included Files
@ -64,4 +64,4 @@
* Public Functions
****************************************************************************/
#endif /* __ARCH_ARM_SRC_SAMD_SAM_SERIAL_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_SERIAL_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_spi.c
* arch/arm/src/samdl/sam_spi.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -73,7 +73,7 @@
#include "sam_sercom.h"
#include "sam_spi.h"
#ifdef SAMD_HAVE_SPI
#ifdef SAMDL_HAVE_SPI
/****************************************************************************
* Pre-processor Definitions
@ -89,7 +89,7 @@
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_VERBOSE
# undef CONFIG_DEBUG_SPI
# undef CONFIG_SAMD_SPI_REGDEBUG
# undef CONFIG_SAMDL_SPI_REGDEBUG
#endif
#ifdef CONFIG_DEBUG_SPI
@ -144,7 +144,7 @@ struct sam_spidev_s
/* Debug stuff */
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
bool wr; /* Last was a write */
uint32_t regaddr; /* Last address */
uint32_t regval; /* Last value */
@ -158,7 +158,7 @@ struct sam_spidev_s
/* Helpers */
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
static bool spi_checkreg(struct sam_spidev_s *priv, bool wr,
uint32_t regval, uint32_t regaddr);
#else
@ -189,22 +189,22 @@ static void spi_dumpregs(struct sam_spidev_s *priv, const char *msg);
#if 0 /* Not used */
static int spi_interrupt(struct sam_spidev_s *dev);
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
static int spi0_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
static int spi1_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
static int spi2_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
static int spi3_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
static int spi4_interrupt(int irq, void *context);
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
static int spi5_interrupt(int irq, void *context);
#endif
#endif
@ -236,7 +236,7 @@ static void spi_pad_configure(struct sam_spidev_s *priv);
* Private Data
****************************************************************************/
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
/* SPI0 driver operations */
static const struct spi_ops_s g_spi0ops =
@ -288,7 +288,7 @@ static struct sam_spidev_s g_spi0dev =
};
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
/* SPI1 driver operations */
static const struct spi_ops_s g_spi1ops =
@ -340,7 +340,7 @@ static struct sam_spidev_s g_spi1dev =
};
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
/* SPI2 driver operations */
static const struct spi_ops_s g_spi2ops =
@ -392,7 +392,7 @@ static struct sam_spidev_s g_spi2dev =
};
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
/* SPI3 driver operations */
static const struct spi_ops_s g_spi3ops =
@ -444,7 +444,7 @@ static struct sam_spidev_s g_spi3dev =
};
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
/* SPI4 driver operations */
static const struct spi_ops_s g_spi4ops =
@ -496,7 +496,7 @@ static struct sam_spidev_s g_spi4dev =
};
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
/* SPI5 driver operations */
static const struct spi_ops_s g_spi5ops =
@ -572,7 +572,7 @@ static struct sam_spidev_s g_spi5dev =
*
****************************************************************************/
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t regval,
uint32_t regaddr)
{
@ -623,7 +623,7 @@ static uint8_t spi_getreg8(struct sam_spidev_s *priv, unsigned int offset)
uintptr_t regaddr = priv->base + offset;
uint8_t regval = getreg8(regaddr);
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
if (spi_checkreg(priv, false, (uint32_t)regval, regaddr))
{
lldbg("%08x->%02x\n", regaddr, regval);
@ -646,7 +646,7 @@ static void spi_putreg8(struct sam_spidev_s *priv, uint8_t regval,
{
uintptr_t regaddr = priv->base + offset;
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
if (spi_checkreg(priv, true, (uint32_t)regval, regaddr))
{
lldbg("%08x<-%02x\n", regaddr, regval);
@ -669,7 +669,7 @@ static uint16_t spi_getreg16(struct sam_spidev_s *priv, unsigned int offset)
uintptr_t regaddr = priv->base + offset;
uint16_t regval = getreg16(regaddr);
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
if (spi_checkreg(priv, false, (uint32_t)regval, regaddr))
{
lldbg("%08x->%04x\n", regaddr, regval);
@ -692,7 +692,7 @@ static void spi_putreg16(struct sam_spidev_s *priv, uint16_t regval,
{
uintptr_t regaddr = priv->base + offset;
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
if (spi_checkreg(priv, true, (uint32_t)regval, regaddr))
{
lldbg("%08x<-%04x\n", regaddr, regval);
@ -715,7 +715,7 @@ static uint32_t spi_getreg32(struct sam_spidev_s *priv, unsigned int offset)
uintptr_t regaddr = priv->base + offset;
uint32_t regval = getreg32(regaddr);
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
if (spi_checkreg(priv, false, regval, regaddr))
{
lldbg("%08x->%08x\n", regaddr, regval);
@ -738,7 +738,7 @@ static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval,
{
uintptr_t regaddr = priv->base + offset;
#ifdef CONFIG_SAMD_SPI_REGDEBUG
#ifdef CONFIG_SAMDL_SPI_REGDEBUG
if (spi_checkreg(priv, true, regval, regaddr))
{
lldbg("%08x<-%08x\n", regaddr, regval);
@ -846,42 +846,42 @@ static int spi_interrupt(struct sam_spidev_s *dev)
****************************************************************************/
#if 0 /* Not used */
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
static int spi0_interrupt(int irq, void *context)
{
return spi_interrupt(&g_spi0dev);
}
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
static int spi1_interrupt(int irq, void *context)
{
return spi_interrupt(&g_spi1dev);
}
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
static int spi2_interrupt(int irq, void *context)
{
return spi_interrupt(&g_spi2dev);
}
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
static int spi3_interrupt(int irq, void *context)
{
return spi_interrupt(&g_spi3dev);
}
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
static int spi4_interrupt(int irq, void *context)
{
return spi_interrupt(&g_spi4dev);
}
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
static int spi5_interrupt(int irq, void *context)
{
return spi_interrupt(&g_spi5dev);
@ -1471,7 +1471,7 @@ struct spi_dev_s *up_spiinitialize(int port)
spivdbg("port: %d \n", port);
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
if (port == 0)
{
priv = &g_spi0dev;
@ -1479,7 +1479,7 @@ struct spi_dev_s *up_spiinitialize(int port)
else
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
if (port == 1)
{
priv = &g_spi1dev;
@ -1487,7 +1487,7 @@ struct spi_dev_s *up_spiinitialize(int port)
else
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
if (port == 2)
{
priv = &g_spi2dev;
@ -1495,7 +1495,7 @@ struct spi_dev_s *up_spiinitialize(int port)
else
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
if (port == 3)
{
priv = &g_spi3dev;
@ -1503,7 +1503,7 @@ struct spi_dev_s *up_spiinitialize(int port)
else
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
if (port == 4)
{
priv = &g_spi4dev;
@ -1511,7 +1511,7 @@ struct spi_dev_s *up_spiinitialize(int port)
else
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
if (port == 5)
{
priv = &g_spi5dev;
@ -1600,4 +1600,4 @@ struct spi_dev_s *up_spiinitialize(int port)
return (struct spi_dev_s *)priv;
}
#endif /* SAMD_HAVE_SPI */
#endif /* SAMDL_HAVE_SPI */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_spi.h
* arch/arm/src/samdl/sam_spi.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_SPI_H
#define __ARCH_ARM_SRC_SAMD_SAM_SPI_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_SPI_H
#define __ARCH_ARM_SRC_SAMDL_SAM_SPI_H
/****************************************************************************
* Included Files
@ -47,7 +47,7 @@
#include "sam_config.h"
#ifdef SAMD_HAVE_SPI
#ifdef SAMDL_HAVE_SPI
/****************************************************************************
* Pre-processor Definitions
@ -92,7 +92,7 @@ extern "C"
* o sam_spi[n]status and sam_spi[n]cmddata: Implementations of the status
* and cmddata methods of the SPI interface defined by struct spi_ops_
* (see include/nuttx/spi/spi.h). All other methods including
* up_spiinitialize()) are provided by common SAMD logic.
* up_spiinitialize()) are provided by common SAMD/L logic.
*
* Where [n] is the SERCOM number for the SPI module.
*
@ -145,32 +145,32 @@ enum spi_dev_e;
*
****************************************************************************/
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
void sam_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
void sam_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
void sam_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
void sam_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
void sam_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
void sam_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
bool selected);
#endif
@ -190,27 +190,27 @@ void sam_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
*
****************************************************************************/
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
uint8_t sam_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
uint8_t sam_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
uint8_t sam_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
@ -239,27 +239,27 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
****************************************************************************/
#ifdef CONFIG_SPI_CMDDATA
#ifdef SAMD_HAVE_SPI0
#ifdef SAMDL_HAVE_SPI0
int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#ifdef SAMD_HAVE_SPI1
#ifdef SAMDL_HAVE_SPI1
int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#ifdef SAMD_HAVE_SPI2
#ifdef SAMDL_HAVE_SPI2
int sam_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#ifdef SAMD_HAVE_SPI3
#ifdef SAMDL_HAVE_SPI3
int sam_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#ifdef SAMD_HAVE_SPI4
#ifdef SAMDL_HAVE_SPI4
int sam_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#ifdef SAMD_HAVE_SPI5
#ifdef SAMDL_HAVE_SPI5
int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif
@ -270,5 +270,5 @@ int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif /* __ASSEMBLY__ */
#endif /* SAMD_HAVE_SPI */
#endif /* __ARCH_ARM_SRC_SAMD_SAM_SPI_H */
#endif /* SAMDL_HAVE_SPI */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_SPI_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_start.c
* arch/arm/src/samdl/sam_start.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_timerisr.c
* arch/arm/src/samdl/sam_timerisr.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_usart.c
* arch/arm/src/samdl/sam_usart.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -58,7 +58,7 @@
* Public Data
****************************************************************************/
#ifdef SAMD_HAVE_USART0
#ifdef SAMDL_HAVE_USART0
const struct sam_usart_config_s g_usart0config =
{
.sercom = 0,
@ -78,7 +78,7 @@ const struct sam_usart_config_s g_usart0config =
};
#endif
#ifdef SAMD_HAVE_USART1
#ifdef SAMDL_HAVE_USART1
const struct sam_usart_config_s g_usart1config =
{
.sercom = 1,
@ -98,7 +98,7 @@ const struct sam_usart_config_s g_usart1config =
};
#endif
#ifdef SAMD_HAVE_USART2
#ifdef SAMDL_HAVE_USART2
const struct sam_usart_config_s g_usart2config =
{
.sercom = 2,
@ -118,7 +118,7 @@ const struct sam_usart_config_s g_usart2config =
};
#endif
#ifdef SAMD_HAVE_USART3
#ifdef SAMDL_HAVE_USART3
const struct sam_usart_config_s g_usart3config =
{
.sercom = 3,
@ -138,7 +138,7 @@ const struct sam_usart_config_s g_usart3config =
};
#endif
#ifdef SAMD_HAVE_USART4
#ifdef SAMDL_HAVE_USART4
const struct sam_usart_config_s g_usart4config =
{
.sercom = 4,
@ -158,7 +158,7 @@ const struct sam_usart_config_s g_usart4config =
};
#endif
#ifdef SAMD_HAVE_USART5
#ifdef SAMDL_HAVE_USART5
const struct sam_usart_config_s g_usart5config =
{
.sercom = 5,
@ -178,50 +178,50 @@ const struct sam_usart_config_s g_usart5config =
};
#endif
const struct sam_usart_config_s *g_usartconfig[SAMD_NSERCOM] =
const struct sam_usart_config_s *g_usartconfig[SAMDL_NSERCOM] =
{
#if SAMD_NSERCOM > 5
#ifdef SAMD_HAVE_USART5
#if SAMDL_NSERCOM > 5
#ifdef SAMDL_HAVE_USART5
&g_usart5config,
#else
(const struct sam_usart_config_s *)0,
#endif
#endif
#if SAMD_NSERCOM > 1
#ifdef SAMD_HAVE_USART1
#if SAMDL_NSERCOM > 1
#ifdef SAMDL_HAVE_USART1
&g_usart1config,
#else
(const struct sam_usart_config_s *)0,
#endif
#endif
#if SAMD_NSERCOM > 2
#ifdef SAMD_HAVE_USART2
#if SAMDL_NSERCOM > 2
#ifdef SAMDL_HAVE_USART2
&g_usart2config,
#else
(const struct sam_usart_config_s *)0,
#endif
#endif
#if SAMD_NSERCOM > 3
#ifdef SAMD_HAVE_USART3
#if SAMDL_NSERCOM > 3
#ifdef SAMDL_HAVE_USART3
&g_usart3config,
#else
(const struct sam_usart_config_s *)0,
#endif
#endif
#if SAMD_NSERCOM > 4
#ifdef SAMD_HAVE_USART4
#if SAMDL_NSERCOM > 4
#ifdef SAMDL_HAVE_USART4
&g_usart4config,
#else
(const struct sam_usart_config_s *)0,
#endif
#endif
#if SAMD_NSERCOM > 5
#ifdef SAMD_HAVE_USART5
#if SAMDL_NSERCOM > 5
#ifdef SAMDL_HAVE_USART5
&g_usart5config,
#else
(const struct sam_usart_config_s *)0,

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/sam_usart.h
* arch/arm/src/samdl/sam_usart.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_USART_H
#define __ARCH_ARM_SRC_SAMD_SAM_USART_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_USART_H
#define __ARCH_ARM_SRC_SAMDL_SAM_USART_H
/************************************************************************************
* Included Files
@ -109,31 +109,31 @@ extern "C"
#define EXTERN extern
#endif
#ifdef SAMD_HAVE_USART0
#ifdef SAMDL_HAVE_USART0
EXTERN const struct sam_usart_config_s g_usart0config;
#endif
#ifdef SAMD_HAVE_USART1
#ifdef SAMDL_HAVE_USART1
EXTERN const struct sam_usart_config_s g_usart1config;
#endif
#ifdef SAMD_HAVE_USART2
#ifdef SAMDL_HAVE_USART2
EXTERN const struct sam_usart_config_s g_usart2config;
#endif
#ifdef SAMD_HAVE_USART3
#ifdef SAMDL_HAVE_USART3
EXTERN const struct sam_usart_config_s g_usart3config;
#endif
#ifdef SAMD_HAVE_USART4
#ifdef SAMDL_HAVE_USART4
EXTERN const struct sam_usart_config_s g_usart4config;
#endif
#ifdef SAMD_HAVE_USART5
#ifdef SAMDL_HAVE_USART5
EXTERN const struct sam_usart_config_s g_usart5config;
#endif
EXTERN const struct sam_usart_config_s *g_usartconfig[SAMD_NSERCOM];
EXTERN const struct sam_usart_config_s *g_usartconfig[SAMDL_NSERCOM];
/************************************************************************************
* Public Functions
@ -144,4 +144,4 @@ EXTERN const struct sam_usart_config_s *g_usartconfig[SAMD_NSERCOM];
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMD_SAM_USART_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_USART_H */

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samd/sam_userspace.c
* arch/arm/src/samdl/sam_userspace.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/samd/sam_userspace.h
* arch/arm/src/samdl/sam_userspace.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMD_SAM_USERSPACE_H
#define __ARCH_ARM_SRC_SAMD_SAM_USERSPACE_H
#ifndef __ARCH_ARM_SRC_SAMDL_SAM_USERSPACE_H
#define __ARCH_ARM_SRC_SAMDL_SAM_USERSPACE_H
/************************************************************************************
* Included Files
@ -73,4 +73,4 @@
void sam_userspace(void);
#endif
#endif /* __ARCH_ARM_SRC_SAMD_SAM_USERSPACE_H */
#endif /* __ARCH_ARM_SRC_SAMDL_SAM_USERSPACE_H */