X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_companion.c;h=85d68c44151c4de4029af86318ad9914d10b906a;hb=572e1664938c7ce6c308b36779f6a412959e03f1;hp=a31cc2eadf2e5742917b33872519e382b0b3a75c;hpb=03dc80d15a2f8fe9d7340351226dadd8bc3cfdb9;p=fw%2Faltos

diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c
index a31cc2ea..85d68c44 100644
--- 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,		\