From 8776df74230d4d02a56e42bea89ec6c0259b6a52 Mon Sep 17 00:00:00 2001 From: Francisco Acosta <fco.ja.ac@gmail.com> Date: Tue, 29 May 2018 21:01:28 +0200 Subject: [PATCH] cpu/atmega*: move EEPROM definitions to periph_cpu.h --- cpu/atmega1281/include/cpu_conf.h | 7 ------- cpu/atmega1281/include/periph_cpu.h | 7 +++++++ cpu/atmega1284p/include/cpu_conf.h | 7 ------- cpu/atmega1284p/include/periph_cpu.h | 7 +++++++ cpu/atmega2560/include/cpu_conf.h | 8 -------- cpu/atmega2560/include/periph_cpu.h | 7 +++++++ cpu/atmega256rfr2/include/cpu_conf.h | 7 ------- cpu/atmega256rfr2/include/periph_cpu.h | 7 +++++++ cpu/atmega328p/include/cpu_conf.h | 7 ------- cpu/atmega328p/include/periph_cpu.h | 7 +++++++ 10 files changed, 35 insertions(+), 36 deletions(-) diff --git a/cpu/atmega1281/include/cpu_conf.h b/cpu/atmega1281/include/cpu_conf.h index 5109c6074d..438cbc70ed 100644 --- a/cpu/atmega1281/include/cpu_conf.h +++ b/cpu/atmega1281/include/cpu_conf.h @@ -43,13 +43,6 @@ extern "C" { #endif /** @} */ -/** - * @name EEPROM configuration - * @{ - */ -#define EEPROM_SIZE (4096U) /* 4kB */ -/** @} */ - #ifdef __cplusplus } #endif diff --git a/cpu/atmega1281/include/periph_cpu.h b/cpu/atmega1281/include/periph_cpu.h index 9f69d979e7..07ebe56a75 100644 --- a/cpu/atmega1281/include/periph_cpu.h +++ b/cpu/atmega1281/include/periph_cpu.h @@ -64,6 +64,13 @@ enum { #define I2C_PIN_MASK (1 << PORTD0) | (1 << PORTD1) /** @} */ +/** + * @name EEPROM configuration + * @{ + */ +#define EEPROM_SIZE (4096U) /* 4kB */ +/** @} */ + #ifdef __cplusplus } #endif diff --git a/cpu/atmega1284p/include/cpu_conf.h b/cpu/atmega1284p/include/cpu_conf.h index 0731dc3964..e87b7d2a01 100644 --- a/cpu/atmega1284p/include/cpu_conf.h +++ b/cpu/atmega1284p/include/cpu_conf.h @@ -44,13 +44,6 @@ extern "C" { #define THREAD_STACKSIZE_IDLE (128) /** @} */ -/** - * @name EEPROM configuration - * @{ - */ -#define EEPROM_SIZE (4096U) /* 4kB */ -/** @} */ - #ifdef __cplusplus } #endif diff --git a/cpu/atmega1284p/include/periph_cpu.h b/cpu/atmega1284p/include/periph_cpu.h index 047dae07c1..e61349c6e4 100644 --- a/cpu/atmega1284p/include/periph_cpu.h +++ b/cpu/atmega1284p/include/periph_cpu.h @@ -61,6 +61,13 @@ enum { #define I2C_PIN_MASK (1 << PORTC0) | (1 << PORTC1) /** @} */ +/** + * @name EEPROM configuration + * @{ + */ +#define EEPROM_SIZE (4096U) /* 4kB */ +/** @} */ + #ifdef __cplusplus } #endif diff --git a/cpu/atmega2560/include/cpu_conf.h b/cpu/atmega2560/include/cpu_conf.h index a070cccca2..1e7f0eac9a 100644 --- a/cpu/atmega2560/include/cpu_conf.h +++ b/cpu/atmega2560/include/cpu_conf.h @@ -42,14 +42,6 @@ extern "C" { #define THREAD_STACKSIZE_IDLE (128) /** @} */ -/** - * @name EEPROM configuration - * @{ - */ -#define EEPROM_SIZE (4096U) /* 4kB */ -/** @} */ - - #ifdef __cplusplus } #endif diff --git a/cpu/atmega2560/include/periph_cpu.h b/cpu/atmega2560/include/periph_cpu.h index 10cd8acc1e..2002edc28c 100644 --- a/cpu/atmega2560/include/periph_cpu.h +++ b/cpu/atmega2560/include/periph_cpu.h @@ -66,6 +66,13 @@ enum { #define I2C_PIN_MASK (1 << PORTD0) | (1 << PORTD1) /** @} */ +/** + * @name EEPROM configuration + * @{ + */ +#define EEPROM_SIZE (4096U) /* 4kB */ +/** @} */ + #ifdef __cplusplus } #endif diff --git a/cpu/atmega256rfr2/include/cpu_conf.h b/cpu/atmega256rfr2/include/cpu_conf.h index b21ef3c3c5..e7eb3c681e 100644 --- a/cpu/atmega256rfr2/include/cpu_conf.h +++ b/cpu/atmega256rfr2/include/cpu_conf.h @@ -48,12 +48,5 @@ extern "C" { } #endif -/** - * @name EEPROM configuration - * @{ - */ -#define EEPROM_SIZE (8192U) /* 8kB */ -/** @} */ - #endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/atmega256rfr2/include/periph_cpu.h b/cpu/atmega256rfr2/include/periph_cpu.h index 03562a2402..8ea1970904 100644 --- a/cpu/atmega256rfr2/include/periph_cpu.h +++ b/cpu/atmega256rfr2/include/periph_cpu.h @@ -77,6 +77,13 @@ enum { #endif /** @}*/ +/** + * @name EEPROM configuration + * @{ + */ +#define EEPROM_SIZE (8192U) /* 8kB */ +/** @} */ + #ifdef __cplusplus } #endif diff --git a/cpu/atmega328p/include/cpu_conf.h b/cpu/atmega328p/include/cpu_conf.h index 1f0aab3eab..91ac74da4d 100644 --- a/cpu/atmega328p/include/cpu_conf.h +++ b/cpu/atmega328p/include/cpu_conf.h @@ -42,13 +42,6 @@ extern "C" { #define THREAD_STACKSIZE_IDLE (128) /** @} */ -/** - * @name EEPROM configuration - * @{ - */ -#define EEPROM_SIZE (1024U) /* 1kB */ -/** @} */ - #ifdef __cplusplus } #endif diff --git a/cpu/atmega328p/include/periph_cpu.h b/cpu/atmega328p/include/periph_cpu.h index 03ab92365f..ac4be4cd09 100644 --- a/cpu/atmega328p/include/periph_cpu.h +++ b/cpu/atmega328p/include/periph_cpu.h @@ -57,6 +57,13 @@ enum { #define I2C_PIN_MASK (1 << PORTC4) | (1 << PORTC5) /** @} */ +/** + * @name EEPROM configuration + * @{ + */ +#define EEPROM_SIZE (1024U) /* 1kB */ +/** @} */ + #ifdef __cplusplus } #endif -- GitLab