X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=4a9802d7190d4c06eaeeb6e128af96f5e3daceb8;hb=a148876e36bc3f84f11fdac57a9f69171e30c058;hp=1cddcaf570e540656a2e42b2550a299167c82422;hpb=c1708f3fa4ff412da8817ba0fa58d05fe7ef44f5;p=fw%2Faltos

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 1cddcaf5..4a9802d7 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -25,7 +25,7 @@
 struct ao_ms5607_prom	ao_ms5607_prom;
 static uint8_t	  	ms5607_configured;
 
-#define AO_MS5607_SPI_SPEED	ao_spi_speed(20000000)
+#define AO_MS5607_SPI_SPEED	ao_spi_speed(AO_MS5607_SPI_INDEX, 20000000)
 
 static void
 ao_ms5607_start(void) {
@@ -148,7 +148,6 @@ static void
 ao_ms5607_isr(void)
 {
 	ao_exti_disable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
-	ao_ms5607_done = 1;
 	ao_wakeup((void *) &ao_ms5607_done);
 }
 
@@ -156,23 +155,27 @@ static uint32_t
 ao_ms5607_get_sample(uint8_t cmd) {
 	uint8_t	reply[4];
 
-	ao_ms5607_done = 0;
-
 	ao_ms5607_start();
-	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
 
 	ao_exti_enable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 
+	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+
 #if AO_MS5607_PRIVATE_PINS
-	ao_spi_put(AO_MS5607_SPI_INDEX);
+	ao_spi_put_pins(AO_MS5607_SPI_INDEX);
 #endif
 	ao_arch_block_interrupts();
-	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN) &&
-	       !ao_ms5607_done)
-		ao_sleep((void *) &ao_ms5607_done);
+#if !HAS_TASK
+#define ao_sleep_for(a,t) ao_sleep(a)
+#endif
+	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN)) {
+		if (ao_sleep_for((void *) &ao_ms5607_done, AO_MS_TO_TICKS(10)))
+			break;
+	}
+	ao_exti_disable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 	ao_arch_release_interrupts();
 #if AO_MS5607_PRIVATE_PINS
-	ao_gpio_set(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, 1);
+	ao_spi_clr_cs(AO_MS5607_CS_PORT, 1 << (AO_MS5607_CS_PIN));
 #else
 	ao_ms5607_stop();
 #endif