projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make stm-demo display a scrolling message
[fw/altos]
/
src
/
cc1111
/
ao_arch.h
diff --git
a/src/cc1111/ao_arch.h
b/src/cc1111/ao_arch.h
index eb8ce9be01bf835ddd5cbf7ac505029af05a1dd3..360b35c8b239517109a8773b493827fa42b37e53 100644
(file)
--- a/
src/cc1111/ao_arch.h
+++ b/
src/cc1111/ao_arch.h
@@
-45,7
+45,7
@@
ao_delay(AO_SEC_TO_TICKS(2)); \
} while (0)
ao_delay(AO_SEC_TO_TICKS(2)); \
} while (0)
-#define ao_arch_nop() _
asm nop
_endasm
+#define ao_arch_nop() _
_asm nop _
_endasm
#define ao_arch_interrupt(n) __interrupt n
#define ao_arch_naked_declare __naked
#define ao_arch_interrupt(n) __interrupt n
#define ao_arch_naked_declare __naked
@@
-106,7
+106,7
@@
extern __code __at (0x00a6) uint32_t ao_radio_cal;
/* Save current context */
#define ao_arch_save_regs() \
/* Save current context */
#define ao_arch_save_regs() \
- _
asm
\
+ _
_asm
\
/* 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 \
@@
-125,11
+125,11
@@
extern __code __at (0x00a6) uint32_t ao_radio_cal;
push ar0 \
push ar1 \
push PSW \
push ar0 \
push ar1 \
push PSW \
- _
endasm;
\
+ _
_endasm;
\
PSW = 0; \
PSW = 0; \
- _
asm
\
+ _
_asm
\
push _bp \
push _bp \
- _endasm
+ _
_
endasm
#define ao_arch_save_stack() { \
uint8_t stack_len; \
#define ao_arch_save_stack() { \
uint8_t stack_len; \
@@
-166,7
+166,7
@@
extern __code __at (0x00a6) uint32_t ao_radio_cal;
*stack_ptr++ = *save_ptr++; \
while (--stack_len); \
\
*stack_ptr++ = *save_ptr++; \
while (--stack_len); \
\
- _
asm
\
+ _
_asm
\
pop _bp \
pop PSW \
pop ar1 \
pop _bp \
pop PSW \
pop ar1 \
@@
-193,7
+193,7
@@
extern __code __at (0x00a6) uint32_t ao_radio_cal;
/* Finally pop off the ACC, which was the first register saved. */ \
pop ACC \
ret \
/* Finally pop off the ACC, which was the first register saved. */ \
pop ACC \
ret \
- _
endasm;
\
+ _
_endasm;
\
}
#define ao_arch_critical(b) __critical { b }
}
#define ao_arch_critical(b) __critical { b }
@@
-251,4
+251,11
@@
_ao_xmemcmp(__xdata void *a, __xdata void *b, uint8_t count);
#define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
#define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
+struct ao_serial_speed {
+ uint8_t baud;
+ uint8_t gcr;
+};
+
+extern const __code struct ao_serial_speed ao_serial_speeds[];
+
#endif /* _AO_ARCH_H_ */
#endif /* _AO_ARCH_H_ */