From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 05:33:30 +0000 (-0700)
Subject: altos: Changes required by cc1111 multi-spi support
X-Git-Tag: 1.2.9.4~118^2~12
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=e72147e215a982ce701099626424b9a856ac9d09;ds=sidebyside

altos: Changes required by cc1111 multi-spi support

These drivers got missed

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

diff --git a/src/drivers/ao_74hc165.c b/src/drivers/ao_74hc165.c
index f24fce37..143f4e3f 100644
--- a/src/drivers/ao_74hc165.c
+++ b/src/drivers/ao_74hc165.c
@@ -27,12 +27,12 @@ uint8_t
 ao_74hc165_read(void)
 {
 	static __xdata state;
-	ao_mutex_get(&ao_spi_mutex);
-	ao_spi_set_speed(AO_SPI_SPEED_FAST);
+	ao_spi_get(AO_74HC165_SPI_BUS);
+	ao_spi_set_speed(AO_74HC165_SPI_BUS, AO_SPI_SPEED_FAST);
 	AO_74HC165_CS = 1;
 	ao_spi_recv(&state, 1, AO_74HC165_SPI_BUS);
 	AO_74HC165_CS = 0;
-	ao_mutex_put(&ao_spi_mutex);
+	ao_spi_put(AO_74HC165_SPI_BUS);
 	return state;
 }
 
diff --git a/src/drivers/ao_pca9922.c b/src/drivers/ao_pca9922.c
index fe070b88..d376b968 100644
--- a/src/drivers/ao_pca9922.c
+++ b/src/drivers/ao_pca9922.c
@@ -30,12 +30,12 @@ ao_led_apply(void)
 	/* Don't try the SPI bus during initialization */
 	if (!ao_cur_task)
 		return;
-	ao_mutex_get(&ao_spi_mutex);
-	ao_spi_set_speed(AO_SPI_SPEED_FAST);
+	ao_spi_get(AO_PCA9922_SPI_BUS);
+	ao_spi_set_speed(AO_PCA9922_SPI_BUS,AO_SPI_SPEED_FAST);
 	AO_PCA9922_CS = 1;
 	ao_spi_send(&ao_led_state, 1, AO_PCA9922_SPI_BUS);
 	AO_PCA9922_CS = 0;
-	ao_mutex_put(&ao_spi_mutex);
+	ao_spi_put(AO_PCA9922_SPI_BUS);
 }
 
 void