summaryrefslogtreecommitdiff
path: root/src/stm/ao_arch_funcs.h
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2012-05-16 09:13:53 -0600
committerBdale Garbee <bdale@gag.com>2012-05-16 09:13:53 -0600
commit6a973f788563ccc66b01cc7557a004dabef18d09 (patch)
treeffbc8faad73cde7934c4050deb840092430a311f /src/stm/ao_arch_funcs.h
parentd387f246b24502642b76aad04eb3e0f1a5b78a05 (diff)
parentda2c920b9f3378d5a18551e008c1da5dace1e0ef (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/stm/ao_arch_funcs.h')
-rw-r--r--src/stm/ao_arch_funcs.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 3027b337..447042dd 100644
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -105,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);
@@ -131,16 +131,13 @@ uint8_t
ao_i2c_start(uint8_t i2c_index, uint16_t address);
void
-ao_i2c_stop(uint8_t i2c_index);
-
-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);