projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/easymega-v2.0: Handle different mpu9250 orientation
[fw/altos]
/
src
/
attiny
/
ao_arch_funcs.h
diff --git
a/src/attiny/ao_arch_funcs.h
b/src/attiny/ao_arch_funcs.h
index 35901154b8473e64e01a23fdfe0654256335b765..69b259d9419c34b6c8c24951605f03a8a82dc070 100644
(file)
--- a/
src/attiny/ao_arch_funcs.h
+++ b/
src/attiny/ao_arch_funcs.h
@@
-28,21
+28,21
@@
(reg) |= (mask); \
} while (0)
(reg) |= (mask); \
} while (0)
-#define ao_spi_get_bit(reg,bit,
pin,
bus,speed) ao_spi_get_mask(reg,(1<<(bit)),bus,speed)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<(bit)),bus,speed)
-#define ao_spi_put_bit(reg,bit,
pin,
bus) ao_spi_put_mask(reg,(1<<(bit)),bus)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<(bit)),bus)
#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) \
PORTB |= (1 << bit); \
else \
PORTB &= ~(1 << bit); \
} while (0)
if (v) \
PORTB |= (1 << bit); \
else \
PORTB &= ~(1 << bit); \
} while (0)
-#define ao_gpio_get(port, bit
, pin)
((PORTB >> (bit)) & 1)
+#define ao_gpio_get(port, bit
)
((PORTB >> (bit)) & 1)
/*
* The SPI mutex must be held to call either of these
/*
* The SPI mutex must be held to call either of these
@@
-50,8
+50,8
@@
* 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)