projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm32f103: Fix continuous ADC code
[fw/altos]
/
src
/
avr
/
ao_arch_funcs.h
diff --git
a/src/avr/ao_arch_funcs.h
b/src/avr/ao_arch_funcs.h
index dc2486605acedae5cdc561e1f662950ea299d98d..f2a58af017282534b2071ed37e914a4fb106e2a7 100644
(file)
--- a/
src/avr/ao_arch_funcs.h
+++ b/
src/avr/ao_arch_funcs.h
@@
-32,12
+32,12
@@
extern uint8_t ao_spi_mutex;
ao_mutex_put(&ao_spi_mutex); \
} while (0)
ao_mutex_put(&ao_spi_mutex); \
} while (0)
-#define ao_spi_get_bit(reg,bit,
pin,bus,speed) do {
\
+#define ao_spi_get_bit(reg,bit,
bus,speed) do {
\
ao_mutex_get(&ao_spi_mutex); \
(pin) = 0; \
} while (0)
ao_mutex_get(&ao_spi_mutex); \
(pin) = 0; \
} while (0)
-#define ao_spi_put_bit(reg,bit,
pin,bus) do {
\
+#define ao_spi_put_bit(reg,bit,
bus) do {
\
(pin) = 1; \
ao_mutex_put(&ao_spi_mutex); \
} while (0)
(pin) = 1; \
ao_mutex_put(&ao_spi_mutex); \
} while (0)
@@
-46,7
+46,7
@@
extern uint8_t ao_spi_mutex;
#define ao_gpio_token_paster(x,y) x ## y
#define ao_gpio_token_evaluator(x,y) ao_gpio_token_paster(x,y)
#define ao_gpio_token_paster(x,y) x ## y
#define ao_gpio_token_evaluator(x,y) ao_gpio_token_paster(x,y)
-#define ao_gpio_set(port, bit,
pin, v) do {
\
+#define ao_gpio_set(port, bit,
v) do {
\
if (v) \
(ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
else \
if (v) \
(ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
else \
@@
-59,8
+59,8
@@
extern uint8_t ao_spi_mutex;
* from chip select low to chip select high
*/
* from chip select low to chip select high
*/
-#define ao_enable_output(port, bit,
pin, v) do {
\
- ao_gpio_set(port, bit,
pin, v);
\
+#define ao_enable_output(port, bit,
v) do {
\
+ ao_gpio_set(port, bit,
v);
\
ao_gpio_token_evaluator(DDR,port) |= (1 << bit); \
} while (0)
ao_gpio_token_evaluator(DDR,port) |= (1 << bit); \
} while (0)