projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
stm
/
ao_arch_funcs.h
diff --git
a/src/stm/ao_arch_funcs.h
b/src/stm/ao_arch_funcs.h
index 3027b337fdb7266b19d104ce6c5b786b55aeac23..447042dd6a0ad3bda8c04d8c74d5368dc780d7d9 100644
(file)
--- 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
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);
void
ao_dma_start(uint8_t index);
@@
-130,17
+130,14
@@
ao_i2c_get(uint8_t i2c_index);
uint8_t
ao_i2c_start(uint8_t i2c_index, uint16_t address);
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_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);
void
ao_i2c_init(void);