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/asserv/src/asserv/avrconfig.h | 5 +++++ digital/asserv/src/asserv/pwm_mp.avr.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'digital/asserv/src/asserv') diff --git a/digital/asserv/src/asserv/avrconfig.h b/digital/asserv/src/asserv/avrconfig.h index f95f74f8..c0403592 100644 --- a/digital/asserv/src/asserv/avrconfig.h +++ b/digital/asserv/src/asserv/avrconfig.h @@ -101,5 +101,10 @@ /** Slave send buffer size. */ #define AC_TWI_SL_SEND_BUFFER_SIZE 16 +/* 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 #endif /* avrconfig_h */ diff --git a/digital/asserv/src/asserv/pwm_mp.avr.c b/digital/asserv/src/asserv/pwm_mp.avr.c index 62ef2190..2349148a 100644 --- a/digital/asserv/src/asserv/pwm_mp.avr.c +++ b/digital/asserv/src/asserv/pwm_mp.avr.c @@ -52,8 +52,8 @@ pwm_mp_init (void) DDRE |= _BV (4); #endif #if PWM1or2 || PWM3or4 - spi_init (SPI_IT_DISABLE | SPI_ENABLE | 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); #endif /* Reset PWM values at reset. */ pwm_mp_go = 1; -- cgit v1.2.3