projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Remove unneeded initialization in ao_timer.c
[fw/altos]
/
src
/
cc1111
/
ao_arch.h
diff --git
a/src/cc1111/ao_arch.h
b/src/cc1111/ao_arch.h
index 7fdfad80825cbbd22fffe62d6e0b89e7d52bd0f3..bacfabb87f53852ba1f63b1803e15f178f76f120 100644
(file)
--- a/
src/cc1111/ao_arch.h
+++ b/
src/cc1111/ao_arch.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
@@
-40,6
+41,8
@@
#define AO_STACK_END 0xfe
#define AO_STACK_SIZE (AO_STACK_END - AO_STACK_START + 1)
#define AO_STACK_END 0xfe
#define AO_STACK_SIZE (AO_STACK_END - AO_STACK_START + 1)
+#define AO_PORT_TYPE uint8_t
+
#define ao_arch_reboot() do { \
WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64; \
ao_delay(AO_SEC_TO_TICKS(2)); \
#define ao_arch_reboot() do { \
WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64; \
ao_delay(AO_SEC_TO_TICKS(2)); \
@@
-112,9
+115,7
@@
extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
/* Push ACC first, as when restoring the context it must be restored \
* last (it is used to set the IE register). */ \
push ACC \
/* Push ACC first, as when restoring the context it must be restored \
* last (it is used to set the IE register). */ \
push ACC \
- /* Store the IE register then enable interrupts. */ \
push _IEN0 \
push _IEN0 \
- setb _EA \
push DPL \
push DPH \
push b \
push DPL \
push DPH \
push b \
@@
-147,11
+148,18
@@
extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
while (--stack_len); \
}
while (--stack_len); \
}
-#define ao_arch_isr_stack() \
- /* Empty the stack; might as well let interrupts have the whole thing */ \
- (SP = AO_STACK_START - 1)
+/* Empty the stack; might as well let interrupts have the whole thing */
+#define ao_arch_isr_stack() (SP = AO_STACK_START - 1)
+
+#define ao_arch_block_interrupts() __asm clr _EA __endasm
+#define ao_arch_release_interrupts() __asm setb _EA __endasm
-#define ao_arch_cpu_idle() (PCON = PCON_IDLE)
+/* Idle the CPU, waking when an interrupt occurs */
+#define ao_arch_wait_interrupt() do { \
+ ao_arch_release_interrupts(); \
+ (PCON = PCON_IDLE); \
+ ao_arch_block_interrupts(); \
+ } while (0)
#define ao_arch_restore_stack() { \
uint8_t stack_len; \
#define ao_arch_restore_stack() { \
uint8_t stack_len; \
@@
-192,7
+200,7
@@
extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
0098$: \
SETB _EA \
0099$: \
0098$: \
SETB _EA \
0099$: \
- /* Finally
pop off th
e ACC, which was the first register saved. */ \
+ /* Finally
restor
e ACC, which was the first register saved. */ \
pop ACC \
ret \
__endasm; \
pop ACC \
ret \
__endasm; \
@@
-221,7
+229,7
@@
void
ao_button_init(void);
char
ao_button_init(void);
char
-ao_button_get(
void
) __critical;
+ao_button_get(
uint16_t timeout
) __critical;
void
ao_button_clear(void) __critical;
void
ao_button_clear(void) __critical;
@@
-316,4
+324,11
@@
void
ao_serial1_tx_isr(void) ao_arch_interrupt(14);
#endif
ao_serial1_tx_isr(void) ao_arch_interrupt(14);
#endif
+#if HAS_EXTI_0
+void
+ao_p0_isr(void) __interrupt(13);
+#endif
+
+#define AO_ADC_MAX 32767
+
#endif /* _AO_ARCH_H_ */
#endif /* _AO_ARCH_H_ */