altos/stm: move spi execution to common ao_spi_run

[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..8393898de33d47b0272574eb3e8e591048ad41a9 100644 (file)
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -80,7 +80,7 @@ void
 ao_spi_send_fixed(uint8_t value, uint16_t len, uint8_t spi_index);
 
 void
-ao_spi_send_sync(void *block, uint16_t len, uint8_t spi_index);
+ao_spi_send_sync(const void *block, uint16_t len, uint8_t spi_index);
 
 static inline void
 ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
@@ -249,9 +249,6 @@ ao_dma_start(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);
 
@@ -343,6 +340,14 @@ ao_arch_memory_barrier() {
        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)
@@ -391,13 +396,6 @@ static inline void ao_arch_save_stack(void) {
 
 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 */
@@ -454,14 +452,7 @@ static inline void ao_arch_start_scheduler(void) {
 }
 #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