first cut at turnon scripts for EasyTimer v2

[fw/altos] / src / attiny / ao_spi_attiny.c

diff --git a/src/attiny/ao_spi_attiny.c b/src/attiny/ao_spi_attiny.c
index 064876d78ba02cf010584abf0dffb358ba28fe17..506ebf1550d84b1ee4ddec58045f175bc7fc4cd1 100644 (file)
--- a/src/attiny/ao_spi_attiny.c
+++ b/src/attiny/ao_spi_attiny.c
@@ -3,7 +3,8 @@
  *
  * 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; version 2 of the License.
+ * 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
@@ -81,7 +82,7 @@ ao_spi_transfer(uint8_t i)
  * so using interrupts would take way too long
  */
 void
-ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
+ao_spi_send_bus(void *block, uint16_t len) 
 {
        uint8_t *d = block;
 
@@ -94,7 +95,7 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
  * Poll, sending zeros and reading data back
  */
 void
-ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
+ao_spi_recv_bus(void *block, uint16_t len) 
 {
        uint8_t *d = block;
 
@@ -116,8 +117,7 @@ ao_spi_init(void)
 #else
        USICR = SPI_USICR_FAST_2;
 #endif
-       SPI_DIR &= ~(1 << DDB0);        /* DI */
+       SPI_DIR &= (uint8_t) ~(1 << DDB0);      /* DI */
        SPI_DIR |= (1 << DDB1);         /* DO */
        SPI_DIR |= (1 << DDB2);         /* SCLK */
-       SPI_DIR |= (1 << DDB3);         /* CS */
 }