From 2b7ecefce7790fa4d69473ed613705f2194a7832 Mon Sep 17 00:00:00 2001 From: David Kopf Date: Mon, 27 Feb 2012 17:05:22 -0500 Subject: [PATCH] Remove unused SPI initializer flag from AVR. Comment out in the msp-430 template. --- cpu/avr/spi.c | 6 ------ cpu/msp430/f1xxx/spi.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cpu/avr/spi.c b/cpu/avr/spi.c index 45fa011fa..c96f24032 100644 --- a/cpu/avr/spi.c +++ b/cpu/avr/spi.c @@ -26,7 +26,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: spi.c,v 1.1 2007/01/25 18:22:55 bg- Exp $ */ #include @@ -48,11 +47,6 @@ unsigned char spi_busy = 0; void spi_init(void) { - static unsigned char spi_inited = 0; - - if (spi_inited) - return; - /* Initalize ports for communication with SPI units. */ /* CSN=SS and must be output when master! */ DDRB |= BV(MOSI) | BV(SCK) | BV(CSN); diff --git a/cpu/msp430/f1xxx/spi.c b/cpu/msp430/f1xxx/spi.c index a88f69a57..0cf7c7715 100644 --- a/cpu/msp430/f1xxx/spi.c +++ b/cpu/msp430/f1xxx/spi.c @@ -26,7 +26,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: spi.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $ */ #include "contiki-conf.h" @@ -46,11 +45,12 @@ unsigned char spi_busy = 0; void spi_init(void) { +/* static unsigned char spi_inited = 0; if (spi_inited) return; - +*/ /* Initalize ports for communication with SPI units. */ U0CTL = CHAR + SYNC + MM + SWRST; /* SW reset,8-bit transfer, SPI master */