diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dc32729a87..7e938a3567 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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 diff --git a/arch/arm/include/samd/chip.h b/arch/arm/include/samdl/chip.h similarity index 62% rename from arch/arm/include/samd/chip.h rename to arch/arm/include/samdl/chip.h index 1021cf7cd2..a70bab59f9 100644 --- a/arch/arm/include/samd/chip.h +++ b/arch/arm/include/samdl/chip.h @@ -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 * * 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 *************************************************************/ @@ -310,10 +310,10 @@ * bits[7:6] of each field, bits[5:0] read as zero and ignore writes. */ -#define NVIC_SYSH_PRIORITY_MIN 0xc0 /* All bits[7:3] set is minimum priority */ -#define NVIC_SYSH_PRIORITY_DEFAULT 0x80 /* Midpoint is the default */ -#define NVIC_SYSH_PRIORITY_MAX 0x00 /* Zero is maximum priority */ -#define NVIC_SYSH_PRIORITY_STEP 0x40 /* Five bits of interrupt priority used */ +#define NVIC_SYSH_PRIORITY_MIN 0xc0 /* All bits[7:3] set is minimum priority */ +#define NVIC_SYSH_PRIORITY_DEFAULT 0x80 /* Midpoint is the default */ +#define NVIC_SYSH_PRIORITY_MAX 0x00 /* Zero is maximum priority */ +#define NVIC_SYSH_PRIORITY_STEP 0x40 /* Five bits of interrupt priority used */ /************************************************************************************ * Public Types @@ -327,4 +327,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_INCLUDE_SAMD_CHIP_H */ +#endif /* __ARCH_ARM_INCLUDE_SAMDL_CHIP_H */ diff --git a/arch/arm/include/samd/irq.h b/arch/arm/include/samdl/irq.h similarity index 92% rename from arch/arm/include/samd/irq.h rename to arch/arm/include/samdl/irq.h index a8855fda2d..62cf7161d8 100644 --- a/arch/arm/include/samd/irq.h +++ b/arch/arm/include/samdl/irq.h @@ -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 * * 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 -#include +#include /**************************************************************************************** * Pre-processor Definitions @@ -76,9 +76,9 @@ /* Chip-Specific External interrupts */ #if defined(SAMD20) -# include +# include #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 */ diff --git a/arch/arm/include/samd/samd20_irq.h b/arch/arm/include/samdl/samd20_irq.h similarity index 98% rename from arch/arm/include/samd/samd20_irq.h rename to arch/arm/include/samdl/samd20_irq.h index 0710d6a755..9cf6bd7b43 100644 --- a/arch/arm/include/samd/samd20_irq.h +++ b/arch/arm/include/samdl/samd20_irq.h @@ -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 */ diff --git a/arch/arm/src/samd/Kconfig b/arch/arm/src/samdl/Kconfig similarity index 63% rename from arch/arm/src/samd/Kconfig rename to arch/arm/src/samdl/Kconfig index c7e82921cd..261d667553 100644 --- a/arch/arm/src/samd/Kconfig +++ b/arch/arm/src/samdl/Kconfig @@ -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 diff --git a/arch/arm/src/samd/Make.defs b/arch/arm/src/samdl/Make.defs similarity index 98% rename from arch/arm/src/samd/Make.defs rename to arch/arm/src/samdl/Make.defs index 36fd5afbdd..4c3ba2ff26 100644 --- a/arch/arm/src/samd/Make.defs +++ b/arch/arm/src/samdl/Make.defs @@ -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 @@ -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 diff --git a/arch/arm/src/samd/chip.h b/arch/arm/src/samdl/chip.h similarity index 94% rename from arch/arm/src/samd/chip.h rename to arch/arm/src/samdl/chip.h index 1b7d17a5f3..697cc957bb 100644 --- a/arch/arm/src/samd/chip.h +++ b/arch/arm/src/samdl/chip.h @@ -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 @@ -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 +#include /* 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 */ diff --git a/arch/arm/src/samd/chip/sam_evsys.h b/arch/arm/src/samdl/chip/sam_evsys.h similarity index 98% rename from arch/arm/src/samd/chip/sam_evsys.h rename to arch/arm/src/samdl/chip/sam_evsys.h index 4d05565441..471d155da0 100644 --- a/arch/arm/src/samd/chip/sam_evsys.h +++ b/arch/arm/src/samdl/chip/sam_evsys.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_fuses.h b/arch/arm/src/samdl/chip/sam_fuses.h similarity index 98% rename from arch/arm/src/samd/chip/sam_fuses.h rename to arch/arm/src/samdl/chip/sam_fuses.h index ffd606e20f..b16ca1b122 100644 --- a/arch/arm/src/samd/chip/sam_fuses.h +++ b/arch/arm/src/samdl/chip/sam_fuses.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_gclk.h b/arch/arm/src/samdl/chip/sam_gclk.h similarity index 98% rename from arch/arm/src/samd/chip/sam_gclk.h rename to arch/arm/src/samdl/chip/sam_gclk.h index 946388e356..5b578cc3ba 100644 --- a/arch/arm/src/samd/chip/sam_gclk.h +++ b/arch/arm/src/samdl/chip/sam_gclk.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_i2c_master.h b/arch/arm/src/samdl/chip/sam_i2c_master.h similarity index 98% rename from arch/arm/src/samd/chip/sam_i2c_master.h rename to arch/arm/src/samdl/chip/sam_i2c_master.h index 6cec792da7..d7fe9c2070 100644 --- a/arch/arm/src/samd/chip/sam_i2c_master.h +++ b/arch/arm/src/samdl/chip/sam_i2c_master.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_i2c_slave.h b/arch/arm/src/samdl/chip/sam_i2c_slave.h similarity index 98% rename from arch/arm/src/samd/chip/sam_i2c_slave.h rename to arch/arm/src/samdl/chip/sam_i2c_slave.h index a2f94b3362..d519daee24 100644 --- a/arch/arm/src/samd/chip/sam_i2c_slave.h +++ b/arch/arm/src/samdl/chip/sam_i2c_slave.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_memorymap.h b/arch/arm/src/samdl/chip/sam_memorymap.h similarity index 88% rename from arch/arm/src/samd/chip/sam_memorymap.h rename to arch/arm/src/samdl/chip/sam_memorymap.h index 99b1c13b0d..e7f916e9c6 100644 --- a/arch/arm/src/samd/chip/sam_memorymap.h +++ b/arch/arm/src/samdl/chip/sam_memorymap.h @@ -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 @@ -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 -#include +#include #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 */ diff --git a/arch/arm/src/samd/chip/sam_nvmctrl.h b/arch/arm/src/samdl/chip/sam_nvmctrl.h similarity index 98% rename from arch/arm/src/samd/chip/sam_nvmctrl.h rename to arch/arm/src/samdl/chip/sam_nvmctrl.h index 6bacb8c22d..732dd64b12 100644 --- a/arch/arm/src/samd/chip/sam_nvmctrl.h +++ b/arch/arm/src/samdl/chip/sam_nvmctrl.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_pinmap.h b/arch/arm/src/samdl/chip/sam_pinmap.h similarity index 88% rename from arch/arm/src/samd/chip/sam_pinmap.h rename to arch/arm/src/samdl/chip/sam_pinmap.h index f3a56a0df7..0e7bb9e447 100644 --- a/arch/arm/src/samd/chip/sam_pinmap.h +++ b/arch/arm/src/samdl/chip/sam_pinmap.h @@ -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 @@ -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 -#include +#include #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 */ diff --git a/arch/arm/src/samd/chip/sam_pm.h b/arch/arm/src/samdl/chip/sam_pm.h similarity index 98% rename from arch/arm/src/samd/chip/sam_pm.h rename to arch/arm/src/samdl/chip/sam_pm.h index 226c9121c3..dbe0ad02b5 100644 --- a/arch/arm/src/samd/chip/sam_pm.h +++ b/arch/arm/src/samdl/chip/sam_pm.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_port.h b/arch/arm/src/samdl/chip/sam_port.h similarity index 99% rename from arch/arm/src/samd/chip/sam_port.h rename to arch/arm/src/samdl/chip/sam_port.h index 806948ea67..4d798175d9 100644 --- a/arch/arm/src/samd/chip/sam_port.h +++ b/arch/arm/src/samdl/chip/sam_port.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_sercom.h b/arch/arm/src/samdl/chip/sam_sercom.h similarity index 95% rename from arch/arm/src/samd/chip/sam_sercom.h rename to arch/arm/src/samdl/chip/sam_sercom.h index 7bf34ef9b4..f284567712 100644 --- a/arch/arm/src/samd/chip/sam_sercom.h +++ b/arch/arm/src/samdl/chip/sam_sercom.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_spi.h b/arch/arm/src/samdl/chip/sam_spi.h similarity index 98% rename from arch/arm/src/samd/chip/sam_spi.h rename to arch/arm/src/samdl/chip/sam_spi.h index d38b19bd08..c79ee778dc 100644 --- a/arch/arm/src/samd/chip/sam_spi.h +++ b/arch/arm/src/samdl/chip/sam_spi.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_sysctrl.h b/arch/arm/src/samdl/chip/sam_sysctrl.h similarity index 99% rename from arch/arm/src/samd/chip/sam_sysctrl.h rename to arch/arm/src/samdl/chip/sam_sysctrl.h index a46884edd0..b386888d7e 100644 --- a/arch/arm/src/samd/chip/sam_sysctrl.h +++ b/arch/arm/src/samdl/chip/sam_sysctrl.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_usart.h b/arch/arm/src/samdl/chip/sam_usart.h similarity index 98% rename from arch/arm/src/samd/chip/sam_usart.h rename to arch/arm/src/samdl/chip/sam_usart.h index 4c41e1f6f6..f6b512860e 100644 --- a/arch/arm/src/samd/chip/sam_usart.h +++ b/arch/arm/src/samdl/chip/sam_usart.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/sam_wdt.h b/arch/arm/src/samdl/chip/sam_wdt.h similarity index 98% rename from arch/arm/src/samd/chip/sam_wdt.h rename to arch/arm/src/samdl/chip/sam_wdt.h index e595fd2f47..a85dc53965 100644 --- a/arch/arm/src/samd/chip/sam_wdt.h +++ b/arch/arm/src/samdl/chip/sam_wdt.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/samd20_memorymap.h b/arch/arm/src/samdl/chip/samd20_memorymap.h similarity index 96% rename from arch/arm/src/samd/chip/samd20_memorymap.h rename to arch/arm/src/samdl/chip/samd20_memorymap.h index ba276034c2..9de006f1ca 100644 --- a/arch/arm/src/samd/chip/samd20_memorymap.h +++ b/arch/arm/src/samdl/chip/samd20_memorymap.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/chip/samd20_pinmap.h b/arch/arm/src/samdl/chip/samd20_pinmap.h similarity index 99% rename from arch/arm/src/samd/chip/samd20_pinmap.h rename to arch/arm/src/samdl/chip/samd20_pinmap.h index 155358f3fd..62cc8ff30e 100644 --- a/arch/arm/src/samd/chip/samd20_pinmap.h +++ b/arch/arm/src/samdl/chip/samd20_pinmap.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_clockconfig.c b/arch/arm/src/samdl/sam_clockconfig.c similarity index 99% rename from arch/arm/src/samd/sam_clockconfig.c rename to arch/arm/src/samdl/sam_clockconfig.c index e6c5f5868a..16b79dc51d 100644 --- a/arch/arm/src/samd/sam_clockconfig.c +++ b/arch/arm/src/samdl/sam_clockconfig.c @@ -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 diff --git a/arch/arm/src/samd/sam_clockconfig.h b/arch/arm/src/samdl/sam_clockconfig.h similarity index 94% rename from arch/arm/src/samd/sam_clockconfig.h rename to arch/arm/src/samdl/sam_clockconfig.h index ee39b45ebb..00194320ef 100644 --- a/arch/arm/src/samd/sam_clockconfig.h +++ b/arch/arm/src/samdl/sam_clockconfig.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_config.h b/arch/arm/src/samdl/sam_config.h similarity index 62% rename from arch/arm/src/samd/sam_config.h rename to arch/arm/src/samdl/sam_config.h index fbbb742051..a7fbbe9d6e 100644 --- a/arch/arm/src/samd/sam_config.h +++ b/arch/arm/src/samdl/sam_config.h @@ -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 @@ -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 -#include +#include /************************************************************************************ * 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 */ diff --git a/arch/arm/src/samd/sam_idle.c b/arch/arm/src/samdl/sam_idle.c similarity index 99% rename from arch/arm/src/samd/sam_idle.c rename to arch/arm/src/samdl/sam_idle.c index 22c2c65614..f0baac5f9b 100644 --- a/arch/arm/src/samd/sam_idle.c +++ b/arch/arm/src/samdl/sam_idle.c @@ -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 diff --git a/arch/arm/src/samd/sam_irq.c b/arch/arm/src/samdl/sam_irq.c similarity index 99% rename from arch/arm/src/samd/sam_irq.c rename to arch/arm/src/samdl/sam_irq.c index db088a5a43..224c6b062f 100644 --- a/arch/arm/src/samd/sam_irq.c +++ b/arch/arm/src/samdl/sam_irq.c @@ -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 diff --git a/arch/arm/src/samd/sam_irq.h b/arch/arm/src/samdl/sam_irq.h similarity index 95% rename from arch/arm/src/samd/sam_irq.h rename to arch/arm/src/samdl/sam_irq.h index fa35993f55..ddc5a7ada5 100644 --- a/arch/arm/src/samd/sam_irq.h +++ b/arch/arm/src/samdl/sam_irq.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_irqprio.c b/arch/arm/src/samdl/sam_irqprio.c similarity index 99% rename from arch/arm/src/samd/sam_irqprio.c rename to arch/arm/src/samdl/sam_irqprio.c index 9c23c5cdca..e02325f632 100644 --- a/arch/arm/src/samd/sam_irqprio.c +++ b/arch/arm/src/samdl/sam_irqprio.c @@ -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 diff --git a/arch/arm/src/samd/sam_lowputc.c b/arch/arm/src/samdl/sam_lowputc.c similarity index 98% rename from arch/arm/src/samd/sam_lowputc.c rename to arch/arm/src/samdl/sam_lowputc.c index e2548e70b9..5844b98a58 100644 --- a/arch/arm/src/samd/sam_lowputc.c +++ b/arch/arm/src/samdl/sam_lowputc.c @@ -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 @@ -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; diff --git a/arch/arm/src/samd/sam_lowputc.h b/arch/arm/src/samdl/sam_lowputc.h similarity index 95% rename from arch/arm/src/samd/sam_lowputc.h rename to arch/arm/src/samdl/sam_lowputc.h index e4defc9ccd..a553c89ac9 100644 --- a/arch/arm/src/samd/sam_lowputc.h +++ b/arch/arm/src/samdl/sam_lowputc.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_port.c b/arch/arm/src/samdl/sam_port.c similarity index 99% rename from arch/arm/src/samd/sam_port.c rename to arch/arm/src/samdl/sam_port.c index 32cd08d859..039a8021bb 100644 --- a/arch/arm/src/samd/sam_port.c +++ b/arch/arm/src/samdl/sam_port.c @@ -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 diff --git a/arch/arm/src/samd/sam_port.h b/arch/arm/src/samdl/sam_port.h similarity index 98% rename from arch/arm/src/samd/sam_port.h rename to arch/arm/src/samdl/sam_port.h index f8ff14e953..cdfd43630d 100644 --- a/arch/arm/src/samd/sam_port.h +++ b/arch/arm/src/samdl/sam_port.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_sercom.c b/arch/arm/src/samdl/sam_sercom.c similarity index 99% rename from arch/arm/src/samd/sam_sercom.c rename to arch/arm/src/samdl/sam_sercom.c index 608cca25ae..fe47b03c3f 100644 --- a/arch/arm/src/samd/sam_sercom.c +++ b/arch/arm/src/samdl/sam_sercom.c @@ -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 diff --git a/arch/arm/src/samd/sam_sercom.h b/arch/arm/src/samdl/sam_sercom.h similarity index 96% rename from arch/arm/src/samd/sam_sercom.h rename to arch/arm/src/samdl/sam_sercom.h index 1a179e974e..9511dfb359 100644 --- a/arch/arm/src/samd/sam_sercom.h +++ b/arch/arm/src/samdl/sam_sercom.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_serial.c b/arch/arm/src/samdl/sam_serial.c similarity index 93% rename from arch/arm/src/samd/sam_serial.c rename to arch/arm/src/samdl/sam_serial.c index 5f1b5c5a73..47b5a07e02 100644 --- a/arch/arm/src/samd/sam_serial.c +++ b/arch/arm/src/samdl/sam_serial.c @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_serial.h b/arch/arm/src/samdl/sam_serial.h similarity index 94% rename from arch/arm/src/samd/sam_serial.h rename to arch/arm/src/samdl/sam_serial.h index d692a738ee..7c634565bb 100644 --- a/arch/arm/src/samd/sam_serial.h +++ b/arch/arm/src/samdl/sam_serial.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_spi.c b/arch/arm/src/samdl/sam_spi.c similarity index 97% rename from arch/arm/src/samd/sam_spi.c rename to arch/arm/src/samdl/sam_spi.c index 34763c49c8..3f16b729f3 100644 --- a/arch/arm/src/samd/sam_spi.c +++ b/arch/arm/src/samdl/sam_spi.c @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_spi.h b/arch/arm/src/samdl/sam_spi.h similarity index 93% rename from arch/arm/src/samd/sam_spi.h rename to arch/arm/src/samdl/sam_spi.h index 6db4d38ff3..51b619f878 100644 --- a/arch/arm/src/samd/sam_spi.h +++ b/arch/arm/src/samdl/sam_spi.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_start.c b/arch/arm/src/samdl/sam_start.c similarity index 99% rename from arch/arm/src/samd/sam_start.c rename to arch/arm/src/samdl/sam_start.c index 58062bfc12..0dfe079323 100644 --- a/arch/arm/src/samd/sam_start.c +++ b/arch/arm/src/samdl/sam_start.c @@ -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 diff --git a/arch/arm/src/samd/sam_timerisr.c b/arch/arm/src/samdl/sam_timerisr.c similarity index 99% rename from arch/arm/src/samd/sam_timerisr.c rename to arch/arm/src/samdl/sam_timerisr.c index d169869436..55cdd2183d 100644 --- a/arch/arm/src/samd/sam_timerisr.c +++ b/arch/arm/src/samdl/sam_timerisr.c @@ -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 diff --git a/arch/arm/src/samd/sam_usart.c b/arch/arm/src/samdl/sam_usart.c similarity index 92% rename from arch/arm/src/samd/sam_usart.c rename to arch/arm/src/samdl/sam_usart.c index 2f95ecd22d..8e9fd37e77 100644 --- a/arch/arm/src/samd/sam_usart.c +++ b/arch/arm/src/samdl/sam_usart.c @@ -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 @@ -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, diff --git a/arch/arm/src/samd/sam_usart.h b/arch/arm/src/samdl/sam_usart.h similarity index 92% rename from arch/arm/src/samd/sam_usart.h rename to arch/arm/src/samdl/sam_usart.h index acd2450520..c594f1ed8c 100644 --- a/arch/arm/src/samd/sam_usart.h +++ b/arch/arm/src/samdl/sam_usart.h @@ -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 @@ -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 */ diff --git a/arch/arm/src/samd/sam_userspace.c b/arch/arm/src/samdl/sam_userspace.c similarity index 99% rename from arch/arm/src/samd/sam_userspace.c rename to arch/arm/src/samdl/sam_userspace.c index 60275e56db..8a55c7c9ea 100644 --- a/arch/arm/src/samd/sam_userspace.c +++ b/arch/arm/src/samdl/sam_userspace.c @@ -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 diff --git a/arch/arm/src/samd/sam_userspace.h b/arch/arm/src/samdl/sam_userspace.h similarity index 94% rename from arch/arm/src/samd/sam_userspace.h rename to arch/arm/src/samdl/sam_userspace.h index e460afad36..ef911602b6 100644 --- a/arch/arm/src/samd/sam_userspace.h +++ b/arch/arm/src/samdl/sam_userspace.h @@ -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 @@ -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 */ diff --git a/configs/samd20-xplained/README.txt b/configs/samd20-xplained/README.txt index 31037d1e1b..44281f1c3a 100644 --- a/configs/samd20-xplained/README.txt +++ b/configs/samd20-xplained/README.txt @@ -460,7 +460,7 @@ SAMD20 Xplained Pro-specific Configuration Options CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory - CONFIG_ARCH_CHIP="samd" + CONFIG_ARCH_CHIP="samdl" CONFIG_ARCH_CHIP_name - For use in C code to identify the exact chip: @@ -513,38 +513,38 @@ SAMD20 Xplained Pro-specific Configuration Options Individual subsystems can be enabled: - CONFIG_SAMD_WDT - Watchdog Timer" - CONFIG_SAMD_RTC - Real Time Counter" - CONFIG_SAMD_NVMCTRL - Non-Volatile Memory Controller" - CONFIG_SAMD_EVSYS - Event System" - CONFIG_SAMD_SERCOM0 - Serial Communication Interface 0" - CONFIG_SAMD_SERCOM1 - Serial Communication Interface 1" - CONFIG_SAMD_SERCOM2 - Serial Communication Interface 2" - CONFIG_SAMD_SERCOM3 - Serial Communication Interface 3" - CONFIG_SAMD_SERCOM4 - Serial Communication Interface 4" - CONFIG_SAMD_SERCOM5 - Serial Communication Interface 5" - CONFIG_SAMD_TC0 - Timer/Counter 0" - CONFIG_SAMD_TC1 - Timer/Counter 1" - CONFIG_SAMD_TC2 - Timer/Counter 2" - CONFIG_SAMD_TC3 - Timer/Counter 3" - CONFIG_SAMD_TC4 - Timer/Counter 4" - CONFIG_SAMD_TC5 - Timer/Counter 5" - CONFIG_SAMD_TC6 - Timer/Counter 6" - CONFIG_SAMD_TC7 - Timer/Counter 6" - CONFIG_SAMD_ADC - Analog-to-Digital Converter" - CONFIG_SAMD_AC - Analog Comparator" - CONFIG_SAMD_DAC - Digital-to-Analog Converter" - CONFIG_SAMD_PTC - Peripheral Touch Controller" + CONFIG_SAMDL_WDT - Watchdog Timer" + CONFIG_SAMDL_RTC - Real Time Counter" + CONFIG_SAMDL_NVMCTRL - Non-Volatile Memory Controller" + CONFIG_SAMDL_EVSYS - Event System" + CONFIG_SAMDL_SERCOM0 - Serial Communication Interface 0" + CONFIG_SAMDL_SERCOM1 - Serial Communication Interface 1" + CONFIG_SAMDL_SERCOM2 - Serial Communication Interface 2" + CONFIG_SAMDL_SERCOM3 - Serial Communication Interface 3" + CONFIG_SAMDL_SERCOM4 - Serial Communication Interface 4" + CONFIG_SAMDL_SERCOM5 - Serial Communication Interface 5" + CONFIG_SAMDL_TC0 - Timer/Counter 0" + CONFIG_SAMDL_TC1 - Timer/Counter 1" + CONFIG_SAMDL_TC2 - Timer/Counter 2" + CONFIG_SAMDL_TC3 - Timer/Counter 3" + CONFIG_SAMDL_TC4 - Timer/Counter 4" + CONFIG_SAMDL_TC5 - Timer/Counter 5" + CONFIG_SAMDL_TC6 - Timer/Counter 6" + CONFIG_SAMDL_TC7 - Timer/Counter 6" + CONFIG_SAMDL_ADC - Analog-to-Digital Converter" + CONFIG_SAMDL_AC - Analog Comparator" + CONFIG_SAMDL_DAC - Digital-to-Analog Converter" + CONFIG_SAMDL_PTC - Peripheral Touch Controller" Some subsystems can be configured to operate in different ways. The drivers need to know how to configure the subsystem. - CONFIG_SAMD_SERCOM0_ISI2C, CONFIG_SAMD_SERCOM0_ISSPI, or CONFIG_SAMD_SERCOM0_ISUSART - CONFIG_SAMD_SERCOM1_ISI2C, CONFIG_SAMD_SERCOM1_ISSPI, or CONFIG_SAMD_SERCOM1_ISUSART - CONFIG_SAMD_SERCOM2_ISI2C, CONFIG_SAMD_SERCOM2_ISSPI, or CONFIG_SAMD_SERCOM2_ISUSART - CONFIG_SAMD_SERCOM3_ISI2C, CONFIG_SAMD_SERCOM3_ISSPI, or CONFIG_SAMD_SERCOM3_ISUSART - CONFIG_SAMD_SERCOM4_ISI2C, CONFIG_SAMD_SERCOM4_ISSPI, or CONFIG_SAMD_SERCOM4_ISUSART - CONFIG_SAMD_SERCOM5_ISI2C, CONFIG_SAMD_SERCOM5_ISSPI, or CONFIG_SAMD_SERCOM5_ISUSART + CONFIG_SAMDL_SERCOM0_ISI2C, CONFIG_SAMDL_SERCOM0_ISSPI, or CONFIG_SAMDL_SERCOM0_ISUSART + CONFIG_SAMDL_SERCOM1_ISI2C, CONFIG_SAMDL_SERCOM1_ISSPI, or CONFIG_SAMDL_SERCOM1_ISUSART + CONFIG_SAMDL_SERCOM2_ISI2C, CONFIG_SAMDL_SERCOM2_ISSPI, or CONFIG_SAMDL_SERCOM2_ISUSART + CONFIG_SAMDL_SERCOM3_ISI2C, CONFIG_SAMDL_SERCOM3_ISSPI, or CONFIG_SAMDL_SERCOM3_ISUSART + CONFIG_SAMDL_SERCOM4_ISI2C, CONFIG_SAMDL_SERCOM4_ISSPI, or CONFIG_SAMDL_SERCOM4_ISUSART + CONFIG_SAMDL_SERCOM5_ISI2C, CONFIG_SAMDL_SERCOM5_ISSPI, or CONFIG_SAMDL_SERCOM5_ISUSART SAT91SAMD20 specific device driver settings @@ -608,9 +608,9 @@ Configurations be used, instead, by reconfiguring to use SERCOM3 instead of SERCOM4: - System Type -> SAMD Peripheral Support - CONFIG_SAMD_SERCOM3=y : Enable one or both - CONFIG_SAMD_SERCOM4=n + System Type -> SAMD/L Peripheral Support + CONFIG_SAMDL_SERCOM3=y : Enable one or both + CONFIG_SAMDL_SERCOM4=n Device Drivers -> Serial Driver Support -> Serial Console CONFIG_USART4_SERIAL_CONSOLE=y : Select only one for the console @@ -717,8 +717,8 @@ Configuration sub-directories details. System Type -> Peripherals: - CONFIG_SAMD_SERCOM0=y : Use SERCOM0 if the I/O is in EXT1 - CONFIG_SAMD_SERCOM0_ISSPI=y : Configure SERCOM0 as an SPI master + CONFIG_SAMDL_SERCOM0=y : Use SERCOM0 if the I/O is in EXT1 + CONFIG_SAMDL_SERCOM0_ISSPI=y : Configure SERCOM0 as an SPI master Device Drivers CONFIG_SPI=y : Enable SPI support @@ -778,8 +778,8 @@ Configuration sub-directories EXT3: SPI is provided through SERCOM5 System Type -> Peripherals: - CONFIG_SAMD_SERCOM1=y : Use SERCOM1 if the I/O is in EXT2 - CONFIG_SAMD_SERCOM1_ISSPI=y : Configure SERCOM1 as an SPI master + CONFIG_SAMDL_SERCOM1=y : Use SERCOM1 if the I/O is in EXT2 + CONFIG_SAMDL_SERCOM1_ISSPI=y : Configure SERCOM1 as an SPI master Device Drivers -> SPI CONFIG_SPI=y : Enable SPI support diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig index 987da85c50..e82faacec2 100644 --- a/configs/samd20-xplained/nsh/defconfig +++ b/configs/samd20-xplained/nsh/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM0=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv6-m" -CONFIG_ARCH_CHIP="samd" +CONFIG_ARCH_CHIP="samdl" CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set # CONFIG_ARCH_HAVE_FPU is not set @@ -137,42 +137,42 @@ CONFIG_ARCH_FAMILY_SAMD20=y # CONFIG_ARCH_FAMILY_SAMD20E is not set # CONFIG_ARCH_FAMILY_SAMD20G is not set CONFIG_ARCH_FAMILY_SAMD20J=y -CONFIG_SAMD_HAVE_SERCOM4=y -CONFIG_SAMD_HAVE_SERCOM5=y -CONFIG_SAMD_HAVE_TC6=y -CONFIG_SAMD_HAVE_TC7=y +CONFIG_SAMDL_HAVE_SERCOM4=y +CONFIG_SAMDL_HAVE_SERCOM5=y +CONFIG_SAMDL_HAVE_TC6=y +CONFIG_SAMDL_HAVE_TC7=y # # SAMD Peripheral Support # -# CONFIG_SAMD_WDT is not set -# CONFIG_SAMD_RTC is not set -# CONFIG_SAMD_NVMCTRL is not set -# CONFIG_SAMD_EVSYS is not set -# CONFIG_SAMD_SERCOM0 is not set -# CONFIG_SAMD_SERCOM1 is not set -# CONFIG_SAMD_SERCOM2 is not set -CONFIG_SAMD_SERCOM3=y -CONFIG_SAMD_SERCOM4=y -# CONFIG_SAMD_SERCOM5 is not set -# CONFIG_SAMD_TC0 is not set -# CONFIG_SAMD_TC1 is not set -# CONFIG_SAMD_TC2 is not set -# CONFIG_SAMD_TC3 is not set -# CONFIG_SAMD_TC4 is not set -# CONFIG_SAMD_TC5 is not set -# CONFIG_SAMD_TC6 is not set -# CONFIG_SAMD_TC7 is not set -# CONFIG_SAMD_ADC is not set -# CONFIG_SAMD_AC is not set -# CONFIG_SAMD_DAC is not set -# CONFIG_SAMD_PTC is not set -# CONFIG_SAMD_SERCOM3_ISI2C is not set -# CONFIG_SAMD_SERCOM3_ISSPI is not set -CONFIG_SAMD_SERCOM3_ISUSART=y -# CONFIG_SAMD_SERCOM4_ISI2C is not set -# CONFIG_SAMD_SERCOM4_ISSPI is not set -CONFIG_SAMD_SERCOM4_ISUSART=y +# CONFIG_SAMDL_WDT is not set +# CONFIG_SAMDL_RTC is not set +# CONFIG_SAMDL_NVMCTRL is not set +# CONFIG_SAMDL_EVSYS is not set +# CONFIG_SAMDL_SERCOM0 is not set +# CONFIG_SAMDL_SERCOM1 is not set +# CONFIG_SAMDL_SERCOM2 is not set +CONFIG_SAMDL_SERCOM3=y +CONFIG_SAMDL_SERCOM4=y +# CONFIG_SAMDL_SERCOM5 is not set +# CONFIG_SAMDL_TC0 is not set +# CONFIG_SAMDL_TC1 is not set +# CONFIG_SAMDL_TC2 is not set +# CONFIG_SAMDL_TC3 is not set +# CONFIG_SAMDL_TC4 is not set +# CONFIG_SAMDL_TC5 is not set +# CONFIG_SAMDL_TC6 is not set +# CONFIG_SAMDL_TC7 is not set +# CONFIG_SAMDL_ADC is not set +# CONFIG_SAMDL_AC is not set +# CONFIG_SAMDL_DAC is not set +# CONFIG_SAMDL_PTC is not set +# CONFIG_SAMDL_SERCOM3_ISI2C is not set +# CONFIG_SAMDL_SERCOM3_ISSPI is not set +CONFIG_SAMDL_SERCOM3_ISUSART=y +# CONFIG_SAMDL_SERCOM4_ISI2C is not set +# CONFIG_SAMDL_SERCOM4_ISSPI is not set +CONFIG_SAMDL_SERCOM4_ISUSART=y # # Architecture Options diff --git a/configs/samd20-xplained/scripts/flash.ld b/configs/samd20-xplained/scripts/flash.ld index 197cbf9c7a..849f6ff572 100755 --- a/configs/samd20-xplained/scripts/flash.ld +++ b/configs/samd20-xplained/scripts/flash.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/samd30-xplained/scripts/flash.ld + * configs/samd20-xplained/scripts/flash.ld * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/samd20-xplained/src/Makefile b/configs/samd20-xplained/src/Makefile index 75fa61457c..66aef7fafc 100644 --- a/configs/samd20-xplained/src/Makefile +++ b/configs/samd20-xplained/src/Makefile @@ -46,7 +46,7 @@ ifeq ($(CONFIG_HAVE_CXX),y) CSRCS += sam_cxxinitialize.c endif -ifeq ($(CONFIG_SAMD_SERCOM0),y) +ifeq ($(CONFIG_SAMDL_SERCOM0),y) CSRCS += sam_spi.c endif diff --git a/configs/samd20-xplained/src/sam_boot.c b/configs/samd20-xplained/src/sam_boot.c index 0290cee10a..78a58f164b 100644 --- a/configs/samd20-xplained/src/sam_boot.c +++ b/configs/samd20-xplained/src/sam_boot.c @@ -74,7 +74,7 @@ void sam_boardinitialize(void) * sam_spiinitialize() has been brought into the link. */ -#ifdef SAMD_HAVE_SPI +#ifdef SAMDL_HAVE_SPI if (sam_spiinitialize) { sam_spiinitialize(); diff --git a/configs/samd20-xplained/src/sam_cxxinitialize.c b/configs/samd20-xplained/src/sam_cxxinitialize.c index d0a195e824..1086ca140f 100644 --- a/configs/samd20-xplained/src/sam_cxxinitialize.c +++ b/configs/samd20-xplained/src/sam_cxxinitialize.c @@ -43,9 +43,6 @@ #include -#include -#include "chip.h" - #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) /************************************************************************************ diff --git a/configs/samd20-xplained/src/sam_mmcsd.c b/configs/samd20-xplained/src/sam_mmcsd.c index 666b173e7c..f9b61b3ae8 100644 --- a/configs/samd20-xplained/src/sam_mmcsd.c +++ b/configs/samd20-xplained/src/sam_mmcsd.c @@ -60,7 +60,7 @@ # error Mountpoints are disabled (CONFIG_DISABLE_MOUNTPOINT=y) #endif -#ifndef SAMD_HAVE_SPI0 +#ifndef SAMDL_HAVE_SPI0 # error SERCOM0 SPI support is required #endif @@ -68,7 +68,7 @@ # error MMC/SD support is required (CONFIG_MMCSD) #endif -#define SAMD_MMCSDSLOTNO 0 /* There is only one slot */ +#define SAMDL_MMCSDSLOTNO 0 /* There is only one slot */ /**************************************************************************** * Public Functions @@ -82,7 +82,7 @@ * - CONFIG_SAMD20_XPLAINED_IOMODULE=y, * - CONFIG_DISABLE_MOUNTPOINT=n, * - CONFIG_MMCSD=y, and - * - SAMD_HAVE_SPI0=y (CONFIG_SAMD_SERCOM0 && CONFIG_SAMD_SERCOM0_ISSPI) + * - SAMDL_HAVE_SPI0=y (CONFIG_SAMDL_SERCOM0 && CONFIG_SAMDL_SERCOM0_ISSPI) * *****************************************************************************/ @@ -106,18 +106,18 @@ int sam_sdinitialize(int port, int minor) /* Bind the SPI device for the chip select to the slot */ - fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMD_MMCSDSLOTNO); + fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO); - ret = mmcsd_spislotinitialize(minor, SAMD_MMCSDSLOTNO, spi); + ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi); if (ret < 0) { fdbg("Failed to bind SPI%d to MMC/SD slot %d: %d\n", - port, SAMD_MMCSDSLOTNO, ret); + port, SAMDL_MMCSDSLOTNO, ret); return ret; } fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n", - port, SAMD_MMCSDSLOTNO); + port, SAMDL_MMCSDSLOTNO); return OK; } diff --git a/configs/samd20-xplained/src/sam_nsh.c b/configs/samd20-xplained/src/sam_nsh.c index 377d9da40f..0f5480c79d 100644 --- a/configs/samd20-xplained/src/sam_nsh.c +++ b/configs/samd20-xplained/src/sam_nsh.c @@ -53,7 +53,7 @@ /* Some configuration checks */ #ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1 -# ifndef SAMD_HAVE_SPI0 +# ifndef SAMDL_HAVE_SPI0 # error I/O1 module on EXT1 requires SERCOM SPI0 # undef CONFIG_SAMD20_XPLAINED_IOMODULE # endif @@ -61,7 +61,7 @@ #endif #ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2 -# ifndef SAMD_HAVE_SPI1 +# ifndef SAMDL_HAVE_SPI1 # error I/O1 module on EXT2 requires SERCOM SPI1 # undef CONFIG_SAMD20_XPLAINED_IOMODULE # endif @@ -72,12 +72,12 @@ /* Support for the SD card slot on the I/O1 module */ /* Verify NSH PORT and SLOT settings */ -# define SAMD_MMCSDSLOTNO 0 /* There is only one slot */ +# define SAMDL_MMCSDSLOTNO 0 /* There is only one slot */ -# if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != SAMD_MMCSDSLOTNO +# if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != SAMDL_MMCSDSLOTNO # error Only one MMC/SD slot: Slot 0 (CONFIG_NSH_MMCSDSLOTNO) # undef CONFIG_NSH_MMCSDSLOTNO -# define CONFIG_NSH_MMCSDSLOTNO SAMD_MMCSDSLOTNO +# define CONFIG_NSH_MMCSDSLOTNO SAMDL_MMCSDSLOTNO # endif # if defined(CONFIG_NSH_MMCSDSPIPORTNO) && CONFIG_NSH_MMCSDSPIPORTNO != SPI_PORTNO @@ -107,7 +107,7 @@ int board_app_initialize(void) { -#if defined(SAMD_HAVE_SPI0) && defined(CONFIG_SAMD20_XPLAINED_IOMODULE) +#if defined(SAMDL_HAVE_SPI0) && defined(CONFIG_SAMD20_XPLAINED_IOMODULE) /* Initialize the SPI-based MMC/SD slot */ { diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c index e13f19395f..04e3e731ea 100644 --- a/configs/samd20-xplained/src/sam_spi.c +++ b/configs/samd20-xplained/src/sam_spi.c @@ -51,7 +51,7 @@ #include "samd20-xplained.h" -#ifdef SAMD_HAVE_SPI +#ifdef SAMDL_HAVE_SPI /**************************************************************************** * Pre-processor Definitions @@ -129,7 +129,7 @@ void weak_function sam_spiinitialize(void) * 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. * @@ -179,7 +179,7 @@ void weak_function sam_spiinitialize(void) * ****************************************************************************/ -#ifdef SAMD_HAVE_SPI0 +#ifdef SAMDL_HAVE_SPI0 void sam_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { @@ -207,7 +207,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, } #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) { @@ -235,28 +235,28 @@ void sam_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, } #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) { @@ -278,7 +278,7 @@ 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) { uint8_t ret = 0; @@ -301,7 +301,7 @@ 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) { uint8_t ret = 0; @@ -324,28 +324,28 @@ 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) { return 0; } #endif -#ifdef SAMD_HAVE_SPI3 +#ifdef SAMDL_HAVE_SPI3 uint8_t sam_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return 0; } #endif -#ifdef SAMD_HAVE_SPI4 +#ifdef SAMDL_HAVE_SPI4 uint8_t sam_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return 0; } #endif -#ifdef SAMD_HAVE_SPI5 +#ifdef SAMDL_HAVE_SPI5 uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { uint8_t ret = 0; @@ -378,7 +378,7 @@ 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) { #ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1 @@ -399,7 +399,7 @@ 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) { #ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2 @@ -420,28 +420,28 @@ 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) { return OK; } #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) { return OK; } #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) { return OK; } #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) { return OK; @@ -449,4 +449,4 @@ int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) #endif #endif /* CONFIG_SPI_CMDDATA */ -#endif /* SAMD_HAVE_SPI */ +#endif /* SAMDL_HAVE_SPI */ diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c index f3af916cde..d3ec794d1a 100644 --- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c +++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c @@ -134,8 +134,8 @@ # error "The OLED driver requires CONFIG_LCD_UG2832HSWEG04 in the configuration" #endif -#ifndef SAMD_HAVE_SPI0 -# error "The OLED driver requires SAMD_HAVE_SPI0 in the configuration" +#ifndef SAMDL_HAVE_SPI0 +# error "The OLED driver requires SAMDL_HAVE_SPI0 in the configuration" #endif #ifndef CONFIG_SPI_CMDDATA diff --git a/configs/teensy-lc/src/kl_cxxinitialize.c b/configs/teensy-lc/src/kl_cxxinitialize.c index e4c31e1b91..66e498c813 100644 --- a/configs/teensy-lc/src/kl_cxxinitialize.c +++ b/configs/teensy-lc/src/kl_cxxinitialize.c @@ -43,9 +43,6 @@ #include -#include -#include "chip.h" - #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) /************************************************************************************