X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=f7db3bf41c82eca69ba8bbe1125cc402908614ef;hb=059f09dbca4703c25b42389b54c6510331c39485;hp=8263a52983cd2daf167761976353eb459f1f29e5;hpb=1f2b75518169c4f2da9762de46bf1d9a71a04d17;p=fw%2Faltos

diff --git a/src/core/ao.h b/src/core/ao.h
index 8263a529..f7db3bf4 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -114,6 +114,7 @@ ao_start_scheduler(void);
 #define AO_PANIC_USB		10	/* Trying to send USB packet while busy */
 #define AO_PANIC_BT		11	/* Communications with bluetooth device failed */
 #define AO_PANIC_STACK		12	/* Stack overflow */
+#define AO_PANIC_SPI		13	/* SPI communication failure */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -940,47 +941,6 @@ ao_serial0_init(void);
 #endif
 
 
-/*
- * ao_spi.c
- */
-
-extern __xdata uint8_t	ao_spi_mutex;
-
-#define ao_spi_get_mask(reg,mask) do {\
-	ao_mutex_get(&ao_spi_mutex); \
-	(reg) &= ~(mask); \
-	} while (0)
-
-#define ao_spi_put_mask(reg,mask) do { \
-	(reg) |= (mask); \
-	ao_mutex_put(&ao_spi_mutex); \
-	} while (0)
-
-#define ao_spi_get_bit(bit) do {\
-	ao_mutex_get(&ao_spi_mutex); \
-	(bit) = 0; \
-	} while (0)
-
-#define ao_spi_put_bit(bit) do { \
-	(bit) = 1; \
-	ao_mutex_put(&ao_spi_mutex); \
-	} while (0)
-
-/*
- * The SPI mutex must be held to call either of these
- * functions -- this mutex covers the entire SPI operation,
- * from chip select low to chip select high
- */
-
-void
-ao_spi_send(void __xdata *block, uint16_t len) __reentrant;
-
-void
-ao_spi_recv(void __xdata *block, uint16_t len) __reentrant;
-
-void
-ao_spi_init(void);
-
 /*
  * ao_spi_slave.c
  */
@@ -1550,6 +1510,9 @@ ao_config_get(void);
 void
 ao_config_put(void);
 
+void
+ao_config_set_radio(void);
+
 void
 ao_config_init(void);
 
@@ -1932,6 +1895,14 @@ ao_sqrt(uint32_t op);
  * ao_freq.c
  */
 
-int32_t ao_freq_to_set(int32_t freq, int32_t cal);
+int32_t ao_freq_to_set(int32_t freq, int32_t cal) __reentrant;
+
+#include <ao_arch_funcs.h>
+
+/*
+ * ao_ms5607.c
+ */
+
+void ao_ms5607_init(void);
 
 #endif /* _AO_H_ */