altos: Move SPI functions to architecture-specific location

Some architecture specific stuff needs to use core altos code, so
create new ao_arch_funcs.h files per architecture that get pulled in
at the end of ao.h

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

4 files changed, 153 insertions, 41 deletions

diff --git a/src/avr/ao_arch_funcs.h b/src/avr/ao_arch_funcs.h
new file mode 100644
index 00000000..9ad14fbb
--- /dev/null
+++ b/src/avr/ao_arch_funcs.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+/*
+ * 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);
+
diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
new file mode 100644
index 00000000..9ad14fbb
--- /dev/null
+++ b/src/cc1111/ao_arch_funcs.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+/*
+ * 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);
+
diff --git a/src/core/ao.h b/src/core/ao.h
index 8263a529..080cadb2 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -941,47 +941,6 @@ ao_serial0_init(void);
 
 
 /*
- * 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
  */
 
@@ -1934,4 +1893,6 @@ ao_sqrt(uint32_t op);
 
 int32_t ao_freq_to_set(int32_t freq, int32_t cal);
 
+#include <ao_arch_funcs.h>
+
 #endif /* _AO_H_ */
diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
new file mode 100644
index 00000000..9b68f19a
--- /dev/null
+++ b/src/stm/ao_arch_funcs.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_ARCH_FUNCS_H_
+#define _AO_ARCH_FUNCS_H_
+
+extern uint8_t	ao_spi_mutex[STM_NUM_SPI];
+
+static inline void ao_spi_get(uint8_t spi_index) { ao_mutex_get(&ao_spi_mutex[spi_index]); }
+static inline void ao_spi_put(uint8_t spi_index) { ao_mutex_put(&ao_spi_mutex[spi_index]); }
+
+void
+ao_spi_send(void *block, uint16_t len, uint8_t spi_index);
+
+void
+ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
+
+void
+ao_spi_init(uint8_t spi_index);
+
+#endif /* _AO_ARCH_FUNCS_H_ */