From bdd377580a0374cc2893d386eb0f47b802232ac9 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 17 Apr 2009 00:25:16 +0200 Subject: * digital/avr/modules/spi: - fixed bad SPI2X mode. - prepare for software driver. --- digital/avr/modules/flash/flash.c | 5 ++--- digital/avr/modules/flash/test/avrconfig.h | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'digital/avr/modules/flash') diff --git a/digital/avr/modules/flash/flash.c b/digital/avr/modules/flash/flash.c index 96acb8ad..dffc6d82 100644 --- a/digital/avr/modules/flash/flash.c +++ b/digital/avr/modules/flash/flash.c @@ -105,9 +105,8 @@ flash_init (void) AC_FLASH_DDR |= _BV(AC_FLASH_BIT_SS); /* send the read-ID instruction. */ - spi_init (SPI_IT_DISABLE | SPI_ENABLE | SPI_MASTER | SPI_MSB_FIRST - | SPI_MASTER | SPI_CPOL_FALLING | SPI_CPHA_SETUP - | SPI_FOSC_DIV16); + spi_init (SPI_MASTER, SPI_CPOL_FALLING | SPI_CPHA_SETUP, SPI_MSB_FIRST, + SPI_FOSC_DIV16); AC_FLASH_PORT &= ~_BV(AC_FLASH_BIT_SS); spi_send (FLASH_READ_ID); diff --git a/digital/avr/modules/flash/test/avrconfig.h b/digital/avr/modules/flash/test/avrconfig.h index c4d9f159..0c80a8d2 100644 --- a/digital/avr/modules/flash/test/avrconfig.h +++ b/digital/avr/modules/flash/test/avrconfig.h @@ -83,6 +83,12 @@ /** Support for quote parameter. */ #define AC_PROTO_QUOTE 1 +/* spi - SPI module. */ +/** Select driver: HARD, SOFT, or NONE. */ +#define AC_SPI0_DRIVER HARD +/** Same thing for an optionnal second SPI driver. */ +#define AC_SPI1_DRIVER NONE + /* flash - Flash SPI AVR module. */ /** Flash PORT used. */ #define AC_FLASH_PORT PORTD -- cgit v1.2.3