altos/avr: Remove debugging printf in avr stdio startup

[fw/altos] / src / drivers / ao_companion.c

diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c
index a31cc2eadf2e5742917b33872519e382b0b3a75c..a3167956fd9ca25d464a42426e570e214e9dd7f1 100644 (file)
--- a/src/drivers/ao_companion.c
+++ b/src/drivers/ao_companion.c
@@ -18,28 +18,20 @@
 #include <ao.h>
 #include <ao_companion.h>
 
-#ifndef ao_spi_slow
-#define ao_spi_slow(bus) (U0GCR = (UxGCR_CPOL_NEGATIVE |       \
-                                  UxGCR_CPHA_FIRST_EDGE |      \
-                                  UxGCR_ORDER_MSB |            \
-                                  (13 << UxGCR_BAUD_E_SHIFT)))
-
-#define ao_spi_fast(bus) (U0GCR = (UxGCR_CPOL_NEGATIVE |       \
-                                  UxGCR_CPHA_FIRST_EDGE |      \
-                                  UxGCR_ORDER_MSB |            \
-                                  (17 << UxGCR_BAUD_E_SHIFT)))
+#ifdef MEGAMETRUM
+#define ao_spi_slow(b)
+#define ao_spi_fast(b)
 #endif
 
 #define COMPANION_SELECT()     do {                    \
                ao_spi_get_bit(AO_COMPANION_CS_PORT,    \
                               AO_COMPANION_CS_PIN,     \
                               AO_COMPANION_CS,         \
-                              AO_COMPANION_SPI_BUS);   \
-               ao_spi_slow(AO_COMPANION_SPI_BUS);      \
+                              AO_COMPANION_SPI_BUS,    \
+                              AO_SPI_SPEED_200kHz);    \
        } while (0)
 
 #define COMPANION_DESELECT()   do {                    \
-               ao_spi_fast(AO_COMPANION_SPI_BUS);      \
                ao_spi_put_bit(AO_COMPANION_CS_PORT,    \
                               AO_COMPANION_CS_PIN,     \
                               AO_COMPANION_CS,         \
@@ -139,7 +131,7 @@ static __xdata struct ao_task ao_companion_task;
 void
 ao_companion_init(void)
 {
-       ao_enable_output(AO_COMPANION_CS_PORT, AO_COMPANION_CS_PIN, 1);
+       ao_enable_output(AO_COMPANION_CS_PORT, AO_COMPANION_CS_PIN, AO_COMPANION_CS, 1);
        ao_cmd_register(&ao_companion_cmds[0]);
        ao_add_task(&ao_companion_task, ao_companion, "companion");
 }