X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_arch_funcs.h;h=447042dd6a0ad3bda8c04d8c74d5368dc780d7d9;hb=6a973f788563ccc66b01cc7557a004dabef18d09;hp=309937d58180545bad3e309186e7e9a231175516;hpb=0dd9e1dd62656a931f9559af6da9131f704f83f9;p=fw%2Faltos

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 309937d5..447042dd 100644
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -31,9 +31,15 @@ ao_spi_put(uint8_t spi_index);
 void
 ao_spi_send(void *block, uint16_t len, uint8_t spi_index);
 
+void
+ao_spi_send_fixed(uint8_t value, uint16_t len, uint8_t spi_index);
+
 void
 ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
 
+void
+ao_spi_duplex(void *out, void *in, uint16_t len, uint8_t spi_index);
+
 void
 ao_spi_init(void);
 
@@ -47,7 +53,7 @@ ao_spi_init(void);
 		ao_spi_put(bus);		\
 	} while (0)
 
-#define ao_stm_enable_port(port) do {					\
+#define ao_enable_port(port) do {					\
 		if (&(port) == &stm_gpioa)				\
 			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN); \
 		else if (&(port) == &stm_gpiob)				\
@@ -61,29 +67,29 @@ ao_spi_init(void);
 	} while (0)
 
 
-#define ao_stm_enable_cs(port,bit) do {				\
+#define ao_enable_cs(port,bit) do {				\
 		stm_gpio_set(&(port), bit, 1);			\
 		stm_moder_set(&(port), bit, STM_MODER_OUTPUT);	\
 	} while (0)
 
 #define ao_spi_init_cs(port, mask) do {				\
-		ao_stm_enable_port(port);			\
-		if (mask & 0x0001) ao_stm_enable_cs(port, 0);	\
-		if (mask & 0x0002) ao_stm_enable_cs(port, 1);	\
-		if (mask & 0x0004) ao_stm_enable_cs(port, 2);	\
-		if (mask & 0x0008) ao_stm_enable_cs(port, 3);	\
-		if (mask & 0x0010) ao_stm_enable_cs(port, 4);	\
-		if (mask & 0x0020) ao_stm_enable_cs(port, 5);	\
-		if (mask & 0x0040) ao_stm_enable_cs(port, 6);	\
-		if (mask & 0x0080) ao_stm_enable_cs(port, 7);	\
-		if (mask & 0x0100) ao_stm_enable_cs(port, 8);	\
-		if (mask & 0x0200) ao_stm_enable_cs(port, 9);	\
-		if (mask & 0x0400) ao_stm_enable_cs(port, 10);	\
-		if (mask & 0x0800) ao_stm_enable_cs(port, 11);	\
-		if (mask & 0x1000) ao_stm_enable_cs(port, 12);	\
-		if (mask & 0x2000) ao_stm_enable_cs(port, 13);	\
-		if (mask & 0x4000) ao_stm_enable_cs(port, 14);	\
-		if (mask & 0x8000) ao_stm_enable_cs(port, 15);	\
+		ao_enable_port(port);				\
+		if ((mask) & 0x0001) ao_enable_cs(port, 0);	\
+		if ((mask) & 0x0002) ao_enable_cs(port, 1);	\
+		if ((mask) & 0x0004) ao_enable_cs(port, 2);	\
+		if ((mask) & 0x0008) ao_enable_cs(port, 3);	\
+		if ((mask) & 0x0010) ao_enable_cs(port, 4);	\
+		if ((mask) & 0x0020) ao_enable_cs(port, 5);	\
+		if ((mask) & 0x0040) ao_enable_cs(port, 6);	\
+		if ((mask) & 0x0080) ao_enable_cs(port, 7);	\
+		if ((mask) & 0x0100) ao_enable_cs(port, 8);	\
+		if ((mask) & 0x0200) ao_enable_cs(port, 9);	\
+		if ((mask) & 0x0400) ao_enable_cs(port, 10);\
+		if ((mask) & 0x0800) ao_enable_cs(port, 11);\
+		if ((mask) & 0x1000) ao_enable_cs(port, 12);\
+		if ((mask) & 0x2000) ao_enable_cs(port, 13);\
+		if ((mask) & 0x4000) ao_enable_cs(port, 14);\
+		if ((mask) & 0x8000) ao_enable_cs(port, 15);\
 	} while (0)
 
 /* ao_dma_stm.c
@@ -99,7 +105,7 @@ ao_dma_set_transfer(uint8_t 		index,
 		    uint32_t		ccr);
 
 void
-ao_dma_set_isr(uint8_t index, void (*isr)(void));
+ao_dma_set_isr(uint8_t index, void (*isr)(int index));
 
 void
 ao_dma_start(uint8_t index);
@@ -127,11 +133,11 @@ ao_i2c_start(uint8_t i2c_index, uint16_t address);
 void
 ao_i2c_put(uint8_t i2c_index);
 
-void
-ao_i2c_send(void *block, uint16_t len, uint8_t i2c_index);
+uint8_t
+ao_i2c_send(void *block, uint16_t len, uint8_t i2c_index, uint8_t stop);
 
-void
-ao_i2c_recv(void *block, uint16_t len, uint8_t i2c_index);
+uint8_t
+ao_i2c_recv(void *block, uint16_t len, uint8_t i2c_index, uint8_t stop);
 
 void
 ao_i2c_init(void);