X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_arch_funcs.h;h=15106dea42d620b1bbc452c9e56b6eaea2c6bc36;hb=ec963d358895ae46af63d2a6e9a32bdfb4d631c0;hp=69f2cbfbf971fc9ea671dc4b8bb377e3582eeb7f;hpb=7339d2379713b5b7e4c4fe6bad89ed93f9d39e82;p=fw%2Faltos

diff --git a/src/lpc/ao_arch_funcs.h b/src/lpc/ao_arch_funcs.h
index 69f2cbfb..15106dea 100644
--- a/src/lpc/ao_arch_funcs.h
+++ b/src/lpc/ao_arch_funcs.h
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -108,7 +109,7 @@ ao_arch_memory_barrier() {
 static inline void
 ao_arch_init_stack(struct ao_task *task, void *start)
 {
-	uint32_t	*sp = (uint32_t *) (task->stack + AO_STACK_SIZE);
+	uint32_t	*sp = (uint32_t *) (void *) (task->stack + AO_STACK_SIZE);
 	uint32_t	a = (uint32_t) start;
 	int		i;
 
@@ -224,11 +225,31 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
 void
 ao_spi_duplex(const void *out, void *in, uint16_t len, uint8_t spi_index);
 
-extern uint16_t	ao_spi_speed[LPC_NUM_SPI];
-
 void
 ao_spi_init(void);
 
+static inline void
+ao_spi_send_sync(const void *block, uint16_t len, uint8_t spi_index)
+{
+	ao_spi_send(block, len, spi_index);
+}
+
+static inline void ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
+{
+	struct lpc_ssp	*lpc_ssp;
+	switch (spi_index) {
+	case 0:
+		lpc_ssp = &lpc_ssp0;
+		break;
+	case 1:
+		lpc_ssp = &lpc_ssp1;
+		break;
+	}
+	lpc_ssp->dr = byte;
+	while ((lpc_ssp->sr & (1 << LPC_SSP_SR_RNE)) == 0);
+	(void) lpc_ssp->dr;
+}
+
 #define ao_spi_init_cs(port, mask) do {					\
 		uint8_t __bit__;					\
 		for (__bit__ = 0; __bit__ < 32; __bit__++) {		\