From 144cd0c5de0042b880f36cf0db3f01a6060dabd7 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Mon, 14 Apr 2008 00:52:52 +0200 Subject: * digital/avr/modules/spi: - there is no HOST support in the SPI module. --- digital/avr/modules/spi/Makefile | 2 +- digital/avr/modules/spi/Makefile.module | 2 +- digital/avr/modules/spi/spi.avr.c | 129 ++++++++++++++++++++++++++++++++ digital/avr/modules/spi/spi.c | 129 -------------------------------- digital/avr/modules/spi/test/Makefile | 4 +- 5 files changed, 133 insertions(+), 133 deletions(-) create mode 100644 digital/avr/modules/spi/spi.avr.c delete mode 100644 digital/avr/modules/spi/spi.c (limited to 'digital/avr') diff --git a/digital/avr/modules/spi/Makefile b/digital/avr/modules/spi/Makefile index fa689635..9068899d 100755 --- a/digital/avr/modules/spi/Makefile +++ b/digital/avr/modules/spi/Makefile @@ -1,5 +1,5 @@ BASE = ../.. DOC = spi.html -EXTRACTDOC = spi.h spi.c +EXTRACTDOC = spi.h spi.avr.c include $(BASE)/make/Makefile.gen diff --git a/digital/avr/modules/spi/Makefile.module b/digital/avr/modules/spi/Makefile.module index f2529dfa..396ba9e3 100755 --- a/digital/avr/modules/spi/Makefile.module +++ b/digital/avr/modules/spi/Makefile.module @@ -1 +1 @@ -spi_SOURCES = spi.c +spi_SOURCES = spi.avr.c diff --git a/digital/avr/modules/spi/spi.avr.c b/digital/avr/modules/spi/spi.avr.c new file mode 100644 index 00000000..581756f1 --- /dev/null +++ b/digital/avr/modules/spi/spi.avr.c @@ -0,0 +1,129 @@ +/* spi.avr.c */ +/* {{{ + * + * Copyright (C) 2008 Nélio Laranjeiro + * + * APBTeam: + * Web: http://apbteam.org/ + * Email: team AT apbteam DOT org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * }}} */ +#include "io.h" +#include "common.h" +#include "spi.h" + +/** For host */ +#ifdef HOST +static uint8_t SPCR; +static uint8_t SPDR; +static uint8_t SPSR; +static uint8_t SPIF; +#endif + +/** Spi driver context. */ +static spi_t spi_global; + +/** Initialise the SPI Control Register. + * \param sprc the sprc register data to be store in the register. + * \param cb the function call back to call the user which receive the data. + * \param user_data the user data to be provieded in the function call back. + */ +void +spi_init(uint8_t sprc) +{ + /* Master configuration. */ + if (sprc & _BV(MSTR)) + { + SPI_PORT |= _BV(SPI_BIT_SS); + SPI_DDR |= _BV(SPI_BIT_SS); + + SPI_DDR &= ~_BV(SPI_BIT_MISO); + SPI_PORT &= ~_BV(SPI_BIT_MISO); + + SPI_PORT |= _BV(SPI_BIT_MOSI); + SPI_DDR |= _BV(SPI_BIT_MOSI); + + SPI_PORT |= _BV(SPI_BIT_SCK); + SPI_DDR |= _BV(SPI_BIT_SCK); + } + else + { + SPI_DDR &= ~_BV(SPI_BIT_SS); + SPI_PORT |= _BV(SPI_BIT_SS); + + SPI_PORT |= _BV(SPI_BIT_MISO); + SPI_DDR |= _BV(SPI_BIT_MISO); + + SPI_DDR &= ~_BV(SPI_BIT_MOSI); + SPI_PORT &= ~_BV(SPI_BIT_MOSI); + + SPI_DDR &= ~_BV(SPI_BIT_SCK); + SPI_PORT &= ~_BV(SPI_BIT_SCK); + } + + SPCR = sprc; + spi_global.interruption = SPCR & _BV(SPIE); +} + +/** Send a data to the Slave. + * \param data the data to send + */ +void +spi_send(uint8_t data) +{ + SPDR = data; + // Wait the end of the transmission. + while(!(SPSR & _BV(SPIF))); +} + +/** Receive a data from the SPI bus. + * \return the data received from the bus. + */ +uint8_t +spi_recv(void) +{ + SPDR = 0; + /* Wait for reception complete */ + while(!(SPSR & _BV(SPIF))); + + /* Return data register */ + return SPDR; +} + +/** Send and receive data. + * \param data the data to send. + * \return the data received. + */ +uint8_t +spi_send_and_recv (uint8_t data) +{ + SPDR = data; + // Wait the end of the transmission. + while(!(SPSR & _BV(SPIF))); + + return SPDR; +} + +/** Return the status register from the SPI driver. + * \return the status register value + */ +uint8_t +spi_status(void) +{ + return SPSR; +} + diff --git a/digital/avr/modules/spi/spi.c b/digital/avr/modules/spi/spi.c deleted file mode 100644 index 73cb1706..00000000 --- a/digital/avr/modules/spi/spi.c +++ /dev/null @@ -1,129 +0,0 @@ -/* spi.c */ -/* {{{ - * - * Copyright (C) 2008 Nélio Laranjeiro - * - * APBTeam: - * Web: http://apbteam.org/ - * Email: team AT apbteam DOT org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * }}} */ -#include "io.h" -#include "common.h" -#include "spi.h" - -/** For host */ -#ifdef HOST -static uint8_t SPCR; -static uint8_t SPDR; -static uint8_t SPSR; -static uint8_t SPIF; -#endif - -/** Spi driver context. */ -static spi_t spi_global; - -/** Initialise the SPI Control Register. - * \param sprc the sprc register data to be store in the register. - * \param cb the function call back to call the user which receive the data. - * \param user_data the user data to be provieded in the function call back. - */ -void -spi_init(uint8_t sprc) -{ - /* Master configuration. */ - if (sprc & _BV(MSTR)) - { - SPI_PORT |= _BV(SPI_BIT_SS); - SPI_DDR |= _BV(SPI_BIT_SS); - - SPI_DDR &= ~_BV(SPI_BIT_MISO); - SPI_PORT &= ~_BV(SPI_BIT_MISO); - - SPI_PORT |= _BV(SPI_BIT_MOSI); - SPI_DDR |= _BV(SPI_BIT_MOSI); - - SPI_PORT |= _BV(SPI_BIT_SCK); - SPI_DDR |= _BV(SPI_BIT_SCK); - } - else - { - SPI_DDR &= ~_BV(SPI_BIT_SS); - SPI_PORT |= _BV(SPI_BIT_SS); - - SPI_PORT |= _BV(SPI_BIT_MISO); - SPI_DDR |= _BV(SPI_BIT_MISO); - - SPI_DDR &= ~_BV(SPI_BIT_MOSI); - SPI_PORT &= ~_BV(SPI_BIT_MOSI); - - SPI_DDR &= ~_BV(SPI_BIT_SCK); - SPI_PORT &= ~_BV(SPI_BIT_SCK); - } - - SPCR = sprc; - spi_global.interruption = SPCR & _BV(SPIE); -} - -/** Send a data to the Slave. - * \param data the data to send - */ -void -spi_send(uint8_t data) -{ - SPDR = data; - // Wait the end of the transmission. - while(!(SPSR & _BV(SPIF))); -} - -/** Receive a data from the SPI bus. - * \return the data received from the bus. - */ -uint8_t -spi_recv(void) -{ - SPDR = 0; - /* Wait for reception complete */ - while(!(SPSR & _BV(SPIF))); - - /* Return data register */ - return SPDR; -} - -/** Send and receive data. - * \param data the data to send. - * \return the data received. - */ -uint8_t -spi_send_and_recv (uint8_t data) -{ - SPDR = data; - // Wait the end of the transmission. - while(!(SPSR & _BV(SPIF))); - - return SPDR; -} - -/** Return the status register from the SPI driver. - * \return the status register value - */ -uint8_t -spi_status(void) -{ - return SPSR; -} - diff --git a/digital/avr/modules/spi/test/Makefile b/digital/avr/modules/spi/test/Makefile index 9da68382..fcab3dc7 100755 --- a/digital/avr/modules/spi/test/Makefile +++ b/digital/avr/modules/spi/test/Makefile @@ -1,10 +1,10 @@ BASE = ../../.. -PROGS = test_spi +AVR_PROGS = test_spi test_spi_SOURCES = test_spi.c MODULES = utils spi uart proto CONFIGFILE = avrconfig.h # atmega8, atmega8535, atmega128... -AVR_MCU = atmega8 +AVR_MCU = atmega128 # -O2 : speed # -Os : size OPTIMIZE = -O2 -- cgit v1.2.3