projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm: remove ao_dma_abort
[fw/altos]
/
src
/
stm
/
ao_arch_funcs.h
diff --git
a/src/stm/ao_arch_funcs.h
b/src/stm/ao_arch_funcs.h
index 5a7782dea8913779c8aa01cb37eb93cdec8387bc..25b435879b3fbab71e5625b3a2ddebaaf2586fca 100644
(file)
--- a/
src/stm/ao_arch_funcs.h
+++ b/
src/stm/ao_arch_funcs.h
@@
-249,9
+249,6
@@
ao_dma_start(uint8_t index);
void
ao_dma_done_transfer(uint8_t index);
void
ao_dma_done_transfer(uint8_t index);
-void
-ao_dma_abort(uint8_t index);
-
void
ao_dma_alloc(uint8_t index);
void
ao_dma_alloc(uint8_t index);
@@
-343,6
+340,14
@@
ao_arch_memory_barrier() {
asm volatile("" ::: "memory");
}
asm volatile("" ::: "memory");
}
+static inline void
+ao_arch_irq_check(void) {
+ uint32_t primask;
+ asm("mrs %0,primask" : "=&r" (primask));
+ if ((primask & 1) == 0)
+ ao_panic(AO_PANIC_IRQ);
+}
+
#if HAS_TASK
static inline void
ao_arch_init_stack(struct ao_task *task, void *start)
#if HAS_TASK
static inline void
ao_arch_init_stack(struct ao_task *task, void *start)
@@
-391,13
+396,6
@@
static inline void ao_arch_save_stack(void) {
static inline void ao_arch_restore_stack(void) {
uint32_t sp;
static inline void ao_arch_restore_stack(void) {
uint32_t sp;
- uint32_t control;
-
- asm("mrs %0,control" : "=&r" (control));
- control |= (1 << 1);
- asm("msr control,%0" : : "r" (control));
- asm("isb");
-
sp = (uint32_t) ao_cur_task->sp;
/* Switch stacks */
sp = (uint32_t) ao_cur_task->sp;
/* Switch stacks */
@@
-454,14
+452,7
@@
static inline void ao_arch_start_scheduler(void) {
}
#endif
}
#endif
-static inline void ao_arch_isr_stack(void) {
- uint32_t control;
-
- asm("mrs %0,control" : "=&r" (control));
- control &= ~(1 << 1);
- asm("msr control,%0" : : "r" (control));
- asm("isb");
-}
+#define ao_arch_isr_stack()
#endif
#endif