projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix a bunch of time variables to be AO_TICK_TYPE
[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 8c9d1ae69a6dbe81135cf606c2c12ba738effb57..69b259d9419c34b6c8c24951605f03a8a82dc070 100644
(file)
--- a/
src/attiny/ao_arch_funcs.h
+++ b/
src/attiny/ao_arch_funcs.h
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,49
+21,46
@@
*/
#define ao_spi_get_mask(reg,mask,bus,speed) do { \
*/
#define ao_spi_get_mask(reg,mask,bus,speed) do { \
- (reg) &= ~(mask); \
+ (reg) &= ~(mask);
\
} while (0)
#define ao_spi_put_mask(reg,mask,bus) do { \
(reg) |= (mask); \
} while (0)
} while (0)
#define ao_spi_put_mask(reg,mask,bus) do { \
(reg) |= (mask); \
} while (0)
-#define ao_spi_get_bit(reg,bit,pin,bus,speed) do { \
- (pin) = 0; \
- } while (0)
-
-#define ao_spi_put_bit(reg,bit,pin,bus) do { \
- (pin) = 1; \
- } while (0)
+#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,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) ((PORTB >> (bit)) & 1)
+
/*
* The SPI mutex must be held to call either of these
* functions -- this mutex covers the entire SPI operation,
* from chip select low to chip select high
*/
/*
* The SPI mutex must be held to call either of these
* functions -- this mutex covers the entire SPI operation,
* 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)
void
ao_gpio_token_evaluator(DDR,port) |= (1 << bit); \
} while (0)
void
-ao_spi_send_bus(void
__xdata *block, uint16_t len) __reentrant
;
+ao_spi_send_bus(void
*block, uint16_t len)
;
void
void
-ao_spi_recv_bus(void
__xdata *block, uint16_t len) __reentrant
;
+ao_spi_recv_bus(void
*block, uint16_t len)
;
#define ao_spi_send(block, len, bus) ao_spi_send_bus(block, len)
#define ao_spi_recv(block, len, bus) ao_spi_recv_bus(block, len)
#define ao_spi_send(block, len, bus) ao_spi_send_bus(block, len)
#define ao_spi_recv(block, len, bus) ao_spi_recv_bus(block, len)
@@
-112,10
+110,10
@@
ao_i2c_init(void);
/* notask.c */
uint8_t
/* notask.c */
uint8_t
-ao_sleep(
__xdata
void *wchan);
+ao_sleep(void *wchan);
void
void
-ao_wakeup(
__xdata
void *wchan);
+ao_wakeup(void *wchan);
extern alt_t ao_max_height;
extern alt_t ao_max_height;