From 88c32664a8c0e345f1a26b670dd05fde34fce921 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 13:11:51 +0200 Subject: [PATCH 1/8] cpu: s/sam3x8e/sam3/ --- cpu/{sam3x8e => sam3}/Makefile | 0 cpu/{sam3x8e => sam3}/Makefile.include | 0 cpu/{sam3x8e => sam3}/cpu.c | 0 cpu/{sam3x8e => sam3}/doc.txt | 0 cpu/{sam3x8e => sam3}/hwtimer_arch.c | 0 cpu/{sam3x8e => sam3}/include/component/component_adc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_can.h | 0 cpu/{sam3x8e => sam3}/include/component/component_chipid.h | 0 cpu/{sam3x8e => sam3}/include/component/component_dacc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_dmac.h | 0 cpu/{sam3x8e => sam3}/include/component/component_efc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_emac.h | 0 cpu/{sam3x8e => sam3}/include/component/component_gpbr.h | 0 cpu/{sam3x8e => sam3}/include/component/component_hsmci.h | 0 cpu/{sam3x8e => sam3}/include/component/component_matrix.h | 0 cpu/{sam3x8e => sam3}/include/component/component_pdc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_pio.h | 0 cpu/{sam3x8e => sam3}/include/component/component_pmc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_pwm.h | 0 cpu/{sam3x8e => sam3}/include/component/component_rstc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_rtc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_rtt.h | 0 cpu/{sam3x8e => sam3}/include/component/component_sdramc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_smc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_spi.h | 0 cpu/{sam3x8e => sam3}/include/component/component_ssc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_supc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_tc.h | 0 cpu/{sam3x8e => sam3}/include/component/component_trng.h | 0 cpu/{sam3x8e => sam3}/include/component/component_twi.h | 0 cpu/{sam3x8e => sam3}/include/component/component_uart.h | 0 cpu/{sam3x8e => sam3}/include/component/component_uotghs.h | 0 cpu/{sam3x8e => sam3}/include/component/component_usart.h | 0 cpu/{sam3x8e => sam3}/include/component/component_wdt.h | 0 cpu/{sam3x8e => sam3}/include/component/doc.txt | 0 cpu/{sam3x8e => sam3}/include/cpu_conf.h | 0 cpu/{sam3x8e => sam3}/include/hwtimer_cpu.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_adc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_can0.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_can1.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_chipid.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_dacc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_dmac.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_efc0.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_efc1.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_emac.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_gpbr.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_hsmci.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_matrix.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_pioa.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_piob.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_pioc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_piod.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_pioe.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_piof.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_pmc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_pwm.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_rstc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_rtc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_rtt.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_sdramc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_smc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_spi0.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_spi1.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_ssc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_supc.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_tc0.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_tc1.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_tc2.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_trng.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_twi0.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_twi1.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_uart.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_uotghs.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_usart0.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_usart1.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_usart2.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_usart3.h | 0 cpu/{sam3x8e => sam3}/include/instance/instance_wdt.h | 0 cpu/{sam3x8e => sam3}/include/periph_cpu.h | 0 cpu/{sam3x8e => sam3}/include/pio/pio_sam3x8e.h | 0 cpu/{sam3x8e => sam3}/include/sam3x8e.h | 0 cpu/{sam3x8e => sam3}/include/system_sam3xa.h | 0 cpu/{sam3x8e => sam3}/ldscripts/sam3x8e.ld | 0 cpu/{sam3x8e => sam3}/lpm_arch.c | 0 cpu/{sam3x8e => sam3}/periph/Makefile | 0 cpu/{sam3x8e => sam3}/periph/gpio.c | 0 cpu/{sam3x8e => sam3}/periph/random.c | 0 cpu/{sam3x8e => sam3}/periph/spi.c | 0 cpu/{sam3x8e => sam3}/periph/timer.c | 0 cpu/{sam3x8e => sam3}/periph/uart.c | 0 cpu/{sam3x8e => sam3}/startup.c | 0 92 files changed, 0 insertions(+), 0 deletions(-) rename cpu/{sam3x8e => sam3}/Makefile (100%) rename cpu/{sam3x8e => sam3}/Makefile.include (100%) rename cpu/{sam3x8e => sam3}/cpu.c (100%) rename cpu/{sam3x8e => sam3}/doc.txt (100%) rename cpu/{sam3x8e => sam3}/hwtimer_arch.c (100%) rename cpu/{sam3x8e => sam3}/include/component/component_adc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_can.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_chipid.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_dacc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_dmac.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_efc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_emac.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_gpbr.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_hsmci.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_matrix.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_pdc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_pio.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_pmc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_pwm.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_rstc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_rtc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_rtt.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_sdramc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_smc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_spi.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_ssc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_supc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_tc.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_trng.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_twi.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_uart.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_uotghs.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_usart.h (100%) rename cpu/{sam3x8e => sam3}/include/component/component_wdt.h (100%) rename cpu/{sam3x8e => sam3}/include/component/doc.txt (100%) rename cpu/{sam3x8e => sam3}/include/cpu_conf.h (100%) rename cpu/{sam3x8e => sam3}/include/hwtimer_cpu.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_adc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_can0.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_can1.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_chipid.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_dacc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_dmac.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_efc0.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_efc1.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_emac.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_gpbr.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_hsmci.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_matrix.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_pioa.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_piob.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_pioc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_piod.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_pioe.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_piof.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_pmc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_pwm.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_rstc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_rtc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_rtt.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_sdramc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_smc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_spi0.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_spi1.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_ssc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_supc.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_tc0.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_tc1.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_tc2.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_trng.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_twi0.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_twi1.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_uart.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_uotghs.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_usart0.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_usart1.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_usart2.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_usart3.h (100%) rename cpu/{sam3x8e => sam3}/include/instance/instance_wdt.h (100%) rename cpu/{sam3x8e => sam3}/include/periph_cpu.h (100%) rename cpu/{sam3x8e => sam3}/include/pio/pio_sam3x8e.h (100%) rename cpu/{sam3x8e => sam3}/include/sam3x8e.h (100%) rename cpu/{sam3x8e => sam3}/include/system_sam3xa.h (100%) rename cpu/{sam3x8e => sam3}/ldscripts/sam3x8e.ld (100%) rename cpu/{sam3x8e => sam3}/lpm_arch.c (100%) rename cpu/{sam3x8e => sam3}/periph/Makefile (100%) rename cpu/{sam3x8e => sam3}/periph/gpio.c (100%) rename cpu/{sam3x8e => sam3}/periph/random.c (100%) rename cpu/{sam3x8e => sam3}/periph/spi.c (100%) rename cpu/{sam3x8e => sam3}/periph/timer.c (100%) rename cpu/{sam3x8e => sam3}/periph/uart.c (100%) rename cpu/{sam3x8e => sam3}/startup.c (100%) diff --git a/cpu/sam3x8e/Makefile b/cpu/sam3/Makefile similarity index 100% rename from cpu/sam3x8e/Makefile rename to cpu/sam3/Makefile diff --git a/cpu/sam3x8e/Makefile.include b/cpu/sam3/Makefile.include similarity index 100% rename from cpu/sam3x8e/Makefile.include rename to cpu/sam3/Makefile.include diff --git a/cpu/sam3x8e/cpu.c b/cpu/sam3/cpu.c similarity index 100% rename from cpu/sam3x8e/cpu.c rename to cpu/sam3/cpu.c diff --git a/cpu/sam3x8e/doc.txt b/cpu/sam3/doc.txt similarity index 100% rename from cpu/sam3x8e/doc.txt rename to cpu/sam3/doc.txt diff --git a/cpu/sam3x8e/hwtimer_arch.c b/cpu/sam3/hwtimer_arch.c similarity index 100% rename from cpu/sam3x8e/hwtimer_arch.c rename to cpu/sam3/hwtimer_arch.c diff --git a/cpu/sam3x8e/include/component/component_adc.h b/cpu/sam3/include/component/component_adc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_adc.h rename to cpu/sam3/include/component/component_adc.h diff --git a/cpu/sam3x8e/include/component/component_can.h b/cpu/sam3/include/component/component_can.h similarity index 100% rename from cpu/sam3x8e/include/component/component_can.h rename to cpu/sam3/include/component/component_can.h diff --git a/cpu/sam3x8e/include/component/component_chipid.h b/cpu/sam3/include/component/component_chipid.h similarity index 100% rename from cpu/sam3x8e/include/component/component_chipid.h rename to cpu/sam3/include/component/component_chipid.h diff --git a/cpu/sam3x8e/include/component/component_dacc.h b/cpu/sam3/include/component/component_dacc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_dacc.h rename to cpu/sam3/include/component/component_dacc.h diff --git a/cpu/sam3x8e/include/component/component_dmac.h b/cpu/sam3/include/component/component_dmac.h similarity index 100% rename from cpu/sam3x8e/include/component/component_dmac.h rename to cpu/sam3/include/component/component_dmac.h diff --git a/cpu/sam3x8e/include/component/component_efc.h b/cpu/sam3/include/component/component_efc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_efc.h rename to cpu/sam3/include/component/component_efc.h diff --git a/cpu/sam3x8e/include/component/component_emac.h b/cpu/sam3/include/component/component_emac.h similarity index 100% rename from cpu/sam3x8e/include/component/component_emac.h rename to cpu/sam3/include/component/component_emac.h diff --git a/cpu/sam3x8e/include/component/component_gpbr.h b/cpu/sam3/include/component/component_gpbr.h similarity index 100% rename from cpu/sam3x8e/include/component/component_gpbr.h rename to cpu/sam3/include/component/component_gpbr.h diff --git a/cpu/sam3x8e/include/component/component_hsmci.h b/cpu/sam3/include/component/component_hsmci.h similarity index 100% rename from cpu/sam3x8e/include/component/component_hsmci.h rename to cpu/sam3/include/component/component_hsmci.h diff --git a/cpu/sam3x8e/include/component/component_matrix.h b/cpu/sam3/include/component/component_matrix.h similarity index 100% rename from cpu/sam3x8e/include/component/component_matrix.h rename to cpu/sam3/include/component/component_matrix.h diff --git a/cpu/sam3x8e/include/component/component_pdc.h b/cpu/sam3/include/component/component_pdc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_pdc.h rename to cpu/sam3/include/component/component_pdc.h diff --git a/cpu/sam3x8e/include/component/component_pio.h b/cpu/sam3/include/component/component_pio.h similarity index 100% rename from cpu/sam3x8e/include/component/component_pio.h rename to cpu/sam3/include/component/component_pio.h diff --git a/cpu/sam3x8e/include/component/component_pmc.h b/cpu/sam3/include/component/component_pmc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_pmc.h rename to cpu/sam3/include/component/component_pmc.h diff --git a/cpu/sam3x8e/include/component/component_pwm.h b/cpu/sam3/include/component/component_pwm.h similarity index 100% rename from cpu/sam3x8e/include/component/component_pwm.h rename to cpu/sam3/include/component/component_pwm.h diff --git a/cpu/sam3x8e/include/component/component_rstc.h b/cpu/sam3/include/component/component_rstc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_rstc.h rename to cpu/sam3/include/component/component_rstc.h diff --git a/cpu/sam3x8e/include/component/component_rtc.h b/cpu/sam3/include/component/component_rtc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_rtc.h rename to cpu/sam3/include/component/component_rtc.h diff --git a/cpu/sam3x8e/include/component/component_rtt.h b/cpu/sam3/include/component/component_rtt.h similarity index 100% rename from cpu/sam3x8e/include/component/component_rtt.h rename to cpu/sam3/include/component/component_rtt.h diff --git a/cpu/sam3x8e/include/component/component_sdramc.h b/cpu/sam3/include/component/component_sdramc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_sdramc.h rename to cpu/sam3/include/component/component_sdramc.h diff --git a/cpu/sam3x8e/include/component/component_smc.h b/cpu/sam3/include/component/component_smc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_smc.h rename to cpu/sam3/include/component/component_smc.h diff --git a/cpu/sam3x8e/include/component/component_spi.h b/cpu/sam3/include/component/component_spi.h similarity index 100% rename from cpu/sam3x8e/include/component/component_spi.h rename to cpu/sam3/include/component/component_spi.h diff --git a/cpu/sam3x8e/include/component/component_ssc.h b/cpu/sam3/include/component/component_ssc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_ssc.h rename to cpu/sam3/include/component/component_ssc.h diff --git a/cpu/sam3x8e/include/component/component_supc.h b/cpu/sam3/include/component/component_supc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_supc.h rename to cpu/sam3/include/component/component_supc.h diff --git a/cpu/sam3x8e/include/component/component_tc.h b/cpu/sam3/include/component/component_tc.h similarity index 100% rename from cpu/sam3x8e/include/component/component_tc.h rename to cpu/sam3/include/component/component_tc.h diff --git a/cpu/sam3x8e/include/component/component_trng.h b/cpu/sam3/include/component/component_trng.h similarity index 100% rename from cpu/sam3x8e/include/component/component_trng.h rename to cpu/sam3/include/component/component_trng.h diff --git a/cpu/sam3x8e/include/component/component_twi.h b/cpu/sam3/include/component/component_twi.h similarity index 100% rename from cpu/sam3x8e/include/component/component_twi.h rename to cpu/sam3/include/component/component_twi.h diff --git a/cpu/sam3x8e/include/component/component_uart.h b/cpu/sam3/include/component/component_uart.h similarity index 100% rename from cpu/sam3x8e/include/component/component_uart.h rename to cpu/sam3/include/component/component_uart.h diff --git a/cpu/sam3x8e/include/component/component_uotghs.h b/cpu/sam3/include/component/component_uotghs.h similarity index 100% rename from cpu/sam3x8e/include/component/component_uotghs.h rename to cpu/sam3/include/component/component_uotghs.h diff --git a/cpu/sam3x8e/include/component/component_usart.h b/cpu/sam3/include/component/component_usart.h similarity index 100% rename from cpu/sam3x8e/include/component/component_usart.h rename to cpu/sam3/include/component/component_usart.h diff --git a/cpu/sam3x8e/include/component/component_wdt.h b/cpu/sam3/include/component/component_wdt.h similarity index 100% rename from cpu/sam3x8e/include/component/component_wdt.h rename to cpu/sam3/include/component/component_wdt.h diff --git a/cpu/sam3x8e/include/component/doc.txt b/cpu/sam3/include/component/doc.txt similarity index 100% rename from cpu/sam3x8e/include/component/doc.txt rename to cpu/sam3/include/component/doc.txt diff --git a/cpu/sam3x8e/include/cpu_conf.h b/cpu/sam3/include/cpu_conf.h similarity index 100% rename from cpu/sam3x8e/include/cpu_conf.h rename to cpu/sam3/include/cpu_conf.h diff --git a/cpu/sam3x8e/include/hwtimer_cpu.h b/cpu/sam3/include/hwtimer_cpu.h similarity index 100% rename from cpu/sam3x8e/include/hwtimer_cpu.h rename to cpu/sam3/include/hwtimer_cpu.h diff --git a/cpu/sam3x8e/include/instance/instance_adc.h b/cpu/sam3/include/instance/instance_adc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_adc.h rename to cpu/sam3/include/instance/instance_adc.h diff --git a/cpu/sam3x8e/include/instance/instance_can0.h b/cpu/sam3/include/instance/instance_can0.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_can0.h rename to cpu/sam3/include/instance/instance_can0.h diff --git a/cpu/sam3x8e/include/instance/instance_can1.h b/cpu/sam3/include/instance/instance_can1.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_can1.h rename to cpu/sam3/include/instance/instance_can1.h diff --git a/cpu/sam3x8e/include/instance/instance_chipid.h b/cpu/sam3/include/instance/instance_chipid.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_chipid.h rename to cpu/sam3/include/instance/instance_chipid.h diff --git a/cpu/sam3x8e/include/instance/instance_dacc.h b/cpu/sam3/include/instance/instance_dacc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_dacc.h rename to cpu/sam3/include/instance/instance_dacc.h diff --git a/cpu/sam3x8e/include/instance/instance_dmac.h b/cpu/sam3/include/instance/instance_dmac.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_dmac.h rename to cpu/sam3/include/instance/instance_dmac.h diff --git a/cpu/sam3x8e/include/instance/instance_efc0.h b/cpu/sam3/include/instance/instance_efc0.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_efc0.h rename to cpu/sam3/include/instance/instance_efc0.h diff --git a/cpu/sam3x8e/include/instance/instance_efc1.h b/cpu/sam3/include/instance/instance_efc1.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_efc1.h rename to cpu/sam3/include/instance/instance_efc1.h diff --git a/cpu/sam3x8e/include/instance/instance_emac.h b/cpu/sam3/include/instance/instance_emac.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_emac.h rename to cpu/sam3/include/instance/instance_emac.h diff --git a/cpu/sam3x8e/include/instance/instance_gpbr.h b/cpu/sam3/include/instance/instance_gpbr.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_gpbr.h rename to cpu/sam3/include/instance/instance_gpbr.h diff --git a/cpu/sam3x8e/include/instance/instance_hsmci.h b/cpu/sam3/include/instance/instance_hsmci.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_hsmci.h rename to cpu/sam3/include/instance/instance_hsmci.h diff --git a/cpu/sam3x8e/include/instance/instance_matrix.h b/cpu/sam3/include/instance/instance_matrix.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_matrix.h rename to cpu/sam3/include/instance/instance_matrix.h diff --git a/cpu/sam3x8e/include/instance/instance_pioa.h b/cpu/sam3/include/instance/instance_pioa.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_pioa.h rename to cpu/sam3/include/instance/instance_pioa.h diff --git a/cpu/sam3x8e/include/instance/instance_piob.h b/cpu/sam3/include/instance/instance_piob.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_piob.h rename to cpu/sam3/include/instance/instance_piob.h diff --git a/cpu/sam3x8e/include/instance/instance_pioc.h b/cpu/sam3/include/instance/instance_pioc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_pioc.h rename to cpu/sam3/include/instance/instance_pioc.h diff --git a/cpu/sam3x8e/include/instance/instance_piod.h b/cpu/sam3/include/instance/instance_piod.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_piod.h rename to cpu/sam3/include/instance/instance_piod.h diff --git a/cpu/sam3x8e/include/instance/instance_pioe.h b/cpu/sam3/include/instance/instance_pioe.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_pioe.h rename to cpu/sam3/include/instance/instance_pioe.h diff --git a/cpu/sam3x8e/include/instance/instance_piof.h b/cpu/sam3/include/instance/instance_piof.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_piof.h rename to cpu/sam3/include/instance/instance_piof.h diff --git a/cpu/sam3x8e/include/instance/instance_pmc.h b/cpu/sam3/include/instance/instance_pmc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_pmc.h rename to cpu/sam3/include/instance/instance_pmc.h diff --git a/cpu/sam3x8e/include/instance/instance_pwm.h b/cpu/sam3/include/instance/instance_pwm.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_pwm.h rename to cpu/sam3/include/instance/instance_pwm.h diff --git a/cpu/sam3x8e/include/instance/instance_rstc.h b/cpu/sam3/include/instance/instance_rstc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_rstc.h rename to cpu/sam3/include/instance/instance_rstc.h diff --git a/cpu/sam3x8e/include/instance/instance_rtc.h b/cpu/sam3/include/instance/instance_rtc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_rtc.h rename to cpu/sam3/include/instance/instance_rtc.h diff --git a/cpu/sam3x8e/include/instance/instance_rtt.h b/cpu/sam3/include/instance/instance_rtt.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_rtt.h rename to cpu/sam3/include/instance/instance_rtt.h diff --git a/cpu/sam3x8e/include/instance/instance_sdramc.h b/cpu/sam3/include/instance/instance_sdramc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_sdramc.h rename to cpu/sam3/include/instance/instance_sdramc.h diff --git a/cpu/sam3x8e/include/instance/instance_smc.h b/cpu/sam3/include/instance/instance_smc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_smc.h rename to cpu/sam3/include/instance/instance_smc.h diff --git a/cpu/sam3x8e/include/instance/instance_spi0.h b/cpu/sam3/include/instance/instance_spi0.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_spi0.h rename to cpu/sam3/include/instance/instance_spi0.h diff --git a/cpu/sam3x8e/include/instance/instance_spi1.h b/cpu/sam3/include/instance/instance_spi1.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_spi1.h rename to cpu/sam3/include/instance/instance_spi1.h diff --git a/cpu/sam3x8e/include/instance/instance_ssc.h b/cpu/sam3/include/instance/instance_ssc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_ssc.h rename to cpu/sam3/include/instance/instance_ssc.h diff --git a/cpu/sam3x8e/include/instance/instance_supc.h b/cpu/sam3/include/instance/instance_supc.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_supc.h rename to cpu/sam3/include/instance/instance_supc.h diff --git a/cpu/sam3x8e/include/instance/instance_tc0.h b/cpu/sam3/include/instance/instance_tc0.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_tc0.h rename to cpu/sam3/include/instance/instance_tc0.h diff --git a/cpu/sam3x8e/include/instance/instance_tc1.h b/cpu/sam3/include/instance/instance_tc1.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_tc1.h rename to cpu/sam3/include/instance/instance_tc1.h diff --git a/cpu/sam3x8e/include/instance/instance_tc2.h b/cpu/sam3/include/instance/instance_tc2.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_tc2.h rename to cpu/sam3/include/instance/instance_tc2.h diff --git a/cpu/sam3x8e/include/instance/instance_trng.h b/cpu/sam3/include/instance/instance_trng.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_trng.h rename to cpu/sam3/include/instance/instance_trng.h diff --git a/cpu/sam3x8e/include/instance/instance_twi0.h b/cpu/sam3/include/instance/instance_twi0.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_twi0.h rename to cpu/sam3/include/instance/instance_twi0.h diff --git a/cpu/sam3x8e/include/instance/instance_twi1.h b/cpu/sam3/include/instance/instance_twi1.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_twi1.h rename to cpu/sam3/include/instance/instance_twi1.h diff --git a/cpu/sam3x8e/include/instance/instance_uart.h b/cpu/sam3/include/instance/instance_uart.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_uart.h rename to cpu/sam3/include/instance/instance_uart.h diff --git a/cpu/sam3x8e/include/instance/instance_uotghs.h b/cpu/sam3/include/instance/instance_uotghs.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_uotghs.h rename to cpu/sam3/include/instance/instance_uotghs.h diff --git a/cpu/sam3x8e/include/instance/instance_usart0.h b/cpu/sam3/include/instance/instance_usart0.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_usart0.h rename to cpu/sam3/include/instance/instance_usart0.h diff --git a/cpu/sam3x8e/include/instance/instance_usart1.h b/cpu/sam3/include/instance/instance_usart1.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_usart1.h rename to cpu/sam3/include/instance/instance_usart1.h diff --git a/cpu/sam3x8e/include/instance/instance_usart2.h b/cpu/sam3/include/instance/instance_usart2.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_usart2.h rename to cpu/sam3/include/instance/instance_usart2.h diff --git a/cpu/sam3x8e/include/instance/instance_usart3.h b/cpu/sam3/include/instance/instance_usart3.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_usart3.h rename to cpu/sam3/include/instance/instance_usart3.h diff --git a/cpu/sam3x8e/include/instance/instance_wdt.h b/cpu/sam3/include/instance/instance_wdt.h similarity index 100% rename from cpu/sam3x8e/include/instance/instance_wdt.h rename to cpu/sam3/include/instance/instance_wdt.h diff --git a/cpu/sam3x8e/include/periph_cpu.h b/cpu/sam3/include/periph_cpu.h similarity index 100% rename from cpu/sam3x8e/include/periph_cpu.h rename to cpu/sam3/include/periph_cpu.h diff --git a/cpu/sam3x8e/include/pio/pio_sam3x8e.h b/cpu/sam3/include/pio/pio_sam3x8e.h similarity index 100% rename from cpu/sam3x8e/include/pio/pio_sam3x8e.h rename to cpu/sam3/include/pio/pio_sam3x8e.h diff --git a/cpu/sam3x8e/include/sam3x8e.h b/cpu/sam3/include/sam3x8e.h similarity index 100% rename from cpu/sam3x8e/include/sam3x8e.h rename to cpu/sam3/include/sam3x8e.h diff --git a/cpu/sam3x8e/include/system_sam3xa.h b/cpu/sam3/include/system_sam3xa.h similarity index 100% rename from cpu/sam3x8e/include/system_sam3xa.h rename to cpu/sam3/include/system_sam3xa.h diff --git a/cpu/sam3x8e/ldscripts/sam3x8e.ld b/cpu/sam3/ldscripts/sam3x8e.ld similarity index 100% rename from cpu/sam3x8e/ldscripts/sam3x8e.ld rename to cpu/sam3/ldscripts/sam3x8e.ld diff --git a/cpu/sam3x8e/lpm_arch.c b/cpu/sam3/lpm_arch.c similarity index 100% rename from cpu/sam3x8e/lpm_arch.c rename to cpu/sam3/lpm_arch.c diff --git a/cpu/sam3x8e/periph/Makefile b/cpu/sam3/periph/Makefile similarity index 100% rename from cpu/sam3x8e/periph/Makefile rename to cpu/sam3/periph/Makefile diff --git a/cpu/sam3x8e/periph/gpio.c b/cpu/sam3/periph/gpio.c similarity index 100% rename from cpu/sam3x8e/periph/gpio.c rename to cpu/sam3/periph/gpio.c diff --git a/cpu/sam3x8e/periph/random.c b/cpu/sam3/periph/random.c similarity index 100% rename from cpu/sam3x8e/periph/random.c rename to cpu/sam3/periph/random.c diff --git a/cpu/sam3x8e/periph/spi.c b/cpu/sam3/periph/spi.c similarity index 100% rename from cpu/sam3x8e/periph/spi.c rename to cpu/sam3/periph/spi.c diff --git a/cpu/sam3x8e/periph/timer.c b/cpu/sam3/periph/timer.c similarity index 100% rename from cpu/sam3x8e/periph/timer.c rename to cpu/sam3/periph/timer.c diff --git a/cpu/sam3x8e/periph/uart.c b/cpu/sam3/periph/uart.c similarity index 100% rename from cpu/sam3x8e/periph/uart.c rename to cpu/sam3/periph/uart.c diff --git a/cpu/sam3x8e/startup.c b/cpu/sam3/startup.c similarity index 100% rename from cpu/sam3x8e/startup.c rename to cpu/sam3/startup.c From c387224c7e91e03bb653fb684534c5745dd01796 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 13:12:13 +0200 Subject: [PATCH 2/8] board/arduino-due: adjusted CPU for renamed sam3 --- boards/arduino-due/Makefile.include | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include index 328f58611a..50f448cb26 100644 --- a/boards/arduino-due/Makefile.include +++ b/boards/arduino-due/Makefile.include @@ -1,5 +1,6 @@ # define the cpu used by the arduino due board -export CPU = sam3x8e +export CPU = sam3 +export CPU_MODEL = sam3x8e # define the default port depending on the host OS PORT_LINUX ?= /dev/ttyACM0 From 2195ce7860694075922268f72f9b35afee7d8597 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 13:12:33 +0200 Subject: [PATCH 3/8] board/udoo: addjusted CPU for renamed sam3 --- boards/udoo/Makefile.include | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include index 71d88e6044..d74211959f 100644 --- a/boards/udoo/Makefile.include +++ b/boards/udoo/Makefile.include @@ -1,5 +1,6 @@ # define the cpu used by the udoo board -export CPU = sam3x8e +export CPU = sam3 +export CPU_MODEL = sam3x8e #define the flash-tool and default port depending on the host operating system OS := $(shell uname) From d41c3656327f82de70d8e7941ddb4a6ddb19b87d Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 13:40:41 +0200 Subject: [PATCH 4/8] doxygen: adjusted exclude to changed sam3 cpu name --- doc/doxygen/riot.doxyfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/doxygen/riot.doxyfile b/doc/doxygen/riot.doxyfile index bf0089dfaa..886e151270 100644 --- a/doc/doxygen/riot.doxyfile +++ b/doc/doxygen/riot.doxyfile @@ -816,6 +816,8 @@ EXCLUDE_PATTERNS = */board/*/tools/* \ */cpu/*/include/instance/* \ */cpu/*/include/pio/* \ */cpu/*/include/atmel/* \ + */cpu/sam3/include/sam3*.h \ + */cpu/sam3/include/system_sam*.h \ */cpu/lpc*/include/core_cm*.h \ */cpu/cortexm_common/include/core_cm*.h \ */cpu/stm32f*/include/stm32f* \ @@ -824,7 +826,6 @@ EXCLUDE_PATTERNS = */board/*/tools/* \ */cpu/lpc1768/include/LPC17xx.h \ */boards/*/include/periph_conf.h \ */cpu/x86/include/x86_pci.h \ - */cpu/sam3x8e/include/sam3x8e.h \ */cpu/stm32l1/include/stm32l1xx.h \ */cpu/k60/include/MK60D10.h \ */cpu/k60/include/MK60DZ10.h \ From a819fd6474e8e964bec9b06fe644f19f43cb587e Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 14:41:36 +0200 Subject: [PATCH 5/8] cpu/sam3: fixed to remove cppcheck warnings - fixed gpio driver - fixed uart driver --- cpu/sam3/periph/gpio.c | 8 ++++++++ cpu/sam3/periph/uart.c | 10 ++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cpu/sam3/periph/gpio.c b/cpu/sam3/periph/gpio.c index 058161acb9..71a33fd704 100644 --- a/cpu/sam3/periph/gpio.c +++ b/cpu/sam3/periph/gpio.c @@ -264,6 +264,8 @@ int gpio_init(gpio_t dev, gpio_dir_t dir, gpio_pp_t pushpull) PMC->PMC_PCER0 = (1 << GPIO_31_IRQ); break; #endif + default: + return -2; } /* give the PIO module the power over the corresponding pin */ @@ -793,6 +795,8 @@ int gpio_read(gpio_t dev) pin = GPIO_31_PIN; break; #endif + default: + return -1; } if (port->PIO_OSR & pin) { @@ -1656,6 +1660,7 @@ void isr_pioa(void) gpio_config[GPIO_A31_MAP].cb(gpio_config[GPIO_A31_MAP].arg); } #endif + (void)status; /* added to suppress cppcheck warnings */ if (sched_context_switch_request) { thread_yield(); } @@ -1824,6 +1829,7 @@ void isr_piob(void) gpio_config[GPIO_B31_MAP].cb(gpio_config[GPIO_B31_MAP].arg); } #endif + (void)status; /* added to suppress cppcheck warnings */ if (sched_context_switch_request) { thread_yield(); } @@ -1992,6 +1998,7 @@ void isr_pioc(void) gpio_config[GPIO_C31_MAP].cb(gpio_config[GPIO_C31_MAP].arg); } #endif + (void)status; /* added to suppress cppcheck warnings */ if (sched_context_switch_request) { thread_yield(); } @@ -2160,6 +2167,7 @@ void isr_piod(void) gpio_config[GPIO_D31_MAP].cb(gpio_config[GPIO_D31_MAP].arg); } #endif + (void)status; /* added to suppress cppcheck warnings */ if (sched_context_switch_request) { thread_yield(); } diff --git a/cpu/sam3/periph/uart.c b/cpu/sam3/periph/uart.c index feda12c375..07da80ddd4 100644 --- a/cpu/sam3/periph/uart.c +++ b/cpu/sam3/periph/uart.c @@ -95,8 +95,6 @@ int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, uart_tx_cb_t t int uart_init_blocking(uart_t uart, uint32_t baudrate) { - uint16_t clock_divider = F_CPU / (16 * baudrate); - switch (uart) { #if UART_0_EN case UART_0: @@ -108,7 +106,7 @@ int uart_init_blocking(uart_t uart, uint32_t baudrate) UART_0_PORT->PIO_ABSR &= ~UART_0_PINS; /* periph function A */ /* set clock divider */ - UART_0_DEV->UART_BRGR = clock_divider; + UART_0_DEV->UART_BRGR = (F_CPU / (16 * baudrate)); /* set to normal mode without parity */ UART_0_DEV->UART_MR = UART_MR_PAR_NO | UART_MR_CHMODE_NORMAL; /* enable receiver and transmitter and reset status bits */ @@ -125,7 +123,7 @@ int uart_init_blocking(uart_t uart, uint32_t baudrate) UART_1_PORT->PIO_ABSR &= ~UART_1_PINS; /* periph function A */ /* set clock divider */ - UART_1_DEV->US_BRGR = clock_divider; + UART_1_DEV->US_BRGR = (F_CPU / (16 * baudrate)); /* set to normal mode without parity */ UART_1_DEV->US_MR = US_MR_CHRL_8_BIT | US_MR_PAR_NO; /* enable receiver and transmitter and reset status bits */ @@ -142,7 +140,7 @@ int uart_init_blocking(uart_t uart, uint32_t baudrate) UART_2_PORT->PIO_ABSR &= ~UART_2_PINS; /* periph function A */ /* set clock divider */ - UART_2_DEV->US_BRGR = clock_divider; + UART_2_DEV->US_BRGR = (F_CPU / (16 * baudrate)); /* set to normal mode without parity */ UART_2_DEV->US_MR = US_MR_CHRL_8_BIT | US_MR_PAR_NO; /* enable receiver and transmitter and reset status bits */ @@ -159,7 +157,7 @@ int uart_init_blocking(uart_t uart, uint32_t baudrate) UART_3_PORT->PIO_ABSR |= UART_3_PINS; /* periph function B */ /* set clock divider */ - UART_3_DEV->US_BRGR = clock_divider; + UART_3_DEV->US_BRGR = (F_CPU / (16 * baudrate)); /* set to normal mode without parity */ UART_3_DEV->US_MR = US_MR_CHRL_8_BIT | US_MR_PAR_NO; /* enable receiver and transmitter and reset status bits */ From 6764f7abcd70418b1c5e943bc5c5dc44f934b77e Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 17:26:40 +0200 Subject: [PATCH 6/8] cpu/sam3: moved pwm driver into correct position --- cpu/{sam3x8e => sam3}/periph/pwm.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cpu/{sam3x8e => sam3}/periph/pwm.c (100%) diff --git a/cpu/sam3x8e/periph/pwm.c b/cpu/sam3/periph/pwm.c similarity index 100% rename from cpu/sam3x8e/periph/pwm.c rename to cpu/sam3/periph/pwm.c From 2588a62d89867eab80cbd6f19edc1f11d66cf4a7 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 12 Jun 2015 19:34:05 +0200 Subject: [PATCH 7/8] cpu/sam3: made headers for sam3e8x exclusive --- cpu/sam3/include/sam3x8e.h | 134 +++++++++--------- .../{ => sam3x8e}/component/component_adc.h | 0 .../{ => sam3x8e}/component/component_can.h | 0 .../component/component_chipid.h | 0 .../{ => sam3x8e}/component/component_dacc.h | 0 .../{ => sam3x8e}/component/component_dmac.h | 0 .../{ => sam3x8e}/component/component_efc.h | 0 .../{ => sam3x8e}/component/component_emac.h | 0 .../{ => sam3x8e}/component/component_gpbr.h | 0 .../{ => sam3x8e}/component/component_hsmci.h | 0 .../component/component_matrix.h | 0 .../{ => sam3x8e}/component/component_pdc.h | 0 .../{ => sam3x8e}/component/component_pio.h | 0 .../{ => sam3x8e}/component/component_pmc.h | 0 .../{ => sam3x8e}/component/component_pwm.h | 0 .../{ => sam3x8e}/component/component_rstc.h | 0 .../{ => sam3x8e}/component/component_rtc.h | 0 .../{ => sam3x8e}/component/component_rtt.h | 0 .../component/component_sdramc.h | 0 .../{ => sam3x8e}/component/component_smc.h | 0 .../{ => sam3x8e}/component/component_spi.h | 0 .../{ => sam3x8e}/component/component_ssc.h | 0 .../{ => sam3x8e}/component/component_supc.h | 0 .../{ => sam3x8e}/component/component_tc.h | 0 .../{ => sam3x8e}/component/component_trng.h | 0 .../{ => sam3x8e}/component/component_twi.h | 0 .../{ => sam3x8e}/component/component_uart.h | 0 .../component/component_uotghs.h | 0 .../{ => sam3x8e}/component/component_usart.h | 0 .../{ => sam3x8e}/component/component_wdt.h | 0 .../include/{ => sam3x8e}/component/doc.txt | 0 .../{ => sam3x8e}/instance/instance_adc.h | 0 .../{ => sam3x8e}/instance/instance_can0.h | 0 .../{ => sam3x8e}/instance/instance_can1.h | 0 .../{ => sam3x8e}/instance/instance_chipid.h | 0 .../{ => sam3x8e}/instance/instance_dacc.h | 0 .../{ => sam3x8e}/instance/instance_dmac.h | 0 .../{ => sam3x8e}/instance/instance_efc0.h | 0 .../{ => sam3x8e}/instance/instance_efc1.h | 0 .../{ => sam3x8e}/instance/instance_emac.h | 0 .../{ => sam3x8e}/instance/instance_gpbr.h | 0 .../{ => sam3x8e}/instance/instance_hsmci.h | 0 .../{ => sam3x8e}/instance/instance_matrix.h | 0 .../{ => sam3x8e}/instance/instance_pioa.h | 0 .../{ => sam3x8e}/instance/instance_piob.h | 0 .../{ => sam3x8e}/instance/instance_pioc.h | 0 .../{ => sam3x8e}/instance/instance_piod.h | 0 .../{ => sam3x8e}/instance/instance_pioe.h | 0 .../{ => sam3x8e}/instance/instance_piof.h | 0 .../{ => sam3x8e}/instance/instance_pmc.h | 0 .../{ => sam3x8e}/instance/instance_pwm.h | 0 .../{ => sam3x8e}/instance/instance_rstc.h | 0 .../{ => sam3x8e}/instance/instance_rtc.h | 0 .../{ => sam3x8e}/instance/instance_rtt.h | 0 .../{ => sam3x8e}/instance/instance_sdramc.h | 0 .../{ => sam3x8e}/instance/instance_smc.h | 0 .../{ => sam3x8e}/instance/instance_spi0.h | 0 .../{ => sam3x8e}/instance/instance_spi1.h | 0 .../{ => sam3x8e}/instance/instance_ssc.h | 0 .../{ => sam3x8e}/instance/instance_supc.h | 0 .../{ => sam3x8e}/instance/instance_tc0.h | 0 .../{ => sam3x8e}/instance/instance_tc1.h | 0 .../{ => sam3x8e}/instance/instance_tc2.h | 0 .../{ => sam3x8e}/instance/instance_trng.h | 0 .../{ => sam3x8e}/instance/instance_twi0.h | 0 .../{ => sam3x8e}/instance/instance_twi1.h | 0 .../{ => sam3x8e}/instance/instance_uart.h | 0 .../{ => sam3x8e}/instance/instance_uotghs.h | 0 .../{ => sam3x8e}/instance/instance_usart0.h | 0 .../{ => sam3x8e}/instance/instance_usart1.h | 0 .../{ => sam3x8e}/instance/instance_usart2.h | 0 .../{ => sam3x8e}/instance/instance_usart3.h | 0 .../{ => sam3x8e}/instance/instance_wdt.h | 0 .../include/{ => sam3x8e}/pio/pio_sam3x8e.h | 0 74 files changed, 67 insertions(+), 67 deletions(-) rename cpu/sam3/include/{ => sam3x8e}/component/component_adc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_can.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_chipid.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_dacc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_dmac.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_efc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_emac.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_gpbr.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_hsmci.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_matrix.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_pdc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_pio.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_pmc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_pwm.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_rstc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_rtc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_rtt.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_sdramc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_smc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_spi.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_ssc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_supc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_tc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_trng.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_twi.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_uart.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_uotghs.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_usart.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/component_wdt.h (100%) rename cpu/sam3/include/{ => sam3x8e}/component/doc.txt (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_adc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_can0.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_can1.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_chipid.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_dacc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_dmac.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_efc0.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_efc1.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_emac.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_gpbr.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_hsmci.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_matrix.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_pioa.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_piob.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_pioc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_piod.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_pioe.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_piof.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_pmc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_pwm.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_rstc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_rtc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_rtt.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_sdramc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_smc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_spi0.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_spi1.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_ssc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_supc.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_tc0.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_tc1.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_tc2.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_trng.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_twi0.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_twi1.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_uart.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_uotghs.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_usart0.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_usart1.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_usart2.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_usart3.h (100%) rename cpu/sam3/include/{ => sam3x8e}/instance/instance_wdt.h (100%) rename cpu/sam3/include/{ => sam3x8e}/pio/pio_sam3x8e.h (100%) diff --git a/cpu/sam3/include/sam3x8e.h b/cpu/sam3/include/sam3x8e.h index 6adb53e68c..0df01ab684 100644 --- a/cpu/sam3/include/sam3x8e.h +++ b/cpu/sam3/include/sam3x8e.h @@ -274,34 +274,34 @@ void WDT_Handler ( void ); /** \addtogroup SAM3X8E_api Peripheral Software API */ /*@{*/ -#include "component/component_adc.h" -#include "component/component_can.h" -#include "component/component_chipid.h" -#include "component/component_dacc.h" -#include "component/component_dmac.h" -#include "component/component_efc.h" -#include "component/component_emac.h" -#include "component/component_gpbr.h" -#include "component/component_hsmci.h" -#include "component/component_matrix.h" -#include "component/component_pdc.h" -#include "component/component_pio.h" -#include "component/component_pmc.h" -#include "component/component_pwm.h" -#include "component/component_rstc.h" -#include "component/component_rtc.h" -#include "component/component_rtt.h" -#include "component/component_smc.h" -#include "component/component_spi.h" -#include "component/component_ssc.h" -#include "component/component_supc.h" -#include "component/component_tc.h" -#include "component/component_trng.h" -#include "component/component_twi.h" -#include "component/component_uart.h" -#include "component/component_uotghs.h" -#include "component/component_usart.h" -#include "component/component_wdt.h" +#include "sam3x8e/component/component_adc.h" +#include "sam3x8e/component/component_can.h" +#include "sam3x8e/component/component_chipid.h" +#include "sam3x8e/component/component_dacc.h" +#include "sam3x8e/component/component_dmac.h" +#include "sam3x8e/component/component_efc.h" +#include "sam3x8e/component/component_emac.h" +#include "sam3x8e/component/component_gpbr.h" +#include "sam3x8e/component/component_hsmci.h" +#include "sam3x8e/component/component_matrix.h" +#include "sam3x8e/component/component_pdc.h" +#include "sam3x8e/component/component_pio.h" +#include "sam3x8e/component/component_pmc.h" +#include "sam3x8e/component/component_pwm.h" +#include "sam3x8e/component/component_rstc.h" +#include "sam3x8e/component/component_rtc.h" +#include "sam3x8e/component/component_rtt.h" +#include "sam3x8e/component/component_smc.h" +#include "sam3x8e/component/component_spi.h" +#include "sam3x8e/component/component_ssc.h" +#include "sam3x8e/component/component_supc.h" +#include "sam3x8e/component/component_tc.h" +#include "sam3x8e/component/component_trng.h" +#include "sam3x8e/component/component_twi.h" +#include "sam3x8e/component/component_uart.h" +#include "sam3x8e/component/component_uotghs.h" +#include "sam3x8e/component/component_usart.h" +#include "sam3x8e/component/component_wdt.h" /*@}*/ /* ************************************************************************** */ @@ -310,44 +310,44 @@ void WDT_Handler ( void ); /** \addtogroup SAM3X8E_reg Registers Access Definitions */ /*@{*/ -#include "instance/instance_hsmci.h" -#include "instance/instance_ssc.h" -#include "instance/instance_spi0.h" -#include "instance/instance_tc0.h" -#include "instance/instance_tc1.h" -#include "instance/instance_tc2.h" -#include "instance/instance_twi0.h" -#include "instance/instance_twi1.h" -#include "instance/instance_pwm.h" -#include "instance/instance_usart0.h" -#include "instance/instance_usart1.h" -#include "instance/instance_usart2.h" -#include "instance/instance_usart3.h" -#include "instance/instance_uotghs.h" -#include "instance/instance_emac.h" -#include "instance/instance_can0.h" -#include "instance/instance_can1.h" -#include "instance/instance_trng.h" -#include "instance/instance_adc.h" -#include "instance/instance_dmac.h" -#include "instance/instance_dacc.h" -#include "instance/instance_smc.h" -#include "instance/instance_matrix.h" -#include "instance/instance_pmc.h" -#include "instance/instance_uart.h" -#include "instance/instance_chipid.h" -#include "instance/instance_efc0.h" -#include "instance/instance_efc1.h" -#include "instance/instance_pioa.h" -#include "instance/instance_piob.h" -#include "instance/instance_pioc.h" -#include "instance/instance_piod.h" -#include "instance/instance_rstc.h" -#include "instance/instance_supc.h" -#include "instance/instance_rtt.h" -#include "instance/instance_wdt.h" -#include "instance/instance_rtc.h" -#include "instance/instance_gpbr.h" +#include "sam3x8e/instance/instance_hsmci.h" +#include "sam3x8e/instance/instance_ssc.h" +#include "sam3x8e/instance/instance_spi0.h" +#include "sam3x8e/instance/instance_tc0.h" +#include "sam3x8e/instance/instance_tc1.h" +#include "sam3x8e/instance/instance_tc2.h" +#include "sam3x8e/instance/instance_twi0.h" +#include "sam3x8e/instance/instance_twi1.h" +#include "sam3x8e/instance/instance_pwm.h" +#include "sam3x8e/instance/instance_usart0.h" +#include "sam3x8e/instance/instance_usart1.h" +#include "sam3x8e/instance/instance_usart2.h" +#include "sam3x8e/instance/instance_usart3.h" +#include "sam3x8e/instance/instance_uotghs.h" +#include "sam3x8e/instance/instance_emac.h" +#include "sam3x8e/instance/instance_can0.h" +#include "sam3x8e/instance/instance_can1.h" +#include "sam3x8e/instance/instance_trng.h" +#include "sam3x8e/instance/instance_adc.h" +#include "sam3x8e/instance/instance_dmac.h" +#include "sam3x8e/instance/instance_dacc.h" +#include "sam3x8e/instance/instance_smc.h" +#include "sam3x8e/instance/instance_matrix.h" +#include "sam3x8e/instance/instance_pmc.h" +#include "sam3x8e/instance/instance_uart.h" +#include "sam3x8e/instance/instance_chipid.h" +#include "sam3x8e/instance/instance_efc0.h" +#include "sam3x8e/instance/instance_efc1.h" +#include "sam3x8e/instance/instance_pioa.h" +#include "sam3x8e/instance/instance_piob.h" +#include "sam3x8e/instance/instance_pioc.h" +#include "sam3x8e/instance/instance_piod.h" +#include "sam3x8e/instance/instance_rstc.h" +#include "sam3x8e/instance/instance_supc.h" +#include "sam3x8e/instance/instance_rtt.h" +#include "sam3x8e/instance/instance_wdt.h" +#include "sam3x8e/instance/instance_rtc.h" +#include "sam3x8e/instance/instance_gpbr.h" /*@}*/ /* ************************************************************************** */ @@ -514,7 +514,7 @@ void WDT_Handler ( void ); /** \addtogroup SAM3X8E_pio Peripheral Pio Definitions */ /*@{*/ -#include "pio/pio_sam3x8e.h" +#include "sam3x8e/pio/pio_sam3x8e.h" /*@}*/ /* ************************************************************************** */ diff --git a/cpu/sam3/include/component/component_adc.h b/cpu/sam3/include/sam3x8e/component/component_adc.h similarity index 100% rename from cpu/sam3/include/component/component_adc.h rename to cpu/sam3/include/sam3x8e/component/component_adc.h diff --git a/cpu/sam3/include/component/component_can.h b/cpu/sam3/include/sam3x8e/component/component_can.h similarity index 100% rename from cpu/sam3/include/component/component_can.h rename to cpu/sam3/include/sam3x8e/component/component_can.h diff --git a/cpu/sam3/include/component/component_chipid.h b/cpu/sam3/include/sam3x8e/component/component_chipid.h similarity index 100% rename from cpu/sam3/include/component/component_chipid.h rename to cpu/sam3/include/sam3x8e/component/component_chipid.h diff --git a/cpu/sam3/include/component/component_dacc.h b/cpu/sam3/include/sam3x8e/component/component_dacc.h similarity index 100% rename from cpu/sam3/include/component/component_dacc.h rename to cpu/sam3/include/sam3x8e/component/component_dacc.h diff --git a/cpu/sam3/include/component/component_dmac.h b/cpu/sam3/include/sam3x8e/component/component_dmac.h similarity index 100% rename from cpu/sam3/include/component/component_dmac.h rename to cpu/sam3/include/sam3x8e/component/component_dmac.h diff --git a/cpu/sam3/include/component/component_efc.h b/cpu/sam3/include/sam3x8e/component/component_efc.h similarity index 100% rename from cpu/sam3/include/component/component_efc.h rename to cpu/sam3/include/sam3x8e/component/component_efc.h diff --git a/cpu/sam3/include/component/component_emac.h b/cpu/sam3/include/sam3x8e/component/component_emac.h similarity index 100% rename from cpu/sam3/include/component/component_emac.h rename to cpu/sam3/include/sam3x8e/component/component_emac.h diff --git a/cpu/sam3/include/component/component_gpbr.h b/cpu/sam3/include/sam3x8e/component/component_gpbr.h similarity index 100% rename from cpu/sam3/include/component/component_gpbr.h rename to cpu/sam3/include/sam3x8e/component/component_gpbr.h diff --git a/cpu/sam3/include/component/component_hsmci.h b/cpu/sam3/include/sam3x8e/component/component_hsmci.h similarity index 100% rename from cpu/sam3/include/component/component_hsmci.h rename to cpu/sam3/include/sam3x8e/component/component_hsmci.h diff --git a/cpu/sam3/include/component/component_matrix.h b/cpu/sam3/include/sam3x8e/component/component_matrix.h similarity index 100% rename from cpu/sam3/include/component/component_matrix.h rename to cpu/sam3/include/sam3x8e/component/component_matrix.h diff --git a/cpu/sam3/include/component/component_pdc.h b/cpu/sam3/include/sam3x8e/component/component_pdc.h similarity index 100% rename from cpu/sam3/include/component/component_pdc.h rename to cpu/sam3/include/sam3x8e/component/component_pdc.h diff --git a/cpu/sam3/include/component/component_pio.h b/cpu/sam3/include/sam3x8e/component/component_pio.h similarity index 100% rename from cpu/sam3/include/component/component_pio.h rename to cpu/sam3/include/sam3x8e/component/component_pio.h diff --git a/cpu/sam3/include/component/component_pmc.h b/cpu/sam3/include/sam3x8e/component/component_pmc.h similarity index 100% rename from cpu/sam3/include/component/component_pmc.h rename to cpu/sam3/include/sam3x8e/component/component_pmc.h diff --git a/cpu/sam3/include/component/component_pwm.h b/cpu/sam3/include/sam3x8e/component/component_pwm.h similarity index 100% rename from cpu/sam3/include/component/component_pwm.h rename to cpu/sam3/include/sam3x8e/component/component_pwm.h diff --git a/cpu/sam3/include/component/component_rstc.h b/cpu/sam3/include/sam3x8e/component/component_rstc.h similarity index 100% rename from cpu/sam3/include/component/component_rstc.h rename to cpu/sam3/include/sam3x8e/component/component_rstc.h diff --git a/cpu/sam3/include/component/component_rtc.h b/cpu/sam3/include/sam3x8e/component/component_rtc.h similarity index 100% rename from cpu/sam3/include/component/component_rtc.h rename to cpu/sam3/include/sam3x8e/component/component_rtc.h diff --git a/cpu/sam3/include/component/component_rtt.h b/cpu/sam3/include/sam3x8e/component/component_rtt.h similarity index 100% rename from cpu/sam3/include/component/component_rtt.h rename to cpu/sam3/include/sam3x8e/component/component_rtt.h diff --git a/cpu/sam3/include/component/component_sdramc.h b/cpu/sam3/include/sam3x8e/component/component_sdramc.h similarity index 100% rename from cpu/sam3/include/component/component_sdramc.h rename to cpu/sam3/include/sam3x8e/component/component_sdramc.h diff --git a/cpu/sam3/include/component/component_smc.h b/cpu/sam3/include/sam3x8e/component/component_smc.h similarity index 100% rename from cpu/sam3/include/component/component_smc.h rename to cpu/sam3/include/sam3x8e/component/component_smc.h diff --git a/cpu/sam3/include/component/component_spi.h b/cpu/sam3/include/sam3x8e/component/component_spi.h similarity index 100% rename from cpu/sam3/include/component/component_spi.h rename to cpu/sam3/include/sam3x8e/component/component_spi.h diff --git a/cpu/sam3/include/component/component_ssc.h b/cpu/sam3/include/sam3x8e/component/component_ssc.h similarity index 100% rename from cpu/sam3/include/component/component_ssc.h rename to cpu/sam3/include/sam3x8e/component/component_ssc.h diff --git a/cpu/sam3/include/component/component_supc.h b/cpu/sam3/include/sam3x8e/component/component_supc.h similarity index 100% rename from cpu/sam3/include/component/component_supc.h rename to cpu/sam3/include/sam3x8e/component/component_supc.h diff --git a/cpu/sam3/include/component/component_tc.h b/cpu/sam3/include/sam3x8e/component/component_tc.h similarity index 100% rename from cpu/sam3/include/component/component_tc.h rename to cpu/sam3/include/sam3x8e/component/component_tc.h diff --git a/cpu/sam3/include/component/component_trng.h b/cpu/sam3/include/sam3x8e/component/component_trng.h similarity index 100% rename from cpu/sam3/include/component/component_trng.h rename to cpu/sam3/include/sam3x8e/component/component_trng.h diff --git a/cpu/sam3/include/component/component_twi.h b/cpu/sam3/include/sam3x8e/component/component_twi.h similarity index 100% rename from cpu/sam3/include/component/component_twi.h rename to cpu/sam3/include/sam3x8e/component/component_twi.h diff --git a/cpu/sam3/include/component/component_uart.h b/cpu/sam3/include/sam3x8e/component/component_uart.h similarity index 100% rename from cpu/sam3/include/component/component_uart.h rename to cpu/sam3/include/sam3x8e/component/component_uart.h diff --git a/cpu/sam3/include/component/component_uotghs.h b/cpu/sam3/include/sam3x8e/component/component_uotghs.h similarity index 100% rename from cpu/sam3/include/component/component_uotghs.h rename to cpu/sam3/include/sam3x8e/component/component_uotghs.h diff --git a/cpu/sam3/include/component/component_usart.h b/cpu/sam3/include/sam3x8e/component/component_usart.h similarity index 100% rename from cpu/sam3/include/component/component_usart.h rename to cpu/sam3/include/sam3x8e/component/component_usart.h diff --git a/cpu/sam3/include/component/component_wdt.h b/cpu/sam3/include/sam3x8e/component/component_wdt.h similarity index 100% rename from cpu/sam3/include/component/component_wdt.h rename to cpu/sam3/include/sam3x8e/component/component_wdt.h diff --git a/cpu/sam3/include/component/doc.txt b/cpu/sam3/include/sam3x8e/component/doc.txt similarity index 100% rename from cpu/sam3/include/component/doc.txt rename to cpu/sam3/include/sam3x8e/component/doc.txt diff --git a/cpu/sam3/include/instance/instance_adc.h b/cpu/sam3/include/sam3x8e/instance/instance_adc.h similarity index 100% rename from cpu/sam3/include/instance/instance_adc.h rename to cpu/sam3/include/sam3x8e/instance/instance_adc.h diff --git a/cpu/sam3/include/instance/instance_can0.h b/cpu/sam3/include/sam3x8e/instance/instance_can0.h similarity index 100% rename from cpu/sam3/include/instance/instance_can0.h rename to cpu/sam3/include/sam3x8e/instance/instance_can0.h diff --git a/cpu/sam3/include/instance/instance_can1.h b/cpu/sam3/include/sam3x8e/instance/instance_can1.h similarity index 100% rename from cpu/sam3/include/instance/instance_can1.h rename to cpu/sam3/include/sam3x8e/instance/instance_can1.h diff --git a/cpu/sam3/include/instance/instance_chipid.h b/cpu/sam3/include/sam3x8e/instance/instance_chipid.h similarity index 100% rename from cpu/sam3/include/instance/instance_chipid.h rename to cpu/sam3/include/sam3x8e/instance/instance_chipid.h diff --git a/cpu/sam3/include/instance/instance_dacc.h b/cpu/sam3/include/sam3x8e/instance/instance_dacc.h similarity index 100% rename from cpu/sam3/include/instance/instance_dacc.h rename to cpu/sam3/include/sam3x8e/instance/instance_dacc.h diff --git a/cpu/sam3/include/instance/instance_dmac.h b/cpu/sam3/include/sam3x8e/instance/instance_dmac.h similarity index 100% rename from cpu/sam3/include/instance/instance_dmac.h rename to cpu/sam3/include/sam3x8e/instance/instance_dmac.h diff --git a/cpu/sam3/include/instance/instance_efc0.h b/cpu/sam3/include/sam3x8e/instance/instance_efc0.h similarity index 100% rename from cpu/sam3/include/instance/instance_efc0.h rename to cpu/sam3/include/sam3x8e/instance/instance_efc0.h diff --git a/cpu/sam3/include/instance/instance_efc1.h b/cpu/sam3/include/sam3x8e/instance/instance_efc1.h similarity index 100% rename from cpu/sam3/include/instance/instance_efc1.h rename to cpu/sam3/include/sam3x8e/instance/instance_efc1.h diff --git a/cpu/sam3/include/instance/instance_emac.h b/cpu/sam3/include/sam3x8e/instance/instance_emac.h similarity index 100% rename from cpu/sam3/include/instance/instance_emac.h rename to cpu/sam3/include/sam3x8e/instance/instance_emac.h diff --git a/cpu/sam3/include/instance/instance_gpbr.h b/cpu/sam3/include/sam3x8e/instance/instance_gpbr.h similarity index 100% rename from cpu/sam3/include/instance/instance_gpbr.h rename to cpu/sam3/include/sam3x8e/instance/instance_gpbr.h diff --git a/cpu/sam3/include/instance/instance_hsmci.h b/cpu/sam3/include/sam3x8e/instance/instance_hsmci.h similarity index 100% rename from cpu/sam3/include/instance/instance_hsmci.h rename to cpu/sam3/include/sam3x8e/instance/instance_hsmci.h diff --git a/cpu/sam3/include/instance/instance_matrix.h b/cpu/sam3/include/sam3x8e/instance/instance_matrix.h similarity index 100% rename from cpu/sam3/include/instance/instance_matrix.h rename to cpu/sam3/include/sam3x8e/instance/instance_matrix.h diff --git a/cpu/sam3/include/instance/instance_pioa.h b/cpu/sam3/include/sam3x8e/instance/instance_pioa.h similarity index 100% rename from cpu/sam3/include/instance/instance_pioa.h rename to cpu/sam3/include/sam3x8e/instance/instance_pioa.h diff --git a/cpu/sam3/include/instance/instance_piob.h b/cpu/sam3/include/sam3x8e/instance/instance_piob.h similarity index 100% rename from cpu/sam3/include/instance/instance_piob.h rename to cpu/sam3/include/sam3x8e/instance/instance_piob.h diff --git a/cpu/sam3/include/instance/instance_pioc.h b/cpu/sam3/include/sam3x8e/instance/instance_pioc.h similarity index 100% rename from cpu/sam3/include/instance/instance_pioc.h rename to cpu/sam3/include/sam3x8e/instance/instance_pioc.h diff --git a/cpu/sam3/include/instance/instance_piod.h b/cpu/sam3/include/sam3x8e/instance/instance_piod.h similarity index 100% rename from cpu/sam3/include/instance/instance_piod.h rename to cpu/sam3/include/sam3x8e/instance/instance_piod.h diff --git a/cpu/sam3/include/instance/instance_pioe.h b/cpu/sam3/include/sam3x8e/instance/instance_pioe.h similarity index 100% rename from cpu/sam3/include/instance/instance_pioe.h rename to cpu/sam3/include/sam3x8e/instance/instance_pioe.h diff --git a/cpu/sam3/include/instance/instance_piof.h b/cpu/sam3/include/sam3x8e/instance/instance_piof.h similarity index 100% rename from cpu/sam3/include/instance/instance_piof.h rename to cpu/sam3/include/sam3x8e/instance/instance_piof.h diff --git a/cpu/sam3/include/instance/instance_pmc.h b/cpu/sam3/include/sam3x8e/instance/instance_pmc.h similarity index 100% rename from cpu/sam3/include/instance/instance_pmc.h rename to cpu/sam3/include/sam3x8e/instance/instance_pmc.h diff --git a/cpu/sam3/include/instance/instance_pwm.h b/cpu/sam3/include/sam3x8e/instance/instance_pwm.h similarity index 100% rename from cpu/sam3/include/instance/instance_pwm.h rename to cpu/sam3/include/sam3x8e/instance/instance_pwm.h diff --git a/cpu/sam3/include/instance/instance_rstc.h b/cpu/sam3/include/sam3x8e/instance/instance_rstc.h similarity index 100% rename from cpu/sam3/include/instance/instance_rstc.h rename to cpu/sam3/include/sam3x8e/instance/instance_rstc.h diff --git a/cpu/sam3/include/instance/instance_rtc.h b/cpu/sam3/include/sam3x8e/instance/instance_rtc.h similarity index 100% rename from cpu/sam3/include/instance/instance_rtc.h rename to cpu/sam3/include/sam3x8e/instance/instance_rtc.h diff --git a/cpu/sam3/include/instance/instance_rtt.h b/cpu/sam3/include/sam3x8e/instance/instance_rtt.h similarity index 100% rename from cpu/sam3/include/instance/instance_rtt.h rename to cpu/sam3/include/sam3x8e/instance/instance_rtt.h diff --git a/cpu/sam3/include/instance/instance_sdramc.h b/cpu/sam3/include/sam3x8e/instance/instance_sdramc.h similarity index 100% rename from cpu/sam3/include/instance/instance_sdramc.h rename to cpu/sam3/include/sam3x8e/instance/instance_sdramc.h diff --git a/cpu/sam3/include/instance/instance_smc.h b/cpu/sam3/include/sam3x8e/instance/instance_smc.h similarity index 100% rename from cpu/sam3/include/instance/instance_smc.h rename to cpu/sam3/include/sam3x8e/instance/instance_smc.h diff --git a/cpu/sam3/include/instance/instance_spi0.h b/cpu/sam3/include/sam3x8e/instance/instance_spi0.h similarity index 100% rename from cpu/sam3/include/instance/instance_spi0.h rename to cpu/sam3/include/sam3x8e/instance/instance_spi0.h diff --git a/cpu/sam3/include/instance/instance_spi1.h b/cpu/sam3/include/sam3x8e/instance/instance_spi1.h similarity index 100% rename from cpu/sam3/include/instance/instance_spi1.h rename to cpu/sam3/include/sam3x8e/instance/instance_spi1.h diff --git a/cpu/sam3/include/instance/instance_ssc.h b/cpu/sam3/include/sam3x8e/instance/instance_ssc.h similarity index 100% rename from cpu/sam3/include/instance/instance_ssc.h rename to cpu/sam3/include/sam3x8e/instance/instance_ssc.h diff --git a/cpu/sam3/include/instance/instance_supc.h b/cpu/sam3/include/sam3x8e/instance/instance_supc.h similarity index 100% rename from cpu/sam3/include/instance/instance_supc.h rename to cpu/sam3/include/sam3x8e/instance/instance_supc.h diff --git a/cpu/sam3/include/instance/instance_tc0.h b/cpu/sam3/include/sam3x8e/instance/instance_tc0.h similarity index 100% rename from cpu/sam3/include/instance/instance_tc0.h rename to cpu/sam3/include/sam3x8e/instance/instance_tc0.h diff --git a/cpu/sam3/include/instance/instance_tc1.h b/cpu/sam3/include/sam3x8e/instance/instance_tc1.h similarity index 100% rename from cpu/sam3/include/instance/instance_tc1.h rename to cpu/sam3/include/sam3x8e/instance/instance_tc1.h diff --git a/cpu/sam3/include/instance/instance_tc2.h b/cpu/sam3/include/sam3x8e/instance/instance_tc2.h similarity index 100% rename from cpu/sam3/include/instance/instance_tc2.h rename to cpu/sam3/include/sam3x8e/instance/instance_tc2.h diff --git a/cpu/sam3/include/instance/instance_trng.h b/cpu/sam3/include/sam3x8e/instance/instance_trng.h similarity index 100% rename from cpu/sam3/include/instance/instance_trng.h rename to cpu/sam3/include/sam3x8e/instance/instance_trng.h diff --git a/cpu/sam3/include/instance/instance_twi0.h b/cpu/sam3/include/sam3x8e/instance/instance_twi0.h similarity index 100% rename from cpu/sam3/include/instance/instance_twi0.h rename to cpu/sam3/include/sam3x8e/instance/instance_twi0.h diff --git a/cpu/sam3/include/instance/instance_twi1.h b/cpu/sam3/include/sam3x8e/instance/instance_twi1.h similarity index 100% rename from cpu/sam3/include/instance/instance_twi1.h rename to cpu/sam3/include/sam3x8e/instance/instance_twi1.h diff --git a/cpu/sam3/include/instance/instance_uart.h b/cpu/sam3/include/sam3x8e/instance/instance_uart.h similarity index 100% rename from cpu/sam3/include/instance/instance_uart.h rename to cpu/sam3/include/sam3x8e/instance/instance_uart.h diff --git a/cpu/sam3/include/instance/instance_uotghs.h b/cpu/sam3/include/sam3x8e/instance/instance_uotghs.h similarity index 100% rename from cpu/sam3/include/instance/instance_uotghs.h rename to cpu/sam3/include/sam3x8e/instance/instance_uotghs.h diff --git a/cpu/sam3/include/instance/instance_usart0.h b/cpu/sam3/include/sam3x8e/instance/instance_usart0.h similarity index 100% rename from cpu/sam3/include/instance/instance_usart0.h rename to cpu/sam3/include/sam3x8e/instance/instance_usart0.h diff --git a/cpu/sam3/include/instance/instance_usart1.h b/cpu/sam3/include/sam3x8e/instance/instance_usart1.h similarity index 100% rename from cpu/sam3/include/instance/instance_usart1.h rename to cpu/sam3/include/sam3x8e/instance/instance_usart1.h diff --git a/cpu/sam3/include/instance/instance_usart2.h b/cpu/sam3/include/sam3x8e/instance/instance_usart2.h similarity index 100% rename from cpu/sam3/include/instance/instance_usart2.h rename to cpu/sam3/include/sam3x8e/instance/instance_usart2.h diff --git a/cpu/sam3/include/instance/instance_usart3.h b/cpu/sam3/include/sam3x8e/instance/instance_usart3.h similarity index 100% rename from cpu/sam3/include/instance/instance_usart3.h rename to cpu/sam3/include/sam3x8e/instance/instance_usart3.h diff --git a/cpu/sam3/include/instance/instance_wdt.h b/cpu/sam3/include/sam3x8e/instance/instance_wdt.h similarity index 100% rename from cpu/sam3/include/instance/instance_wdt.h rename to cpu/sam3/include/sam3x8e/instance/instance_wdt.h diff --git a/cpu/sam3/include/pio/pio_sam3x8e.h b/cpu/sam3/include/sam3x8e/pio/pio_sam3x8e.h similarity index 100% rename from cpu/sam3/include/pio/pio_sam3x8e.h rename to cpu/sam3/include/sam3x8e/pio/pio_sam3x8e.h From 9476c03550fc8722cda7efc8e3733ffc8d47a556 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Sun, 14 Jun 2015 12:48:26 +0200 Subject: [PATCH 8/8] cpu/sam3: adjusted name of doxygen group --- cpu/sam3/cpu.c | 2 +- cpu/sam3/doc.txt | 2 +- cpu/sam3/hwtimer_arch.c | 2 +- cpu/sam3/include/cpu_conf.h | 1 + cpu/sam3/include/hwtimer_cpu.h | 2 +- cpu/sam3/lpm_arch.c | 2 +- cpu/sam3/startup.c | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cpu/sam3/cpu.c b/cpu/sam3/cpu.c index 720c8818ca..1fc4683ca8 100644 --- a/cpu/sam3/cpu.c +++ b/cpu/sam3/cpu.c @@ -7,7 +7,7 @@ */ /** - * @ingroup cpu_sam3x8e + * @ingroup cpu_sam3 * @{ * * @file diff --git a/cpu/sam3/doc.txt b/cpu/sam3/doc.txt index bc486c5691..af39ae1d77 100644 --- a/cpu/sam3/doc.txt +++ b/cpu/sam3/doc.txt @@ -1,5 +1,5 @@ /** - * @defgroup cpu_sam3x8e Atmel SAM3X8E + * @defgroup cpu_sam3 Atmel SAM3X8E * @ingroup cpu * @brief Atmel SAM3X8E Cortex-M3 MCU specific code */ diff --git a/cpu/sam3/hwtimer_arch.c b/cpu/sam3/hwtimer_arch.c index 99ceea582c..bcf558aa10 100644 --- a/cpu/sam3/hwtimer_arch.c +++ b/cpu/sam3/hwtimer_arch.c @@ -7,7 +7,7 @@ */ /** - * @ingroup cpu_sam3x8e + * @ingroup cpu_sam3 * @{ * * @file diff --git a/cpu/sam3/include/cpu_conf.h b/cpu/sam3/include/cpu_conf.h index d1eedab7ff..16d9275a23 100644 --- a/cpu/sam3/include/cpu_conf.h +++ b/cpu/sam3/include/cpu_conf.h @@ -7,6 +7,7 @@ */ /** + * @ingroup cpu_sam3 * @{ * * @file diff --git a/cpu/sam3/include/hwtimer_cpu.h b/cpu/sam3/include/hwtimer_cpu.h index 8d021ef10b..ed2a5556ce 100644 --- a/cpu/sam3/include/hwtimer_cpu.h +++ b/cpu/sam3/include/hwtimer_cpu.h @@ -7,7 +7,7 @@ */ /** - * @ingroup cpu_sam3x8e + * @ingroup cpu_sam3 * @{ * * @file diff --git a/cpu/sam3/lpm_arch.c b/cpu/sam3/lpm_arch.c index 36a8233f51..3884e10ab4 100644 --- a/cpu/sam3/lpm_arch.c +++ b/cpu/sam3/lpm_arch.c @@ -7,7 +7,7 @@ */ /** - * @ingroup cpu_sam3x8e + * @ingroup cpu_sam3 * @{ * * @file diff --git a/cpu/sam3/startup.c b/cpu/sam3/startup.c index ffda96768f..6a81dfae93 100644 --- a/cpu/sam3/startup.c +++ b/cpu/sam3/startup.c @@ -7,7 +7,7 @@ */ /** - * @ingroup cpu_sam3x8e + * @ingroup cpu_sam3 * @{ * * @file