From: Keith Packard <keithp@keithp.com>
Date: Tue, 2 Nov 2010 06:21:16 +0000 (-0700)
Subject: altos: Fix remaining SPI users to initialize SPI in main
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8c1672560df866a70fe6fa69ce5ba65d835433dc;p=fw%2Faltos

altos: Fix remaining SPI users to initialize SPI in main

Any product using SPI must initialize the SPI bus along with the
SPI-based drivers.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao_ee.c b/src/ao_ee.c
index a67ca12d..36c8a100 100644
--- a/src/ao_ee.c
+++ b/src/ao_ee.c
@@ -340,6 +340,5 @@ ao_ee_init(void)
 	P1DIR |= (1 << EE_CS_INDEX);
 	P1SEL &= ~(1 << EE_CS_INDEX);
 
-	ao_spi_init();
 	ao_cmd_register(&ao_ee_cmds[0]);
 }
diff --git a/src/ao_flash.c b/src/ao_flash.c
index c3f45ee3..4f3618ee 100644
--- a/src/ao_flash.c
+++ b/src/ao_flash.c
@@ -455,7 +455,5 @@ ao_ee_init(void)
 	FLASH_CS = 1;
 	P1DIR |= (1 << FLASH_CS_INDEX);
 	P1SEL &= ~(1 << FLASH_CS_INDEX);
-
-	ao_spi_init();
 	ao_cmd_register(&ao_flash_cmds[0]);
 }
diff --git a/src/ao_telemetrum.c b/src/ao_telemetrum.c
index fd0adae8..1209c820 100644
--- a/src/ao_telemetrum.c
+++ b/src/ao_telemetrum.c
@@ -48,6 +48,7 @@ main(void)
 	ao_adc_init();
 	ao_beep_init();
 	ao_cmd_init();
+	ao_spi_init();
 	ao_ee_init();
 	ao_flight_init();
 	ao_log_init();