From 7765653d83364f266b7f1917b1cd6ab1508e7acf Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 31 Mar 2019 22:01:41 -0400 Subject: avr: Use enumerations for buses and reserve pins Signed-off-by: Kevin O'Connor --- src/avr/spi.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/avr/spi.c') diff --git a/src/avr/spi.c b/src/avr/spi.c index 495e8330..319c51d6 100644 --- a/src/avr/spi.c +++ b/src/avr/spi.c @@ -11,17 +11,22 @@ #include "pgm.h" // READP #include "sched.h" // sched_shutdown +DECL_ENUMERATION("spi_bus", "spi", 0); + #if CONFIG_MACH_atmega168 || CONFIG_MACH_atmega328 || CONFIG_MACH_atmega328p -static const uint8_t SS = GPIO('B', 2), SCK = GPIO('B', 5); -static const uint8_t MOSI = GPIO('B', 3), MISO = GPIO('B', 4); +static const uint8_t MISO = GPIO('B', 4), MOSI = GPIO('B', 3); +static const uint8_t SCK = GPIO('B', 5), SS = GPIO('B', 2); +DECL_CONSTANT_STR("BUS_PINS_spi", "PB4,PB3,PB5"); #elif CONFIG_MACH_atmega644p || CONFIG_MACH_atmega1284p -static const uint8_t SS = GPIO('B', 4), SCK = GPIO('B', 7); -static const uint8_t MOSI = GPIO('B', 5), MISO = GPIO('B', 6); +static const uint8_t MISO = GPIO('B', 6), MOSI = GPIO('B', 5); +static const uint8_t SCK = GPIO('B', 7), SS = GPIO('B', 4); +DECL_CONSTANT_STR("BUS_PINS_spi", "PB6,PB5,PB7"); #elif CONFIG_MACH_at90usb1286 || CONFIG_MACH_at90usb646 \ || CONFIG_MACH_atmega32u4 || CONFIG_MACH_atmega1280 \ || CONFIG_MACH_atmega2560 -static const uint8_t SS = GPIO('B', 0), SCK = GPIO('B', 1); -static const uint8_t MOSI = GPIO('B', 2), MISO = GPIO('B', 3); +static const uint8_t MISO = GPIO('B', 3), MOSI = GPIO('B', 2); +static const uint8_t SCK = GPIO('B', 1), SS = GPIO('B', 0); +DECL_CONSTANT_STR("BUS_PINS_spi", "PB3,PB2,PB1"); #endif static void -- cgit v1.2.3-70-g09d2