projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Clean up usage of port parameters
[fw/altos]
/
src
/
stm
/
ao_arch.h
diff --git
a/src/stm/ao_arch.h
b/src/stm/ao_arch.h
index adb6eb947a30daec3e4c6ff02c051ff3f5e69fc8..bbd1b3b1f33e50a90bed62d4178fd689789f77d6 100644
(file)
--- a/
src/stm/ao_arch.h
+++ b/
src/stm/ao_arch.h
@@
-74,12
+74,6
@@
extern const uint16_t ao_serial_number;
uint32_t a = (uint32_t) start; \
int i; \
\
uint32_t a = (uint32_t) start; \
int i; \
\
- /* APSR */ \
- ARM_PUSH32(sp, 0); \
- \
- /* PRIMASK with interrupts enabled */ \
- ARM_PUSH32(sp, 0); \
- \
/* Return address (goes into LR) */ \
ARM_PUSH32(sp, a); \
\
/* Return address (goes into LR) */ \
ARM_PUSH32(sp, a); \
\
@@
-88,23
+82,29
@@
extern const uint16_t ao_serial_number;
while (i--) \
ARM_PUSH32(sp, 0); \
\
while (i--) \
ARM_PUSH32(sp, 0); \
\
+ /* APSR */ \
+ ARM_PUSH32(sp, 0); \
+ \
+ /* PRIMASK with interrupts enabled */ \
+ ARM_PUSH32(sp, 0); \
+ \
task->sp = sp; \
} while (0);
#define ao_arch_save_regs() do { \
task->sp = sp; \
} while (0);
#define ao_arch_save_regs() do { \
-
uint32_t apsr;
\
-
uint32_t primask;
\
+
/* Save general registers */
\
+
asm("push {r0-r12,lr}\n");
\
\
/* Save APSR */ \
\
/* Save APSR */ \
- asm("mrs
%0,apsr" : "=&r" (apsr));
\
- asm("push {
%0}" : : "r" (apsr));
\
+ asm("mrs
r0,apsr");
\
+ asm("push {
r0}");
\
\
/* Save PRIMASK */ \
\
/* Save PRIMASK */ \
- asm("mrs
%0,primask" : "=&r" (primask));
\
- asm("push {
%0}" : : "r" (primask));
\
+ asm("mrs
r0,primask");
\
+ asm("push {
r0}");
\
\
\
- /*
Save general registers */
\
-
asm("push {r0-r12,lr}\n");
\
+ /*
Enable interrupts */
\
+
sei();
\
} while (0)
#define ao_arch_save_stack() do { \
} while (0)
#define ao_arch_save_stack() do { \
@@
-123,23
+123,21
@@
extern const uint16_t ao_serial_number;
#define ao_arch_restore_stack() do { \
uint32_t sp; \
#define ao_arch_restore_stack() do { \
uint32_t sp; \
- uint32_t primask; \
- uint32_t apsr; \
sp = (uint32_t) ao_cur_task->sp; \
\
/* Switch stacks */ \
asm("mov sp, %0" : : "r" (sp) ); \
\
sp = (uint32_t) ao_cur_task->sp; \
\
/* Switch stacks */ \
asm("mov sp, %0" : : "r" (sp) ); \
\
- /* Restore general registers */ \
- asm("pop {r0-r12,lr}\n"); \
- \
/* Restore PRIMASK */ \
/* Restore PRIMASK */ \
- asm("pop {
%0}" : "=&r" (primask) );
\
- asm("msr primask,
%0" : : "r" (primask) );
\
+ asm("pop {
r0}");
\
+ asm("msr primask,
r0");
\
\
/* Restore APSR */ \
\
/* Restore APSR */ \
- asm("pop {%0}" : "=&r" (apsr) ); \
- asm("msr apsr,%0" : : "r" (apsr) ); \
+ asm("pop {r0}"); \
+ asm("msr apsr,r0"); \
+ \
+ /* Restore general registers */ \
+ asm("pop {r0-r12,lr}\n"); \
\
/* Return to calling function */ \
asm("bx lr"); \
\
/* Return to calling function */ \
asm("bx lr"); \
@@
-181,8
+179,6
@@
void ao_lcd_font_init(void);
void ao_lcd_font_string(char *s);
void ao_lcd_font_string(char *s);
-#define USE_SERIAL_STDIN (USE_SERIAL_1_STDIN + USE_SERIAL_2_STDIN + USE_SERIAL_3_STDIN)
-
char
ao_serial1_getchar(void);
char
ao_serial1_getchar(void);